Working add/edit people and names; working privacy (living and private); unified templates for display/edit

svn: r13952

src/data/templates/gramps-base.html

@@ -39,7 +39,11 @@
          <li><a href="/admin">Admin</a></li>
        {% endif %}
     {% else %}
+	 {% if next %}
+         <li><a href="/login/?next={{next}}">Login</a></li>
+         {% else %}
          <li><a href="/login/">Login</a></li>
+	 {% endif %}
   {% endif %}
     </ul>
     {% endblock %}

src/data/templates/registration/login.html

@@ -29,7 +29,11 @@
     </td>
    </tr>
  </table>
+{% if next %}
+ <input type="hidden" name="next" value="{{next}}" />
+{% else %}
  <input type="hidden" name="next" value="/" />
+{% endif %}
  <input type="submit" value="Login" />
 </form>
 {% endblock %}

src/data/templates/view_name_detail.html

@@ -26,33 +26,35 @@
 {% endif %}
 <tr>
  <td class="ColumnAttribute">{{form.surname.label}}:</td>
- <td class="ColumnValue" id="data">{{form.surname|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render form.surname user action %}</td>
  <td class="ColumnAttribute">{{form.prefix.label}}:</td>
- <td class="ColumnValue" id="data">{{form.prefix|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render form.prefix user action %}</td>
 </tr>
  <td class="ColumnAttribute">{{form.first_name.label}}:</td>
- <td class="ColumnValue" id="data">{{form.first_name|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render form.first_name user action %}</td>
  <td class="ColumnAttribute">{{form.call.label}}:</td>
- <td class="ColumnValue" id="data">{{form.call|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render form.call user action %}</td>
 <tr>
 </tr>
  <td class="ColumnAttribute">{{form.title.label}}:</td>
- <td class="ColumnValue" id="data">{{form.title|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render form.title user action %}</td>
  <td class="ColumnAttribute">{{form.suffix.label}}:</td>
- <td class="ColumnValue" id="data">{{form.suffix|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render form.suffix user action %}</td>
 <tr>
  <td class="ColumnAttribute">{{form.patronymic.label}}:</td>
- <td class="ColumnValue" id="data">{{form.patronymic|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render form.patronymic user action %}</td>
  <td class="ColumnAttribute">{{form.name_type.label}}:</td>
- <td class="ColumnValue" id="data">{{form.name_type|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render form.name_type user action %}</td>
 </tr>
 <tr>
  <td class="ColumnAttribute">{{form.preferred.label}}:</td>
 {% if form.model.preferred %}
- <td class="ColumnValue" id="data" colspan="3">True</td>
+ <td class="ColumnValue" id="data">True</td>
 {% else %}
- <td class="ColumnValue" id="data" colspan="3">{{form.preferred|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render form.preferred user action %}</td>
 {% endif %}
+ <td class="ColumnAttribute">{{form.private.label}}:</td>
+ <td class="ColumnValue" id="data">{% render form.private user action %}</td>
 </tr>
 </tbody>
 </table>
@@ -65,6 +67,7 @@
 <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="#tab-general">General</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="#tab-sources">Sources</a></li>
     <li class="ui-corner-top ui-state-default"><a href="#tab-notes">Notes</a></li>
   </ul>
@@ -74,21 +77,24 @@
     <div style="overflow: auto; height:150px; color: black; background-color: white;">
     <table border="1">
     <tr><td style="background-color: #FFF2C5;">{{form.group_as.label}}: </td>
-        <td>{{form.group_as|render:action}}</td>
+        <td>{% render form.group_as user action %}</td>
     </tr>
     <tr><td style="background-color: #FFF2C5;">{{form.sort_as.label}}: </td>
-        <td>{{form.sort_as|render:action}}</td>
+        <td>{% render form.sort_as user action %}</td>
     </tr>
     <tr><td style="background-color: #FFF2C5;">{{form.display_as.label}}: </td>
-         <td>{{form.display_as|render:action}}</td>
+         <td>{% render form.display_as user action %}</td>
     </tr>
     <tr><td style="background-color: #FFF2C5;">{{form.text.label}}: </td>
-         <td>{{form.text|render:action}}</td>
+         <td>{% render form.text user action %}</td>
     </tr>
     </table>
     </div>
     &nbsp;
   </div>
+  <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-names">
+    {% name_table person user action "/person/%s/name" person.handle %}
+  </div>
   <div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-sources">
     {% source_table form.model user action "/person/%s/name/%s/source" person.handle form.model.order %}
   </div>
@@ -107,6 +113,7 @@
   {% 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 %}

src/data/templates/view_page.html

@@ -13,82 +13,14 @@
 </form>
 </div>
 
-<div class="pagination">
-    <span class="step-links">
-        <div id="alphabet" style="padding: 0pt 0 0pt 0;">
-        <ul>
-        {% ifequal page.number 1 %}
-        <li>first</li>
-        {% else %}
-        <li><a href="?page=1{{search_query}}">first</a></li>
-	{% endifequal %}
-        {% if page.has_previous %}
-            <li><a href="?page={{page.previous_page_number}}{{search_query}}">previous</a></li>
-	{% else %}
-            <li>previous</li>
-        {% endif %}
+{% paginator %}
 
-        <span class="current">
-            <li>Page {{ page.number }} of {{ page.paginator.num_pages }}</li>
-        </span>
-
-        {% if page.has_next %}
-            <li><a href="?page={{ page.next_page_number }}{{search_query}}">next</a></li>
-	{% else %}
-            <li>next</li>
-        {% endif %}
-        {% ifequal page.number page.paginator.num_pages %}
-        <li>last</li>
-        {% else %}
-        <li><a href="?page={{page.paginator.num_pages}}{{search_query}}">last</a></li>
-	{% endifequal %}
-	<b>Matches</b>: {{page.paginator.count}}/{{total}}
-	</ul>
-        </div>
-    </span>
-</div>
-
-<p>&nbsp;</p>
-
-<div style="overflow:auto; height:450px;width:700px;">
+<div style="overflow:auto; height:500px;width:800px;">
 
 {% block table_data %} <table></table> {% endblock %}
 
 </div>
 
-<div class="pagination">
-    <span class="step-links">
-        <div id="alphabet" style="padding: 10pt 0 10pt 0;">
-        <ul>
-        {% ifequal page.number 1 %}
-        <li>first</li>
-        {% else %}
-        <li><a href="?page=1{{search_query}}">first</a></li>
-	{% endifequal %}
-        {% if page.has_previous %}
-            <li><a href="?page={{page.previous_page_number}}{{search_query}}">previous</a></li>
-	{% else %}
-            <li>previous</li>
-        {% endif %}
-
-        <span class="current">
-            <li>Page {{ page.number }} of {{ page.paginator.num_pages }}</li>
-        </span>
-
-        {% if page.has_next %}
-            <li><a href="?page={{ page.next_page_number }}{{search_query}}">next</a></li>
-	{% else %}
-            <li>next</li>
-        {% endif %}
-        {% ifequal page.number page.paginator.num_pages %}
-        <li>last</li>
-        {% else %}
-        <li><a href="?page={{page.paginator.num_pages}}{{search_query}}">last</a></li>
-	{% endifequal %}
-	<b>Matches</b>: {{page.paginator.count}}/{{total}}
-	</ul>
-        </div>
-    </span>
-</div>
+{% include "paginator.html" %}
 
 {% endblock %}

src/data/templates/view_people.html

@@ -24,13 +24,19 @@
     </td>
     <td><a href="{{name.person.handle}}/" class="grampsid">[{{name.person.gramps_id}}]</a></td>
     <td><a href="{{name.person.handle}}/" class="noThumb">{{name.person.gender_type}}</a></td>
-    <td><a href="{{name.person.handle}}/" class="noThumb">{{name.person.birth}}</a></td>
-    <td><a href="{{name.person.handle}}/" class="noThumb">{{name.person.death}}</a></td>
+    <td><a href="{{name.person.handle}}/" class="noThumb">{{name.person.birth|render_date:user}}</a></td>
+    <td><a href="{{name.person.handle}}/" class="noThumb">{{name.person.death|render_date:user}}</a></td>
     {% endif %}
   </tr>
   {% endfor %}
 </tbody>
 </table>
 
+{% if user.is_authenticated %}
+
+{% make_button "Add a new Person" "/person/add" %}
+
+{% endif %}
+
 {% endblock %}
 

src/data/templates/view_person_detail.html

@@ -11,7 +11,7 @@
    </script>
 
 <div class="content" id="IndividualDetail">
-<h3>{{nameform|make_name:user}} [{{person.gramps_id}}]</h3>
+<h3>{{nameform|render_name:user}} [{{person.gramps_id}}]</h3>
 <div id="summaryarea">
 <table class="infolist"> {% comment %} 5 cols {% endcomment %}
 <tbody>
@@ -19,10 +19,10 @@
 {% if user.is_authenticated %}
   {% ifequal action "edit" %}
     {% for error in personform.errors %}
-       {{error}}<br>
+       Error in person: {{error}}<br>
     {% endfor %}
     {% for error in nameform.errors %}
-       {{error}}<br>
+       Error in name: {{error}}<br>
     {% endfor %}
     <form method="post">
   {% endifequal %}
@@ -30,43 +30,45 @@
 
 <tr>
  <td class="ColumnAttribute">{{nameform.surname.label}}</td>
- <td class="ColumnValue" id="data">{{nameform.surname|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render nameform.surname user action %}</td>
  <td class="ColumnAttribute">{{nameform.prefix.label}}</td>
- <td class="ColumnValue" id="data">{{nameform.prefix|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render nameform.prefix user action %}</td>
  <td rowspan="6" colspan="2" style="border:solid 2px #7D5925;">Image:</td>
 </tr>
 <tr>
  <td class="ColumnAttribute" colspan="2"></td>
  <td class="ColumnAttribute">{{nameform.suffix.label}}</td>
- <td class="ColumnValue" id="data">{{nameform.suffix|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render nameform.suffix user action %}</td>
 </tr>
 <tr>
  <td class="ColumnAttribute">{{nameform.first_name.label}}</td>
- <td class="ColumnValue" id="data">{{nameform.first_name|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render nameform.first_name user action nameform.model.person.probably_alive "[Living]" %}</td>
  <td class="ColumnAttribute">{{nameform.call.label}}</td>
- <td class="ColumnValue" id="data">{{nameform.call|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render nameform.call user action %}</td>
 </tr>
 <tr>
  <td class="ColumnAttribute">{{nameform.name_type.label}}</td>
- <td class="ColumnValue" id="data">{{nameform.name_type|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render nameform.name_type user action %}</td>
  <td class="ColumnAttribute">{{nameform.patronymic.label}}</td>
- <td class="ColumnValue" id="data">{{nameform.patronymic|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render nameform.patronymic user action %}</td>
 </tr>
 <tr>
  <td class="ColumnAttribute" colspan="2"></td>
  <td class="ColumnAttribute">{{nameform.title.label}}</td>
- <td class="ColumnValue" id="data">{{nameform.title|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render nameform.title user action %}</td>
 </tr>
 <tr>
  <td class="ColumnAttribute">{{personform.gender_type.label}}</td>
- <td class="ColumnValue" id="data">{{personform.gender_type|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render personform.gender_type user action %}</td>
  <td class="ColumnAttribute">{{personform.gramps_id.label}}</td>
- <td class="ColumnValue" id="data">{{personform.gramps_id|render:action}}</td>
+ <td class="ColumnValue" id="data">{% render personform.gramps_id user action %}</td>
 </tr>
 <tr>
  <td class="ColumnAttribute">{{personform.marker_type.label}}</td>
- <td class="ColumnValue" id="data">{{personform.marker_type|render:action}}</td>
- <td class="ColumnAttribute" colspan="3"></td>
+ <td class="ColumnValue" id="data">{% render personform.marker_type user action %}</td>
+ <td class="ColumnAttribute">{{personform.private.label}}</td>
+ <td class="ColumnValue" id="data">{% render personform.private user action %}</td>
+ <td class="ColumnAttribute" colspan="1"></td>
 </tr>
 </tbody>
 </table>
@@ -135,6 +137,7 @@
     </form>
   {% else %}
 {% make_button "Back to People" "/person/" %}
+{% make_button "Add Person" "/person/add" %}
 {% make_button "Edit Person" "/person/%s/edit" person.handle %}
 {% make_button "Delete Person" "/person/%s/delete" person.handle %}
   {% endifequal %}