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

added missing tables for refs and secondary information

Browse Source 
svn: r19716
This commit is contained in:
Doug Blank 2012-05-30 21:05:38 +00:00
parent 83b12cd6b6
commit 61bd569c29
10 changed files with 162 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/data/templates/view_citation_detail.html
View File

@ -32,7 +32,7 @@
<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-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-media">Media</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-data">Data</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-references">References</a></li>
</ul>
@ -63,9 +63,11 @@
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-notes">
{% note_table citation user action "/note/$act/citation/%s" citation.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-gallery">
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-media">
{% media_table citation user action "/media/$act/citation/%s" citation.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-data">
{% data_table citation user action "/data/$act/citation/%s" citation.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references">
{% citation_reference_table citation user action %}
@ -83,7 +85,7 @@
<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-shared-general">General</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-shared-notes">Notes</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-shared-gallery">Gallery</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-shared-media">Media</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-shared-repositories">Repositories</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-shared-references">References</a></li>
</ul>
@ -118,13 +120,14 @@
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-shared-notes">
{% note_table source user action "/note/$act/source/%s" source.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-shared-gallery">
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-shared-data">
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-shared-media">
{% media_table source user action "/media/$act/source/%s" source.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-shared-repositories">
{% repository_table source user action "/repository/$act/source/%s" source.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-shared-references">
{% citation_reference_table source user action %}
</div>
</div>

26
src/data/templates/view_event_detail.html
View File

@ -48,22 +48,26 @@
<!-- Tabs -->
<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-sources">Sources</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-notes">Notes</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-gallery">Gallery</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-attributes">Attributes</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-references">References</a></li>
<ul class="ui-tab-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<li class="ui-state-default ui-corner-top ui-tab-selected ui-state-active"><a href="#tab-sources">Source Citations</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-media">Media</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="#tab-references">References</a></li>
</ul>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-sources">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom" id="tab-sources">
{% citation_table event user action "/citation/$act/event/%s" event.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-notes">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-notes">
{% note_table event user action "/note/$act/event/%s" event.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-gallery">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-media">
{% media_table event user action "/media/$act/event/%s" event.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-attributes">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-attributes">
{% attribute_table event user action "/attribute/$act/event/%s" event.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-references">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-references">
{% event_reference_table event user action %}
</div>
</div>

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

@ -90,12 +90,12 @@
<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-attributes">Attributes</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-media">Media</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-lds">LDS</a></li>
</ul>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-children">
<!-- Events -->
{% children_table family user action "/family/%s/add/child" family.handle %}
{% children_table family user action "/family/%s/children/$act" family.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-events">
{% event_table family user action "/event/$act/family/%s" family.handle %}
@ -109,8 +109,8 @@
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-notes">
{% note_table family user action "/note/$act/family/%s" family.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-gallery">
{% gallery_table family user action "/media/$act/family/%s" family.handle %}
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-media">
{% media_table family user action "/media/$act/family/%s" family.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-lds">
{% lds_table family user action "/lds/add/family/%s" family.handle %}

12
src/data/templates/view_media_detail.html
View File

@ -53,21 +53,19 @@
<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-sources" style=":hover {color: black;}">Sources</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-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#tab-sources" style=":hover {color: black;}">Source Citations</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="#tab-notes">Notes</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="tab-sources">
{% citation_table media user action "/citation/$act/media/%s" media.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-notes">
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-gallery">
{% note_table media user action "/note/$act/media/%s" media.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-attributes">
{% attribute_table media user action "/attribute/add/media/%s" media.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tab-references">
{% media_reference_table media user action %}

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

@ -70,9 +70,9 @@
<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-corner-top ui-state-default"><a href="#tabs-references">References</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-references">
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references">
{% note_reference_table note user action %}
</div>
</div>

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

@ -85,7 +85,7 @@
<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="#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-media">Media</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>
@ -111,8 +111,8 @@
ui-tabs-hide" id="tab-notes">
{% note_table person user action "/note/$act/person/%s" person.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-gallery">
{% gallery_table person user action "/media/$act/person/%s" person.handle %}
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-media">
{% media_table person user action "/media/$act/person/%s" person.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-internet">
{% internet_table person user action "/person/%s/$act/internet" person.handle %}

35
src/data/templates/view_place_detail.html
View File

@ -47,27 +47,34 @@
<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-location">Location</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-alternatelocations">Alternate Locations</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-sources">Sources</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-notes">Notes</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-gallery">Gallery</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-internet">Internet</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-references">References</a></li>
<li class="ui-state-default ui-corner-top ui-tabs-selected ui-state-active"><a href="#tab-locations">Location</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-alternatelocations">Alternate Locations</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>
<li class="ui-corner-top ui-state-default"><a href="#tab-media">Media</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-references">References</a></li>
</ul>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom" id="tabs-locations">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom" id="tab-locations">
<!-- place.location_set -->
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-alternatelocations">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-alternatelocations">
{% location_table place user action "/location/$act/place/%s" place.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-sources">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-sources">
{% source_table place user action "/source/$act/place/%s" place.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-notes">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-notes">
{% note_table place user action "/note/$act/place/%s" place.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-gallery">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-media">
{% media_table place user action "/media/$act/place/%s" place.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-internet">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-internet">
{% internet_table place user action "/internet/$act/place/%s" place.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-references">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-references">
{% place_reference_table place user action %}
</div>
</div>
</div>

23
src/data/templates/view_repository_detail.html
View File

@ -43,20 +43,23 @@
<!-- Tabs -->
<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-addresses">Addresses</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-internet">Internet</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-notes">Notes</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tabs-references">References</a></li>
<div class="ui-tab ui-widget ui-widget-content ui-corner-all" id="tabs">
<ul class="ui-tab-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<li class="ui-state-default ui-corner-top ui-tab-selected ui-state-active"><a href="#tab-addresses">Addresses</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-notes">Notes</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" id="tabs-addresses">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom" id="tab-addresses">
{% address_table repository user action "/address/add/repository/%s" repository.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-internet">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-internet">
{% internet_table repository user action "/internet/add/repository/%s" repository.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-notes">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-notes">
{% note_table repository user action "/note/$act/repository/%s" repository.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tabs-references">
<div class="ui-tab-panel ui-widget-content ui-corner-bottom ui-tab-hide" id="tab-references">
{% repository_reference_table repository user action %}
</div>
</div>

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

@ -52,20 +52,25 @@
<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-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-media">Media</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-data">Data</a></li>
<li class="ui-corner-top ui-state-default"><a href="#tab-repositories">Repositories</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" id="tab-notes">
{% note_table source user action "/note/$act/source/%s" source.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-gallery">
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-media">
{% media_table source user action "/media/$act/source/%s" source.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-data">
{% data_table source user action "/data/add/source/%s" source.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-repositories">
{% repository_table source user action "/repository/$act/source/%s" source.handle %}
</div>
<div class="ui-tabs-panel ui-widget-content ui-corner-bottom ui-tabs-hide" id="tab-references">
{% source_reference_table source user action %}
</div>
</div>

85
src/webapp/utils.py
View File

@ -84,19 +84,24 @@ util_tags = [
"source_table",
"note_table",
"attribute_table",
"data_table",
"address_table",
"gallery_table",
"location_table",
"media_table",
"internet_table",
"association_table",
"lds_table",
"reference_table",
"repository_table",
"person_reference_table",
"note_reference_table",
"event_reference_table",
"repository_reference_table",
"citation_reference_table",
"source_reference_table",
"media_reference_table",
"tag_reference_table",
"place_reference_table",
"children_table",
"make_button",
]
@ -379,6 +384,23 @@ def citation_table(obj, user, action, url=None, *args):
retval += nbsp("") # to keep tabs same height
return retval
def repository_table(obj, user, action, url=None, *args):
retval = ""
table = Table()
table.columns(
_("ID"),
_("Type"),
_("Note"))
if user.is_authenticated():
pass
retval += table.get_html()
if user.is_superuser and url and action == "view":
retval += make_button(_("Add Repository"), (url % args).replace("$act", "add"))
retval += make_button(_("Share Repository"), (url % args).replace("$act", "share"))
else:
retval += nbsp("") # to keep tabs same height
return retval
def note_table(obj, user, action, url=None, *args):
retval = ""
table = Table()
@ -404,6 +426,21 @@ def note_table(obj, user, action, url=None, *args):
retval += nbsp("") # to keep tabs same height
return retval
def data_table(obj, user, action, url=None, *args):
retval = ""
table = Table()
table.columns(_("Type"),
_("Value"),
)
if user.is_authenticated():
pass
retval += table.get_html()
if user.is_superuser and url and action == "view":
retval += make_button(_("Add Data"), (url % args))
else:
retval += nbsp("") # to keep tabs same height
return retval
def attribute_table(obj, user, action, url=None, *args):
retval = ""
table = Table()
@ -448,7 +485,24 @@ def address_table(obj, user, action, url=None, *args):
retval += nbsp("") # to keep tabs same height
return retval
def gallery_table(obj, user, action, url=None, *args):
def location_table(obj, user, action, url=None, *args):
retval = ""
table = Table()
table.columns(_("Date"),
_("Address"),
_("City"),
_("State"),
_("Country"))
if user.is_authenticated():
pass # FIXME
retval += table.get_html()
if user.is_superuser and url and action == "view":
retval += make_button(_("Add Address"), (url % args))
else:
retval += nbsp("") # to keep tabs same height
return retval
def media_table(obj, user, action, url=None, *args):
retval = ""
table = Table()
table.columns(_("Description"),
@ -645,6 +699,20 @@ def citation_reference_table(obj, user, action):
retval += nbsp("") # to keep tabs same height
return retval
def source_reference_table(obj, user, action):
retval = ""
table = Table()
table.columns(
_("Type"),
_("Reference"),
_("ID"))
if user.is_authenticated() and action != "add":
pass
# FIXME: where is source ref?
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
return retval
def media_reference_table(obj, user, action):
retval = ""
table = Table()
@ -664,6 +732,19 @@ def media_reference_table(obj, user, action):
retval += nbsp("") # to keep tabs same height
return retval
def place_reference_table(obj, user, action):
retval = ""
table = Table()
table.columns(
_("Type"),
_("Reference"),
_("ID"))
if user.is_authenticated() and action != "add":
pass # FIXME
retval += table.get_html()
retval += nbsp("") # to keep tabs same height
return retval
def tag_reference_table(obj, user, action):
retval = ""
table = Table()