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

Re-added event description back into event sections

Browse Source 
svn: r15390
This commit is contained in:
Rob G. Healey 2010-05-12 07:08:28 +00:00
parent 3a0acefae7
commit 9b73c0e80a
2 changed files with 25 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/data/Web_Basic-Blue.css
View File

@ -530,20 +530,23 @@ div#events table.eventlist {
margin-top: .3cm; margin-top: .3cm;
} }
table.eventlist tbody tr td.ColumnEvent { table.eventlist tbody tr td.ColumnEvent {
width: 20%; width: 10%;
} }
table.eventlist tbody tr td.ColumnDate { table.eventlist tbody tr td.ColumnDate {
width: 16%; width: 12%;
} }
table.eventlist tbody tr td.ColumnPlace { table.eventlist tbody tr td.ColumnPlace {
width: 35%; width: 25%;
} }
table.eventlist tbody tr td.ColumnSources { table.eventlist tbody tr td.ColumnDescription {
width: 12%; width: 15%;
} }
table.eventlist tbody tr td.ColumnNotes { table.eventlist tbody tr td.ColumnNotes {
width: 25%; width: 25%;
} }
table.eventlist tbody tr td.ColumnSources {
width: 12%;
}
table.eventlist tbody tr td.ColumnPerson { table.eventlist tbody tr td.ColumnPerson {
width: 35%; width: 35%;
} }

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

@ -506,7 +506,7 @@ class BasePage(object):
""" """
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, subdirs) event_data = self.get_event_data(evt, evt_ref, subdirs)
trow.extend( trow.extend(
Html("td", data or " ", class_ = "Column" + colclass, Html("td", data or " ", class_ = "Column" + colclass,
@ -564,14 +564,12 @@ class BasePage(object):
else: else:
return eventtype return eventtype
def get_event_data(self, evt, evt_ref, showplc, showdescr, up, gid = None): def get_event_data(self, evt, evt_ref, up, gid = None):
""" """
retrieve event data from event and evt_ref retrieve event data from event and evt_ref
@param: evt = event from database @param: evt = event from database
@param: evt_ref = eent reference @param: evt_ref = eent reference
@param: showplc = show the event place or not?
@param: showdescr = to show the event description or not?
@param: up = either True or False; add subdirs or not? @param: up = either True or False; add subdirs or not?
""" """
db = self.report.database db = self.report.database
@ -591,17 +589,10 @@ class BasePage(object):
# position 0 = translatable label, position 1 = column class # position 0 = translatable label, position 1 = column class
# position 2 = data # position 2 = data
info = [ info = [
[DHEAD, "Date", _dd.display(evt.get_date_object() )] (DHEAD, "Date", _dd.display(evt.get_date_object() ) ),
(PHEAD, "Place", place_hyper),
(DESCRHEAD, "Description", evt.get_description() )
] ]
if showplc:
info.append([PHEAD, "Place", place_hyper])
if showdescr:
descr = evt.get_description()
info.append([DESCRHEAD, "Description", descr])
# return event data information to its callers
return info return info
def dump_ordinance(self, db, ldsobj, LDSSealedType = "Person"): def dump_ordinance(self, db, ldsobj, LDSSealedType = "Person"):
@ -2586,7 +2577,7 @@ class EventPage(BasePage):
""" """
for more information: see get_event_data() for more information: see get_event_data()
""" """
event_data = self.get_event_data(event, event_handle, True, True, subdirs, evt_gid) event_data = self.get_event_data(event, event_handle, subdirs, evt_gid)
for (label, colclass, data) in event_data: for (label, colclass, data) in event_data:
if data: if data:
@ -4642,17 +4633,17 @@ class IndividualPage(BasePage):
""" """
trow = Html("tr") trow = Html("tr")
trow.extend(
Html("th", label, class_ = "Column" + colclass, inline = True)
for (label, colclass) in [
(_EVENT, "Event"),
(DHEAD, "Date"),
(PHEAD, "Place"),
(NHEAD, "Notes"),
(SHEAD, "Sources") ]
)
# return header row to its callers trow.extend(
Html("th", label, class_ = "Column" + colclass, inline = True)
for (label, colclass) in [
(_EVENT, "Event"),
(DHEAD, "Date"),
(PHEAD, "Place"),
(DESCRHEAD, "Description"),
(NHEAD, "Notes"),
(SHEAD, "Sources") ]
)
return trow return trow
def format_event(self, eventlist): def format_event(self, eventlist):