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

Fixed two invalid syntax errors in ExportGeneWeb. Fixed padding issues in Nebraska with Navigation areas. Minor little changes to others.

Browse Source 
svn: r12848
This commit is contained in:
Rob G. Healey 2009-07-29 07:58:22 +00:00
parent 8a7296920f
commit 99e17ea98e
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/data/Web_Nebraska.css
View File

@ -251,7 +251,7 @@ p#user_header {
min-width:770px; min-width:770px;
height:32px; height:32px;
margin:0; margin:0;
padding:0 0 0 9px; padding:0 0 0 5px;
background-color:#A97; background-color:#A97;
border-bottom:solid 1px #542; border-bottom:solid 1px #542;
} }
@ -266,7 +266,7 @@ p#user_header {
color:#542; color:#542;
text-decoration:none; text-decoration:none;
margin:0; margin:0;
padding:8px 13px; padding:6px 10px;
} }
#navigation ul li a:hover, #subnavigation ul li a:hover { #navigation ul li a:hover, #subnavigation ul li a:hover {
@ -345,6 +345,12 @@ table.infolist tbody tr td.ColumnType {
} }
table.infolist tbody tr td.ColumnPartner { table.infolist tbody tr td.ColumnPartner {
font-size:.9em; font-size:.9em;
background-color:#FFF;
}
table.infolist tbody tr td.ColumnPartner a:hover {
display:block;
padding:15px;
background-color:#C1B398;
} }
table.infolist tbody tr td.ColumnParents { table.infolist tbody tr td.ColumnParents {
font-size:.9em; font-size:.9em;
@ -497,6 +503,7 @@ table.individuallist tbody tr td.ColumnName a:hover {
} }
#Sources table.infolist tbody tr td.ColumnName { #Sources table.infolist tbody tr td.ColumnName {
padding:0; padding:0;
background-color:#FFF;
} }
#Sources table.infolist tbody tr td.ColumnName a { #Sources table.infolist tbody tr td.ColumnName a {
font-size:.9em; font-size:.9em;
@ -514,6 +521,7 @@ table.individuallist tbody tr td.ColumnName a:hover {
#Places { } #Places { }
#Places table.infolist tbody tr td.ColumnName { #Places table.infolist tbody tr td.ColumnName {
padding:0; padding:0;
background-color:#FFF;
} }
#Places table.infolist tbody tr td.ColumnName a { #Places table.infolist tbody tr td.ColumnName a {
padding:.1em 10px .3em 10px; padding:.1em 10px .3em 10px;
@ -530,6 +538,7 @@ table.individuallist tbody tr td.ColumnName a:hover {
} }
#Gallery table.infolist tbody tr td.ColumnName { #Gallery table.infolist tbody tr td.ColumnName {
padding:0; padding:0;
background-color:#FFF;
} }
#Gallery table.infolist tbody tr td.ColumnName a { #Gallery table.infolist tbody tr td.ColumnName a {
padding:.1em 10px .3em 10px; padding:.1em 10px .3em 10px;

4
src/plugins/export/ExportGeneWeb.py
View File

@ -453,7 +453,7 @@ class GeneWebWriter(object):
def get_ref_name(self,person): def get_ref_name(self,person):
surname = self.rem_spaces( person.get_primary_name().get_surname()) surname = self.rem_spaces( person.get_primary_name().get_surname())
firstname = Config.get(Config.PRIVATE_GIVEN_TEXT)) firstname = Config.get(Config.PRIVATE_GIVEN_TEXT)
if not (Utils.probably_alive(person,self.db) and \ if not (Utils.probably_alive(person,self.db) and \
self.restrict and self.living): self.restrict and self.living):
firstname = self.rem_spaces( person.get_primary_name().get_first_name()) firstname = self.rem_spaces( person.get_primary_name().get_first_name())
@ -464,7 +464,7 @@ class GeneWebWriter(object):
def get_child_ref_name(self,person,father_lastname): def get_child_ref_name(self,person,father_lastname):
surname = self.rem_spaces( person.get_primary_name().get_surname()) surname = self.rem_spaces( person.get_primary_name().get_surname())
firstname = Config.get(Config.PRIVATE_GIVEN_TEXT)) firstname = Config.get(Config.PRIVATE_GIVEN_TEXT)
if not (Utils.probably_alive(person,self.db) and \ if not (Utils.probably_alive(person,self.db) and \
self.restrict and self.living): self.restrict and self.living):
firstname = self.rem_spaces( person.get_primary_name().get_first_name()) firstname = self.rem_spaces( person.get_primary_name().get_first_name())

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

@ -568,21 +568,21 @@ class BasePage(object):
# Link to _NARRATIVESCREEN stylesheet # Link to _NARRATIVESCREEN stylesheet
fname = '/'.join(["styles", _NARRATIVESCREEN]) fname = '/'.join(["styles", _NARRATIVESCREEN])
url2 = self.report.build_url_fname(fname, None, self.up) url3 = self.report.build_url_fname(fname, None, self.up)
# Link to _NARRATIVEPRINT stylesheet # Link to _NARRATIVEPRINT stylesheet
fname = '/'.join(["styles", _NARRATIVEPRINT]) fname = '/'.join(["styles", _NARRATIVEPRINT])
url3 = self.report.build_url_fname(fname, None, self.up) url4 = self.report.build_url_fname(fname, None, self.up)
# Link to GRAMPS favicon # Link to GRAMPS favicon
fname = '/'.join(['images', 'favicon.ico']) fname = '/'.join(['images', 'favicon.ico'])
url4 = self.report.build_url_image('favicon.ico', 'images', self.up) url5 = self.report.build_url_image('favicon.ico', 'images', self.up)
# create stylesheet and favicon links # create stylesheet and favicon links
links = [Html('link', href=url4, type='image/x-icon', rel='shortcut icon'), links = [Html('link', href=url5, type='image/x-icon', rel='shortcut icon'),
Html('link', href=url1, type='text/css', media='screen', rel='stylesheet'), Html('link', href=url1, type='text/css', media='screen', rel='stylesheet'),
Html('link', href=url2, type='text/css', media='screen', rel='stylesheet'), Html('link', href=url3, type='text/css', media='screen', rel='stylesheet'),
Html('link', href=url3, type='text/css', media='print', rel='stylesheet') Html('link', href=url4, type='text/css', media='print', rel='stylesheet')
] ]
# add additional meta and link tags # add additional meta and link tags
@ -3252,12 +3252,14 @@ class IndividualPage(BasePage):
sref_links = self.get_citation_links(event.get_source_references()) sref_links = self.get_citation_links(event.get_source_references())
txt = ''.join(wrapper.wrap(event.get_description())) txt = ''.join(wrapper.wrap(event.get_description()))
txt = txt or ' ' txt = txt or ' '
trow += Html('td', txt, class_='ColumnValue Description') trow += Html('td', txt, class_='ColumnValue Description', inline=True \
if txt == ' ' else False)
# Sources # Sources
citation = self.get_citation_links(event.get_source_references()) citation = self.get_citation_links(event.get_source_references())
txt = citation or ' ' txt = citation or ' '
trow += Html('td', txt, class_='ColumnValue Source') trow += Html('td', txt, class_='ColumnValue Source', inline=True \
if txt == ' ' else False)
# Notes # Notes
# if the event or event reference has a note attached to it, # if the event or event reference has a note attached to it,
@ -3666,6 +3668,7 @@ class IndividualPage(BasePage):
tcell = Html('td', class_='ColumnValue') tcell = Html('td', class_='ColumnValue')
trow += tcell trow += tcell
# display partner's name
if partner_handle: if partner_handle:
if partner_handle in self.ind_list: if partner_handle in self.ind_list:
url = self.report.build_url_fname_html(partner_handle, 'ppl', True) url = self.report.build_url_fname_html(partner_handle, 'ppl', True)
@ -3682,6 +3685,8 @@ class IndividualPage(BasePage):
Html('td', ' ', class_='ColumnAttribute', inline=True) Html('td', ' ', class_='ColumnAttribute', inline=True)
) )
table += trow table += trow
# here is where the mess happens...
tcell = Html('td', class_='ColumnValue') tcell = Html('td', class_='ColumnValue')
trow += tcell trow += tcell
formatted_event = self.format_event(family_events) formatted_event = self.format_event(family_events)