Main html table set to 90%; order of choices is based on numeric in Django

svn: r19552

src/data/templates/view_citation_detail.html

@@ -17,7 +17,7 @@
 
 <h3>{{source.title|escape}}</h3>
 <div id="summaryarea">
-<table class="infolist"> {% comment %} 2 cols {% endcomment %}
+<table class="infolist" style="width:90%;"> {% comment %} 2 cols {% endcomment %}
 <tbody>
 <tr>
 <td class="ColumnAttribute">Title:</td>

src/data/templates/view_event_detail.html

@@ -15,7 +15,7 @@
 {% include "detail_breadcrumb.html" %}
 
 <div id="summaryarea">
-<table class="infolist">
+<table class="infolist" style="width:90%;"> 
 <trbody>
 <tr>
 <td class="ColumnAttribute">Event type:</td>

src/data/templates/view_family_detail.html

@@ -17,7 +17,7 @@
 <h3>{{family.father|make_name:user}} and {{family.mother|make_name:user}}</h3>
 
 <div id="summaryarea">
-<table class="infolist"> {% comment %} 4 cols {% endcomment %}
+<table class="infolist" style="width:90%;"> {% comment %} 4 cols {% endcomment %}
 <tbody>
 <tr>
 <th colspan="2">Father</th>

src/data/templates/view_name_detail.html

@@ -19,7 +19,7 @@
 
 <h3>{{person|make_name:user}} [{{person.gramps_id}}]</h3>
 <div id="summaryarea">
-<table class="infolist"> {% comment %} 4 cols {% endcomment %}
+<table class="infolist" style="width:90%;"> {% comment %} 4 cols {% endcomment %}
 <tbody>
 
 {% if user.is_authenticated %}

src/data/templates/view_note_detail.html

@@ -15,7 +15,7 @@
 {% include "detail_breadcrumb.html" %}
 
 <div id="summaryarea">
-<table class="infolist">
+<table class="infolist" style="width:90%;">
 <tbody>
 <tr>
 <td class="ColumnAttribute">ID:</td>

src/data/templates/view_person_detail.html

@@ -15,7 +15,7 @@
 {% include "detail_breadcrumb.html" %}
 
 <div id="summaryarea">
-<table class="infolist"> {% comment %} 5 cols {% endcomment %}
+<table class="infolist" style="width:90%;"> {% comment %} 5 cols {% endcomment %}
 <tbody>
 {% if user.is_authenticated %}
   {% ifequal action "edit" %}

src/data/templates/view_place_detail.html

@@ -16,7 +16,7 @@
 
 <div id="summaryarea">
 
-<table class="infolist">
+<table class="infolist" style="width:90%;">
 <tr>
 <td class="ColumnAttribute">Place Name:</td>
 <td class="Columnvalue" id="data" colpan="3"> {{place.title|escape}}</td>

src/data/templates/view_report_detail.html

@@ -10,7 +10,7 @@
 <div id="summaryarea">
 
 <form name="RunForm" action="/report/{{report.handle}}/run">
-<table class="infolist">
+<table class="infolist" style="width:90%;"> 
 <tr>
 <td class="ColumnAttribute">Name:</td>
 <td class="ColumnValue" id="data" colspan="5">{{report.name}} </td>

src/data/templates/view_repository_detail.html

@@ -16,7 +16,7 @@
 
 <div id="summaryarea">
 
-<table class="infolist">
+<table class="infolist" style="width:90%;">
 <tr>
 <td class="ColumnAttribute">Name:</td>
 <td class="ColumnValue" id="data" colspan="5">{{repository.name}} </td>

src/data/templates/view_source_detail.html

@@ -17,7 +17,7 @@
 
 <h3>{{source.title|escape}}</h3>
 <div id="summaryarea">
-<table class="infolist"> {% comment %} 2 cols {% endcomment %}
+<table class="infolist" style="width:90%;"> {% comment %} 2 cols {% endcomment %}
 <tbody>
 <tr>
 <td class="ColumnAttribute">Title:</td>

src/data/templates/view_surname_detail.html

@@ -19,7 +19,7 @@
 
 <h3>{{person|make_name:user}} [{{person.gramps_id}}]</h3>
 <div id="summaryarea">
-<table class="infolist"> {% comment %} 4 cols {% endcomment %}
+<table class="infolist" style="width:90%;"> {% comment %} 4 cols {% endcomment %}
 <tbody>
 
 {% if user.is_authenticated %}

src/data/templates/view_tag_detail.html

@@ -16,7 +16,7 @@
 
 <div id="summaryarea">
 
-<table class="infolist">
+<table class="infolist" style="width:90%;">
 <tr>
 <td class="ColumnAttribute">Name:</td>
 <td class="ColumnValue" id="data" colspan="5">{{tag.name}} </td>

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])
 
 #---------------------------------------------------------------------------
 #

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)