From 73a8acc7bc114bd06f95fd3af062f543402be324 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Mon, 14 Dec 2009 07:04:37 +0000 Subject: [PATCH] Removed debugging code in NarrativeWeb. Adjusted elements in MediaListPage. svn: r13794 --- configure.in | 2 +- src/data/Web_Visually.css | 8 ++++---- src/plugins/webreport/NarrativeWeb.py | 11 +++++------ 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/configure.in b/configure.in index 893975ffe..2737fdba6 100644 --- a/configure.in +++ b/configure.in @@ -124,6 +124,7 @@ src/Filters/Rules/MediaObject/Makefile src/Filters/Rules/Repository/Makefile src/Filters/Rules/Note/Makefile src/Filters/SideBar/Makefile +src/gui/widgets/Makefile src/BasicUtils/Makefile src/Simple/Makefile src/GrampsDbUtils/Makefile @@ -146,7 +147,6 @@ src/plugins/tool/Makefile src/plugins/view/Makefile src/plugins/webreport/Makefile src/DateHandler/Makefile -src/widgets/Makefile src/data/Makefile src/glade/Makefile src/images/Makefile diff --git a/src/data/Web_Visually.css b/src/data/Web_Visually.css index ff098827e..ef8acbce9 100644 --- a/src/data/Web_Visually.css +++ b/src/data/Web_Visually.css @@ -712,19 +712,19 @@ div#EventDetail table.eventlist tbody tr td.ColumnDate { background-colo: #D8F3D6; } #Gallery table.infolist tbody tr td.ColumnRowLabel { - width: 8%; + width: 5%; padding-bottom: 0; } #Gallery table.infolist tbody tr td.ColumnName { - padding: 0; width: 50%; background-color: #FFF; } #Gallery table.infolist tbody tr td.ColumnName a { - padding:.1em 10px .3em 10px; + display: block; + padding: .2em 10px .4em 10px; } #Gallery table.infolist tbody tr td.ColumnDate { - width: 15%; + width: 20%; } #Gallery table.infolist tbody tr td.ColumnMime { width: 20%; diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index f481dc075..03ddf809f 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -1104,7 +1104,7 @@ class BasePage(object): self.report.copy_file(Utils.media_path_full(db, obj.get_path()), newpath) # get media rectangles - _region_items = self.media_rectangles(obj_handle, obj) + _region_items = self.media_ref_ewgions(obj_handle, obj) if len(_region_items): with Html("div") as mediadisplay: @@ -1156,7 +1156,7 @@ class BasePage(object): # no image to return return None - def media_rectangles(self, handle, media): + def media_ref_ewgions(self, handle, media): """ ************************************* @@ -1265,7 +1265,7 @@ class BasePage(object): try: # get media rectangles - _region_items = self.media_rectangles(photo_handle, photo) + _region_items = self.media_ref_ewgions(photo_handle, photo) if len(_region_items): with Html("div") as mediadisplay: snapshot += mediadisplay @@ -1344,7 +1344,7 @@ class BasePage(object): try: # get media rectangles - _region_items = self.media_rectangles(photo_handle, photo) + _region_items = self.media_ref_ewgions(photo_handle, photo) if len(_region_items): with Html("div") as mediadisplay: section += mediadisplay @@ -2589,7 +2589,7 @@ class MediaPage(BasePage): BasePage.__init__(self, report, title, media.gramps_id) # get media rectangles - _region_items = self.media_rectangles(handle, media) + _region_items = self.media_ref_ewgions(handle, media) of = self.report.create_file(handle, "img") self.up = True @@ -2637,7 +2637,6 @@ class MediaPage(BasePage): with Html("div", id = "summaryarea") as summaryarea: mediadetail += summaryarea if mime_type: - print mime_type if mime_type.startswith("image/"): if not target_exists: with Html("div", id = "MediaDisplay") as mediadisplay: