NarrativeWeb is now using format_date() where it is just needing to be displayed. Where calculations are needed, using Date() and date(). Stylesheets are being updated as well. A lot of general cleanup as well.

svn: r13486
This commit is contained in:
Rob G. Healey 2009-11-03 04:18:05 +00:00
parent e83e5effc5
commit 99499779dc
3 changed files with 611 additions and 554 deletions

View File

@ -533,40 +533,36 @@ div#EventList, div#EventDetail { }
div#events table.eventlist {
margin-top: .3cm;
}
table.eventlist tbody tr.BeginName {
border-bottom: solid 1px #000;
}
table.eventlist tbody tr td {
background-color: #CCC;
padding: 4px 0px 4px 0px;
background-color: #FFF;
border-bottom: dashed 1px #000;
}
table.eventlist tbody tr td.ColumnEvent {
background-color: #FFF;
width: 20%;
}
table.eventlist tbody tr td.ColumnDate {
width: 16%;
background-color: #CCC;
width: 20%;
}
table.eventlist tbody tr td.ColumnPlace {
background-color: #FFF;
width: 35%;
}
table.eventlist tbody tr td.ColumnSources {
background-color: #FFF;
width: 12%;
}
table.eventlist tbody tr td.ColumnNotes {
background-color: #333;
width: 25%;
}
table.eventlist tbody tr td.ColumnPerson {
background-color: #FFF;
width: 35%;
width: 30%;
}
table.eventlist tbody tr td.ColumnPartner {
background-color: #FFF;
width: 35%;
}
div#EventList table.eventlist tbody tr.BeginName {
border-top: solid 1px #000;
}
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 {

View File

@ -1,4 +1,4 @@
/*
./*
**************************************************************************************************
Copyright Holder and License
**************************************************************************************************
@ -32,10 +32,10 @@ see <http://www.gnu.org/licenses/>.
--------------------------------------------------------------------------------------------------
Color Palette
--------------------------------------------------------------------------------------------------
brown darkest #453619
brown dark #542
brown light #C1B398
gray #696969
green dark #228A22
green #6AF364, #5D835F
green lighter #D8F3D6
@ -139,8 +139,8 @@ h4 {
color: #FFF;
margin-top: .3cm;
padding:.2em 0 .2em 20px;
background-color: #453619;
border-bottom:solid 4px #5D835F;
background-color: #228A22;
border-bottom:solid 4px #A97;
}
h5, h6 {
font:normal 1em/1.2em serif;
@ -201,13 +201,13 @@ span.preposition {
div#header {
background-color: #542;
border-bottom: solid 8px #5D835F;
height: 90px;
height: 60px;
width: 100%;
}
#SiteTitle {
margin:0;
padding:.5em 0 0.5em 10px;
font-size: 40px;
font-size: 28px;
color: #FFF;
font-style: italic;
}
@ -305,8 +305,8 @@ div#navigation ul li a:hover, div#subnavigation ul li a:hover {
div#navigation ul li.CurrentSection a, div#subnavigation ul li.CurrentSection a {
font-weight:bold;
font-style: italic;
background-color: #CCC;
color: #000;
background-color: #228A22;
color: #FFF;
}
div#navigation ul li.CurrentSection a:hover {
background-color: #000;
@ -372,7 +372,6 @@ table.infolist thead tr th {
border: solid 1px #5D835F;
}
table.infolist thead tr th a {
background-color: #6AF364;
color: #000;
}
table.infolist thead tr th a:hover {
@ -389,7 +388,7 @@ table.infolist tr td a {
color: #000;
}
table.infolist tr.BeginLetter td, table.infolist tr.BeginSurname td {
border-top:solid 1px #453619;
border-top:solid 1px #228A22;
}
table.infolist tr td.ColumnLetter {
width:3%;
@ -492,13 +491,14 @@ table.surnamelist tbody tr td.ColumnSurname:hover,
table.surname {
border-bottom:solid 1px #000;
}
table.surname tbody tr td {
border-bottom:dashed 1px #000;
}
table.surname thead tr th.ColumnName {
width:20%;
padding-left:20px;
}
table.surname tbody tr td {
border-bottom:dashed 1px #000;
background-color: #D8F3D6;
}
table.surname tbody tr td.ColumnName {
background-color: #FFF;
width:20%;
@ -516,6 +516,10 @@ table.surname tbody tr td.ColumnName:hover {
table.surname tbody tr td.ColumnPartner {
background-color: #FFF;
}
table.surname tbody tr td.ColumnPartner a {
display:block;
padding:.6em 10px .6em 0px;
}
table.surname thead tr th.ColumnParents,
table.surname tbody tr td.ColumnParents {
width:25%;
@ -582,6 +586,9 @@ div#IndividualDetail div.subsection table tr td:first-child {
----------------------------------------------------- */
#Places { }
#Places table.infolist tbody tr td.ColumnLetter {
background-color: #D8F3D6;
}
#Places table.infolist tbody tr td.ColumnName {
padding:0;
background-color: #FFF;
@ -589,7 +596,6 @@ div#IndividualDetail div.subsection table tr td:first-child {
#Places table.infolist tbody tr td.ColumnName a {
padding:.1em 10px .3em 10px;
}
#Places table.infolist tbody tr td.ColumnName a:hover { }
/* EventList and EventDetail
----------------------------------------------------- */
@ -598,19 +604,21 @@ div#EventList, div#EventDetail { }
div#events table.eventlist {
margin-top: .3cm;
}
table.eventlist tbody tr.BeginName {
border-bottom: solid 1px #5D835F;
div#events table.eventlist tbody tr td.ColumnEvent a {
padding: 2px 100px 2px 10px;
}
div#events table.eventlist tbody tr td.ColumnPlace a {
padding: 2px 70px 2px 0px;
}
table.eventlist tbody tr td {
background-color: #D8F3D6;
padding: 4px 0px 4px 0px;
background-color: #FFF;
border-bottom: dashed 1px #000;
}
table.eventlist tbody tr td.ColumnEvent {
background-color: #FFF;
width: 20%;
}
table.eventlist tbody tr td.ColumnDate {
background-color: #D8F3D6;
width: 16%;
}
table.eventlist tbody tr td.ColumnPlace {
@ -622,21 +630,30 @@ table.eventlist tbody tr td.ColumnSources {
width: 12%;
}
table.eventlist tbody tr td.ColumnNotes {
background-color: #D8F3D6;
width: 25%;
}
table.eventlist tbody tr td.ColumnPerson {
background-color: #FFF;
width: 35%;
}
table.eventlist tbody tr td.ColumnPartner {
background-color: #FFF;
width: 35%;
}
div#families table.eventlist {
margin: 0;
padding: 0;
}
div#EventList table.eventlist tbody tr.BeginName {
border-top: solid 1px #000;
}
div#EventList table.eventlist tbody tr td {
padding: 4px 0px 4px 0px;
}
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;
padding: 4px 0px 4px 10px;
}
div#EventDetail h3 {
font-size: xxx-large;
@ -665,6 +682,7 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
#Gallery table.infolist tbody tr td.ColumnRowLabel,
#Gallery table.infolist tbody tr td.ColumnDate {
background-color: #D8F3D6;
padding-bottom:0;
}
#Gallery table.infolist tbody tr td.ColumnName {
@ -674,8 +692,9 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
#Gallery table.infolist tbody tr td.ColumnName a {
padding:.1em 10px .3em 10px;
}
#Gallery table.infolist tbody tr td.ColumnName a:hover { }
#Gallery table.gallerylist tbody tr td {
border-bottom: dashed 1px #000;
}
#GalleryNav {
font:normal 1em/1em sans-serif;
margin:1em 0 0 0;
@ -685,7 +704,7 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
#GalleryNav a {
font-weight:bold;
text-decoration:none;
border:solid 1px #453619;
border:solid 1px #228A22;
}
#GalleryNav a:hover { }
@ -710,7 +729,7 @@ div#EventDetail table.eventlist tbody tr td.ColumnEvent {
position:relative;
overflow:hidden;
text-align:center;
border:solid 1px #453619;
border:solid 1px #228A22;
}
#GalleryDisplay img {
margin:0 auto;
@ -746,10 +765,11 @@ table.exiflist tr td.ColumnValue {
/* Contact
----------------------------------------------------- */
#Contact #summaryarea {
background-color: #D8F3D7;
width:500px;
margin:0 auto;
padding:3em;
border:double 4px #453619;
border:double 4px #000;
}
#Contact #summaryarea img {
float:right;
@ -801,7 +821,6 @@ div#Download table.download {
margin: .5em 0 .5em 0;
border: solid 1px #5D835F;
width: 100%;
nackground-color: #D8F3D6;
}
div#Download table.download img {
float:center;
@ -810,6 +829,7 @@ div#Download table.download tbody tr#Row02 {
border-bottom:solid 2px #000;
}
div#Download table.download tbody tr td {
background-color: #D8F3D6;
border: solid 1px #000;
text-align:left;
}
@ -945,7 +965,7 @@ div#events h4 {
padding-bottom:.8em;
}
#IndividualDetail div#events table.infolist tbody tr td.ColumnAttribute {
border-bottom:solid 1px #453619;
border-bottom:solid 1px #228A22;
}
#IndividualDetail div#events table.infolist tbody tr td.ColumnValue {
border-bottom:solid 1px #000;
@ -1268,7 +1288,7 @@ div#pedigree {
margin-top:-25px;
margin-left:16px;
background-color: #FFF;
border:solid 1px #453619;
border:solid 1px #228A22;
}
#treeContainer div.boxbg a:hover {
position:relative;
@ -1279,7 +1299,7 @@ div#pedigree {
width:190px;
margin-left:-20px;
padding:10px 25px 12px 25px;
border:solid 2px #453619;
border:solid 2px #228A22;
}
#treeContainer div.boxbg a:hover,
#treeContainer div.AncCol3 a:hover,
@ -1343,7 +1363,7 @@ div#pedigree {
height:1px;
margin:0 0 0 16px;
padding:0;
background-color: #453619;
background-color: #228A22;
}
#tree div div.bhline {
position:absolute;
@ -1351,7 +1371,7 @@ div#pedigree {
width:1px;
margin:0 0 0 16px;
padding:0;
background-color: #453619;
background-color: #228A22;
}
.ghline, .gvline {
display:none;
@ -1407,13 +1427,13 @@ body#WebCal {
font-style:italic;
color: #000;
background-color: #6AF364;
border:solid 2px #453619;
border:solid 2px #228A22;
}
.calendar tfoot tr td {
padding:.7em 5% 1em 5%;
border-top:solid 2px #000;
vertical-align:middle;
color: #453619;
color: #228A22;
background-color: #D8F3D6;
}
@ -1438,7 +1458,7 @@ body#WebCal {
padding:0;
border-width:1px 0 0 1px;
border-style:solid;
border-color: #453619;
border-color: #228A22;
}
.calendar tbody tr td.weekday {
background-color: #FFF;
@ -1447,13 +1467,13 @@ body#WebCal {
background-color: #D8F3D6;
}
.calendar tbody tr td.saturday {
border-right:solid 1px #453619;
border-right:solid 1px #228A22;
}
.calendar tbody tr td.sunday {
border-left:solid 1px #453619;
border-left:solid 1px #228A22;
}
.calendar tbody tr td:first-child {
border-left:solid 1px #453619;
border-left:solid 1px #228A22;
}
.calendar tbody tr:first-child td {
border-top:none;
@ -1472,7 +1492,7 @@ body#WebCal {
width:92%;
margin:0 4%;
padding:.2em 0 .3em 0;
border-top:dashed 1px #453619;
border-top:dashed 1px #228A22;
}
.calendar tbody tr td ul li:first-child {
border:none;
@ -1484,7 +1504,7 @@ body#WebCal {
color: #0A65B5;
}
.calendar tbody tr td ul li span.yearsmarried em {
color: #453619;
color: #228A22;
}
.calendar tbody tr td.highlight { }
@ -1540,3 +1560,27 @@ body#fullyearlinked table.calendar tbody tr td.saturday {
body#fullyearlinked able.calendar tbody tr td.sunday {
border:solid 2px #000;
}
/* Calendar: OneDay
--------------------------------------------------------------------------------- */
body#OneDay h3 {
color: #228A22;
font-weight: bold;
text-align: center;
}
table.oneday {
margin: .3em 0 .3em 0;
padding: 0;
}
table.oneday tbody tr td {
border-bottom: dashed 1px #228A22;
}
table.oneday tbody tr td.ColumnRowLabel {
width: 5%;
}
table.oneday tbody tr td.ColumnText {
width: 85%;
}
table.oneday tbody tr td.ColumnEvent {
width; 10%;
}

File diff suppressed because it is too large Load Diff