From dfb41b0fae3cc9f4916350c1b39bf3ee91350db2 Mon Sep 17 00:00:00 2001
From: Gaetan Delannay <gaetan.delannay@gmail.com>
Date: Tue, 24 Feb 2015 22:01:45 +0100
Subject: [PATCH] [gen] Bugfix: ckeditor

---
 fields/string.py | 9 +++++----
 gen/ui/appy.css  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fields/string.py b/fields/string.py
index d420b15..6606dea 100644
--- a/fields/string.py
+++ b/fields/string.py
@@ -1005,10 +1005,11 @@ class String(Field):
 
     def getCkParams(self, obj, language):
         '''Gets the base params to set on a rich text field'''
-        ckAttrs = {'customConfig': '/ui/ckeditor/config.js',
-                   'contentsCss': '/ui/ckeditor/contents.css',
-                   'stylesSet': '/ui/ckeditor/styles.js', 'toolbar': 'Appy',
-                   'format_tags': ';'.join(self.styles),
+        base = obj.getTool().getSiteUrl()
+        ckAttrs = {'customConfig': '%s/ui/ckeditor/config.js' % base,
+                   'contentsCss': '%s/ui/ckeditor/contents.css' % base,
+                   'stylesSet': '%s/ui/ckeditor/styles.js' % base,
+                   'toolbar': 'Appy', 'format_tags': ';'.join(self.styles),
                    'scayt_sLang': self.getCkLanguage(obj, language)}
         if self.width: ckAttrs['width'] = self.width
         if self.height: ckAttrs['height'] = self.height
diff --git a/gen/ui/appy.css b/gen/ui/appy.css
index ee30c03..88deb9a 100644
--- a/gen/ui/appy.css
+++ b/gen/ui/appy.css
@@ -126,7 +126,7 @@ td.search { padding-top: 8px }
 .grid th { font-style: italic; font-weight: normal;
            border-bottom: 5px solid #fdfdfd; padding: 3px 5px 0 5px }
 .grid td { padding: 3px 3px 0 3px }
-.timeline { font-size: 90%; color: #555555 }
+.timeline { font-size: 85%; color: #555555 }
 .timeline td { text-align: center; padding: 1px }
 .timeline th { padding: 1px }
 .tlLeft { text-align: left !important }