cubicweb: comparison web/webconfig.py

equal deleted inserted replaced

-:f299ee54d7e0
+:f7fdb5dd82f6
 __docformat__ = "restructuredtext en"
 _ = unicode
 import os
 from os.path import join, exists, split
+from warnings import warn
 from logilab.common.decorators import cached
 from cubicweb.toolsutils import read_config
 from cubicweb.cwconfig import CubicWebConfiguration, register_persistent_options, merge_options
 }),
 ))
 def fckeditor_installed(self):
-return exists(self.ext_resources['FCKEDITOR_PATH'])
+return exists(self.uiprops['FCKEDITOR_PATH'])
 def eproperty_definitions(self):
 for key, pdef in super(WebConfiguration, self).eproperty_definitions():
 if key == 'ui.fckeditor' and not self.fckeditor_installed():
 continue
 return repo
 def vc_config(self):
 return self.repository().get_versions()
-# mapping to external resources (id -> path) (`external_resources` file) ##
-ext_resources = {
-'FAVICON':  'DATADIR/favicon.ico',
-'LOGO':     'DATADIR/logo.png',
-'RSS_LOGO': 'DATADIR/rss.png',
-'HELP':     'DATADIR/help.png',
-'CALENDAR_ICON': 'DATADIR/calendar.gif',
-'SEARCH_GO':'DATADIR/go.png',
-'FCKEDITOR_PATH':  '/usr/share/fckeditor/',
-'IE_STYLESHEETS':    ['DATADIR/cubicweb.ie.css'],
-'STYLESHEETS':       ['DATADIR/cubicweb.css'],
-'STYLESHEETS_PRINT': ['DATADIR/cubicweb.print.css'],
-'JAVASCRIPTS':       ['DATADIR/jquery.js',
-'DATADIR/jquery.corner.js',
-'DATADIR/jquery.json.js',
-'DATADIR/cubicweb.compat.js',
-'DATADIR/cubicweb.python.js',
-'DATADIR/cubicweb.htmlhelpers.js'],
-}
 def anonymous_user(self):
 """return a login and password to use for anonymous users. None
 may be returned for both if anonymous connections are not allowed
 """
 try:
 user = unicode(user)
 return user, passwd
 def has_resource(self, rid):
 """return true if an external resource is defined"""
-return bool(self.ext_resources.get(rid))
+return bool(self.uiprops.get(rid))
 @cached
 def locate_resource(self, rid):
 """return the directory where the given resource may be found"""
 return self._fs_locate(rid, 'data')
 def load_configuration(self):
 """load instance's configuration files"""
 super(WebConfiguration, self).load_configuration()
 # load external resources definition
 self._init_base_url()
-self._build_ext_resources()
+self._build_ui_properties()
 def _init_base_url(self):
 # normalize base url(s)
 baseurl = self['base-url'] or self.default_base_url()
 if baseurl and baseurl[-1] != '/':
 httpsurl = self['https-url']
 if httpsurl and httpsurl[-1] != '/':
 httpsurl += '/'
 if not self.repairing:
 self.global_set_option('https-url', httpsurl)
+if self.debugmode:
-def _build_ext_resources(self):
+self.datadir_url = baseurl + 'data/'
-libresourcesfile = join(self.shared_dir(), 'data', 'external_resources')
+else:
-self.ext_resources.update(read_config(libresourcesfile))
+self.datadir_url = baseurl + 'data%s/' % self.instance_md5_version()
+def _build_ui_properties(self):
+# self.datadir_url[:-1] to remove trailing /
+from cubicweb.web.propertysheet import PropertySheet
+self.uiprops = PropertySheet(datadir_url=self.datadir_url[:-1])
+libuiprops = join(self.shared_dir(), 'data', 'uiprops.py')
+self.uiprops.load(libuiprops)
 for path in reversed([self.apphome] + self.cubes_path()):
-resourcesfile = join(path, 'data', 'external_resources')
+self._load_ui_properties(join(path, 'data'))
-if exists(resourcesfile):
+self._load_ui_properties(self.apphome)
-self.debug('loading %s', resourcesfile)
-self.ext_resources.update(read_config(resourcesfile))
+def _load_ui_properties(self, path):
-resourcesfile = join(self.apphome, 'external_resources')
+resourcesfile = join(path, 'external_resources')
 if exists(resourcesfile):
-self.debug('loading %s', resourcesfile)
+warn('[3.9] %s file is deprecated, use an uiprops.py file'
-self.ext_resources.update(read_config(resourcesfile))
+% resourcesfile, DeprecationWarning)
-for resource in ('STYLESHEETS', 'STYLESHEETS_PRINT',
+for rid, val in read_config(resourcesfile).iteritems():
-'IE_STYLESHEETS', 'JAVASCRIPTS'):
+if rid in ('STYLESHEETS', 'STYLESHEETS_PRINT',
-val = self.ext_resources[resource]
+'IE_STYLESHEETS', 'JAVASCRIPTS'):
-if isinstance(val, str):
+val = [w.strip().replace('DATADIR/', self.datadir_url)
-files = [w.strip() for w in val.split(',') if w.strip()]
+for w in val.split(',') if w.strip()]
-self.ext_resources[resource] = files
+if rid == 'IE_STYLESHEETS':
+rid = 'STYLESHEETS_IE'
+else:
+val = val.strip().replace('DATADIR/', self.datadir_url)
+self.uiprops[rid] = val
+uipropsfile = join(path, 'uiprops.py')
+if exists(uipropsfile):
+self.debug('loading %s', uipropsfile)
+self.uiprops.load(uipropsfile)
 # static files handling ###################################################
 @property
 def static_directory(self):

changeset 5444	f7fdb5dd82f6
parent 5443	f299ee54d7e0
child 5445	4467ed43d97d