From 8c3bfdc44faa61abbd1569a94bab7375f0ec0832 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Thu, 26 Feb 2009 08:25:45 +0000 Subject: [PATCH] More refactoring ... Help from Gerald Britton. svn: r12123 --- src/plugins/webreport/NarrativeWeb.py | 35 ++++++++++------- src/plugins/webreport/WebCal.py | 56 +++++++++++---------------- 2 files changed, 42 insertions(+), 49 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 9399d7b9b..5ef4361cf 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -101,6 +101,10 @@ from gen.lib.eventroletype import EventRoleType # constants # #------------------------------------------------------------------------ +# Names for stylesheets +_NARRATIVESCREEN = 'narrative-screen.css' +_NARRATIVEPRINT = 'narrative-print.css' + # variables for alphabet_navigation _PERSON = 0 _PLACE = 1 @@ -394,33 +398,34 @@ class BasePage: (const.PROGRAM_NAME, const.VERSION, const.URL_HOMEPAGE)) of.write('\t\n' % self.author) - # Link to css behaviours + # Link to media reference regions behaviour stylesheet fname = os.path.join("styles", "behaviour.css") url = self.report.build_url_fname(fname, None, self.up) - of.write('\t\n' % url) + of.write('\t\n' % url) # Link to screen stylesheet - fname = os.path.join("styles", self.report.css) + fname = os.path.join("styles", _NARRATIVESCREEN) url = self.report.build_url_fname(fname, None, self.up) - of.write('\t\n' % url) + of.write('\t\n' % url) # Link to printer stylesheet - fname = os.path.join("styles", "Web_Print-Default.css") + fname = os.path.join("styles", _NARRATIVEPRINT) url = self.report.build_url_fname(fname, None, self.up) - of.write('\t\n' % url) + of.write('\t\n' % url) # Link to GRAMPS favicon url = self.report.build_url_image('favicon.ico', 'images', self.up) - of.write('\t\n' % url) + of.write('\t\n' % url) of.write('\n\n') of.write('\n') # Terminated in write_footer() - of.write('