diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 11c8eafb3..fe297d653 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -3991,11 +3991,6 @@ class IndividualPage(BasePage): if assocs: individualdetail += self.display_ind_associations(assocs) - # display sources - sect11 = self.display_ind_sources(self.person) - if sect11 is not None: - individualdetail += sect11 - # create family map link if self.familymappages: if len(place_lat_long): @@ -4012,6 +4007,11 @@ class IndividualPage(BasePage): if sect14 is not None: individualdetail += sect14 + # display personal sources + personal_sources = self.display_ind_sources(self.person) + if personal_sources is not None: + individualdetail += personal_sources + # add clearline for proper styling # create footer section footer = self.write_footer() @@ -6315,6 +6315,9 @@ class NavWebReport(Report): Imagine we run gramps on Windows (heaven forbits), we don't want to see backslashes in the URL. """ + if not fname: + return "" + if constfunc.win(): fname = fname.replace('\\',"/") subdirs = self.build_subdirs(subdir, fname, up) diff --git a/src/plugins/webstuff/css/Web_Navigation-Horizontal.css b/src/plugins/webstuff/css/Web_Navigation-Horizontal.css index 0db5e6204..22ff4ca92 100755 --- a/src/plugins/webstuff/css/Web_Navigation-Horizontal.css +++ b/src/plugins/webstuff/css/Web_Navigation-Horizontal.css @@ -33,8 +33,8 @@ body { background-color: #000; color: #FFF; margin: 0 auto; - padding: 5px 2px 5px 2px; - width: 100%; + padding: 0px 0px 7px 7px; + width: 965px; } /* Navigation