From 1f783f6545894de018dd7bc022618ce7a6b6f2ab Mon Sep 17 00:00:00 2001 From: Brian Matherly Date: Sun, 10 Feb 2008 21:17:43 +0000 Subject: [PATCH] 0001750: Some problems with web pages svn: r10012 --- ChangeLog | 31 ++++++++++++++++++------------- src/PluginUtils/_GuiOptions.py | 1 - src/plugins/NarrativeWeb.py | 30 +++++++++++++++--------------- 3 files changed, 33 insertions(+), 29 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b1f3c6b3..6722711bd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,20 +1,25 @@ +2008-02-10 Brian Matherly + * src/plugins/NarrativeWeb.py: + * src/PluginUtils/_GuiOptions.py: + 0001750: Some problems with web pages + 2008-02-08 Raphael Ackermann * src/Editors/_EditPrimary.py: 0001347: double gid. fix previous commit 2008-02-09 Brian Matherly - * src/ReportBase/_WebReportDialog.py: - * src/ReportBase/_ReportDialog.py: - * src/ReportBase/Makefile.am - * src/ReportBase/_BareReportDialog.py: - * src/ReportBase/_ReportOptions.py: - * src/plugins/WebCal.py: - * src/plugins/BookReport.py: - * src/plugins/NarrativeWeb.py: - * src/PluginUtils/__init__.py: - * src/PluginUtils/_MenuOptions.py: - * src/PluginUtils/_GuiOptions.py: - * src/BaseDoc.py: - Web Calendar and Narrative Web report now use Menu Options. + * src/ReportBase/_WebReportDialog.py: + * src/ReportBase/_ReportDialog.py: + * src/ReportBase/Makefile.am + * src/ReportBase/_BareReportDialog.py: + * src/ReportBase/_ReportOptions.py: + * src/plugins/WebCal.py: + * src/plugins/BookReport.py: + * src/plugins/NarrativeWeb.py: + * src/PluginUtils/__init__.py: + * src/PluginUtils/_MenuOptions.py: + * src/PluginUtils/_GuiOptions.py: + * src/BaseDoc.py: + Web Calendar and Narrative Web report now use Menu Options. 2008-02-08 Raphael Ackermann * src/Editors/_EditEvent.py: diff --git a/src/PluginUtils/_GuiOptions.py b/src/PluginUtils/_GuiOptions.py index de2418d10..50b01baf9 100644 --- a/src/PluginUtils/_GuiOptions.py +++ b/src/PluginUtils/_GuiOptions.py @@ -1106,7 +1106,6 @@ class GuiDestinationOption(gtk.HBox): status = fcd.run() if status == gtk.RESPONSE_OK: path = unicode(fcd.get_filename(), sys.getfilesystemencoding()) - print path if path: if not self.__option.get_directory_entry() and \ not path.endswith(self.__option.get_extension()): diff --git a/src/plugins/NarrativeWeb.py b/src/plugins/NarrativeWeb.py index bd20abfb2..62ba72e3b 100644 --- a/src/plugins/NarrativeWeb.py +++ b/src/plugins/NarrativeWeb.py @@ -410,9 +410,9 @@ class BasePage: def show_link(self,of,lpath,title,path): if path: - of.write('%s\n' % (path,lpath,self.ext,title)) + of.write('%s\n' % (path,lpath,self.ext,title)) else: - of.write('%s\n' % (lpath,self.ext,title)) + of.write('%s\n' % (lpath,self.ext,title)) def display_first_image_as_thumbnail( self, of, db, photolist=None): @@ -619,9 +619,9 @@ class BasePage: def build_name(self,path,base): if path: - return path + "/" + base + "." + self.ext + return path + "/" + base + self.ext else: - return base + "." + self.ext + return base + self.ext def person_link(self,of,path,name,gid="",up=True): if up: @@ -636,20 +636,20 @@ class BasePage: handle = self.lnkfmt(name) dirpath = self.build_path(handle,'srn',up) - of.write('%s' % (dirpath,handle,self.ext,name)) + of.write('%s' % (dirpath,handle,self.ext,name)) if opt_val != None: of.write(' (%d)' % opt_val) of.write('') def media_ref_link(self,of,handle,name,up=False): dirpath = self.build_path(handle,'img',up) - of.write('%s' % ( + of.write('%s' % ( dirpath,handle,self.ext,name)) def media_link(self,of,handle,path,name,up,usedescr=True): dirpath = self.build_path(handle,'img',up) of.write('
\n') - of.write('

' % (dirpath,handle,self.ext)) + of.write('

' % (dirpath,handle,self.ext)) of.write('

\n' % name) if usedescr: @@ -660,7 +660,7 @@ class BasePage: path = os.path.join('images','document.png') dirpath = self.build_path(handle,'img',up) of.write('
\n') - of.write('

' % (dirpath,handle,self.ext)) + of.write('

' % (dirpath,handle,self.ext)) of.write('' % name) of.write('

\n') @@ -670,7 +670,7 @@ class BasePage: def source_link(self,of,handle,name,gid="",up=False): dirpath = self.build_path(handle,'src',up) - of.write('%s' % ( + of.write('%s' % ( dirpath,handle,self.ext,name)) if not self.noid and gid != "": of.write(' [%s]' % gid) @@ -678,7 +678,7 @@ class BasePage: def place_link(self,of,handle,name,gid="",up=False): dirpath = self.build_path(handle,'plc',up) - of.write('%s' % ( + of.write('%s' % ( dirpath,handle,self.ext,name)) if not self.noid and gid != "": of.write(' [%s]' % gid) @@ -686,7 +686,7 @@ class BasePage: def place_link_str(self,handle,name,gid="",up=False): dirpath = self.build_path(handle,'plc',up) - retval = '%s' % ( + retval = '%s' % ( dirpath,handle,self.ext,name) if not self.noid and gid != "": retval = retval + ' [%s]' % gid @@ -1306,13 +1306,13 @@ class SurnameListPage(BasePage): of.write('%s\n' % _('Letter')) if not self.use_home and not self.use_intro: - of.write('%s\n' % ("index", self.ext, + of.write('%s\n' % ("index", self.ext, _('Surname'))) else: - of.write('%s\n' % ("surnames", + of.write('%s\n' % ("surnames", self.ext, _('Surname'))) - of.write('%s\n' % ("surnames_count", self.ext, _('Number of people'))) + of.write('%s\n' % ("surnames_count", self.ext, _('Number of people'))) of.write('\n\n') person_handle_list = sort_people(db,person_handle_list) @@ -2719,7 +2719,7 @@ class NavWebOptions(MenuReportOptions): self.__update_filters() title = StringOption(_("Web site title"), _('My Family Tree')) - title.set_help(_("The of the web site")) + title.set_help(_("The title of the web site")) menu.add_option(category_name, "title", title) ext = EnumeratedListOption(_("File extension"), ".html" )