CSS fixes and rest of fix of 3837

svn: r15186
This commit is contained in:
Doug Blank 2010-04-17 18:19:13 +00:00
parent 8f38b63312
commit 00b02b19ed
2 changed files with 26 additions and 17 deletions

View File

@ -205,11 +205,9 @@ div#navigation, div#subnavigation {
width: 100%;
margin: 0;
padding: 0;
border: solid 2px #000;
}
div#navigation ul, div#subnavigation ul {
list-style:none;
min-width: 900px;
height: 24px;
margin:0;
padding: 0px 0px 0px 9px;
@ -225,7 +223,7 @@ div#navigation ul li:after, div#subnavigation ul li:after {
content: "| ";
}
div#navigation ul li a, div#subnavigation ul li a {
bakground-color: #A97;
background-color: #A97;
display: block;
padding: 4px 8px 4px 8px;
float: left;
@ -257,7 +255,6 @@ div#alphabet {
}
div#alphabet ul {
list-style:none;
min-width:770px;
height:24px;
margin:0;
padding: 0px 0px 0px 16px;
@ -308,7 +305,6 @@ table.infolist tr th a:hover {
table.infolist tr td {
font:normal 1.1em/1.4em serif;
vertical-align:middle;
padding:.1em 10px;
}
table.infolist tr td a {
display:block;
@ -602,10 +598,7 @@ div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before {
content:"+ ";
}
div#EventDetail h3 {
font-size: xxx-large;
}
div#EventDetail h3:first-lettr {
color: #453619;
font-size: 1em;;
}
div#EventDetail table.eventlist {
margin: .5cm 0 .3cm 1.5cm;
@ -754,7 +747,7 @@ table.download {
width:100%;
}
table.download img {
float:center;
text-align:center;
}
table.download thead tr th {
text-align:center;
@ -1237,13 +1230,13 @@ div#pedigree {
}
#treeContainer div.boxbg span.thumbnail {
display:block;
max-width:80px auto;
max-width:80px;
max-height:65px;
margin:0 auto;
padding:4px 0;
}
#treeContainer div.boxbg span.thumbnail img {
max-width:80px auto;
max-width:80px;
max-height:65px;
margin:0 auto;
}
@ -1534,5 +1527,5 @@ table.oneday tbody tr td.ColumnText {
width: 85%;
}
table.oneday tbody tr td.ColumnEvent {
width; 10%;
width: 10%;
}

View File

@ -450,7 +450,7 @@ class BasePage(object):
ul = Html("p")
for notehandle in notelist:
ul.extend(
Html("p", str(db.get_note_from_handle(notehandle).type))
Html("i", str(db.get_note_from_handle(notehandle).type))
)
ul.extend(
self.get_note_format(db.get_note_from_handle(notehandle))
@ -503,10 +503,26 @@ class BasePage(object):
notelist = evt.get_note_list()
notelist.extend( evt_ref.get_note_list() )
if notelist:
notelist = self.dump_notes( notelist )
htmllist = self.dump_notes( notelist )
else:
notelist = " "
trow += Html("td", notelist, class_ = "ColumnNotes")
htmllist = " "
# if the event or event reference has a attributes attached to it,
# get the text and format it correctly
attrlist = evt.get_attribute_list()
attrlist.extend(evt_ref.get_attribute_list())
for attr in attrlist:
htmllist.extend ( Html (
"p",
_("%(type)s: %(value)s") % {
'type' : Html("b", attr.get_type()),
'value' : attr.get_value() } ))
#also output notes attached to the attributes
notelist = attr.get_note_list()
if notelist:
htmllist.extend ( self.dump_notes( notelist ) or " " )
trow += Html("td", htmllist, class_ = "ColumnNotes")
# get event source references
srcrefs = self.get_citation_links( evt.get_source_references() ) or " "