From 64ec8c20f8805afc47af6173699dd3a6b3d54cf2 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Sun, 6 Dec 2009 23:35:46 +0000 Subject: [PATCH] Fixed CSS typos; got all gramps-connect view pages structured svn: r13736 --- src/data/Web_Mainz.css | 8 +- src/data/Web_Print-Default.css | 14 +-- src/data/templates/view_event_detail.html | 24 ++-- src/data/templates/view_name_detail.html | 108 ++++-------------- src/data/templates/view_note_detail.html | 43 +++---- src/data/templates/view_page.html | 4 +- src/data/templates/view_place_detail.html | 55 ++++++--- .../templates/view_repository_detail.html | 47 ++++---- 8 files changed, 135 insertions(+), 168 deletions(-) diff --git a/src/data/Web_Mainz.css b/src/data/Web_Mainz.css index eee7225f8..69b81be5e 100644 --- a/src/data/Web_Mainz.css +++ b/src/data/Web_Mainz.css @@ -619,9 +619,9 @@ div#EventList table.alphaevent tbody tr td.ColumnPerson span.mother:before { content:"+ "; } div#EventDetail h3 { - font-size: xxx-large; + font-size: large; } -div#EventDetail h3:first-lettr { +div#EventDetail h3:first-letter { color: #000; } div#EventDetail table.eventlist { @@ -768,7 +768,7 @@ table.download { width:100%; } table.download img { - float:center; + text-align: center; } table.download thead tr th { text-align:center; @@ -835,7 +835,7 @@ div#RepositoryList table.repolist tbody tr td.ColumnName { min-height:500px; padding:1.5em 0 3em 0; } -#Home p, #Introduction p, #Surnames p, #Individuals p, #Sources p, #Places p, #Gallery p, { +#Home p, #Introduction p, #Surnames p, #Individuals p, #Sources p, #Places p, #Gallery p { margin:0 20px 1em 20px; padding-top:1em; } diff --git a/src/data/Web_Print-Default.css b/src/data/Web_Print-Default.css index 85ac2d9fa..742b72abe 100644 --- a/src/data/Web_Print-Default.css +++ b/src/data/Web_Print-Default.css @@ -558,9 +558,9 @@ div#EventList table.eventlist tbody tr td.ColumnPartner a { padding: 4px 0px 4px 10px; } div#EventDetail h3 { - font-size: xxx-large; + font-size: large; } -div#EventDetail h3:first-lettr { +div#EventDetail h3:first-letter { color: #5D835F; } div#EventDetail table.eventlist { @@ -721,7 +721,7 @@ div#Download table.download { width: 100%; } div#Download table.download img { - float:center; + text-align:center; } div#Download table.download tbody tr#Row02 { border-bottom:solid 2px #000; @@ -893,7 +893,7 @@ div#events h4 { line-height:12px; text-transform:uppercase; color: #542; - padding-top:6px 0 4px 0; + padding:6px 0 4px 0; background-color: #6AF364; } #IndividualDetail div#events table.infolist thead tr th:first-child { @@ -1032,7 +1032,7 @@ div#Addresses { } div#Addresses table.infolist { font-size: 12px; - background- color: #D8F3D6; + background-color: #D8F3D6; } div#Addresses table.infolist tbody tr td { border-bottom: solid 1px #5D835F; @@ -1047,7 +1047,7 @@ div#Addresses table.infolist tbody tr td.ColumnCity { width: 8%; } div#Addresses table.infolist tbody tr td.ColumnCounty { - with: 8%; + width: 8%; } div#Addresses table.infolist tbody tr td.ColumnState { width: 12%; @@ -1487,5 +1487,5 @@ table.oneday tbody tr td.ColumnText { width: 85%; } table.oneday tbody tr td.ColumnEvent { - width; 10%; + width: 10%; } diff --git a/src/data/templates/view_event_detail.html b/src/data/templates/view_event_detail.html index 77af4e578..49bffd415 100644 --- a/src/data/templates/view_event_detail.html +++ b/src/data/templates/view_event_detail.html @@ -30,7 +30,7 @@ Place: -{{event.place.title|escape}} +{{event.place.title|escape}} [{{event.place.gramps_id}}] @@ -40,16 +40,20 @@
-
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- -
Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.
-
Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.
+
+
+
+
+
+
+
+
diff --git a/src/data/templates/view_name_detail.html b/src/data/templates/view_name_detail.html index bb2faebf7..26cfa8748 100644 --- a/src/data/templates/view_name_detail.html +++ b/src/data/templates/view_name_detail.html @@ -11,46 +11,34 @@
-

{{person.name_set|make_name:user}}

+

{{name|make_name:user}}

- {% comment %} 5 cols {% endcomment %} +
{% comment %} 4 cols {% endcomment %} {% if user.is_authenticated %} - + - - + - - - - - + - - + - - - - - - - + + + - - - - - - - + + + + +
Family:{{person.name_set|preferred:"surname"}}{{name.surname}} Prefix:{{person.name_set|preferred:"prefix"}}Image:{{name.prefix}}
Suffix:{{person.name_set|preferred:"suffix"}}
Given:{{person.name_set|preferred:"first_name"}}{{name.first_name}} Call Name:{{person.name_set|preferred:"call"}}
{{name.call}}
Type:{{person.name_set|preferred:"name_type"}}Patronymic:{{person.name_set|preferred:"patronymic"}}
Title:{{person.name_set|preferred:"title"}}{{name.title}}Suffix:{{name.suffix}}
Gender:{{person.gender_type|escape}}ID:{{person.gramps_id|escape}}Marker:{{person.marker_type|escape}}Patronymic:{{name.patronymic}}Type:{{name.name_type}}
@@ -59,38 +47,25 @@ Family: - {{person.name_set|preferred:"surname"}} + {{name.surname}} Prefix: [Private] - Image: - - - Suffix: - [Private] Given: [Private] Call Name: [Private] - - Type: - {{person.name_set|preferred:"name_type"}} - Patronymic: - [Private] - - Title: [Private] + Suffix: + [Private] - - Gender: - {{person.gender_type|escape}} - ID: - {{person.gramps_id|escape}} - Marker: - + Patronymic: + [Private] + Type: + {{name.name_type}} @@ -103,54 +78,19 @@
-
- - {{ person|person_event_table:user|safe }} -
-
- {{ person|person_name_table:user|safe }} +
- {{ person|person_source_table:user|safe }} -
-
- {{ person|person_attribute_table:user|safe }} -
-
- {{ person|person_address_table:user|safe }}
- {{ person|person_note_table:user|safe }} -
-
- {{ person|person_gallery_table:user|safe }} -
-
- {{ person|person_internet_table:user|safe }} -
-
- {{ person|person_association_table:user|safe }} -
-
- {{ person|person_lds_table:user|safe }} -
-
- {{ person|person_reference_table:user|safe }}
+[Back to Person Details] {% endblock %} diff --git a/src/data/templates/view_note_detail.html b/src/data/templates/view_note_detail.html index d1c7b684f..1000f2ad2 100644 --- a/src/data/templates/view_note_detail.html +++ b/src/data/templates/view_note_detail.html @@ -10,18 +10,22 @@ }); - +
+
+
+ - + + + + - - - - - - - + + + + +
Event type: {{event.event_type|escape}}Date:ID: {{note.gramps_id|escape}}Marker:{{note.note_marker_type|escape}}
Description:{{event.description|escape}}
ID:{{event.gramps_id|escape}}
Place:{{event.place.title|escape}}Type:{{event.description|escape}}PreformattedPrivate
@@ -30,18 +34,17 @@
-
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- -
Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.
-
Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.
+
+ {{note.text}} +
+
+ {{note.references.all.to_list}} +
+
+
- - {% endblock %} diff --git a/src/data/templates/view_page.html b/src/data/templates/view_page.html index cfe7f480a..bf96c95ec 100644 --- a/src/data/templates/view_page.html +++ b/src/data/templates/view_page.html @@ -8,8 +8,8 @@

- - + +

diff --git a/src/data/templates/view_place_detail.html b/src/data/templates/view_place_detail.html index d1c7b684f..6f48cd13f 100644 --- a/src/data/templates/view_place_detail.html +++ b/src/data/templates/view_place_detail.html @@ -10,18 +10,25 @@ }); - +
+
+ +
- + + - + + + + - - - - + + + +
Event type: {{event.event_type|escape}}Date:Place Name: {{place.title|escape}}
Description:{{event.description|escape}}Latitude:{{place.latitude|escape}}Longitude:{{place.longitude|escape}}
ID:{{event.gramps_id|escape}}
Place:{{event.place.title|escape}}ID:{{place.gramps_id|escape}}Private:{{place.private}}
@@ -30,18 +37,30 @@
-
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- -
Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.
-
Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- - {% endblock %} diff --git a/src/data/templates/view_repository_detail.html b/src/data/templates/view_repository_detail.html index ce840b319..7d163b2b7 100644 --- a/src/data/templates/view_repository_detail.html +++ b/src/data/templates/view_repository_detail.html @@ -10,18 +10,21 @@ }); - +
+
+ +
- + + - - - - - - - + + + + + +
Family: Prefix:Name:{{repository.name}}
Description:
ID:{{person.gramps_id|escape}}
Place:Type:{{repository.repository_type}}ID:{{repository.gramps_id}}Private:{{repository.private}}
@@ -30,21 +33,19 @@
-
Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
- -
Phasellus mattis tincidunt nibh. Cras orci urna, blandit id, pretium vel, aliquet ornare, felis. Maecenas scelerisque sem non nisl. Fusce sed lorem in enim dictum bibendum.
-
Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.
+
+
+
+
+
+
+
+