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

Fixed Events in display_event_header(), display_event_row(), write_event_row(), class EventListPage and EventOage. Cleanup little with alphabet_navigation(), corrections and modifications to stylesheet to match.

Browse Source 
svn: r13271
This commit is contained in:
Rob G. Healey 2009-09-28 23:52:05 +00:00
parent 53dd372508
commit e35544a0df
2 changed files with 56 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/data/Web_Visually.css
View File

@ -304,7 +304,7 @@ body#WebCal div#navigation ul li a {
} }
#navigation ul li a:hover, #subnavigation ul li a:hover { #navigation ul li a:hover, #subnavigation ul li a:hover {
margin-top: -6px; margin-top: -6px;
padding: 11px 11px 12px 10px; padding: 11px 11px 12px 1px;
background-color: #C1B398; background-color: #C1B398;
color: #000; color: #000;
} }
@ -581,16 +581,16 @@ div#EventList, div#EventDetail { }
div#events table.eventlist { div#events table.eventlist {
margin-top: .3cm; margin-top: .3cm;
} }
table.eventlist tbody tr { table.eventlist tbody tr.BeginName {
border-bottom: solid 1px #5D835F; border-bottom: solid 1px #5D835F;
} }
table.eventlist tbody tr td { table.eventlist tbody tr td {
background-color: #D8F3D6; background-color: #D8F3D6;
padding: 4px 0px 4px 0px; padding: 4px 0px 4px 0px;
border-bottom: dashed 1px #000;
} }
table.eventlist tbody tr td.ColumnType { table.eventlist tbody tr td.ColumnEvent {
background-color: #FFF; background-color: #FFF;
border-top: solid 1px #5D835F;
width: 20%; width: 20%;
} }
table.eventlist tbody tr td.ColumnDate { table.eventlist tbody tr td.ColumnDate {
@ -615,6 +615,12 @@ table.eventlist tbody tr td.ColumnPartner {
background-color: #FFF; background-color: #FFF;
width: 35%; width: 35%;
} }
div#EventList table.eventlist tbody tr td.ColumnEvent a,
div#EventList table.eventlist tbody tr td.ColumnPerson a,
div#EventList table.eventlist tbody tr td.ColumnPartner a {
display: block;
padding: .9em 10px;
}
div#EventDetail h3 { div#EventDetail h3 {
font-size: xxx-large; font-size: xxx-large;
} }
@ -631,8 +637,9 @@ div#EventDetail table.eventlist tbody tr td.ColumnAttribute {
text-transform: uppercase; text-transform: uppercase;
width: 20%; width: 20%;
} }
div#EventDetail table.eventlist tbody tr td.ColumnType { div#EventDetail table.eventlist tbody tr td.ColumnEvent {
background-color: #D8F3D6; background-color: #D8F3D6;
border-top: solid 1px #5D835F;
} }
/* Gallery /* Gallery

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

@ -487,7 +487,8 @@ 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, showplc, showdescr, showsrc, shownote, subdirs, hyp) event_data = self.get_event_data(evt, evt_ref, showplc, showdescr, showsrc,
shownote, subdirs, hyp)
for (label, colclass, data) in event_data: for (label, colclass, data) in event_data:
data = data or " " data = data or " "
@ -558,29 +559,25 @@ 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 = [
[THEAD, 'Type', evt_hyper], [_("Event"), "Event", evt_hyper],
[DHEAD, 'Date', _dd.display(evt.get_date_object() )] ] [DHEAD, "Date", _dd.display(evt.get_date_object() )] ]
if showplc: if showplc:
place_row = [PHEAD, 'Place', place_hyper] info.append([PHEAD, "Place", place_hyper])
info.append(place_row)
if showdescr: if showdescr:
descr = evt.get_description() descr = evt.get_description()
descr_row = [DESCRHEAD, 'Description', descr] info.append([DESCRHEAD, "Description", descr])
info.append(descr_row)
if showsrc: if showsrc:
srcrefs = self.get_citation_links( evt.get_source_references() ) or " " srcrefs = self.get_citation_links(evt.get_source_references() )
source_row = [SHEAD, 'Sources', srcrefs] info.append([SHEAD, "Sources", srcrefs])
info.append(source_row)
if shownote: if shownote:
notelist = evt.get_note_list() notelist = evt.get_note_list()
notelist.extend(evt_ref.get_note_list() ) notelist.extend(evt_ref.get_note_list() )
notelist = self.dump_notes(notelist) notelist = self.dump_notes(notelist)
note_row = [NHEAD, 'Notes', notelist] info.append([NHEAD, "Notes", notelist])
info.append(note_row)
# return event data information to its callers # return event data information to its callers
return info return info
@ -1376,7 +1373,7 @@ class BasePage(object):
""" """
# the only place that this will ever equal False # the only place that this will ever equal False
# is first there is more than one event for a person for class EventListPage # is first there is more than one event for a person
if first: if first:
# see above for explanation # see above for explanation
@ -2039,11 +2036,9 @@ class EventListPage(BasePage):
"The person’s name 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 and table head
with Html("table", class_ = "infolist eventlist") as table: with Html("table", class_ = "infolist eventlist") as table:
eventlist += table eventlist += table
# begin table head
thead = Html("thead") thead = Html("thead")
table += thead table += thead
@ -2052,10 +2047,11 @@ class EventListPage(BasePage):
thead += trow thead += trow
for (label, colclass) in [ for (label, colclass) in [
[THEAD, 'Type'], [_("Event"), "Event"],
[DHEAD, 'Date'], [DHEAD, "Date"],
[_('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
@ -2069,9 +2065,9 @@ class EventListPage(BasePage):
partner) in event_list: partner) in event_list:
# write eent row data # write eent row data
trow = self.write_event_row(person, partner, evt_type, evt, tbody += self.write_event_row(person, partner, evt_type, evt,
evt_ref, first) evt_ref, first)
tbody += trow
first = False first = False
# and clearline for proper styling # and clearline for proper styling
@ -2103,6 +2099,9 @@ class EventListPage(BasePage):
# begin table row # begin table row
trow = Html("tr") trow = Html("tr")
if first:
trow.attr = ' class = "BeginName" '
# get event data # get event data
""" """
for more information: see get_event_data() for more information: see get_event_data()
@ -2181,7 +2180,8 @@ class EventPage(BasePage):
data = event_data[index][2] or " " data = event_data[index][2] or " "
# determine if we are using the same row or not? # determine if we are using the same row or not?
samerow = True if (data == " " or colclass == "Date") else False samerow = True if (data == " " or (colclass == "Date" or "Event")) \
else False
trow = Html("tr") + ( trow = Html("tr") + (
Html("td", label, class_ = "ColumnAttribute", inline = True), Html("td", label, class_ = "ColumnAttribute", inline = True),
@ -4334,24 +4334,20 @@ class IndividualPage(BasePage):
# position 0 = translatable label, position 1 = column class, and # position 0 = translatable label, position 1 = column class, and
# position 2 = data # position 2 = data
event_header_row = [ event_header_row = [
(THEAD, 'Type'), (_("Event"), "Event"),
(DHEAD, 'Date') ] (DHEAD, "Date") ]
if showplc: if showplc:
place_row = (PHEAD, 'Place') event_header_row.append((PHEAD, "Place"))
event_header_row.append(place_row)
if showdescr: if showdescr:
descr_row = (DESCRHEAD, 'Description') event_header_row.append((DESCRHEAD, "Description"))
event_header_row.append(descr_row)
if showsrc: if showsrc:
source_row = (SHEAD, 'Sources') event_header_row.append((SHEAD, "Sources"))
event_header_row.append(source_row)
if shownote: if shownote:
note_row = (NHEAD, 'Notes') event_header_row.append((NHEAD, "Notes"))
event_header_row.append(note_row)
trow = Html("tr") trow = Html("tr")
for (label, colclass) in event_header_row: for (label, colclass) in event_header_row:
@ -5721,12 +5717,12 @@ def _get_short_name(gender, name):
short_name = short_name + ", " + suffix short_name = short_name + ", " + suffix
return short_name return short_name
def get_person_keyname(db, handle): def __get_person_keyname(db, handle):
""" .... """ """ .... """
person = db.get_person_from_handle(handle) person = db.get_person_from_handle(handle)
return person.get_primary_name().surname return person.get_primary_name().get_surname()
def get_place_keyname(db, handle): def __get_place_keyname(db, handle):
""" ... """ """ ... """
return ReportUtils.place_name(db, handle) return ReportUtils.place_name(db, handle)
@ -5749,10 +5745,13 @@ def get_first_letters(db, handle_list, key):
for handle in handle_list: for handle in handle_list:
if key == _PERSON: if key == _PERSON:
keyname = get_person_keyname(db, handle) keyname = __get_person_keyname(db, handle)
else: else:
keyname = get_place_keyname(db, handle) keyname = __get_place_keyname(db, handle)
first_letters.append(first_letter(keyname)) ltr = first_letter(keyname)
if ltr is not ",":
first_letters.append(ltr)
return first_letters return first_letters
@ -5780,6 +5779,7 @@ def alphabet_navigation(db, handle_list, key):
# See : http://www.gramps-project.org/bugs/view.php?id=2933 # See : http://www.gramps-project.org/bugs/view.php?id=2933
# #
(lang_country, modifier ) = locale.getlocale() (lang_country, modifier ) = locale.getlocale()
for ltr in get_first_letters(db, handle_list, key): for ltr in get_first_letters(db, handle_list, key):
if ltr in sorted_set: if ltr in sorted_set:
sorted_set[ltr] += 1 sorted_set[ltr] += 1
@ -5787,8 +5787,7 @@ def alphabet_navigation(db, handle_list, key):
sorted_set[ltr] = 1 sorted_set[ltr] = 1
# remove the number of each occurance of each letter # remove the number of each occurance of each letter
sorted_alpha_index = sorted((l for l in sorted_set if l != ','), sorted_alpha_index = sorted(sorted_set, key=locale.strxfrm)
key=locale.strxfrm)
# if no letters, return None back to its callers # if no letters, return None back to its callers
if not sorted_alpha_index: if not sorted_alpha_index:
@ -5798,10 +5797,10 @@ def alphabet_navigation(db, handle_list, key):
with Html("div", id="alphabet") as alphabet_nav: with Html("div", id="alphabet") as alphabet_nav:
num_ltrs = len(sorted_alpha_index) num_ltrs = len(sorted_alpha_index)
nrows = ((num_ltrs / 34) + 1) nrows = ((num_ltrs // 34) + 1)
index = 0
for rows in xrange(nrows): index = 0
for row in xrange(nrows):
unordered = Html("ul") unordered = Html("ul")
alphabet_nav += unordered alphabet_nav += unordered