diff --git a/src/data/templates/view_citation_detail.html b/src/data/templates/view_citation_detail.html index 7588eb47a..367510a43 100644 --- a/src/data/templates/view_citation_detail.html +++ b/src/data/templates/view_citation_detail.html @@ -32,7 +32,7 @@ @@ -63,9 +63,11 @@
{% note_table citation user action "/note/$act/citation/%s" citation.handle %}
-
+
+ {% media_table citation user action "/media/$act/citation/%s" citation.handle %}
+ {% data_table citation user action "/data/$act/citation/%s" citation.handle %}
{% citation_reference_table citation user action %} @@ -83,7 +85,7 @@ @@ -118,13 +120,14 @@
{% note_table source user action "/note/$act/source/%s" source.handle %}
-
-
-
+
+ {% media_table source user action "/media/$act/source/%s" source.handle %}
+ {% repository_table source user action "/repository/$act/source/%s" source.handle %}
+ {% citation_reference_table source user action %}
diff --git a/src/data/templates/view_event_detail.html b/src/data/templates/view_event_detail.html index a31544117..f7fd5525a 100644 --- a/src/data/templates/view_event_detail.html +++ b/src/data/templates/view_event_detail.html @@ -48,22 +48,26 @@
-
    -
  • Sources
    • -
  • Notes
    • -
  • Gallery
    • -
  • Attributes
    • -
  • References
    • + -
    +
    + {% citation_table event user action "/citation/$act/event/%s" event.handle %}
    -
    +
    + {% note_table event user action "/note/$act/event/%s" event.handle %}
    -
    +
    + {% media_table event user action "/media/$act/event/%s" event.handle %}
    -
    +
    + {% attribute_table event user action "/attribute/$act/event/%s" event.handle %}
    -
    +
    {% event_reference_table event user action %}
    diff --git a/src/data/templates/view_family_detail.html b/src/data/templates/view_family_detail.html index d7f0b5d8c..0ba8b7e7b 100644 --- a/src/data/templates/view_family_detail.html +++ b/src/data/templates/view_family_detail.html @@ -90,12 +90,12 @@
  • Sources
  • Attributes
  • Notes
    • -
  • Gallery
    • +
  • Media
  • LDS
- {% children_table family user action "/family/%s/add/child" family.handle %} + {% children_table family user action "/family/%s/children/$act" family.handle %}
{% event_table family user action "/event/$act/family/%s" family.handle %} @@ -109,8 +109,8 @@
{% note_table family user action "/note/$act/family/%s" family.handle %}
-
- {% gallery_table family user action "/media/$act/family/%s" family.handle %} +
+ {% media_table family user action "/media/$act/family/%s" family.handle %}
{% lds_table family user action "/lds/add/family/%s" family.handle %} diff --git a/src/data/templates/view_media_detail.html b/src/data/templates/view_media_detail.html index c9f8a6ba1..f72988ee7 100644 --- a/src/data/templates/view_media_detail.html +++ b/src/data/templates/view_media_detail.html @@ -53,21 +53,19 @@
+ {% citation_table media user action "/citation/$act/media/%s" media.handle %}
-
-
- -
+ {% note_table media user action "/note/$act/media/%s" media.handle %}
+ {% attribute_table media user action "/attribute/add/media/%s" media.handle %}
{% media_reference_table media user action %} diff --git a/src/data/templates/view_note_detail.html b/src/data/templates/view_note_detail.html index d9cd4ab4e..aa7e9b608 100644 --- a/src/data/templates/view_note_detail.html +++ b/src/data/templates/view_note_detail.html @@ -70,9 +70,9 @@
-
+
{% note_reference_table note user action %}
diff --git a/src/data/templates/view_person_detail.html b/src/data/templates/view_person_detail.html index e2a06fac5..aaecefbbd 100644 --- a/src/data/templates/view_person_detail.html +++ b/src/data/templates/view_person_detail.html @@ -85,7 +85,7 @@
  • Attributes
  • Addresses
  • Notes
    • -
  • Gallery
    • +
  • Media
  • Internet
  • Associations
  • LDS
    • @@ -111,8 +111,8 @@ ui-tabs-hide" id="tab-notes"> {% note_table person user action "/note/$act/person/%s" person.handle %}
    -
    - {% gallery_table person user action "/media/$act/person/%s" person.handle %} +
    + {% media_table person user action "/media/$act/person/%s" person.handle %}
    {% internet_table person user action "/person/%s/$act/internet" person.handle %} diff --git a/src/data/templates/view_place_detail.html b/src/data/templates/view_place_detail.html index 338e81bd9..bb5565b8a 100644 --- a/src/data/templates/view_place_detail.html +++ b/src/data/templates/view_place_detail.html @@ -47,27 +47,34 @@
    -
    +
    +
    -
    +
    + {% location_table place user action "/location/$act/place/%s" place.handle %}
    -
    +
    + {% source_table place user action "/source/$act/place/%s" place.handle %}
    -
    +
    + {% note_table place user action "/note/$act/place/%s" place.handle %}
    -
    +
    + {% media_table place user action "/media/$act/place/%s" place.handle %}
    -
    +
    + {% internet_table place user action "/internet/$act/place/%s" place.handle %}
    -
    +
    + {% place_reference_table place user action %}
    diff --git a/src/data/templates/view_repository_detail.html b/src/data/templates/view_repository_detail.html index cf39e9e2f..d3ff9dcfd 100644 --- a/src/data/templates/view_repository_detail.html +++ b/src/data/templates/view_repository_detail.html @@ -43,20 +43,23 @@ -
    -
      -
    • Addresses
      • -
    • Internet
      • -
    • Notes
      • -
    • References
      • +
      + -
      +
      + {% address_table repository user action "/address/add/repository/%s" repository.handle %}
      -
      +
      + {% internet_table repository user action "/internet/add/repository/%s" repository.handle %}
      -
      +
      + {% note_table repository user action "/note/$act/repository/%s" repository.handle %}
      -
      +
      {% repository_reference_table repository user action %}
      diff --git a/src/data/templates/view_source_detail.html b/src/data/templates/view_source_detail.html index ba014ece9..8d6a61e4e 100644 --- a/src/data/templates/view_source_detail.html +++ b/src/data/templates/view_source_detail.html @@ -52,20 +52,25 @@
      + {% note_table source user action "/note/$act/source/%s" source.handle %}
      -
      +
      + {% media_table source user action "/media/$act/source/%s" source.handle %}
      + {% data_table source user action "/data/add/source/%s" source.handle %}
      + {% repository_table source user action "/repository/$act/source/%s" source.handle %}
      + {% source_reference_table source user action %}
      diff --git a/src/webapp/utils.py b/src/webapp/utils.py index ba072366b..a3760dffb 100644 --- a/src/webapp/utils.py +++ b/src/webapp/utils.py @@ -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()