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

More corrections in WebCal (year at a glance).

Browse Source 
New Web_Evergreen.css from Rob Healey.
Added Rob to the authors.xml
Removed unused CSS files from the Makefile. (These files will
have to be deleted from SVN too.)
	* src/data/Makefile.am
	* src/data/Web_Evergreen.css
	* src/data/authors.xml
	* src/plugins/WebCal.py


svn: r10951
This commit is contained in:
Kees Bakker 2008-08-01 09:51:16 +00:00
parent 0eeb4c3e01
commit 1a93ee6d53
4 changed files with 58 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/data/Makefile.am
View File

@ -11,15 +11,6 @@ dist_pkgdata_DATA = \
system_filters.xml \ system_filters.xml \
tips.xml\ tips.xml\
lds.xml\ lds.xml\
NWeb-Print_Default.css\
NWeb-Screen_Basic-Ash.css\
NWeb-Screen_Basic-Cypress.css\
NWeb-Screen_Basic-Lilac.css\
NWeb-Screen_Basic-Peach.css\
NWeb-Screen_Basic-Spruce.css\
NWeb-Screen_Mainz.css\
NWeb-Screen_Nebraska.css\
NWeb-Screen_Sharp.css\
Web_Evergreen.css\ Web_Evergreen.css\
Web_Nebraska.css\ Web_Nebraska.css\
Web_Print-Default.css\ Web_Print-Default.css\

95
src/data/Web_Evergreen.css
View File

@ -129,7 +129,7 @@ h3 {
margin:0; margin:0;
color:#426E40; color:#426E40;
padding:.3em 20px 0 20px; padding:.3em 20px 0 20px;
border-bottom:double 4px #426E40; border-bottom:double 4px #000;
} }
h4 { h4 {
font-size:1em; font-size:1em;
@ -139,7 +139,7 @@ h4 {
text-align:center; text-align:center;
margin:0; margin:0;
padding:.5em 0 .2em 0; padding:.5em 0 .2em 0;
border-bottom:dashed 1px #426E40; border-bottom:dashed 1px #000;
} }
h5, h6 { h5, h6 {
font-style:italic; font-style:italic;
@ -203,7 +203,7 @@ a:hover {
*/ */
#header { #header {
width:100%; width:100%;
height:1.5cm; height:1cm;
padding:0 0 .9em 0; padding:0 0 .9em 0;
margin:0; margin:0;
background-color:#139400; background-color:#139400;
@ -211,12 +211,13 @@ a:hover {
border-bottom:solid 2px #D30; border-bottom:solid 2px #D30;
} }
#SiteTitle { #SiteTitle {
font:italic 1cm serif; font:italic 2em serif;
color:#FAFAFA; color:#FAFAFA;
margin:0; margin:0;
padding:.5em 0 0 20px; padding:0;
float:center; float:center;
text-align:center; text-align:center;
vertical-align:middle;
} }
#GRAMPSinfo { #GRAMPSinfo {
font:normal .8em/1.2em sans-serif; font:normal .8em/1.2em sans-serif;
@ -256,10 +257,7 @@ p#user_header {
list-style-type:none; list-style-type:none;
text-align:center; text-align:center;
vertical-align:middle; vertical-align:middle;
font-size:10px; background-color:#6AF364;
margin:0;
padding:0;
background-color:#00FFFF;
border-top:solid 4px #D30; border-top:solid 4px #D30;
border-bottom:solid 4px #D30; border-bottom:solid 4px #D30;
} }
@ -267,8 +265,6 @@ p#user_header {
display:inline; display:inline;
width:2em; width:2em;
text-align:center; text-align:center;
font-size:10px;
padding:0;
margin:0; margin:0;
} }
#navigation ul li a { #navigation ul li a {
@ -276,19 +272,21 @@ p#user_header {
color:#000; color:#000;
text-decoration:none; text-decoration:none;
margin:0; margin:0;
padding:4px 0 0 4px; padding:4px;
} }
#navigation ul li a:hover { #navigation ul li a:hover {
background-color:#6AF364; background-color:#000;
color:#FAFAFA;
} }
#navigation ul li#CurrentSection a { #navigation ul li#CurrentSection a {
border-right:solid 2px #D30; border-right:solid 2px #D30;
border-left:solid 2px #D30; border-left:solid 2px #D30;
border-top:solid 2px #D30;
border-bottom:solid 2px #FAFAFA;
font-family:Georgia, serif; font-family:Georgia, serif;
font-weight:bold; font-weight:bold;
font-style:italic; font-style:italic;
font-size:16px; font-size:16px;
padding:
text-decoration:none; text-decoration:none;
background-color:#FAFAFA; background-color:#FAFAFA;
color:#426E40; color:#426E40;
@ -335,39 +333,36 @@ p#user_header {
.calendar thead tr th.weekend, .calendar thead tr th.weekday { .calendar thead tr th.weekend, .calendar thead tr th.weekday {
background-color:#426E40; background-color:#426E40;
color:#FAFAFA; color:#FAFAFA;
border:solid 2px #6AF364; border:solid 1px #6AF364;
} }
.calendar tbody tr.week5 { .calendar tbody tr.week5, .calendar tbody tr.week6 {
border-bottom:solid 1px #426E40; border-bottom:solid 1px #000;
}
.calendar tbody tr.week6 {
border-bottom:solid 1px #426E40;
} }
.calendar tbody tr td { .calendar tbody tr td {
vertical-align:top; vertical-align:top;
height:6em; height:10em;
padding:0; padding:0;
border-width:1px 0 0 1px; border-width:1px 0 0 1px;
border-style:solid; border-style:solid;
border-color:#426E40; border-color:#000;
}
.calendar tbody tr td.previous, .calendar tbody tr td.next {
background-color:#D8F3D6;
}
.calendar tbody tr td.weekday {
background-color:#FAFAFA;
} }
.calendar tbody tr td.weekend { .calendar tbody tr td.weekend {
background-color:#D8F3D6; background-color:#D8F3D6;
} }
.calendar tbody tr td.saturday { .calendar tbody tr td.saturday {
border-right:solid 1px #426E40; border-right:solid 1px #000;
} }
.calendar tbody tr td.sunday { .calendar tbody tr td.sunday {
border-left:solid 1px #426E40; border-left:solid 1px #000;
}
.calendar tbody tr td.weekday {
background-color:#FAFAFA;
}
.calendar tbody tr td.previous, .calendar tbody tr td.next {
background-color:#D8F3D6;
} }
.calendar tbody tr td#emptyDays { .calendar tbody tr td#emptyDays {
border:solid 1px #426E40; border:solid 1px #000;
} }
.calendar tbody tr td ul { .calendar tbody tr td ul {
list-style:none; list-style:none;
@ -381,7 +376,7 @@ p#user_header {
width:92%; width:92%;
margin:0 4%; margin:0 4%;
padding:.2em 0 .3em 0; padding:.2em 0 .3em 0;
border-top:dashed 1px #426E40; border-top:dashed 1px #000;
} }
.calendar tbody tr td ul li em { .calendar tbody tr td ul li em {
font-style:normal; font-style:normal;
@ -395,7 +390,7 @@ p#user_header {
background-color:#6AF364; background-color:#6AF364;
} }
.calendar tfoot tr td.note { .calendar tfoot tr td.note {
border-top:solid 2px #6AF364; border-top:solid 2px #D30;
background-color:#000; background-color:#000;
color:#FAFAFA; color:#FAFAFA;
} }
@ -406,18 +401,20 @@ p#user_header {
font-size:1.2em; font-size:1.2em;
line-height:100%; line-height:100%;
text-align:center; text-align:center;
background-color:#426E40; background-color:#6AF364;
color:#FAFAFA; color:#000;
margin:0 0 0 .5em; margin:0 0 0 .5em;
padding:.2em 0; padding:.2em 0;
} }
.previous span.date, .next span.date {
background-color:#000;
color:#FAFAFA;
}
.highlight div.date { .highlight div.date {
background-color:#1E90FF; background-color:#1E90FF;
color:#FAFAFA; color:#FAFAFA;
} font-weight:bold;
.previous div.date, .next div.date { font-style:italic;
background-color:#000;
color:#D30;
} }
/* /*
@ -550,10 +547,10 @@ table.surnamelist tbody tr td.ColumnSurname:hover, table#SortByName tbody tr td.
color:#FAFAFA; color:#FAFAFA;
} }
table.surname { table.surname {
border-bottom:solid 2px #1ED416; border-bottom:solid 2px #6AF364;
} }
table.surname tbody tr td { table.surname tbody tr td {
border-bottom:dashed 1px #426E40; border-bottom:dashed 1px #000;
} }
table.surname thead tr th.ColumnName { table.surname thead tr th.ColumnName {
width:20%; width:20%;
@ -590,7 +587,7 @@ table.surname thead tr th.ColumnParents, table.surname tbody tr td.ColumnParents
border-bottom:solid 2px #426E40; border-bottom:solid 2px #426E40;
} }
#Individuals table.individuallist tbody tr td { #Individuals table.individuallist tbody tr td {
border-bottom:dashed 1px #426E40; border-bottom:dashed 1px #000;
} }
#Individuals table.individuallist tbody tr td a { #Individuals table.individuallist tbody tr td a {
text-decoration:none; text-decoration:none;
@ -748,7 +745,7 @@ table.individuallist tbody tr td.ColumnName a:hover {
} }
#GalleryDisplay img { #GalleryDisplay img {
margin:0 auto; margin:0 auto;
border:solid 2px #139400; border:solid 2px #426E40;
} }
#GalleryDetail div#summaryarea{ #GalleryDetail div#summaryarea{
margin:0; margin:0;
@ -770,7 +767,7 @@ table.individuallist tbody tr td.ColumnName a:hover {
margin-bottom:0; margin-bottom:0;
border-style:solid; border-style:solid;
border-width:8px 0 0 0; border-width:8px 0 0 0;
border-color:#D3D3D3; border-color:#6AF364;
} }
/* /*
@ -899,7 +896,7 @@ div#events h4 {
color:#426E40; color:#426E40;
} }
#IndividualDetail div#events table.infolist tbody tr td.ColumnValue { #IndividualDetail div#events table.infolist tbody tr td.ColumnValue {
border-bottom:solid 2px #D3D3D3; border-bottom:solid 2px #000;
color:#426E40; color:#426E40;
} }
#IndividualDetail div#events table.infolist tbody tr td.ColumnValue a { #IndividualDetail div#events table.infolist tbody tr td.ColumnValue a {
@ -1032,7 +1029,7 @@ div#addresses table.infolist tbody tr td.ColumnValue {
#indivgallery .thumbnail a img { #indivgallery .thumbnail a img {
margin:0; margin:0;
padding:0; padding:0;
border:solid 2px #139400; border:solid 2px #000;
} }
#indivgallery div.thumbnail p { #indivgallery div.thumbnail p {
font:normal .7em/1.4em sans-serif; font:normal .7em/1.4em sans-serif;
@ -1100,7 +1097,7 @@ div#summaryarea table.infolist {
margin:0; margin:0;
padding:0; padding:0;
background:#FAFAFA; background:#FAFAFA;
border-bottom:solid .7em #FAFAFA; border-bottom:solid .7em #000;
} }
div#summaryarea table.infolist tr td, div#summaryarea table.infolist tr td p { div#summaryarea table.infolist tr td, div#summaryarea table.infolist tr td p {
font:normal .9em/1.2em sans-serif; font:normal .9em/1.2em sans-serif;
@ -1301,12 +1298,12 @@ div#pedigree {
} }
#footer a:hover { #footer a:hover {
text-decoration:none; text-decoration:none;
background-color:#426E40; background-color:#228B22;
} }
#footer img { #footer img {
border:0; border:0;
margin:0; margin:0;
background:none; float:center;
} }
#footer p#createdate { #footer p#createdate {
font-size:.8em; font-size:.8em;

3
src/data/authors.xml
View File

@ -79,4 +79,7 @@
<author uid="gbritton" title="contributor"> <author uid="gbritton" title="contributor">
Gerald Britton &lt;<html:a href="mailto:gerald.britton@gmail.com">gerald.britton@gmail.com</html:a>&gt; Gerald Britton &lt;<html:a href="mailto:gerald.britton@gmail.com">gerald.britton@gmail.com</html:a>&gt;
</author> </author>
<author uid="robhealey1" title="contributor">
Rob G. Healey &lt;<html:a href="mailto:robhealey1@gmail.com">robhealey1@gmail.com</html:a>&gt;
</author>
</authors> </authors>

34
src/plugins/WebCal.py
View File

@ -563,11 +563,6 @@ class WebCalReport(Report):
of.write(' </tr>\n') of.write(' </tr>\n')
# Complete six weeks for proper styling
# FIXME. Why would we need this? The for loop already
# creates all the weeks we need. At most six weeks.
# self.six_weeks(of, nweeks)
def write_header(self, of, title, cal, mystyle): def write_header(self, of, title, cal, mystyle):
""" """
This creates the header for the Calendars including style embedded for special purpose This creates the header for the Calendars including style embedded for special purpose
@ -768,24 +763,6 @@ class WebCalReport(Report):
self.write_footer(of, "ip") self.write_footer(of, "ip")
self.close_file(of) self.close_file(of)
def six_weeks(self, of, nweeks):
"""
Will complete the calendar out to six weeks for
proper styling of css sheets
"""
if nweeks == 4: # four weeks, add two weeks
for empty_weeks in range(1, 3):
of.write(' <tr class="week%d">\n' % (nweeks + empty_weeks))
of.write(' <td id="emptyDays" colspan="7">\n')
of.write(' </td>\n')
of.write(' </tr>\n')
elif nweeks == 5: # five weeks, add one week
of.write(' <tr class="week6">\n')
of.write(' <td id="emptyDays" colspan="7">\n')
of.write(' </td>\n')
of.write(' </tr>\n')
def blank_year(self): def blank_year(self):
""" """
This method will create the Printable Full Year One Page Calendar... This method will create the Printable Full Year One Page Calendar...
@ -951,7 +928,14 @@ class WebCalReport(Report):
# build the calendar # build the calendar
self.calendar_build(of, "yg", month) self.calendar_build(of, "yg", month)
# TODO. Add week padding to make them all 6 weeks long.
# See six_weeks
nweeks = len(calendar.monthcalendar(year, month))
for i in range(nweeks+1, 7):
of.write(' <tr class="week%d">\n' % i)
of.write(' <td id="emptyDays" colspan="7">\n')
of.write(' </td>\n')
of.write(' </tr>\n')
# close table body before writing note # close table body before writing note
of.write(' </tbody>\n') of.write(' </tbody>\n')
@ -1691,7 +1675,7 @@ def _easter(year):
day = l + 28 - 31 * (month / 4) day = l + 28 - 31 * (month / 4)
return year, month, day return year, month, day
# FIXME. Missing name prefix, suffix etc. # TODO. Check name prefix, suffix etc.
def _get_short_name(person, maiden_name = None): def _get_short_name(person, maiden_name = None):
""" Return person's name, unless maiden_name given, unless married_name listed. """ """ Return person's name, unless maiden_name given, unless married_name listed. """
# Get all of a person's names: # Get all of a person's names: