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

Incremental updates for css tweaks, showing validated info, family details and attempts for proper url handling

Browse Source 
svn: r13631
This commit is contained in:
Doug Blank
2009-11-19 02:41:37 +00:00
parent 1846c513cf
commit f3d85ec0f4
13 changed files with 218 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/data/Web_Mainz.css
View File

@@ -200,6 +200,17 @@ a:visited {
#data {
background-color: white;
border-style: solid;
border-color: #7D5925;
border-width:1px 1px 1px 1px;
}
table tr.even {
background-color: #FFF2C5;
}
table tr.odd {
background-color: #ffffe7;
}
/* Navigation

4
src/data/templates/gramps-base.html
View File

@@ -53,9 +53,9 @@
<div id="footer">
{% block footer %}
<p id="createdate">
Gramps-Connect
Gramps Connect, tools for genealogy collaborations
</p>
<p id="copyright">&copy; 2009 <a href="http://www.gramps-project.org/">www.gramps-project.net</a>
<p id="copyright">&copy; 2009 <a href="http://www.gramps-project.org/">www.gramps-project.org</a>
</p>
{% endblock %}
</div>

5
src/data/templates/main_page.html
View File

@@ -18,13 +18,14 @@
<p id="description">
Database information:</p>
<table class="infolist">
<table class="infolist surname">
<tr>
<th>Item</th>
<th>Count</th>
</tr>
{% for view in views %}
<tr><td align="left"><a href="/{{view.1}}">{{view.0}}</a></td>
<tr class="{% cycle odd,even %}">
<td align="left"><a href="/{{view.1}}">{{view.0}}</a></td>
<td align="right"><a href="/{{view.1}}">{{view.2.objects.count}}</td>
</tr>
{% endfor %}

4
src/data/templates/view_detail_page.html
View File

@@ -1,6 +1,6 @@
{% extends "gramps-base.html" %}
{% block title %}Gramps-Connect - {{cview}} detail {% endblock %}
{% block heading %}Gramps-Connect - {{cview}} detail {% endblock %}
{% block title %}Gramps-Connect: {{cview}} detail {% endblock %}
{% block heading %}Gramps-Connect: {{cview}} detail {% endblock %}
{% block content %}

8
src/data/templates/view_families.html
View File

@@ -6,7 +6,7 @@
<table cellspacing="0" class="infolist surname">
<thead>
<tr>
<th>Family #</th>
<th>#</th>
<th>ID</th>
<th>Father</th>
<th>Mother</th>
@@ -16,10 +16,10 @@
<tbody>
{% for family in page.object_list %}
<tr class="{% cycle odd,even %}">
<td>{{ forloop.counter|row_count:page }}</td>
<td><a href="/{{view}}/{{family.handle|escape}}" class="noThumb">{{ forloop.counter|row_count:page }}</a></td>
<td><a href="/{{view}}/{{family.handle|escape}}" class="noThumb"><span class="grampsid">[{{family.gramps_id}}]</span></a>
<td><a href="/person/{{family.father.handle|escape}}">{{family.father.name_set|make_name:user}}</a>
<td><a href="/person/{{family.mother.handle|escape}}">{{family.mother.name_set|make_name:user}}</a>
<td><a href="/{{view}}/{{family.handle|escape}}">{{family.father.name_set|make_name:user}}</a>
<td><a href="/{{view}}/{{family.handle|escape}}">{{family.mother.name_set|make_name:user}}</a>
{% if user.is_authenticated %}
<td><a href="/{{view}}/{{family.handle|escape}}">{{family.family_rel_type|escape}}</a>
{% else %}

9
src/data/templates/view_family_detail.html
View File

@@ -27,12 +27,21 @@
<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>
{% if user.is_authenticated or not family.father.handle|probably_alive %}
<tr>
<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>
{% else %}
<tr>
<td class="ColumnAttribute">Birth:</td>
<td class="ColumnValue" id="data">[Private]</td>
<td class="ColumnAttribute">Birth:</td>
<td class="ColumnValue" id="data">[Private]</td>
</tr>
{% endif %}
<tr>
<td class="ColumnAttribute">Death:</td>
<td class="ColumnValue" id="data">{{family.father|person_get_death_date}}</td>

4
src/data/templates/view_page.html
View File

@@ -1,8 +1,8 @@
{% extends "gramps-base.html" %}
{% load my_tags %}
{% block title %}Gramps-Connect - {{cview}} view {% endblock %}
{% block heading %}Gramps Connect - {{cview}} view {% endblock %}
{% block title %}Gramps-Connect: {{cview}} view {% endblock %}
{% block heading %}Gramps Connect: {{cview}} view {% endblock %}
{% block content %}

4
src/data/templates/view_page_detail.html
View File

@@ -1,8 +1,8 @@
{% extends "gramps-base.html" %}
{% load my_tags %}
{% block title %}Gramps-Connect - {{cview}} detail {% endblock %}
{% block heading %}Gramps-Connect - {{cview}} detail {% endblock %}
{% block title %}Gramps-Connect: {{cview}} detail {% endblock %}
{% block heading %}Gramps-Connect: {{cview}} detail {% endblock %}
{% block content %}

21
src/data/templates/view_people.html
View File

@@ -3,10 +3,10 @@
{% block table_data %}
<table cellspacing="0" class="infolist IndividualList">
<table cellspacing="0" class="infolist surname">
<thead>
<tr>
<th>Person #</th>
<th>#</th>
<th>Name</th>
<th>ID</th>
<th>Gender</th>
@@ -20,17 +20,18 @@
<tbody>
{% for name in page.object_list %}
<tr class="{% cycle odd,even %}">
<td>{{ forloop.counter|row_count:page }}</td>
<td><a href="/{{view}}/{{name.person.handle|escape}}/" class="noThumb">{{name|make_name:user}}</a>
<td><a href="{{name.person.handle|escape}}/" class="noThumb">{{ forloop.counter|row_count:page }}</a>
</td>
<td><a href="/{{view}}/{{name.person.handle|escape}}" class="grampsid">[{{name.person.gramps_id|escape}}]</a></td>
<td><a href="/{{view}}/{{name.person.handle|escape}}" class="noThumb">{{name.person.gender_type|escape}}</a></td>
<td><a href="{{name.person.handle|escape}}/" class="noThumb">{{name|make_name:user}}</a>
</td>
<td><a href="{{name.person.handle|escape}}/" class="grampsid">[{{name.person.gramps_id|escape}}]</a></td>
<td><a href="{{name.person.handle|escape}}/" class="noThumb">{{name.person.gender_type|escape}}</a></td>
{% if user.is_authenticated %}
<td><a href="/{{view}}/{{name.person.handle|escape}}" class="noThumb">{{name.person|person_get_birth_date}}</a></td>
<td><a href="/{{view}}/{{name.person.handle|escape}}" class="noThumb">{{name.person|person_get_death_date}}</a></td>
<td><a href="{{name.person.handle|escape}}/" class="noThumb">{{name.person|person_get_birth_date}}</a></td>
<td><a href="{{name.person.handle|escape}}/" class="noThumb">{{name.person|person_get_death_date}}</a></td>
{% else %}
<td><a href="/{{view}}/{{name.person.handle|escape}}/" class="noThumb">[Private]</a>
<td><a href="/{{view}}/{{name.person.handle|escape}}/" class="noThumb">[Private]</a>
<td><a href="{{name.person.handle|escape}}/" class="noThumb">[Private]</a>
<td><a href="{{name.person.handle|escape}}/" class="noThumb">[Private]</a>
{% endif %}
</tr>
{% endfor %}

57
src/data/templates/view_person_detail.html
View File

@@ -15,13 +15,18 @@
<div id="summaryarea">
<table class="infolist"> {% comment %} 5 cols {% endcomment %}
<tbody>
{% if user.is_authenticated %}
<tr>
<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>
<td rowspan="5" colspan="2" style="border:solid 2px #7D5925;">Image:</td>
</tr>
<td class="ColumnAttribute" colspan="2"></td>
<td class="ColumnAttribute">Suffix:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"suffix"}}</td>
<tr>
<td class="ColumnAttribute">Given:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"first_name"}}</td>
@@ -34,6 +39,11 @@
<td class="ColumnAttribute">Patronymic:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"patronymic"}}</td>
</tr>
</tr>
<td class="ColumnAttribute" colspan="2"></td>
<td class="ColumnAttribute">Title:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"title"}}</td>
<tr>
<tr>
<td class="ColumnAttribute">Gender:</td>
<td class="ColumnValue" id="data">{{person.gender_type|escape}}</td>
@@ -44,9 +54,50 @@
</tr>
</tbody>
</table>
</div>
</div>
{% else %}
<tr>
<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">[Private]</td>
<td rowspan="5" colspan="2" style="border:solid 2px #7D5925;">Image:</td>
</tr>
<td class="ColumnAttribute" colspan="2"></td>
<td class="ColumnAttribute">Suffix:</td>
<td class="ColumnValue" id="data">[Private]</td>
<tr>
<td class="ColumnAttribute">Given:</td>
<td class="ColumnValue" id="data">[Private]</td>
<td class="ColumnAttribute">Call Name:</td>
<td class="ColumnValue" id="data">[Private]</td>
</tr>
<tr>
<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">[Private]</td>
</tr>
</tr>
<td class="ColumnAttribute" colspan="2"></td>
<td class="ColumnAttribute">Title:</td>
<td class="ColumnValue" id="data">[Private]</td>
<tr>
<tr>
<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"></td>
</tr>
</tbody>
</table>
{% endif %}
</div>
</div>
<!-- Tabs -->
<h2 class="demoHeaders">Tabs</h2>