diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 6f63e5c7e24..178a804d0da 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -1,19 +1,23 @@
# -*- coding: utf-8 -*-
-import base64, glob, os, re
+import base64
+import csv
+import glob
+import operator
+import os
+import re
+import simplejson
+import textwrap
+import xmlrpclib
from xml.etree import ElementTree
from cStringIO import StringIO
-import operator
-import simplejson
+import cherrypy
import openerpweb
import openerpweb.ast
import openerpweb.nonliterals
-import cherrypy
-import xmlrpclib
-import csv
# Should move to openerpweb.Xml2Json
class Xml2Json:
@@ -86,6 +90,27 @@ def concat_files(file_list):
files_concat = "".join(files_content)
return files_concat
+home_template = textwrap.dedent("""
+
+
+
+ OpenERP
+ %(javascript)s
+
+
+ %(css)s
+
+
+
+
+""")
class WebClient(openerpweb.Controller):
_cp_path = "/base/webclient"
@@ -115,40 +140,21 @@ class WebClient(openerpweb.Controller):
@openerpweb.httprequest
def home(self, req, s_action=None):
- template ="""
-
-
-
- OpenERP
- %s
-
-
- %s
-
-
-
-
- """.replace('\n'+' '*8,'\n')
-
# script tags
jslist = ['/base/webclient/js']
if 1: # debug == 1
jslist = manifest_glob(['base'], 'js')
- js = "\n ".join([''%i for i in jslist])
+ js = "\n ".join([''%i for i in jslist])
# css tags
csslist = ['/base/webclient/css']
if 1: # debug == 1
csslist = manifest_glob(['base'], 'css')
- css = "\n ".join([''%i for i in csslist])
- r = template % (js, css)
+ css = "\n ".join([''%i for i in csslist])
+ r = home_template % {
+ 'javascript': js,
+ 'css': css
+ }
return r
class Database(openerpweb.Controller):