Make a few modifications to IndividualPage() Family Section's Attributes and LDS Ordinance.

svn: r18170
This commit is contained in:
Rob G. Healey 2011-09-18 04:32:13 +00:00
parent c026b96ce5
commit 02840b9cb5
2 changed files with 27 additions and 83 deletions

View File

@ -1020,7 +1020,7 @@ class BasePage(object):
"""
# begin attributes division and section title
with Html("div", class_ = "subsection", id ="attributes") as section:
section += Html("h4", AHEAD, inline =True)
section += Html("h4", _("Attributes"), inline =True)
# begin attributes table
with Html("table", class_ = "infolist attrlist") as table:
@ -1035,10 +1035,10 @@ class BasePage(object):
trow.extend(
Html("th", label, class_ =colclass, inline = True)
for (label, colclass) in [
(THEAD, "ColumnType"),
(VHEAD, "ColumnValue"),
(NHEAD, "ColumnNotes"),
(SHEAD, "ColumnSources") ]
(_("Type"), "ColumnType"),
(_("Value"), "ColumnValue"),
(_("Notes"), "ColumnNotes"),
(_("Sources"), "ColumnSources") ]
)
return section, table
@ -5187,29 +5187,29 @@ class IndividualPage(BasePage):
for birth_date, child_handle in children)
# family LDS ordinance list
famldslist = family.lds_ord_list
if famldslist:
family_lds_ordinance_list = family.lds_ord_list
if family_lds_ordinance_list:
trow = Html("tr") + (
Html("td", " ", class_ = "ColumnType", inline = True),
Html("td", " ", class_ = "ColumnAttribute", inline = True),
Html("td", _("LDS Ordinance"), class_ = "ColumnAttribute", inline = True),
Html("td", self.dump_ordinance(db, family, "Family"), class_ = "ColumnValue")
)
table += trow
attrlist = family.get_attribute_list()
if attrlist:
# Family Attribute list
family_attribute_list = family.get_attribute_list()
if family_attribute_list:
trow = Html("tr") + (
Html("td", " ", class_ = "ColumnType",
inline = True),
Html("td", AHEAD, class_ = "ColumnAttribute",
inline = True)
Html("td", " ", class_ ="ColumnType", inline =True),
Html("td", _("Attributes"), class_ ="ColumnAttribute", inline =True)
)
table += trow
tcell = Html("td", class_ = "ColumnValue")
trow += tcell
dummy, attrtable = self.display_attribute_header()
tcell += attrtable
attrtable += self.display_attr_list(attrlist)
attrtable += self.display_attr_list(family_attribute_list)
# return section to its caller
return section

View File

@ -570,6 +570,10 @@ div#EventList, div#EventDetail {
margin: 0;
padding: 0;
}
table.eventlist {
font: normal .9em sans-serif;
width: 100%;
}
table.eventlist tbody tr td {
border-bottom: dashed 1px #000;
}
@ -582,15 +586,13 @@ table.eventlist tbody tr td.ColumnDate {
table.eventlist tbody tr td.ColumnPlace {
width: 25%;
}
table.eventlist tbody tr td.ColumnDescription {
width: 20%;
table.eventlist tbody tr td.ColumnDescription,
taable.eventlist tbody tr td.ColumnSources {
width: 15%;
}
table.eventlist tbody tr td.ColumnNotes {
width: 20%;
}
table.eventlist tbody tr td.ColumnSources {
width: 10%;
}
table.eventlist tbody tr td.ColumnPerson {
width: 35%;
}
@ -1064,26 +1066,21 @@ div#attributes {
padding: 0;
}
table.attrlist {
font: normal .8em sans-serif;
width: 100%;
}
table.attrlist thead tr th {
background-color: #70B1ED;
color: #000;
}
table.attrlist tbody tr td {
border-bottom: dashed 1px #000;
}
table.attrlist tbody tr td.ColumnType {
table.attrlist tbody tr td.ColumnType,
table.attrlist tbody tr td.ColumnSources {
width: 15%;
}
table.attrlist tbody tr td.ColumnValue {
width: 15%;
width: 20%;
}
table.attrlist tbody tr td.ColumnNotes {
width: 40%;
}
table.attrlist tbody tr td.ColumnSources {
width: 10%;
width: 35%;
}
/* Subsections : Parents
@ -1139,59 +1136,6 @@ div#families table.fixed_subtables table.eventlist th:last-child {
width:5em;
}
/* Subsection: Families: Attributes
------------------------------------------------- */
div#families div#attributes table.attributes {
font: normal .8em sans-serif;
}
div#families div#attributes table.attributes thead tr th.ColumnType {
background: none;
border: none;
}
div#families div#attributes table.attributes thead tr th.ColumnAttribute {
background: none;
border: none;
}
div#families div#attributes table.attributes thead tr th.Type {
border-left: solid 1px #000;
width: 15%;
}
/* Subsection: LDS Ordinance
------------------------------------------------------ */
div#LDSOrdinance {
margin: 0;
padding: 0;
}
div#LDSOrdinance table.ldsordlist {
font-size: .35cm;
}
table.ldsordlist {
margin-bottom: .5em;
}
table.ldsordlist tbody tr td.ColumnLDSType {
width: 12%;
}
table.ldsordlist tbody tr td.ColumnLDSDate {
width: 15%;
}
table.ldsordlist tbody tr td.ColumnLDSTemple {
width: 10%;
}
table.ldsordlist tbody tr td.ColumnLDSPlace {
width: 35%;
}
table.ldsordlist tbody tr td.ColumnLDSStatus {
width: 8%;
}
table.ldsordlist tbody tr td.ColumnLDSSealed {
width: 25%;
}
table.ldsordlist tbody tr td.ColumnLDSSources {
width: 7%;
margin-top: .2cm;
}
/* Subsections : Addresses
----------------------------------------------------- */
div#Addresses {