changeset 4645:641b595ce675

use url_prefix_fckeditor if you don't want to use the builtin FCKeditor of moin, but a separate one at some specific url
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 10 Mar 2009 22:38:39 +0100
parents 716dcfb00e8e
children 321ca881ce70
files MoinMoin/PageGraphicalEditor.py MoinMoin/config/multiconfig.py
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/PageGraphicalEditor.py	Sat Mar 07 21:49:55 2009 +0100
+++ b/MoinMoin/PageGraphicalEditor.py	Tue Mar 10 22:38:39 2009 +0100
@@ -314,7 +314,7 @@
         url_prefix_static = request.cfg.url_prefix_static
         url_prefix_local = request.cfg.url_prefix_local
         wikipage = wikiutil.quoteWikinameURL(self.page_name)
-        fckbasepath = url_prefix_local + '/applets/FCKeditor'
+        fckbasepath = request.cfg.url_prefix_fckeditor
         wikiurl = request.getScriptname()
         if not wikiurl or wikiurl[-1] != '/':
             wikiurl += '/'
--- a/MoinMoin/config/multiconfig.py	Sat Mar 07 21:49:55 2009 +0100
+++ b/MoinMoin/config/multiconfig.py	Tue Mar 10 22:38:39 2009 +0100
@@ -362,6 +362,9 @@
         if self.url_prefix_local is None:
             self.url_prefix_local = self.url_prefix_static
 
+        if self.url_prefix_fckeditor is None:
+            self.url_prefix_fckeditor = self.url_prefix_local + '/applets/FCKeditor'
+
         if self.secrets is None:  # admin did not setup a real secret, so make up something
             self.secrets = self.calc_secrets()
 
@@ -911,6 +914,8 @@
      "used as the base URL for icons, css, etc. - includes the moin version number and changes on every release. This replaces the deprecated and sometimes confusing `url_prefix = '/wiki'` setting."),
     ('url_prefix_local', None,
      "used as the base URL for some Javascript - set this to a URL on same server as the wiki if your url_prefix_static points to a different server."),
+    ('url_prefix_fckeditor', None,
+     "used as the base URL for FCKeditor - similar to url_prefix_local, but just for FCKeditor."),
 
     ('url_prefix_action', None,
      "Use 'action' to enable action URL generation to be compatible with robots.txt. It will generate .../action/info/PageName?action=info then. Recommended for internet wikis."),