From b64439c2631dd55772644d28d6c603b94b562948 Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Thu, 5 Aug 2010 18:04:53 +0000 Subject: [PATCH] Adjusted PlaceListPage elements to make it fit correctly. svn: r15682 --- src/data/Web_Basic-Blue.css | 11 ++++++----- src/plugins/webreport/NarrativeWeb.py | 12 ++++++------ 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/src/data/Web_Basic-Blue.css b/src/data/Web_Basic-Blue.css index 7d66d60b5..4e953ae26 100644 --- a/src/data/Web_Basic-Blue.css +++ b/src/data/Web_Basic-Blue.css @@ -453,7 +453,8 @@ table.surname tbody tr td.ColumnName a span.grampsid { } table.surname tbody tr td.ColumnName:hover { background-color: #00029D; - color: #FFF; + color: #FFF;/home/Frog/trunk/src/gui/viewmanager.py:946: GtkWarning: Inserting action group 'Media' into UI manager which already has a group with this name + } table.surname thead tr th.ColumnParents, table.surname tbody tr td.ColumnParents { @@ -526,19 +527,19 @@ div#Places table.infolist tbody tr td.ColumnLetter a:hover { background: none; } div#Places table.infolist tbody tr td.ColumnName { - width: 50%; + width: 25%; } div#Places table.infolist tbody tr td.ColumnState { width: 7%; } div#Places table.infolist tbody tr td.ColumnCountry { - width: 10%; + width: 6%; } div#Places table.infolist tbody tr td.ColumnLatitude { - width: 10%; + width: 8%; } div#Places table.infolist tbody tr td.ColumnLongitude { - width: 10%; + width: 8%; } div#PlaceDetail table.infolist tbody tr td { border-bottom: dashed 1px #000; diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index 61a98bd1f..2b65eed06 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -2352,9 +2352,9 @@ class PlaceListPage(BasePage): [_("Place Name | Name"), "Name"], [_("State"), "State"], [_("Country"), "Country"], - [_("Lat."), "Latitude"], - [_("Long."), "Longitude"] ] - ) + [_("Latitude"), "Latitude"], + [_("Longitude"), "Longitude"] ] + ) sort = Sort.Sort(db) handle_list = sorted(place_handles, key = sort.by_place_title_key) @@ -2366,7 +2366,7 @@ class PlaceListPage(BasePage): for handle in handle_list: place = db.get_place_from_handle(handle) - place_title = ReportUtils.place_name(db, handle) + place_title = place.get_title() ml = place.get_main_location() letter = first_letter(place_title) @@ -2394,12 +2394,12 @@ class PlaceListPage(BasePage): ["State", ml.state], ["Country", ml.country] ] ) + + latitude, longitude = False, False if (place and (place.lat and place.long)): latitude, longitude = conv_lat_lon( place.lat, place.long, "DEG") - else: - latitude, longitude = False, False trow += Html("td", latitude or " ", class_ = "ColumnLatitude", inline = True) trow += Html("td", longitude or " ", class_ = "ColumnLongitude", inline = True)