From 00213b220397b0c0053b02e102d4d076a1465bc6 Mon Sep 17 00:00:00 2001 From: Doug Blank Date: Thu, 17 May 2012 11:56:59 +0000 Subject: [PATCH] Main html table set to 90%; order of choices is based on numeric in Django svn: r19552 --- src/data/templates/view_citation_detail.html | 2 +- src/data/templates/view_event_detail.html | 2 +- src/data/templates/view_family_detail.html | 2 +- src/data/templates/view_name_detail.html | 2 +- src/data/templates/view_note_detail.html | 2 +- src/data/templates/view_person_detail.html | 2 +- src/data/templates/view_place_detail.html | 2 +- src/data/templates/view_report_detail.html | 2 +- src/data/templates/view_repository_detail.html | 2 +- src/data/templates/view_source_detail.html | 2 +- src/data/templates/view_surname_detail.html | 2 +- src/data/templates/view_tag_detail.html | 2 +- src/webapp/grampsdb/models.py | 3 ++- src/webapp/shell.py | 2 +- 14 files changed, 15 insertions(+), 14 deletions(-) diff --git a/src/data/templates/view_citation_detail.html b/src/data/templates/view_citation_detail.html index 4a030aa64..9c01ae72a 100644 --- a/src/data/templates/view_citation_detail.html +++ b/src/data/templates/view_citation_detail.html @@ -17,7 +17,7 @@

{{source.title|escape}}

- {% comment %} 2 cols {% endcomment %} +
{% comment %} 2 cols {% endcomment %} diff --git a/src/data/templates/view_event_detail.html b/src/data/templates/view_event_detail.html index 545a6631b..9df1f5404 100644 --- a/src/data/templates/view_event_detail.html +++ b/src/data/templates/view_event_detail.html @@ -15,7 +15,7 @@ {% include "detail_breadcrumb.html" %}
-
Title:
+
diff --git a/src/data/templates/view_family_detail.html b/src/data/templates/view_family_detail.html index 18068fd13..92bdad8fa 100644 --- a/src/data/templates/view_family_detail.html +++ b/src/data/templates/view_family_detail.html @@ -17,7 +17,7 @@

{{family.father|make_name:user}} and {{family.mother|make_name:user}}

-
Event type:
{% comment %} 4 cols {% endcomment %} +
{% comment %} 4 cols {% endcomment %} diff --git a/src/data/templates/view_name_detail.html b/src/data/templates/view_name_detail.html index f445dd6bd..2ffe02fa0 100644 --- a/src/data/templates/view_name_detail.html +++ b/src/data/templates/view_name_detail.html @@ -19,7 +19,7 @@

{{person|make_name:user}} [{{person.gramps_id}}]

-
Father
{% comment %} 4 cols {% endcomment %} +
{% comment %} 4 cols {% endcomment %} {% if user.is_authenticated %} diff --git a/src/data/templates/view_note_detail.html b/src/data/templates/view_note_detail.html index b04108d3d..b865f861b 100644 --- a/src/data/templates/view_note_detail.html +++ b/src/data/templates/view_note_detail.html @@ -15,7 +15,7 @@ {% include "detail_breadcrumb.html" %}
-
+
diff --git a/src/data/templates/view_person_detail.html b/src/data/templates/view_person_detail.html index 8441023d8..25574428f 100644 --- a/src/data/templates/view_person_detail.html +++ b/src/data/templates/view_person_detail.html @@ -15,7 +15,7 @@ {% include "detail_breadcrumb.html" %}
-
ID:
{% comment %} 5 cols {% endcomment %} +
{% comment %} 5 cols {% endcomment %} {% if user.is_authenticated %} {% ifequal action "edit" %} diff --git a/src/data/templates/view_place_detail.html b/src/data/templates/view_place_detail.html index bcb27b537..5deb334e9 100644 --- a/src/data/templates/view_place_detail.html +++ b/src/data/templates/view_place_detail.html @@ -16,7 +16,7 @@
-
+
diff --git a/src/data/templates/view_report_detail.html b/src/data/templates/view_report_detail.html index afb8f2b84..a12557b78 100644 --- a/src/data/templates/view_report_detail.html +++ b/src/data/templates/view_report_detail.html @@ -10,7 +10,7 @@
-
Place Name: {{place.title|escape}}
+
diff --git a/src/data/templates/view_repository_detail.html b/src/data/templates/view_repository_detail.html index 2464dc09b..cbfdec2e2 100644 --- a/src/data/templates/view_repository_detail.html +++ b/src/data/templates/view_repository_detail.html @@ -16,7 +16,7 @@
-
Name: {{report.name}}
+
diff --git a/src/data/templates/view_source_detail.html b/src/data/templates/view_source_detail.html index 4a030aa64..9c01ae72a 100644 --- a/src/data/templates/view_source_detail.html +++ b/src/data/templates/view_source_detail.html @@ -17,7 +17,7 @@

{{source.title|escape}}

-
Name: {{repository.name}}
{% comment %} 2 cols {% endcomment %} +
{% comment %} 2 cols {% endcomment %} diff --git a/src/data/templates/view_surname_detail.html b/src/data/templates/view_surname_detail.html index ac4efa9e4..8259d05dd 100644 --- a/src/data/templates/view_surname_detail.html +++ b/src/data/templates/view_surname_detail.html @@ -19,7 +19,7 @@

{{person|make_name:user}} [{{person.gramps_id}}]

-
Title:
{% comment %} 4 cols {% endcomment %} +
{% comment %} 4 cols {% endcomment %} {% if user.is_authenticated %} diff --git a/src/data/templates/view_tag_detail.html b/src/data/templates/view_tag_detail.html index ef4a64440..402730f25 100644 --- a/src/data/templates/view_tag_detail.html +++ b/src/data/templates/view_tag_detail.html @@ -16,7 +16,7 @@
-
+
diff --git a/src/webapp/grampsdb/models.py b/src/webapp/grampsdb/models.py index 462d52da6..252aed652 100644 --- a/src/webapp/grampsdb/models.py +++ b/src/webapp/grampsdb/models.py @@ -69,7 +69,8 @@ def get_default_type(the_type): return the_type.objects.get(val=val, name=name) def get_datamap(grampsclass): - return [(x[0],x[2]) for x in grampsclass._DATAMAP] + return sorted([(x[0],x[2]) for x in grampsclass._DATAMAP], + key=lambda item: item[1]) #--------------------------------------------------------------------------- # diff --git a/src/webapp/shell.py b/src/webapp/shell.py index da7ec098d..cf0b22278 100644 --- a/src/webapp/shell.py +++ b/src/webapp/shell.py @@ -15,4 +15,4 @@ db = DbDjango() def Print(m): print m -import_file(db, "/tmp/dblank-im_ged.ged", Print) +#import_file(db, "/tmp/dblank-im_ged.ged", Print)
Name: {{tag.name}}