[Rt-commit] rt branch, 4.2/static-handler, created. rt-4.0.0rc7-251-g0376928
? sunnavy
sunnavy at bestpractical.com
Fri May 13 03:04:09 EDT 2011
The branch, 4.2/static-handler has been created
at 03769287cf991b23ad86b127b1aa51355fde304b (commit)
- Log -----------------------------------------------------------------
commit f9e351734a102c0cc72377bd837703cea8ecfe18
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri May 13 14:30:56 2011 +0800
add static handler as middleware
diff --git a/lib/RT/Interface/Web/Handler.pm b/lib/RT/Interface/Web/Handler.pm
index 4608882..27d6ae5 100644
--- a/lib/RT/Interface/Web/Handler.pm
+++ b/lib/RT/Interface/Web/Handler.pm
@@ -224,7 +224,7 @@ sub PSGIApp {
$self->InitSessionDir;
- return sub {
+ my $mason = sub {
my $env = shift;
RT::ConnectToDatabase() unless RT->InstallMode;
@@ -257,6 +257,32 @@ sub PSGIApp {
});
};
+
+ use Plack::Builder;
+ my $builder = Plack::Builder->new();
+
+ for my $static ( RT->Config->Get('StaticRoots') ) {
+ if ( ref $static ) {
+ if ( ref $static eq 'HASH' ) {
+ $builder->add_middleware( 'Plack::Middleware::Static',
+ %$static );
+ }
+ else {
+ $RT::Logger->error(
+"Invalid config StaticRoots: item can only be a string or a hashref"
+ );
+ }
+ }
+ else {
+ $builder->add_middleware(
+ 'Plack::Middleware::Static',
+ path => qr/^\Q$static/,
+ root => $RT::MasonComponentRoot,
+ );
+ }
+ }
+ return $builder->to_app($mason);
+
sub _psgi_response_cb {
my $self = shift;
my ($ret, $cleanup) = @_;
commit 81eced824047e3c0ecaa910c0893470c7a13f563
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri May 13 14:43:12 2011 +0800
let's use the static handler
diff --git a/etc/RT_Config.pm.in b/etc/RT_Config.pm.in
index 2fa417d..6e6523f 100755
--- a/etc/RT_Config.pm.in
+++ b/etc/RT_Config.pm.in
@@ -127,6 +127,31 @@ C<Set(@Plugins, (qw(Extension::QuickDelete RT::Extension::CommandByMail)));>
Set(@Plugins, ());
+=item C<@StaticRoots>
+
+Set C<@StaticRoots> to serve some paths with static handler.
+
+Example:
+
+C<<<
+Set(
+ @StaticRoots,
+
+ # i.e. { path => qr{^/NoAuth/images/}, root => $RT::MasonComponentRoot }
+ "/NoAuth/images/",
+ {
+ path => qr{^/static},
+ root => '/local/path/to/static',
+ },
+);
+>>>
+
+=cut
+
+Set( @StaticRoots, '/NoAuth/images/', '/NoAuth/RichText',
+ '/NoAuth/css/ballard/images/', '/NoAuth/css/aileron/images',
+ '/NoAuth/css/images' );
+
=back
diff --git a/share/html/NoAuth/RichText/ckeditor/LICENSE.html b/share/html/NoAuth/RichText/LICENSE.html
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/LICENSE.html
rename to share/html/NoAuth/RichText/LICENSE.html
diff --git a/share/html/NoAuth/RichText/ckeditor/adapters/jquery.js b/share/html/NoAuth/RichText/adapters/jquery.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/adapters/jquery.js
rename to share/html/NoAuth/RichText/adapters/jquery.js
diff --git a/share/html/NoAuth/RichText/ckeditor/ckeditor.js b/share/html/NoAuth/RichText/ckeditor.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/ckeditor.js
rename to share/html/NoAuth/RichText/ckeditor.js
diff --git a/share/html/NoAuth/RichText/ckeditor/config.js b/share/html/NoAuth/RichText/config.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/config.js
rename to share/html/NoAuth/RichText/config.js
diff --git a/share/html/NoAuth/RichText/ckeditor/contents.css b/share/html/NoAuth/RichText/contents.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/contents.css
rename to share/html/NoAuth/RichText/contents.css
diff --git a/share/html/NoAuth/RichText/dhandler b/share/html/NoAuth/RichText/dhandler
deleted file mode 100644
index 01a1e91..0000000
--- a/share/html/NoAuth/RichText/dhandler
+++ /dev/null
@@ -1,69 +0,0 @@
-%# BEGIN BPS TAGGED BLOCK {{{
-%#
-%# COPYRIGHT:
-%#
-%# This software is Copyright (c) 1996-2011 Best Practical Solutions, LLC
-%# <sales at bestpractical.com>
-%#
-%# (Except where explicitly superseded by other copyright notices)
-%#
-%#
-%# LICENSE:
-%#
-%# This work is made available to you under the terms of Version 2 of
-%# the GNU General Public License. A copy of that license should have
-%# been provided with this software, but in any event can be snarfed
-%# from www.gnu.org.
-%#
-%# This work 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 for more details.
-%#
-%# You should have received a copy of the GNU General Public License
-%# along with this program; if not, write to the Free Software
-%# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-%# 02110-1301 or visit their web page on the internet at
-%# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html.
-%#
-%#
-%# CONTRIBUTION SUBMISSION POLICY:
-%#
-%# (The following paragraph is not intended to limit the rights granted
-%# to you to modify and distribute this software under the terms of
-%# the GNU General Public License and is only of importance to you if
-%# you choose to contribute your changes and enhancements to the
-%# community by submitting them to Best Practical Solutions, LLC.)
-%#
-%# By intentionally submitting any modifications, corrections or
-%# derivatives to this work, or any other work intended for use with
-%# Request Tracker, to Best Practical Solutions, LLC, you confirm that
-%# you are the copyright holder for those contributions and you grant
-%# Best Practical Solutions, LLC a nonexclusive, worldwide, irrevocable,
-%# royalty-free, perpetual, license to use, copy, create derivative
-%# works based on those contributions, and sublicense and distribute
-%# those contributions and any derivatives thereof.
-%#
-%# END BPS TAGGED BLOCK }}}
-<%INIT>
-use File::Basename;
-my $arg = $m->dhandler_arg;
-my $file = dirname($m->current_comp->source_file) . '/ckeditor/' . $arg;
-return $m->decline unless -f $file && -r _;
-
-my $suffix = $1 if $file =~ /([^.]+)$/;
-
-my $type = {qw(
- xml text/xml
- html text/html
- js application/javascript
- css text/css
- gif image/gif
- jpg image/jpeg
- png image/png
-)}->{$suffix} || 'application/octet-stream';
-
-RT::Interface::Web->SendStaticFile( File => $file, Type => $type );
-
-$m->abort;
-</%INIT>
diff --git a/share/html/NoAuth/RichText/ckeditor/images/spacer.gif b/share/html/NoAuth/RichText/images/spacer.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/images/spacer.gif
rename to share/html/NoAuth/RichText/images/spacer.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/_languages.js b/share/html/NoAuth/RichText/lang/_languages.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/_languages.js
rename to share/html/NoAuth/RichText/lang/_languages.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/_translationstatus.txt b/share/html/NoAuth/RichText/lang/_translationstatus.txt
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/_translationstatus.txt
rename to share/html/NoAuth/RichText/lang/_translationstatus.txt
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/af.js b/share/html/NoAuth/RichText/lang/af.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/af.js
rename to share/html/NoAuth/RichText/lang/af.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/ar.js b/share/html/NoAuth/RichText/lang/ar.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/ar.js
rename to share/html/NoAuth/RichText/lang/ar.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/bg.js b/share/html/NoAuth/RichText/lang/bg.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/bg.js
rename to share/html/NoAuth/RichText/lang/bg.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/bn.js b/share/html/NoAuth/RichText/lang/bn.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/bn.js
rename to share/html/NoAuth/RichText/lang/bn.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/bs.js b/share/html/NoAuth/RichText/lang/bs.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/bs.js
rename to share/html/NoAuth/RichText/lang/bs.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/ca.js b/share/html/NoAuth/RichText/lang/ca.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/ca.js
rename to share/html/NoAuth/RichText/lang/ca.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/cs.js b/share/html/NoAuth/RichText/lang/cs.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/cs.js
rename to share/html/NoAuth/RichText/lang/cs.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/cy.js b/share/html/NoAuth/RichText/lang/cy.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/cy.js
rename to share/html/NoAuth/RichText/lang/cy.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/da.js b/share/html/NoAuth/RichText/lang/da.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/da.js
rename to share/html/NoAuth/RichText/lang/da.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/de.js b/share/html/NoAuth/RichText/lang/de.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/de.js
rename to share/html/NoAuth/RichText/lang/de.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/el.js b/share/html/NoAuth/RichText/lang/el.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/el.js
rename to share/html/NoAuth/RichText/lang/el.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/en-au.js b/share/html/NoAuth/RichText/lang/en-au.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/en-au.js
rename to share/html/NoAuth/RichText/lang/en-au.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/en-ca.js b/share/html/NoAuth/RichText/lang/en-ca.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/en-ca.js
rename to share/html/NoAuth/RichText/lang/en-ca.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/en-gb.js b/share/html/NoAuth/RichText/lang/en-gb.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/en-gb.js
rename to share/html/NoAuth/RichText/lang/en-gb.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/en.js b/share/html/NoAuth/RichText/lang/en.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/en.js
rename to share/html/NoAuth/RichText/lang/en.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/eo.js b/share/html/NoAuth/RichText/lang/eo.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/eo.js
rename to share/html/NoAuth/RichText/lang/eo.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/es.js b/share/html/NoAuth/RichText/lang/es.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/es.js
rename to share/html/NoAuth/RichText/lang/es.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/et.js b/share/html/NoAuth/RichText/lang/et.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/et.js
rename to share/html/NoAuth/RichText/lang/et.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/eu.js b/share/html/NoAuth/RichText/lang/eu.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/eu.js
rename to share/html/NoAuth/RichText/lang/eu.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/fa.js b/share/html/NoAuth/RichText/lang/fa.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/fa.js
rename to share/html/NoAuth/RichText/lang/fa.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/fi.js b/share/html/NoAuth/RichText/lang/fi.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/fi.js
rename to share/html/NoAuth/RichText/lang/fi.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/fo.js b/share/html/NoAuth/RichText/lang/fo.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/fo.js
rename to share/html/NoAuth/RichText/lang/fo.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/fr-ca.js b/share/html/NoAuth/RichText/lang/fr-ca.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/fr-ca.js
rename to share/html/NoAuth/RichText/lang/fr-ca.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/fr.js b/share/html/NoAuth/RichText/lang/fr.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/fr.js
rename to share/html/NoAuth/RichText/lang/fr.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/gl.js b/share/html/NoAuth/RichText/lang/gl.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/gl.js
rename to share/html/NoAuth/RichText/lang/gl.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/gu.js b/share/html/NoAuth/RichText/lang/gu.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/gu.js
rename to share/html/NoAuth/RichText/lang/gu.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/he.js b/share/html/NoAuth/RichText/lang/he.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/he.js
rename to share/html/NoAuth/RichText/lang/he.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/hi.js b/share/html/NoAuth/RichText/lang/hi.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/hi.js
rename to share/html/NoAuth/RichText/lang/hi.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/hr.js b/share/html/NoAuth/RichText/lang/hr.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/hr.js
rename to share/html/NoAuth/RichText/lang/hr.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/hu.js b/share/html/NoAuth/RichText/lang/hu.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/hu.js
rename to share/html/NoAuth/RichText/lang/hu.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/is.js b/share/html/NoAuth/RichText/lang/is.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/is.js
rename to share/html/NoAuth/RichText/lang/is.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/it.js b/share/html/NoAuth/RichText/lang/it.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/it.js
rename to share/html/NoAuth/RichText/lang/it.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/ja.js b/share/html/NoAuth/RichText/lang/ja.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/ja.js
rename to share/html/NoAuth/RichText/lang/ja.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/km.js b/share/html/NoAuth/RichText/lang/km.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/km.js
rename to share/html/NoAuth/RichText/lang/km.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/ko.js b/share/html/NoAuth/RichText/lang/ko.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/ko.js
rename to share/html/NoAuth/RichText/lang/ko.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/lt.js b/share/html/NoAuth/RichText/lang/lt.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/lt.js
rename to share/html/NoAuth/RichText/lang/lt.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/lv.js b/share/html/NoAuth/RichText/lang/lv.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/lv.js
rename to share/html/NoAuth/RichText/lang/lv.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/mn.js b/share/html/NoAuth/RichText/lang/mn.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/mn.js
rename to share/html/NoAuth/RichText/lang/mn.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/ms.js b/share/html/NoAuth/RichText/lang/ms.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/ms.js
rename to share/html/NoAuth/RichText/lang/ms.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/nb.js b/share/html/NoAuth/RichText/lang/nb.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/nb.js
rename to share/html/NoAuth/RichText/lang/nb.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/nl.js b/share/html/NoAuth/RichText/lang/nl.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/nl.js
rename to share/html/NoAuth/RichText/lang/nl.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/no.js b/share/html/NoAuth/RichText/lang/no.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/no.js
rename to share/html/NoAuth/RichText/lang/no.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/pl.js b/share/html/NoAuth/RichText/lang/pl.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/pl.js
rename to share/html/NoAuth/RichText/lang/pl.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/pt-br.js b/share/html/NoAuth/RichText/lang/pt-br.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/pt-br.js
rename to share/html/NoAuth/RichText/lang/pt-br.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/pt.js b/share/html/NoAuth/RichText/lang/pt.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/pt.js
rename to share/html/NoAuth/RichText/lang/pt.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/ro.js b/share/html/NoAuth/RichText/lang/ro.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/ro.js
rename to share/html/NoAuth/RichText/lang/ro.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/ru.js b/share/html/NoAuth/RichText/lang/ru.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/ru.js
rename to share/html/NoAuth/RichText/lang/ru.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/sk.js b/share/html/NoAuth/RichText/lang/sk.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/sk.js
rename to share/html/NoAuth/RichText/lang/sk.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/sl.js b/share/html/NoAuth/RichText/lang/sl.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/sl.js
rename to share/html/NoAuth/RichText/lang/sl.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/sr-latn.js b/share/html/NoAuth/RichText/lang/sr-latn.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/sr-latn.js
rename to share/html/NoAuth/RichText/lang/sr-latn.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/sr.js b/share/html/NoAuth/RichText/lang/sr.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/sr.js
rename to share/html/NoAuth/RichText/lang/sr.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/sv.js b/share/html/NoAuth/RichText/lang/sv.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/sv.js
rename to share/html/NoAuth/RichText/lang/sv.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/th.js b/share/html/NoAuth/RichText/lang/th.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/th.js
rename to share/html/NoAuth/RichText/lang/th.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/tr.js b/share/html/NoAuth/RichText/lang/tr.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/tr.js
rename to share/html/NoAuth/RichText/lang/tr.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/uk.js b/share/html/NoAuth/RichText/lang/uk.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/uk.js
rename to share/html/NoAuth/RichText/lang/uk.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/vi.js b/share/html/NoAuth/RichText/lang/vi.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/vi.js
rename to share/html/NoAuth/RichText/lang/vi.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/zh-cn.js b/share/html/NoAuth/RichText/lang/zh-cn.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/zh-cn.js
rename to share/html/NoAuth/RichText/lang/zh-cn.js
diff --git a/share/html/NoAuth/RichText/ckeditor/lang/zh.js b/share/html/NoAuth/RichText/lang/zh.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/lang/zh.js
rename to share/html/NoAuth/RichText/lang/zh.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js b/share/html/NoAuth/RichText/plugins/a11yhelp/dialogs/a11yhelp.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
rename to share/html/NoAuth/RichText/plugins/a11yhelp/dialogs/a11yhelp.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/a11yhelp/lang/en.js b/share/html/NoAuth/RichText/plugins/a11yhelp/lang/en.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/a11yhelp/lang/en.js
rename to share/html/NoAuth/RichText/plugins/a11yhelp/lang/en.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/a11yhelp/lang/he.js b/share/html/NoAuth/RichText/plugins/a11yhelp/lang/he.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/a11yhelp/lang/he.js
rename to share/html/NoAuth/RichText/plugins/a11yhelp/lang/he.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/about/dialogs/about.js b/share/html/NoAuth/RichText/plugins/about/dialogs/about.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/about/dialogs/about.js
rename to share/html/NoAuth/RichText/plugins/about/dialogs/about.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/about/dialogs/logo_ckeditor.png b/share/html/NoAuth/RichText/plugins/about/dialogs/logo_ckeditor.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/about/dialogs/logo_ckeditor.png
rename to share/html/NoAuth/RichText/plugins/about/dialogs/logo_ckeditor.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/autogrow/plugin.js b/share/html/NoAuth/RichText/plugins/autogrow/plugin.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/autogrow/plugin.js
rename to share/html/NoAuth/RichText/plugins/autogrow/plugin.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/clipboard/dialogs/paste.js b/share/html/NoAuth/RichText/plugins/clipboard/dialogs/paste.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/clipboard/dialogs/paste.js
rename to share/html/NoAuth/RichText/plugins/clipboard/dialogs/paste.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/colordialog/dialogs/colordialog.js b/share/html/NoAuth/RichText/plugins/colordialog/dialogs/colordialog.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/colordialog/dialogs/colordialog.js
rename to share/html/NoAuth/RichText/plugins/colordialog/dialogs/colordialog.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/dialog/dialogDefinition.js b/share/html/NoAuth/RichText/plugins/dialog/dialogDefinition.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/dialog/dialogDefinition.js
rename to share/html/NoAuth/RichText/plugins/dialog/dialogDefinition.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/div/dialogs/div.js b/share/html/NoAuth/RichText/plugins/div/dialogs/div.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/div/dialogs/div.js
rename to share/html/NoAuth/RichText/plugins/div/dialogs/div.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/find/dialogs/find.js b/share/html/NoAuth/RichText/plugins/find/dialogs/find.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/find/dialogs/find.js
rename to share/html/NoAuth/RichText/plugins/find/dialogs/find.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/flash/dialogs/flash.js b/share/html/NoAuth/RichText/plugins/flash/dialogs/flash.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/flash/dialogs/flash.js
rename to share/html/NoAuth/RichText/plugins/flash/dialogs/flash.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/flash/images/placeholder.png b/share/html/NoAuth/RichText/plugins/flash/images/placeholder.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/flash/images/placeholder.png
rename to share/html/NoAuth/RichText/plugins/flash/images/placeholder.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/button.js b/share/html/NoAuth/RichText/plugins/forms/dialogs/button.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/button.js
rename to share/html/NoAuth/RichText/plugins/forms/dialogs/button.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/checkbox.js b/share/html/NoAuth/RichText/plugins/forms/dialogs/checkbox.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/checkbox.js
rename to share/html/NoAuth/RichText/plugins/forms/dialogs/checkbox.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/form.js b/share/html/NoAuth/RichText/plugins/forms/dialogs/form.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/form.js
rename to share/html/NoAuth/RichText/plugins/forms/dialogs/form.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/hiddenfield.js b/share/html/NoAuth/RichText/plugins/forms/dialogs/hiddenfield.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/hiddenfield.js
rename to share/html/NoAuth/RichText/plugins/forms/dialogs/hiddenfield.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/radio.js b/share/html/NoAuth/RichText/plugins/forms/dialogs/radio.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/radio.js
rename to share/html/NoAuth/RichText/plugins/forms/dialogs/radio.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/select.js b/share/html/NoAuth/RichText/plugins/forms/dialogs/select.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/select.js
rename to share/html/NoAuth/RichText/plugins/forms/dialogs/select.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/textarea.js b/share/html/NoAuth/RichText/plugins/forms/dialogs/textarea.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/textarea.js
rename to share/html/NoAuth/RichText/plugins/forms/dialogs/textarea.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/textfield.js b/share/html/NoAuth/RichText/plugins/forms/dialogs/textfield.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/forms/dialogs/textfield.js
rename to share/html/NoAuth/RichText/plugins/forms/dialogs/textfield.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/forms/images/hiddenfield.gif b/share/html/NoAuth/RichText/plugins/forms/images/hiddenfield.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/forms/images/hiddenfield.gif
rename to share/html/NoAuth/RichText/plugins/forms/images/hiddenfield.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/iframedialog/plugin.js b/share/html/NoAuth/RichText/plugins/iframedialog/plugin.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/iframedialog/plugin.js
rename to share/html/NoAuth/RichText/plugins/iframedialog/plugin.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/image/dialogs/image.js b/share/html/NoAuth/RichText/plugins/image/dialogs/image.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/image/dialogs/image.js
rename to share/html/NoAuth/RichText/plugins/image/dialogs/image.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/link/dialogs/anchor.js b/share/html/NoAuth/RichText/plugins/link/dialogs/anchor.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/link/dialogs/anchor.js
rename to share/html/NoAuth/RichText/plugins/link/dialogs/anchor.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/link/dialogs/link.js b/share/html/NoAuth/RichText/plugins/link/dialogs/link.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/link/dialogs/link.js
rename to share/html/NoAuth/RichText/plugins/link/dialogs/link.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/link/images/anchor.gif b/share/html/NoAuth/RichText/plugins/link/images/anchor.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/link/images/anchor.gif
rename to share/html/NoAuth/RichText/plugins/link/images/anchor.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/liststyle/dialogs/liststyle.js b/share/html/NoAuth/RichText/plugins/liststyle/dialogs/liststyle.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/liststyle/dialogs/liststyle.js
rename to share/html/NoAuth/RichText/plugins/liststyle/dialogs/liststyle.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/pagebreak/images/pagebreak.gif b/share/html/NoAuth/RichText/plugins/pagebreak/images/pagebreak.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/pagebreak/images/pagebreak.gif
rename to share/html/NoAuth/RichText/plugins/pagebreak/images/pagebreak.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/pastefromword/filter/default.js b/share/html/NoAuth/RichText/plugins/pastefromword/filter/default.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/pastefromword/filter/default.js
rename to share/html/NoAuth/RichText/plugins/pastefromword/filter/default.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/pastetext/dialogs/pastetext.js b/share/html/NoAuth/RichText/plugins/pastetext/dialogs/pastetext.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/pastetext/dialogs/pastetext.js
rename to share/html/NoAuth/RichText/plugins/pastetext/dialogs/pastetext.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/scayt/dialogs/options.js b/share/html/NoAuth/RichText/plugins/scayt/dialogs/options.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/scayt/dialogs/options.js
rename to share/html/NoAuth/RichText/plugins/scayt/dialogs/options.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/scayt/dialogs/toolbar.css b/share/html/NoAuth/RichText/plugins/scayt/dialogs/toolbar.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/scayt/dialogs/toolbar.css
rename to share/html/NoAuth/RichText/plugins/scayt/dialogs/toolbar.css
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_address.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_address.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_address.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_address.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_blockquote.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_blockquote.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_blockquote.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_blockquote.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_div.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_div.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_div.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_div.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h1.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_h1.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h1.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_h1.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h2.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_h2.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h2.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_h2.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h3.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_h3.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h3.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_h3.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h4.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_h4.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h4.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_h4.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h5.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_h5.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h5.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_h5.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h6.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_h6.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_h6.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_h6.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_p.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_p.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_p.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_p.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_pre.png b/share/html/NoAuth/RichText/plugins/showblocks/images/block_pre.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/showblocks/images/block_pre.png
rename to share/html/NoAuth/RichText/plugins/showblocks/images/block_pre.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/dialogs/smiley.js b/share/html/NoAuth/RichText/plugins/smiley/dialogs/smiley.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/dialogs/smiley.js
rename to share/html/NoAuth/RichText/plugins/smiley/dialogs/smiley.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/angel_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/angel_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/angel_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/angel_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/angry_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/angry_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/angry_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/angry_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/broken_heart.gif b/share/html/NoAuth/RichText/plugins/smiley/images/broken_heart.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/broken_heart.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/broken_heart.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/confused_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/confused_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/confused_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/confused_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/cry_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/cry_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/cry_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/cry_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/devil_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/devil_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/devil_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/devil_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/embaressed_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/embaressed_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/embaressed_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/embaressed_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/envelope.gif b/share/html/NoAuth/RichText/plugins/smiley/images/envelope.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/envelope.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/envelope.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/heart.gif b/share/html/NoAuth/RichText/plugins/smiley/images/heart.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/heart.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/heart.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/kiss.gif b/share/html/NoAuth/RichText/plugins/smiley/images/kiss.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/kiss.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/kiss.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/lightbulb.gif b/share/html/NoAuth/RichText/plugins/smiley/images/lightbulb.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/lightbulb.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/lightbulb.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/omg_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/omg_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/omg_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/omg_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/regular_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/regular_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/regular_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/regular_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/sad_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/sad_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/sad_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/sad_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/shades_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/shades_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/shades_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/shades_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/teeth_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/teeth_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/teeth_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/teeth_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/thumbs_down.gif b/share/html/NoAuth/RichText/plugins/smiley/images/thumbs_down.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/thumbs_down.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/thumbs_down.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/thumbs_up.gif b/share/html/NoAuth/RichText/plugins/smiley/images/thumbs_up.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/thumbs_up.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/thumbs_up.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/tounge_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/tounge_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/tounge_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/tounge_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/whatchutalkingabout_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/whatchutalkingabout_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/wink_smile.gif b/share/html/NoAuth/RichText/plugins/smiley/images/wink_smile.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/smiley/images/wink_smile.gif
rename to share/html/NoAuth/RichText/plugins/smiley/images/wink_smile.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/specialchar/dialogs/specialchar.js b/share/html/NoAuth/RichText/plugins/specialchar/dialogs/specialchar.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/specialchar/dialogs/specialchar.js
rename to share/html/NoAuth/RichText/plugins/specialchar/dialogs/specialchar.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/styles/styles/default.js b/share/html/NoAuth/RichText/plugins/styles/styles/default.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/styles/styles/default.js
rename to share/html/NoAuth/RichText/plugins/styles/styles/default.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/table/dialogs/table.js b/share/html/NoAuth/RichText/plugins/table/dialogs/table.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/table/dialogs/table.js
rename to share/html/NoAuth/RichText/plugins/table/dialogs/table.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/tableresize/plugin.js b/share/html/NoAuth/RichText/plugins/tableresize/plugin.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/tableresize/plugin.js
rename to share/html/NoAuth/RichText/plugins/tableresize/plugin.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/tabletools/dialogs/tableCell.js b/share/html/NoAuth/RichText/plugins/tabletools/dialogs/tableCell.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/tabletools/dialogs/tableCell.js
rename to share/html/NoAuth/RichText/plugins/tabletools/dialogs/tableCell.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/templates/dialogs/templates.js b/share/html/NoAuth/RichText/plugins/templates/dialogs/templates.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/templates/dialogs/templates.js
rename to share/html/NoAuth/RichText/plugins/templates/dialogs/templates.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/templates/templates/default.js b/share/html/NoAuth/RichText/plugins/templates/templates/default.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/templates/templates/default.js
rename to share/html/NoAuth/RichText/plugins/templates/templates/default.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/templates/templates/images/template1.gif b/share/html/NoAuth/RichText/plugins/templates/templates/images/template1.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/templates/templates/images/template1.gif
rename to share/html/NoAuth/RichText/plugins/templates/templates/images/template1.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/templates/templates/images/template2.gif b/share/html/NoAuth/RichText/plugins/templates/templates/images/template2.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/templates/templates/images/template2.gif
rename to share/html/NoAuth/RichText/plugins/templates/templates/images/template2.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/templates/templates/images/template3.gif b/share/html/NoAuth/RichText/plugins/templates/templates/images/template3.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/templates/templates/images/template3.gif
rename to share/html/NoAuth/RichText/plugins/templates/templates/images/template3.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/dialogs/uicolor.js b/share/html/NoAuth/RichText/plugins/uicolor/dialogs/uicolor.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/dialogs/uicolor.js
rename to share/html/NoAuth/RichText/plugins/uicolor/dialogs/uicolor.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/lang/en.js b/share/html/NoAuth/RichText/plugins/uicolor/lang/en.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/lang/en.js
rename to share/html/NoAuth/RichText/plugins/uicolor/lang/en.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/plugin.js b/share/html/NoAuth/RichText/plugins/uicolor/plugin.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/plugin.js
rename to share/html/NoAuth/RichText/plugins/uicolor/plugin.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/uicolor.gif b/share/html/NoAuth/RichText/plugins/uicolor/uicolor.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/uicolor.gif
rename to share/html/NoAuth/RichText/plugins/uicolor/uicolor.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/hue_bg.png b/share/html/NoAuth/RichText/plugins/uicolor/yui/assets/hue_bg.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
rename to share/html/NoAuth/RichText/plugins/uicolor/yui/assets/hue_bg.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png b/share/html/NoAuth/RichText/plugins/uicolor/yui/assets/hue_thumb.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
rename to share/html/NoAuth/RichText/plugins/uicolor/yui/assets/hue_thumb.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/picker_mask.png b/share/html/NoAuth/RichText/plugins/uicolor/yui/assets/picker_mask.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
rename to share/html/NoAuth/RichText/plugins/uicolor/yui/assets/picker_mask.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png b/share/html/NoAuth/RichText/plugins/uicolor/yui/assets/picker_thumb.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
rename to share/html/NoAuth/RichText/plugins/uicolor/yui/assets/picker_thumb.png
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/yui.css b/share/html/NoAuth/RichText/plugins/uicolor/yui/assets/yui.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/assets/yui.css
rename to share/html/NoAuth/RichText/plugins/uicolor/yui/assets/yui.css
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/yui.js b/share/html/NoAuth/RichText/plugins/uicolor/yui/yui.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/uicolor/yui/yui.js
rename to share/html/NoAuth/RichText/plugins/uicolor/yui/yui.js
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/wsc/dialogs/ciframe.html b/share/html/NoAuth/RichText/plugins/wsc/dialogs/ciframe.html
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/wsc/dialogs/ciframe.html
rename to share/html/NoAuth/RichText/plugins/wsc/dialogs/ciframe.html
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/wsc/dialogs/tmpFrameset.html b/share/html/NoAuth/RichText/plugins/wsc/dialogs/tmpFrameset.html
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
rename to share/html/NoAuth/RichText/plugins/wsc/dialogs/tmpFrameset.html
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/wsc/dialogs/wsc.css b/share/html/NoAuth/RichText/plugins/wsc/dialogs/wsc.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/wsc/dialogs/wsc.css
rename to share/html/NoAuth/RichText/plugins/wsc/dialogs/wsc.css
diff --git a/share/html/NoAuth/RichText/ckeditor/plugins/wsc/dialogs/wsc.js b/share/html/NoAuth/RichText/plugins/wsc/dialogs/wsc.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/plugins/wsc/dialogs/wsc.js
rename to share/html/NoAuth/RichText/plugins/wsc/dialogs/wsc.js
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/dialog.css b/share/html/NoAuth/RichText/skins/kama/dialog.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/dialog.css
rename to share/html/NoAuth/RichText/skins/kama/dialog.css
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/editor.css b/share/html/NoAuth/RichText/skins/kama/editor.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/editor.css
rename to share/html/NoAuth/RichText/skins/kama/editor.css
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/icons.png b/share/html/NoAuth/RichText/skins/kama/icons.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/icons.png
rename to share/html/NoAuth/RichText/skins/kama/icons.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/icons_rtl.png b/share/html/NoAuth/RichText/skins/kama/icons_rtl.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/icons_rtl.png
rename to share/html/NoAuth/RichText/skins/kama/icons_rtl.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/images/dialog_sides.gif b/share/html/NoAuth/RichText/skins/kama/images/dialog_sides.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/images/dialog_sides.gif
rename to share/html/NoAuth/RichText/skins/kama/images/dialog_sides.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/images/dialog_sides.png b/share/html/NoAuth/RichText/skins/kama/images/dialog_sides.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/images/dialog_sides.png
rename to share/html/NoAuth/RichText/skins/kama/images/dialog_sides.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/images/dialog_sides_rtl.png b/share/html/NoAuth/RichText/skins/kama/images/dialog_sides_rtl.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/images/dialog_sides_rtl.png
rename to share/html/NoAuth/RichText/skins/kama/images/dialog_sides_rtl.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/images/mini.gif b/share/html/NoAuth/RichText/skins/kama/images/mini.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/images/mini.gif
rename to share/html/NoAuth/RichText/skins/kama/images/mini.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/images/noimage.png b/share/html/NoAuth/RichText/skins/kama/images/noimage.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/images/noimage.png
rename to share/html/NoAuth/RichText/skins/kama/images/noimage.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/images/sprites.png b/share/html/NoAuth/RichText/skins/kama/images/sprites.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/images/sprites.png
rename to share/html/NoAuth/RichText/skins/kama/images/sprites.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/images/sprites_ie6.png b/share/html/NoAuth/RichText/skins/kama/images/sprites_ie6.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/images/sprites_ie6.png
rename to share/html/NoAuth/RichText/skins/kama/images/sprites_ie6.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/images/toolbar_start.gif b/share/html/NoAuth/RichText/skins/kama/images/toolbar_start.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/images/toolbar_start.gif
rename to share/html/NoAuth/RichText/skins/kama/images/toolbar_start.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/skin.js b/share/html/NoAuth/RichText/skins/kama/skin.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/skin.js
rename to share/html/NoAuth/RichText/skins/kama/skin.js
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/kama/templates.css b/share/html/NoAuth/RichText/skins/kama/templates.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/kama/templates.css
rename to share/html/NoAuth/RichText/skins/kama/templates.css
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/dialog.css b/share/html/NoAuth/RichText/skins/office2003/dialog.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/dialog.css
rename to share/html/NoAuth/RichText/skins/office2003/dialog.css
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/editor.css b/share/html/NoAuth/RichText/skins/office2003/editor.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/editor.css
rename to share/html/NoAuth/RichText/skins/office2003/editor.css
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/icons.png b/share/html/NoAuth/RichText/skins/office2003/icons.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/icons.png
rename to share/html/NoAuth/RichText/skins/office2003/icons.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/icons_rtl.png b/share/html/NoAuth/RichText/skins/office2003/icons_rtl.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/icons_rtl.png
rename to share/html/NoAuth/RichText/skins/office2003/icons_rtl.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/images/dialog_sides.gif b/share/html/NoAuth/RichText/skins/office2003/images/dialog_sides.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/images/dialog_sides.gif
rename to share/html/NoAuth/RichText/skins/office2003/images/dialog_sides.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/images/dialog_sides.png b/share/html/NoAuth/RichText/skins/office2003/images/dialog_sides.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/images/dialog_sides.png
rename to share/html/NoAuth/RichText/skins/office2003/images/dialog_sides.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/images/dialog_sides_rtl.png b/share/html/NoAuth/RichText/skins/office2003/images/dialog_sides_rtl.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/images/dialog_sides_rtl.png
rename to share/html/NoAuth/RichText/skins/office2003/images/dialog_sides_rtl.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/images/mini.gif b/share/html/NoAuth/RichText/skins/office2003/images/mini.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/images/mini.gif
rename to share/html/NoAuth/RichText/skins/office2003/images/mini.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/images/noimage.png b/share/html/NoAuth/RichText/skins/office2003/images/noimage.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/images/noimage.png
rename to share/html/NoAuth/RichText/skins/office2003/images/noimage.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/images/sprites.png b/share/html/NoAuth/RichText/skins/office2003/images/sprites.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/images/sprites.png
rename to share/html/NoAuth/RichText/skins/office2003/images/sprites.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/images/sprites_ie6.png b/share/html/NoAuth/RichText/skins/office2003/images/sprites_ie6.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/images/sprites_ie6.png
rename to share/html/NoAuth/RichText/skins/office2003/images/sprites_ie6.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/skin.js b/share/html/NoAuth/RichText/skins/office2003/skin.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/skin.js
rename to share/html/NoAuth/RichText/skins/office2003/skin.js
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/office2003/templates.css b/share/html/NoAuth/RichText/skins/office2003/templates.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/office2003/templates.css
rename to share/html/NoAuth/RichText/skins/office2003/templates.css
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/dialog.css b/share/html/NoAuth/RichText/skins/v2/dialog.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/dialog.css
rename to share/html/NoAuth/RichText/skins/v2/dialog.css
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/editor.css b/share/html/NoAuth/RichText/skins/v2/editor.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/editor.css
rename to share/html/NoAuth/RichText/skins/v2/editor.css
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/icons.png b/share/html/NoAuth/RichText/skins/v2/icons.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/icons.png
rename to share/html/NoAuth/RichText/skins/v2/icons.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/icons_rtl.png b/share/html/NoAuth/RichText/skins/v2/icons_rtl.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/icons_rtl.png
rename to share/html/NoAuth/RichText/skins/v2/icons_rtl.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/images/dialog_sides.gif b/share/html/NoAuth/RichText/skins/v2/images/dialog_sides.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/images/dialog_sides.gif
rename to share/html/NoAuth/RichText/skins/v2/images/dialog_sides.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/images/dialog_sides.png b/share/html/NoAuth/RichText/skins/v2/images/dialog_sides.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/images/dialog_sides.png
rename to share/html/NoAuth/RichText/skins/v2/images/dialog_sides.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/images/dialog_sides_rtl.png b/share/html/NoAuth/RichText/skins/v2/images/dialog_sides_rtl.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/images/dialog_sides_rtl.png
rename to share/html/NoAuth/RichText/skins/v2/images/dialog_sides_rtl.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/images/mini.gif b/share/html/NoAuth/RichText/skins/v2/images/mini.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/images/mini.gif
rename to share/html/NoAuth/RichText/skins/v2/images/mini.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/images/noimage.png b/share/html/NoAuth/RichText/skins/v2/images/noimage.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/images/noimage.png
rename to share/html/NoAuth/RichText/skins/v2/images/noimage.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/images/sprites.png b/share/html/NoAuth/RichText/skins/v2/images/sprites.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/images/sprites.png
rename to share/html/NoAuth/RichText/skins/v2/images/sprites.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/images/sprites_ie6.png b/share/html/NoAuth/RichText/skins/v2/images/sprites_ie6.png
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/images/sprites_ie6.png
rename to share/html/NoAuth/RichText/skins/v2/images/sprites_ie6.png
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/images/toolbar_start.gif b/share/html/NoAuth/RichText/skins/v2/images/toolbar_start.gif
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/images/toolbar_start.gif
rename to share/html/NoAuth/RichText/skins/v2/images/toolbar_start.gif
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/skin.js b/share/html/NoAuth/RichText/skins/v2/skin.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/skin.js
rename to share/html/NoAuth/RichText/skins/v2/skin.js
diff --git a/share/html/NoAuth/RichText/ckeditor/skins/v2/templates.css b/share/html/NoAuth/RichText/skins/v2/templates.css
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/skins/v2/templates.css
rename to share/html/NoAuth/RichText/skins/v2/templates.css
diff --git a/share/html/NoAuth/RichText/ckeditor/themes/default/theme.js b/share/html/NoAuth/RichText/themes/default/theme.js
similarity index 100%
rename from share/html/NoAuth/RichText/ckeditor/themes/default/theme.js
rename to share/html/NoAuth/RichText/themes/default/theme.js
diff --git a/share/html/NoAuth/css/aileron/images/source/background-gradient.png b/share/html/NoAuth/css/aileron/images/background-gradient.png
similarity index 100%
rename from share/html/NoAuth/css/aileron/images/source/background-gradient.png
rename to share/html/NoAuth/css/aileron/images/background-gradient.png
diff --git a/share/html/NoAuth/css/aileron/images/dhandler b/share/html/NoAuth/css/aileron/images/dhandler
deleted file mode 100644
index 6ec9dea..0000000
--- a/share/html/NoAuth/css/aileron/images/dhandler
+++ /dev/null
@@ -1,8 +0,0 @@
-<%INIT>
-use File::Basename;
-my $arg = $m->dhandler_arg;
-my $file = dirname($m->current_comp->source_file) . '/source/'. $arg;
-RT::Interface::Web->SendStaticFile( File => $file );
-
-$m->abort;
-</%INIT>
diff --git a/share/html/NoAuth/css/ballard/images/source/background-gradient.png b/share/html/NoAuth/css/ballard/images/background-gradient.png
similarity index 100%
rename from share/html/NoAuth/css/ballard/images/source/background-gradient.png
rename to share/html/NoAuth/css/ballard/images/background-gradient.png
diff --git a/share/html/NoAuth/css/ballard/images/dhandler b/share/html/NoAuth/css/ballard/images/dhandler
deleted file mode 100644
index 6ec9dea..0000000
--- a/share/html/NoAuth/css/ballard/images/dhandler
+++ /dev/null
@@ -1,8 +0,0 @@
-<%INIT>
-use File::Basename;
-my $arg = $m->dhandler_arg;
-my $file = dirname($m->current_comp->source_file) . '/source/'. $arg;
-RT::Interface::Web->SendStaticFile( File => $file );
-
-$m->abort;
-</%INIT>
diff --git a/share/html/NoAuth/css/web2/images/source/background-gradient.png b/share/html/NoAuth/css/web2/images/background-gradient.png
similarity index 100%
rename from share/html/NoAuth/css/web2/images/source/background-gradient.png
rename to share/html/NoAuth/css/web2/images/background-gradient.png
diff --git a/share/html/NoAuth/css/web2/images/dhandler b/share/html/NoAuth/css/web2/images/dhandler
deleted file mode 100644
index 6ec9dea..0000000
--- a/share/html/NoAuth/css/web2/images/dhandler
+++ /dev/null
@@ -1,8 +0,0 @@
-<%INIT>
-use File::Basename;
-my $arg = $m->dhandler_arg;
-my $file = dirname($m->current_comp->source_file) . '/source/'. $arg;
-RT::Interface::Web->SendStaticFile( File => $file );
-
-$m->abort;
-</%INIT>
diff --git a/share/html/NoAuth/images/autohandler b/share/html/NoAuth/images/autohandler
deleted file mode 100644
index 7abf8b8..0000000
--- a/share/html/NoAuth/images/autohandler
+++ /dev/null
@@ -1,8 +0,0 @@
-<%INIT>
-# This autohandler will spit out RT's images if the user hasn't
-# properly configured their webserver to stop RT from passing
-# images through the mason handler.
-my $file = $m->base_comp->source_file;
-my $relfile = $m->base_comp->path;
-RT::Interface::Web->SendStaticFile( File => $file, RelativeFile => $relfile );
-</%INIT>
commit 03769287cf991b23ad86b127b1aa51355fde304b
Author: sunnavy <sunnavy at bestpractical.com>
Date: Fri May 13 14:52:18 2011 +0800
serve only css and js below /NoAuth/css and /NoAuth/js, respectively.
it's better to use static handler to serve others
diff --git a/share/html/NoAuth/css/autohandler b/share/html/NoAuth/css/autohandler
index 93ceb6a..55fa228 100644
--- a/share/html/NoAuth/css/autohandler
+++ b/share/html/NoAuth/css/autohandler
@@ -46,21 +46,8 @@
%#
%# END BPS TAGGED BLOCK }}}
<%init>
-my $file = $m->base_comp->source_file;
-
-if ($file =~ /\.(?:gif|png|jpe?g)$/i) {
- my $relfile = $m->base_comp->path;
- RT::Interface::Web->SendStaticFile( File => $file, RelativeFile => $relfile );
-}
-elsif ($file =~ /\.(?:htc)$/i) {
- RT::Interface::Web::StaticFileHeaders();
- $r->content_type('text/x-component') ;
- $m->call_next();
- return();
-} else {
- RT::Interface::Web::StaticFileHeaders();
- $r->content_type('text/css') ;
- $m->call_next();
- return();
-}
+RT::Interface::Web::StaticFileHeaders();
+$r->content_type('text/css') ;
+$m->call_next();
+return();
</%init>
diff --git a/share/html/NoAuth/js/autohandler b/share/html/NoAuth/js/autohandler
index c2fff83..6207685 100644
--- a/share/html/NoAuth/js/autohandler
+++ b/share/html/NoAuth/js/autohandler
@@ -46,17 +46,8 @@
%#
%# END BPS TAGGED BLOCK }}}
<%init>
-
-my $type;
-my $file = $m->base_comp->source_file;
-
-if ($file =~ /\.(gif|png|jpe?g)$/i) {
- my $relfile = $m->base_comp->path;
- RT::Interface::Web->SendStaticFile( File => $file, RelativeFile => $relfile );
-} else {
- &RT::Interface::Web::StaticFileHeaders();
- $r->content_type('application/x-javascript');
- $m->call_next();
- return();
-}
+RT::Interface::Web::StaticFileHeaders();
+$r->content_type('application/x-javascript');
+$m->call_next();
+return();
</%init>
-----------------------------------------------------------------------
More information about the Rt-commit
mailing list