diff -r f7fdb5dd82f6 -r 4467ed43d97d web/data/uiprops.py --- a/web/data/uiprops.py Fri Apr 30 12:14:15 2010 +0200 +++ b/web/data/uiprops.py Fri Apr 30 12:15:37 2010 +0200 @@ -1,57 +1,57 @@ """define default ui properties""" # CSS stylesheets to include systematically in HTML headers -STYLESHEETS = ['%s/cubicweb.reset.css' % datadir_url, - '%s/cubicweb.css' % datadir_url] -STYLESHEETS_IE = ['%s/cubicweb.ie.css' % datadir_url] -STYLESHEETS_PRINT = ['%s/cubicweb.print.css' % datadir_url] +STYLESHEETS = [data('cubicweb.reset.css'), + data('cubicweb.css')] +STYLESHEETS_IE = [data('cubicweb.ie.css')] +STYLESHEETS_PRINT = [data('cubicweb.print.css')] # Javascripts files to include systematically in HTML headers -JAVASCRIPTS = ['%s/jquery.js' % datadir_url, - '%s/jquery.corner.js' % datadir_url, - '%s/jquery.json.js' % datadir_url, - '%s/cubicweb.compat.js' % datadir_url, - '%s/cubicweb.python.js' % datadir_url, - '%s/cubicweb.htmlhelpers.js' % datadir_url] +JAVASCRIPTS = [data('jquery.js'), + data('jquery.corner.js'), + data('jquery.json.js'), + data('cubicweb.compat.js'), + data('cubicweb.python.js'), + data('cubicweb.htmlhelpers.js')] # where is installed fckeditor FCKEDITOR_PATH = '/usr/share/fckeditor/' # favicon and logo for the instance -FAVICON = '%s/favicon.ico' % datadir_url -LOGO = '%s/logo.png' % datadir_url +FAVICON = data('favicon.ico') +LOGO = data('logo.png') # rss logo (link to get the rss view of a selection) -RSS_LOGO = '%s/rss.png' % datadir_url -RSS_LOGO_16 = '%s/feed-icon16x16.png' % datadir_url -RSS_LOGO_32 = '%s/feed-icon32x32.png' % datadir_url +RSS_LOGO = data('rss.png') +RSS_LOGO_16 = data('feed-icon16x16.png') +RSS_LOGO_32 = data('feed-icon32x32.png') # XXX cleanup resources below, some of them are probably not used # (at least entity types icons...) # images -HELP = '%s/help.png' % datadir_url -SEARCH_GO = '%s/go.png' % datadir_url -PUCE_UP = '%s/puce_up.png' % datadir_url -PUCE_DOWN = '%s/puce_down.png' % datadir_url +HELP = data('help.png') +SEARCH_GO = data('go.png') +PUCE_UP = data('puce_up.png') +PUCE_DOWN = data('puce_down.png') # button icons -OK_ICON = '%s/ok.png' % datadir_url -CANCEL_ICON = '%s/cancel.png' % datadir_url -APPLY_ICON = '%s/plus.png' % datadir_url -TRASH_ICON = '%s/trash_can_small.png' % datadir_url +OK_ICON = data('ok.png') +CANCEL_ICON = data('cancel.png') +APPLY_ICON = data('plus.png') +TRASH_ICON = data('trash_can_small.png') # icons for entity types -BOOKMARK_ICON = '%s/icon_bookmark.gif' % datadir_url -EMAILADDRESS_ICON = '%s/icon_emailaddress.gif' % datadir_url -EUSER_ICON = '%s/icon_euser.gif' % datadir_url -STATE_ICON = '%s/icon_state.gif' % datadir_url +BOOKMARK_ICON = data('icon_bookmark.gif') +EMAILADDRESS_ICON = data('icon_emailaddress.gif') +EUSER_ICON = data('icon_euser.gif') +STATE_ICON = data('icon_state.gif') # other icons -CALENDAR_ICON = '%s/calendar.gif' % datadir_url -CANCEL_EMAIL_ICON = '%s/sendcancel.png' % datadir_url -SEND_EMAIL_ICON = '%s/sendok.png' % datadir_url -DOWNLOAD_ICON = '%s/download.gif' % datadir_url -UPLOAD_ICON = '%s/upload.gif' % datadir_url -GMARKER_ICON = '%s/gmap_blue_marker.png' % datadir_url -UP_ICON = '%s/up.gif' % datadir_url +CALENDAR_ICON = data('calendar.gif') +CANCEL_EMAIL_ICON = data('sendcancel.png') +SEND_EMAIL_ICON = data('sendok.png') +DOWNLOAD_ICON = data('download.gif') +UPLOAD_ICON = data('upload.gif') +GMARKER_ICON = data('gmap_blue_marker.png') +UP_ICON = data('up.gif')