\n')
@@ -1352,20 +1346,6 @@ class SurnameListPage(BasePage):
'will lead to a list of individuals in the '
'database with this same surname.'))
- alphabet = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
- 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z']
- alpha_list = self.get_alpha_list(person_handle_list)
- of.write('\t
\n')
- for ltr in alphabet:
- of.write('\t\t\t| ')
- if ltr in alpha_list:
- of.write('%s | \n' % (ltr, ltr))
- else:
- of.write('%s\n' % ltr)
- of.write('\t\t\n')
- of.write('\t
\n')
-
if order_by == self.ORDER_BY_COUNT:
of.write('\t
\n')
of.write('\t\n')
@@ -2657,6 +2637,7 @@ class NavWebReport(Report):
self.options['homeimg']
self.use_contact = self.options['contactnote'] or \
self.options['contactimg']
+ self.graph = self.options['graph']
if self.use_home:
self.index_fname = "index"
@@ -2737,33 +2718,8 @@ class NavWebReport(Report):
# Build the person list
ind_list = self.build_person_list()
- # Generate the CSS file if requested
- if self.css:
- self.copy_css(self.css)
-
- imgs = []
- if self.css == "Web_Mainz.css":
- # Copy Mainz Style Images
- imgs += ["Web_Mainz_Bkgd.png",
- "Web_Mainz_Header.png",
- "Web_Mainz_Mid.png",
- "Web_Mainz_MidLight.png",
- "document.png"]
-
- # Copy the Creative Commons icon if the Creative Commons
- # license is requested
- if 0 < self.copyright < len(_CC):
- imgs += ["somerights20.gif"]
-
- imgs += ["favicon.ico",
- "Web_Gender_Female.png",
- "Web_Gender_FemaleFFF.png",
- "Web_Gender_Male.png",
- "Web_Gender_MaleFFF.png"]
-
- for f in imgs:
- from_path = os.path.join(const.IMAGE_DIR, f)
- self.copy_file(from_path, f, "images")
+ # copy all of the neccessary files
+ self.copy_narrated_files()
place_list = {}
source_list = {}
@@ -2796,15 +2752,47 @@ class NavWebReport(Report):
return ind_list
- def copy_css(self, css_file):
+ def copy_narrated_files(self):
"""
- Copy the CSS files to the target directory.
+ Copy all of the CSS and image files
"""
- fname = os.path.join(const.DATA_DIR, css_file)
- self.copy_file(fname, _NARRATIVESCREEN, "styles")
+ # copy screen stylesheet
+ fname = os.path.join(const.DATA_DIR, self.css)
+ self.copy_file(fname, self.css, "styles")
+
+ # copy printer stylesheet
fname = os.path.join(const.DATA_DIR, "Web_Print-Default.css")
- self.copy_file(fname, _NARRATIVEPRINT, "styles")
+ self.copy_file(fname, "Web_Print-Default.css", "styles")
+
+ imgs = []
+
+ # Copy Mainz Style Images
+ if self.css == "Web_Mainz.css":
+ imgs += ["Web_Mainz_Bkgd.png",
+ "Web_Mainz_Header.png",
+ "Web_Mainz_Mid.png",
+ "Web_Mainz_MidLight.png",
+ "document.png"]
+
+ # Copy the Creative Commons icon if the Creative Commons
+ # license is requested???
+ if 0 < self.copyright < len(_CC):
+ imgs += ["somerights20.gif"]
+
+ # include GRAMPS favicon
+ imgs += ["favicon.ico"]
+
+ # copy Ancestor Tree graphics if needed???
+ if self.graph:
+ imgs += ["Web_Gender_Female.png",
+ "Web_Gender_FemaleFFF.png",
+ "Web_Gender_Male.png",
+ "Web_Gender_MaleFFF.png"]
+
+ for f in imgs:
+ from_path = os.path.join(const.IMAGE_DIR, f)
+ self.copy_file(from_path, f, "images")
def person_pages(self, ind_list, place_list, source_list):
@@ -3283,10 +3271,10 @@ class NavWebOptions(MenuReportOptions):
showparents.set_help(_('Whether to include a parents column'))
menu.add_option(category_name, 'showparents', showparents)
- showallsiblings = BooleanOption(_("Include half-siblings and "
+ showallsiblings = BooleanOption(_("Include half and/ or "
"step-siblings on the individual "
"pages"), False)
- showallsiblings.set_help(_( "Whether to include half-siblings and "
+ showallsiblings.set_help(_( "Whether to include half and/ or "
"step-siblings with the parents and "
"siblings"))
menu.add_option(category_name, 'showhalfsiblings', showallsiblings)