Working on PrivateProxy ideas; minor tweaks otherwise

svn: r13853
This commit is contained in:
Doug Blank
2009-12-20 01:57:17 +00:00
parent 4392fa3120
commit 108ff236f7
11 changed files with 160 additions and 118 deletions

View File

@@ -29,9 +29,9 @@
<div id="navigation">
{% block navigation %}
<ul>
<li class="{{ cview|currentSection:"home" }}"><a href="/">Home</a></li>
<li class="{{ tview|currentSection:"home" }}"><a href="/">Home</a></li>
{% for view in views %}
<li class="{{ cview|currentSection:view.1 }}"><a href="/{{view.1}}/">{{view.0}}</a></li>
<li class="{{tview|currentSection:view.1 }}"><a href="/{{view.1}}/">{{view.0}}</a></li>
{% endfor %}
{% if user.is_authenticated %}
<li><a href="/logout">Logout</a></li>

View File

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

View File

@@ -11,7 +11,7 @@
</script>
<div class="content" id="IndividualDetail">
<h3>{{form|make_name:user}}</h3>
<h3>Name for Person [{{person.gramps_id}}]</h3>
<div id="summaryarea">
<table class="infolist"> {% comment %} 4 cols {% endcomment %}
<tbody>
@@ -103,7 +103,7 @@
</div>
</div>
[<a href="/person/{{person.handle}}/">Back to Person Details</a>]
[<a href="/person/{{person.handle}}/">Back to Person</a>]
{% if user.is_authenticated %}
{% ifequal action "edit" %}
<input type="hidden" name="action" value="save"/>
@@ -112,7 +112,6 @@
{% else %}
[<a href="/person/{{person.handle}}/name/{{order}}/edit">Edit Name</a>]
[<a href="/person/{{person.handle}}/name/{{order}}/delete">Delete Name</a>]
[<a href="/person/{{person.handle}}/name/add">Add Name</a>]
{% endifequal %}
{% else %}
{% endif %}

View File

@@ -1,13 +0,0 @@
{% load my_tags %}
<table cellspacing="0">
<thead>
<tr>
{% table_header %}
</tr>
</thead>
<tbody>
{% for view in view_list %}<tr class="{% cycle odd,even %}">
<td><a href="/{{view.name|lower}}/">{{ view.name|escape }}</a></td>
</tr>{% endfor %}
</tbody>
</table>

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: {{tview}} view {% endblock %}
{% block heading %}Gramps-Connect: {{tview}} view {% endblock %}
{% block content %}

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: {{tview}} detail {% endblock %}
{% block heading %}Gramps-Connect: {{tview}} detail {% endblock %}
{% block content %}

View File

@@ -11,91 +11,54 @@
</script>
<div class="content" id="IndividualDetail">
<h3>{{person.name_set|make_name:user}}</h3>
<h3></h3>
<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="ColumnValue" id="data">{{name.surname}}</td>
<td class="ColumnAttribute">Prefix:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"prefix"}}</td>
<td rowspan="5" colspan="2" style="border:solid 2px #7D5925;">Image:</td>
<td class="ColumnValue" id="data">{{name.prefix}}</td>
<td rowspan="6" colspan="2" style="border:solid 2px #7D5925;">Image:</td>
</tr>
<tr>
<td class="ColumnAttribute" colspan="2"></td>
<td class="ColumnAttribute">Suffix:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"suffix"}}</td>
<td class="ColumnValue" id="data">{{name.suffix}}</td>
</tr>
<tr>
<td class="ColumnAttribute">Given:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"first_name"}}</td>
<td class="ColumnValue" id="data">{{name.first_name}}</td>
<td class="ColumnAttribute">Call Name:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"call"}}</td>
<td class="ColumnValue" id="data">{{name.call}}</td>
</tr>
<tr>
<td class="ColumnAttribute">Type:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"name_type"}}</td>
<td class="ColumnValue" id="data">{{name.name_type}}</td>
<td class="ColumnAttribute">Patronymic:</td>
<td class="ColumnValue" id="data">{{person.name_set|preferred:"patronymic"}}</td>
</tr>
<td class="ColumnValue" id="data">{{name.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>
<td class="ColumnValue" id="data">{{name.title}}</td>
</tr>
<tr>
<td class="ColumnAttribute">Gender:</td>
<td class="ColumnValue" id="data">{{person.gender_type|escape}}</td>
<td class="ColumnValue" id="data">{{person.gender_type}}</td>
<td class="ColumnAttribute">ID:</td>
<td class="ColumnValue" id="data">{{person.gramps_id|escape}}</td>
<td class="ColumnValue" id="data">{{person.gramps_id}}</td>
</tr>
<tr>
<td class="ColumnAttribute">Marker:</td>
<td class="ColumnValue" id="data">{{person.marker_type|escape}}</td>
<td class="ColumnValue" id="data">{{person.marker_type}}</td>
<td class="ColumnAttribute" colspan="3"></td>
</tr>
</tbody>
</table>
{% 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 -->