Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

NarrativeWeb: Fixed Address Book not creating page if there was no address. Stylesheets: Cleanup to correctly show AddressBookList.

Browse Source 
svn: r14744
This commit is contained in:
Rob G. Healey
2010-03-10 22:40:14 +00:00
parent 8b0cc60344
commit 34148aea8a
7 changed files with 31 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/data/Web_Basic-Ash.css
View File

@@ -799,33 +799,6 @@ div#RepositoryList table.repolist tbody tr td.ColumnName {
background-color: #FFF; background-color: #FFF;
} }
/* Internet Address Book
------------------------------------------------------ */
div#InternetAddressBook {
margin: 0;
padding: 0;
}
div#InternetAddressBook table.addressbook {
margin: .3em 0 .3em 0;
}
div#InternetAddressBook table.addressbook tbody tr.BeginName {
border-top: solid 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td {
background-color: #FFF;
border-bottom: dashed 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnType {
background-color: #CCC;
width: 15%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnName {
width: 30%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnLink {
width: 70%;
}
/* Address Book /* Address Book
------------------------------------------------------ */ ------------------------------------------------------ */
div#AddressBookList, AddressBookDetail { div#AddressBookList, AddressBookDetail {

27
src/data/Web_Basic-Cypress.css
View File

@@ -826,33 +826,6 @@ div#RepositoryList table.repolist tbody tr td.ColumnName {
background-color: #FFF; background-color: #FFF;
} }
/* Internet Address Book
------------------------------------------------------ */
div#InternetAddressBook {
margin: 0;
padding: 0;
}
div#InternetAddressBook table.addressbook {
margin: .3em 0 .3em 0;
}
div#InternetAddressBook table.addressbook tbody tr.BeginName {
border-top: solid 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td {
background-color: #FFF;
border-bottom: dashed 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnType {
background-color: #E0E6E0;
width: 15%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnName {
width: 30%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnLink {
width: 70%;
}
/* Address Book /* Address Book
------------------------------------------------------ */ ------------------------------------------------------ */
div#AddressBookList, AddressBookDetail { div#AddressBookList, AddressBookDetail {

27
src/data/Web_Basic-Lilac.css
View File

@@ -776,33 +776,6 @@ div#RepositoryList table.repolist tbody tr td.ColumnName {
background-color: #FFF; background-color: #FFF;
} }
/* Internet Address Book
------------------------------------------------------ */
div#InternetAddressBook {
margin: 0;
padding: 0;
}
div#InternetAddressBook table.addressbook {
margin: .3em 0 .3em 0;
}
div#InternetAddressBook table.addressbook tbody tr.BeginName {
border-top: solid 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td {
background-color: #FFF;
border-bottom: dashed 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnType {
background-color: #E0E0E9;
width: 15%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnName {
width: 30%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnLink {
width: 70%;
}
/* Address Book /* Address Book
------------------------------------------------------ */ ------------------------------------------------------ */
div#AddressBookList, AddressBookDetail { div#AddressBookList, AddressBookDetail {

27
src/data/Web_Basic-Peach.css
View File

@@ -779,33 +779,6 @@ div#RepositoryList table.repolist tbody tr td.ColumnName {
background-color: #FFF; background-color: #FFF;
} }
/* Internet Address Book
------------------------------------------------------ */
div#InternetAddressBook {
margin: 0;
padding: 0;
}
div#InternetAddressBook table.addressbook {
margin: .3em 0 .3em 0;
}
div#InternetAddressBook table.addressbook tbody tr.BeginName {
border-top: solid 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td {
background-color: #FFF;
border-bottom: dashed 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnType {
background-color: #FFFBE7;
width: 15%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnName {
width: 30%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnLink {
width: 70%;
}
/* Address Book /* Address Book
------------------------------------------------------ */ ------------------------------------------------------ */
div#AddressBookList, AddressBookDetail { div#AddressBookList, AddressBookDetail {

27
src/data/Web_Basic-Spruce.css
View File

@@ -777,33 +777,6 @@ div#RepositoryList table.repolist tbody tr td.ColumnName {
background-color: #FFF; background-color: #FFF;
} }
/* Internet Address Book
------------------------------------------------------ */
div#InternetAddressBook {
margin: 0;
padding: 0;
}
div#InternetAddressBook table.addressbook {
margin: .3em 0 .3em 0;
}
div#InternetAddressBook table.addressbook tbody tr.BeginName {
border-top: solid 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td {
background-color: #FFF;
border-bottom: dashed 1px #000;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnType {
background-color: #EAEEF4;
width: 15%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnName {
width: 30%;
}
div#InternetAddressBook table.addressbook tbody tr td.ColumnLink {
width: 70%;
}
/* Address Book /* Address Book
------------------------------------------------------ */ ------------------------------------------------------ */
div#AddressBookList, AddressBookDetail { div#AddressBookList, AddressBookDetail {

24
src/data/Web_Nebraska.css
View File

@@ -819,31 +819,37 @@ div#RepositoryList table.repolist tbody tr td.ColumnName {
background-color: #FFF; background-color: #FFF;
} }
/* Internet Address Book /* Address Book
------------------------------------------------------ */ ------------------------------------------------------ */
div#InternetAddressBook { div#AddressBookList {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
div#InternetAddressBook table.addressbook { div#AddressBookList table.addressbook {
margin: .3em 0 .3em 0; margin: .3em 0 .3em 0;
} }
div#InternetAddressBook table.addressbook tbody tr.BeginName { div#AddressBookList table.addressbook tbody tr.BeginName {
border-top: solid 1px #000; border-top: solid 1px #000;
} }
div#InternetAddressBook table.addressbook tbody tr td { div#AddressBookList table.addressbook tbody tr td {
background-color: #FFF; background-color: #FFF;
border-bottom: dashed 1px #000; border-bottom: dashed 1px #000;
} }
div#InternetAddressBook table.addressbook tbody tr td.ColumnType { div#AddressBookList table.addressbook tbody tr td.ColumnRowLabel {
background-color: #F6F2EE; background-color: #F6F2EE;
width: 15%; width: 15%;
} }
div#InternetAddressBook table.addressbook tbody tr td.ColumnName { div#AddressBookList table.addressbook tbody tr td.ColumnName {
width: 30%; width: 30%;
} }
div#InternetAddressBook table.addressbook tbody tr td.ColumnLink { div#AddressBookList table.addressbook tbody tr td.ColumnAddress {
width: 70%; width: 8%;
}
div#AddressBookList table.addressbook tbody tr td.ColumnResidence {
width: 8%;
}
div#AddressBookList table.addressbook tbody tr td.ColumnWebLinks {
width: 8%;
} }
/* Subsections /* Subsections

35
src/plugins/webreport/NarrativeWeb.py
View File

@@ -7,7 +7,7 @@
# Copyright (C) 2007-2009 Stephane Charette <stephanecharette@gmail.com> # Copyright (C) 2007-2009 Stephane Charette <stephanecharette@gmail.com>
# Copyright (C) 2008-2009 Brian G. Matherly # Copyright (C) 2008-2009 Brian G. Matherly
# Copyright (C) 2008 Jason M. Simanek <jason@bohemianalps.com> # Copyright (C) 2008 Jason M. Simanek <jason@bohemianalps.com>
# Copyright (C) 2008-2009 Rob G. Healey <robhealey1@gmail.com> # Copyright (C) 2008-2010 Rob G. Healey <robhealey1@gmail.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@@ -4734,7 +4734,8 @@ class AddressBookListPage(BasePage):
of = self.report.create_file("addressbook") of = self.report.create_file("addressbook")
# Add xml, doctype, meta and stylesheets # Add xml, doctype, meta and stylesheets
addressbooklistpage, body = self.write_header("%s - %s" % (title, _("Address Book")), _KEYPERSON) addressbooklistpage, body = self.write_header("%s - %s" % (title,
_("Address Book")), _KEYPERSON)
# begin AddressBookList division # begin AddressBookList division
with Html("div", class_ = "content", id = "AddressBookList") as addressbooklist: with Html("div", class_ = "content", id = "AddressBookList") as addressbooklist:
@@ -4771,7 +4772,7 @@ class AddressBookListPage(BasePage):
table += tbody table += tbody
# local counters for total line # local counters for total line
index, countadd, countres, counturl = 0, 0, 0, 0 index, countadd, countres, counturl, countfb = 0, 0, 0, 0, 0
for (sort_name, person_handle, has_add, has_res, has_url) in has_url_address: for (sort_name, person_handle, has_add, has_res, has_url) in has_url_address:
person = db.get_person_from_handle(person_handle) person = db.get_person_from_handle(person_handle)
@@ -4780,6 +4781,7 @@ class AddressBookListPage(BasePage):
address = None address = None
residence = None residence = None
weblinks = None weblinks = None
facebook = None
# has address but no residence event # has address but no residence event
if has_add and not has_res: if has_add and not has_res:
@@ -4860,26 +4862,20 @@ class AddressBookPage(BasePage):
# begin address book page division and section title # begin address book page division and section title
with Html("div", class_ = "content", id = "AddressBookDetail") as addressbookdetail: with Html("div", class_ = "content", id = "AddressBookDetail") as addressbookdetail:
body += addressbookdetail body += addressbookdetail
addressbookdetail += Html("h3", self.get_name(person), inline = True) addressbookdetail += Html("h3", self.get_name(person), inline = True)
# individual has an address
if has_add:
addressbookdetail += self.display_addr_list(has_add, None)
# individual has a residence
if has_res:
addressbookdetail += self.dump_residence(has_res)
# individual has a url # individual has a url
if has_url: if has_url:
addressbookdetail += self.display_url_list(has_url) addressbookdetail += self.display_url_list(has_url)
# individual has an address, and not a residence event
if has_add and not has_res:
addressbookdetail += self.display_addr_list(has_add, None)
# individual has a residence event and no addresses
elif has_res and not has_add:
addressbookdetail += self.dump_residence(has_res)
# individual has both
elif has_add and has_res:
addressbookdetail += self.display_addr_list(has_add, None)
addressbookdetail += self.dump_residence(has_res)
# add fullclear for proper styling # add fullclear for proper styling
# and footer section to page # and footer section to page
footer = self.write_footer() footer = self.write_footer()
@@ -5402,12 +5398,12 @@ class NavWebReport(Report):
has_add = None has_add = None
has_url = None has_url = None
has_res = None
if addrlist: if addrlist:
has_add = addrlist has_add = addrlist
if urllist: if urllist:
has_url = urllist has_url = urllist
has_res = None
for event_ref in evt_ref_list: for event_ref in evt_ref_list:
event = db.get_event_from_handle(event_ref.ref) event = db.get_event_from_handle(event_ref.ref)
@@ -5427,10 +5423,11 @@ class NavWebReport(Report):
# Determine if we build Address Book # Determine if we build Address Book
if has_url_address: if has_url_address:
has_url_address.sort() has_url_address.sort()
AddressBookListPage(self, self.title, has_url_address)
self.progress.set_pass(_("Creating address book pages ..."), len(has_url_address)) self.progress.set_pass(_("Creating address book pages ..."), len(has_url_address))
AddressBookListPage(self, self.title, has_url_address)
for (sort_name, person_handle, has_add, has_res, has_url) in has_url_address: for (sort_name, person_handle, has_add, has_res, has_url) in has_url_address:
self.progress.step() self.progress.step()