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

3848: NarWeb: a Family Attribute confuses following families

Browse Source 
svn: r15248
This commit is contained in:
Doug Blank 2010-04-21 00:31:33 +00:00
parent f7bdf34e52
commit 1a0eb9ce07
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,8 +332,6 @@ class BasePage(object):
trow = Html("tr") trow = Html("tr")
attr_data_row = [ attr_data_row = [
("Type", " "),
("Attribute", " "),
("AttrType", str(attr.get_type() ) ), ("AttrType", str(attr.get_type() ) ),
("AttrValue", attr.get_value() ) ] ("AttrValue", attr.get_value() ) ]
@ -866,7 +864,7 @@ class BasePage(object):
return None return None
# begin attributes division and section title # begin attributes division and section title
with Html("div", class_ = "ubsection", id = "attributes") as section: with Html("div", class_ = "subsection", id = "attributes") as section:
section += Html("h4", AHEAD, inline = True) section += Html("h4", AHEAD, inline = True)
# begin attributes table # begin attributes table
@ -882,8 +880,6 @@ class BasePage(object):
trow.extend( trow.extend(
Html("th", label, class_ = "Column" + colclass, inline = True) Html("th", label, class_ = "Column" + colclass, inline = True)
for (label, colclass) in [ for (label, colclass) in [
(" ", "Type"),
(" ", "Attribute"),
(_("Attribute/ Type"), "AttrType"), (_("Attribute/ Type"), "AttrType"),
(VHEAD, "AttrValue"), (VHEAD, "AttrValue"),
(NHEAD, "AttrNotes"), (NHEAD, "AttrNotes"),
@ -4566,8 +4562,14 @@ class IndividualPage(BasePage):
# family attributes # family attributes
attrlist = family.get_attribute_list() attrlist = family.get_attribute_list()
if attrlist: if attrlist:
attr_trow = Html("tr")
attr_tcol = Html("td", class_="ColumnValue")
table += attr_trow
attr_trow += Html("td", class_="ColumnType")
attr_trow += Html("td", class_="ColumnAttribute")
attr_trow += attr_tcol
with Html("table", class_ = "infolist attrlist") as attrTable: with Html("table", class_ = "infolist attrlist") as attrTable:
table += attrTable attr_tcol += attrTable
thead = Html("thead") thead = Html("thead")
attrTable += thead attrTable += thead
@ -4578,8 +4580,6 @@ class IndividualPage(BasePage):
trow.extend( trow.extend(
Html("th", label, class_ = "Column" + colclass, inline = True) Html("th", label, class_ = "Column" + colclass, inline = True)
for (label, colclass) in [ for (label, colclass) in [
(" ", "Type"),
(" ", "Attribute"),
(_("Attribute/ Type"), "AttrType"), (_("Attribute/ Type"), "AttrType"),
(_("Value"), "AttrValue"), (_("Value"), "AttrValue"),
(NHEAD, "AttrNotes"), (NHEAD, "AttrNotes"),