Updates to Family view and tabs

svn: r13616

src/data/templates/view_family_detail.html

@@ -10,20 +10,54 @@
       });
    </script>
 
-<table>
+<div class="content" id="IndividualDetail">
+
+<h3>{{family.father.name_set|make_name:user}} and {{family.mother.name_set|make_name:user}}</h3>
+
+<div id="summaryarea">
+<table class="infolist"> {% comment %} 4 cols {% endcomment %}
+<tbody>
 <tr>
-<td>Event type:</td><td> </td><td>Date:</td><td></td>
+<th colspan="2">Father</th>
+<th colspan="2">Mother</th>
 </tr>
 <tr>
-<td>Description:</td><td spancols="2">{{event.description|escape}}</td>
+ <td class="ColumnAttribute">Name:</td>
+ <td class="ColumnValue" id="data"><a href="/person/{{family.father.handle}}">{{family.father.name_set|make_name:user}} [{{family.father.gramps_id|escape}}]</a></td>
+ <td class="ColumnAttribute">Name:</td>
+ <td class="ColumnValue" id="data"><a href="/person/{{family.mother.handle}}">{{family.mother.name_set|make_name:user}} [{{family.mother.gramps_id|escape}}]</a></td>
 </tr>
 <tr>
-<td>ID:</td><td spancols="2">{{event.gramps_id|escape}}</td>
+ <td class="ColumnAttribute">Birth:</td>
+ <td class="ColumnValue" id="data">{{family.father|person_get_birth_date}}</td>
+ <td class="ColumnAttribute">Birth:</td>
+ <td class="ColumnValue" id="data">{{family.mother|person_get_birth_date}}</td>
 </tr>
 <tr>
-<td>Place:</td><td spancols="2">{{event.place.title|escape}}</td>
+ <td class="ColumnAttribute">Death:</td>
+ <td class="ColumnValue" id="data">{{family.father|person_get_death_date}}</td>
+ <td class="ColumnAttribute">Death:</td>
+ <td class="ColumnValue" id="data">{{family.mother|person_get_death_date}}</td>
 </tr>
+</tbody>
 </table>
+<table class="infolist"> {% comment %} 6 cols {% endcomment %}
+<tbody>
+<tr>
+  <th colspan="6">Relationship information</th>
+</tr>
+<tr>
+ <td class="ColumnAttribute">ID:</td>
+ <td class="ColumnValue" id="data">{{family.gramps_id|escape}}</td>
+ <td class="ColumnAttribute">Type:</td>
+ <td class="ColumnValue" id="data">RELTYPE</td>
+ <td class="ColumnAttribute">Marker:</td>
+ <td class="ColumnValue" id="data">{{family.marker_type|escape}}</td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
 
 <!-- Tabs -->
 <h2 class="demoHeaders">Tabs</h2>
@@ -61,7 +95,5 @@
     {{ family|family_lds_table:user|safe }}
   </div>
 </div>
-
-
 {% endblock %}
 

src/data/templates/view_source_detail.html

@@ -10,38 +10,95 @@
       });
    </script>
 
-<table>
+
+<div class="content" id="IndividualDetail">
+<h3>{{person.name_set|make_name:user}}</h3>
+<div id="summaryarea">
+<table class="infolist"> {% comment %} 5 cols {% endcomment %}
+<tbody>
 <tr>
-<td>Event type:</td><td> {{event.event_type|escape}}</td><td>Date:</td><td></td>
+ <td class="ColumnAttribute">Family:</td>
+ <td class="ColumnValue" id="data">{{person.name_set|preferred:"surname"}}</td>
+ <td class="ColumnAttribute">Prefix:</td>
+ <td class="ColumnValue" id="data">{{person.name_set|preferred:"prefix"}}</td>
+ <td rowspan="3" colspan="2" style="border:solid 2px #7D5925;">Image:</td>
 </tr>
 <tr>
-<td>Description:</td><td spancols="2">{{event.description|escape}}</td>
+ <td class="ColumnAttribute">Given:</td>
+ <td class="ColumnValue" id="data">{{person.name_set|preferred:"first_name"}}</td>
+ <td class="ColumnAttribute">Call Name:</td>
+ <td class="ColumnValue" id="data">{{person.name_set|preferred:"call"}}</td>
 </tr>
 <tr>
-<td>ID:</td><td spancols="2">{{event.gramps_id|escape}}</td>
+ <td class="ColumnAttribute">Type:</td>
+ <td class="ColumnValue" id="data">{{person.name_set|preferred:"name_type"}}</td>
+ <td class="ColumnAttribute">Patronymic:</td>
+ <td class="ColumnValue" id="data">{{person.name_set|preferred:"patronymic"}}</td>
 </tr>
 <tr>
-<td>Place:</td><td spancols="2">{{event.place.title|escape}}</td>
+ <td class="ColumnAttribute">Gender:</td>
+ <td class="ColumnValue" id="data">{{person.gender_type|escape}}</td>
+ <td class="ColumnAttribute">ID:</td>
+ <td class="ColumnValue" id="data">{{person.gramps_id|escape}}</td>
+ <td class="ColumnAttribute">Marker:</td>
+ <td class="ColumnValue" id="data">{{person.marker_type|escape}}</td>
 </tr>
+</tbody>
 </table>
+</div>
+</div>
 
 <!-- Tabs -->
 <h2 class="demoHeaders">Tabs</h2>
 
 <div class="ui-tabs ui-widget ui-widget-content ui-corner-all" id="tabs">
   <ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
-    <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#tabs-1" style=":hover {color: black;}">Sources</a></li>
+    <li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#tab-events">Events</a></li>
-    <li class="ui-corner-top ui-state-default"><a href="#tabs-2">Notes</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-names">Names</a></li>
-    <li class="ui-corner-top ui-state-default"><a href="#tabs-3">Gallery</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-sources">Sources</a></li>
-    <li class="ui-corner-top ui-state-default"><a href="#tabs-3">Attributes</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-attributes">Attributes</a></li>
-    <li class="ui-corner-top ui-state-default"><a href="#tabs-3">References</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-addresses">Addresses</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-notes">Notes</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-gallery">Gallery</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-internet">Internet</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-association">Associations</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-lds">LDS</a></li>
+    <li class="ui-corner-top ui-state-default"><a href="#tab-references">References</a></li>
   </ul>
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-1">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.</div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-events"> 
-
+    <!-- Events -->
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-2">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.</div>
+    {{ person|person_event_table:user|safe }}
-  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-3">Nam dui erat, auctor a, dignissim quis, sollicitudin eu, felis. Pellentesque nisi urna, interdum eget, sagittis et, consequat vestibulum, lacus. Mauris porttitor ullamcorper augue.</div>
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-names">
+    {{ person|person_name_table:user|safe }}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-sources">
+    {{ person|person_source_table:user|safe }}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-attributes">
+    {{ person|person_attribute_table:user|safe }}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-addresses">
+    {{ person|person_address_table:user|safe }}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-notes">
+    {{ person|person_note_table:user|safe }}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-gallery">
+    {{ person|person_gallery_table:user|safe }}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-internet">
+    {{ person|person_internet_table:user|safe }}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-association">
+    {{ person|person_association_table:user|safe }}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-lds">
+    {{ person|person_lds_table:user|safe }}
+  </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references">
+    {{ person|person_reference_table:user|safe }}
+  </div>
 </div>
 
-
 {% endblock %}
-

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.columns(
-    table.row("test")
+        _("#"),
+        _("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()