From 3f19c3d1b3c559131a0df7517c380fc998e1f2a3 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Wed, 18 Nov 2009 02:58:29 +0000 Subject: [PATCH] Updates to Family view and tabs svn: r13616 --- src/data/templates/view_family_detail.html | 46 +++++++++-- src/data/templates/view_source_detail.html | 89 ++++++++++++++++++---- src/web/utils.py | 51 +++++++++++-- 3 files changed, 155 insertions(+), 31 deletions(-) diff --git a/src/data/templates/view_family_detail.html b/src/data/templates/view_family_detail.html index 0240455f1..cc48b16ad 100644 --- a/src/data/templates/view_family_detail.html +++ b/src/data/templates/view_family_detail.html @@ -10,20 +10,54 @@ }); - +
+ +

{{family.father.name_set|make_name:user}} and {{family.mother.name_set|make_name:user}}

+ +
+
{% comment %} 4 cols {% endcomment %} + - + + - + + + + - + + + + - + + + + +
Event type: Date:FatherMother
Description:{{event.description|escape}}Name:{{family.father.name_set|make_name:user}} [{{family.father.gramps_id|escape}}]Name:{{family.mother.name_set|make_name:user}} [{{family.mother.gramps_id|escape}}]
ID:{{event.gramps_id|escape}}Birth:{{family.father|person_get_birth_date}}Birth:{{family.mother|person_get_birth_date}}
Place:{{event.place.title|escape}}Death:{{family.father|person_get_death_date}}Death:{{family.mother|person_get_death_date}}
+ {% comment %} 6 cols {% endcomment %} + + + + + + + + + + + + + +
Relationship information
ID:{{family.gramps_id|escape}}Type:RELTYPEMarker:{{family.marker_type|escape}}
+ +

Tabs

@@ -61,7 +95,5 @@ {{ family|family_lds_table:user|safe }} - - {% endblock %} diff --git a/src/data/templates/view_source_detail.html b/src/data/templates/view_source_detail.html index d1c7b684f..5e3b094f4 100644 --- a/src/data/templates/view_source_detail.html +++ b/src/data/templates/view_source_detail.html @@ -10,38 +10,95 @@ }); - + +
+

{{person.name_set|make_name:user}}

+
+
{% comment %} 5 cols {% endcomment %} + - + + + + + - + + + + - + + + + - + + + + + + +
Event type: {{event.event_type|escape}}Date:Family:{{person.name_set|preferred:"surname"}}Prefix:{{person.name_set|preferred:"prefix"}}Image:
Description:{{event.description|escape}}Given:{{person.name_set|preferred:"first_name"}}Call Name:{{person.name_set|preferred:"call"}}
ID:{{event.gramps_id|escape}}Type:{{person.name_set|preferred:"name_type"}}Patronymic:{{person.name_set|preferred:"patronymic"}}
Place:{{event.place.title|escape}}Gender:{{person.gender_type|escape}}ID:{{person.gramps_id|escape}}Marker:{{person.marker_type|escape}}
+ +

Tabs

-
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.
+
+ + {{ 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 }} +
- {% endblock %} - diff --git a/src/web/utils.py b/src/web/utils.py index 5a48022fd..d7e188859 100644 --- a/src/web/utils.py +++ b/src/web/utils.py @@ -233,43 +233,78 @@ def person_reference_table(djperson, user): def family_children_table(djfamily, user): table = Table() - table.columns(_("Column")) - table.row("test") + table.columns( + _("#"), + _("ID"), + _("Name"), + _("Gender"), + _("Paternal"), + _("Maternal"), + _("Birth Date"), + ) + #for djfamily: + # table.row("test") return table.get_html() def family_event_table(djfamily, user): table = Table() - table.columns(_("Column")) + table.columns( + _("Description"), + _("Type"), + _("ID"), + _("Date"), + _("Place"), + _("Role"), + ) table.row("test") return table.get_html() def family_source_table(djfamily, user): table = Table() - table.columns(_("Column")) + table.columns( + _("ID"), + _("Type"), + _("Author"), + _("Page"), + ) table.row("test") return table.get_html() def family_attribute_table(djfamily, user): table = Table() - table.columns(_("Column")) + table.columns( + _("Type"), + _("Value"), + ) table.row("test") return table.get_html() def family_note_table(djfamily, user): table = Table() - table.columns(_("Column")) + table.columns( + _("Type"), + _("Preview"), + ) table.row("test") return table.get_html() def family_gallery_table(djfamily, user): table = Table() - table.columns(_("Column")) + table.columns( + _("Column"), + ) table.row("test") return table.get_html() def family_lds_table(djfamily, user): table = Table() - table.columns(_("Column")) + table.columns( + _("Type"), + _("Date"), + _("Status"), + _("Temple"), + _("Place"), + ) table.row("test") return table.get_html()