Still working with classes EventListpage() and EventPage(). Making changes as I go with the stylesheet.

svn: r13199
This commit is contained in:
Rob G. Healey 2009-09-13 03:43:27 +00:00
parent d76615b086
commit 1430e3107a
2 changed files with 21 additions and 19 deletions

View File

@ -381,8 +381,8 @@ body#WebCal #navigation, body#fullyearlinked #navigation {
table.infolist { table.infolist {
width:100%; width:100%;
margin: 0; margin: 0;
padding:0; padding: 0;
font-size: 10px; font-size: 12px;
} }
table.infolist thead tr th { table.infolist thead tr th {
font:normal 1.1em/1.2em serif; font:normal 1.1em/1.2em serif;
@ -480,6 +480,9 @@ table.surnamelist thead tr th.ColumnLetter {
padding-left:20px; padding-left:20px;
padding-right:10px; padding-right:10px;
} }
table.surnamelist tbody tr td {
background-color: #D8F3D6;
}
table.surnamelist tbody tr td.ColumnSurname { table.surnamelist tbody tr td.ColumnSurname {
background-color: #FFF; background-color: #FFF;
} }
@ -621,7 +624,7 @@ table.individuallist tbody tr td.ColumnPartner a:hover {
/* Events /* Events
----------------------------------------------------- */ ----------------------------------------------------- */
div#EventList, div#EventDetail {} div#EventList, div#EventDetail { }
div#events table.eventlist { div#events table.eventlist {
margin-top: .3cm; margin-top: .3cm;
@ -643,11 +646,11 @@ table.eventlist tbody tr td.ColumnType {
width: 20%; width: 20%;
} }
table.eventlist tbody tr td.ColumnDate { table.eventlist tbody tr td.ColumnDate {
width: 9%; width: 16%;
} }
table.eventlist tbody tr td.ColumnPlace { table.eventlist tbody tr td.ColumnPlace {
background-color: #FFF; background-color: #FFF;
width: 40%; width: 35%;
} }
table.eventlist tbody tr td.ColumnSources { table.eventlist tbody tr td.ColumnSources {
background-color: #FFF; background-color: #FFF;
@ -659,7 +662,7 @@ table.eventlist tbody tr td.ColumnNotes {
} }
table.eventlist tbody tr td.ColumnPerson { table.eventlist tbody tr td.ColumnPerson {
background-color: #FFF; background-color: #FFF;
width: 25%; width: 35%;
} }
table.eventlist tbody tr td.ColumnPartner { table.eventlist tbody tr td.ColumnPartner {
background-color: #FFF; background-color: #FFF;
@ -676,6 +679,7 @@ div#EventDetail table.eventlist {
width: 800px; width: 800px;
} }
div#EventDetail table.eventlist tbody tr td.ColumnAttribute { div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
border-top: solid 1px #5D835F;
font-weight: bold; font-weight: bold;
text-transform: uppercase; text-transform: uppercase;
width: 20%; width: 20%;

View File

@ -2019,11 +2019,10 @@ class EventListPage(BasePage):
msg = _("This page contains an index of all the events in the " msg = _("This page contains an index of all the events in the "
"database, sorted by their type, date (if one is present), " "database, sorted by their type, date (if one is present), "
"and person’s surname. Clicking on an event’s type " "and person’s surname. Clicking on an event’s type "
"will take you to that event’s page. Clicking on a place " "will take you to that event’s page. Clicking on a "
"will take you to that place’s page. Clicking on a "
"person’s name will take you to that person’s page. " "person’s name will take you to that person’s page. "
"The person will only be shown once for their events.") "The person’s name will only be shown once for their events.")
eventlist += Html('p', msg, id='description') eventlist += Html("p", msg, id="description")
# begin event list table # begin event list table
with Html("table", class_ = "infolist eventlist") as table: with Html("table", class_ = "infolist eventlist") as table:
@ -2040,10 +2039,9 @@ class EventListPage(BasePage):
for (label, colclass) in [ for (label, colclass) in [
[THEAD, 'Type'], [THEAD, 'Type'],
[DHEAD, 'Date'], [DHEAD, 'Date'],
[PHEAD, 'Place'],
[_('Person'), 'Person'], [_('Person'), 'Person'],
[_('Partner'), 'Partner'] ]: [_('Partner'), 'Partner'] ]:
trow += Html("th", label, class_ = 'Column%s' % colclass, inline = True) trow += Html("th", label, class_ = "Column%s" % colclass, inline = True)
# begin table body # begin table body
tbody = Html("tbody") tbody = Html("tbody")
@ -2085,7 +2083,7 @@ class EventListPage(BasePage):
# get person's hyperlink # get person's hyperlink
url = self.report.build_url_fname_html(person.handle, 'ppl', subdirs) url = self.report.build_url_fname_html(person.handle, 'ppl', subdirs)
person_hyper = self.person_link(url, person, True, first, person.gramps_id) person_hyper = self.person_link(url, person, True, first)
# begin table row # begin table row
trow = Html("tr") trow = Html("tr")
@ -2094,8 +2092,8 @@ class EventListPage(BasePage):
""" """
for more information: see get_event_data() for more information: see get_event_data()
""" """
event_data = self.get_event_data(evt, evt_ref, True, False, False, event_data = self.get_event_data(evt, evt_ref, False, False, False,
False, subdirs, True, evt.gramps_id) False, subdirs, True)
for (label, colclass, data) in event_data: for (label, colclass, data) in event_data:
data = " " if (not data or []) else data data = " " if (not data or []) else data
@ -2110,13 +2108,12 @@ class EventListPage(BasePage):
# get partner hyperlink # get partner hyperlink
# display partner if event is either a Marriage or Divorce? # display partner if event is either a Marriage or Divorce?
# partner will not be None
partner_hyper = " " partner_hyper = " "
if partner is not None: if partner is not None:
# get partner hyperlink # get partner hyperlink
url = self.report.build_url_fname_html(partner.handle, 'ppl', subdirs) url = self.report.build_url_fname_html(partner.handle, 'ppl', subdirs)
partner_hyper = self.person_link(url, partner, False, partner.gramps_id) partner_hyper = self.person_link(url, partner, True)
trow += Html("td", partner_hyper, class_ = "ColumnPartner") trow += Html("td", partner_hyper, class_ = "ColumnPartner")
# return EventList row to its caller # return EventList row to its caller
@ -2140,6 +2137,7 @@ class EventPage(BasePage):
# display page itle # display page itle
title = _('%(type)s of %(name)s') % {'type' : evt_type.lower(), title = _('%(type)s of %(name)s') % {'type' : evt_type.lower(),
'name' : self.get_name(person) } 'name' : self.get_name(person) }
# line is in place for Peter Lundgren # line is in place for Peter Lundgren
title = title[0].upper() + title[1:] title = title[0].upper() + title[1:]
eventdetail += Html('h3', title, inline = True) eventdetail += Html('h3', title, inline = True)
@ -2178,7 +2176,7 @@ class EventPage(BasePage):
# get person hyperlink # get person hyperlink
url = self.report.build_url_fname_html(person.handle, 'ppl', self.up) url = self.report.build_url_fname_html(person.handle, 'ppl', self.up)
person_hyper = self.person_link(url, person, True, person.gramps_id) person_hyper = self.person_link(url, person, True, gid=person.gramps_id)
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", _('Person'), class_ = "ColumnAttribute", inline = True), Html("td", _('Person'), class_ = "ColumnAttribute", inline = True),
Html("td", person_hyper, class_ = "ColumnPerson") Html("td", person_hyper, class_ = "ColumnPerson")
@ -2188,7 +2186,7 @@ class EventPage(BasePage):
# display partner if type is either Marriage or Divorce # display partner if type is either Marriage or Divorce
if partner is not None: if partner is not None:
url = self.report.build_url_fname_html(partner.handle, 'ppl', self.up) url = self.report.build_url_fname_html(partner.handle, 'ppl', self.up)
partner_hyper = self.person_link(url, partner, True, partner.gramps_id) partner_hyper = self.person_link(url, partner, True, gid=partner.gramps_id)
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", _('Partner'), class_ = "ColumnAttribute", inline = True), Html("td", _('Partner'), class_ = "ColumnAttribute", inline = True),
Html("td", partner_hyper, class_ = "ColumnPartner") Html("td", partner_hyper, class_ = "ColumnPartner")