Enhance language display for record. Remove useless commands
authorcavaliet
Tue, 03 Sep 2013 12:09:24 +0200
changeset 21 dad1f8de08a9
parent 20 fa466993084a
child 22 48ff361f96c8
Enhance language display for record. Remove useless commands
src/p4l/management/commands/get_country_label.py
src/p4l/management/commands/get_language_label.py
src/p4l/management/commands/get_subject_label.py
src/p4l/management/commands/get_theme_label.py
src/p4l/templates/p4l/p4l_record_view.html
--- a/src/p4l/management/commands/get_country_label.py	Mon Sep 02 17:49:41 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.core.management import BaseCommand
-from p4l.models import Country
-from p4l.utils import fill_label_for_model
-
-
-class Command(BaseCommand):
-
-    def handle(self, *args, **options):
-        fill_label_for_model(Country, 'country', 'http://skos.um.es/unescothes/CS000/Countries')
-
--- a/src/p4l/management/commands/get_language_label.py	Mon Sep 02 17:49:41 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.core.management import BaseCommand
-from p4l.models import Language
-from p4l.utils import fill_label_for_model
-
-
-class Command(BaseCommand):
-
-    def handle(self, *args, **options):
-        fill_label_for_model(Language, 'language', 'http://www.iiep.unesco.org/plan4learning/scheme/Languages')
--- a/src/p4l/management/commands/get_subject_label.py	Mon Sep 02 17:49:41 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.core.management import BaseCommand
-from p4l.models import Subject
-from p4l.utils import fill_label_for_model
-
-
-class Command(BaseCommand):
-
-    def handle(self, *args, **options):
-        fill_label_for_model(Subject, 'subject', 'http://skos.um.es/unescothes/CS000')
-
--- a/src/p4l/management/commands/get_theme_label.py	Mon Sep 02 17:49:41 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-# -*- coding: utf-8 -*-
-from django.core.management import BaseCommand
-from p4l.models import Theme
-from p4l.utils import fill_label_for_model
-
-
-class Command(BaseCommand):
-
-    def handle(self, *args, **options):
-        fill_label_for_model(Theme, 'theme', 'http://www.iiep.unesco.org/plan4learning/scheme/Themes')
-
--- a/src/p4l/templates/p4l/p4l_record_view.html	Mon Sep 02 17:49:41 2013 +0200
+++ b/src/p4l/templates/p4l/p4l_record_view.html	Tue Sep 03 12:09:24 2013 +0200
@@ -37,15 +37,15 @@
     </tr>
     <tr>
       <td>{% trans 'issns' %}</td>
-      <td><ul>{% for i in record.issns.all %}<li>{{ i.issn|default:'' }}</li>{% endfor %}</ul></td>
+      <td><ul>{% for i in record.issns.all %}<li>{{ i.issn|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>{% endfor %}</ul></td>
     </tr>
     <tr>
       <td>{% trans 'isbns' %}</td>
-      <td><ul>{% for i in record.isbns.all %}<li>{{ i.isbn|default:'' }}</li>{% endfor %}</ul></td>
+      <td><ul>{% for i in record.isbns.all %}<li>{{ i.isbn|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>{% endfor %}</ul></td>
     </tr>
     <tr>
       <td>{% trans 'document code' %}</td>
-      <td><ul>{% for i in record.documentCodes.all %}<li>{{ i.documentCode|default:'' }}</li>{% endfor %}</ul></td>
+      <td><ul>{% for i in record.documentCodes.all %}<li>{{ i.documentCode|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>{% endfor %}</ul></td>
     </tr>
     <tr>
       <td>{% trans 'language' %}</td>
@@ -57,15 +57,19 @@
     </tr>
     <tr>
       <td>{% trans 'titles' %}</td>
-      <td><ul>{% for i in record.titles.all %}<li>{{ i.title|default:'' }}</li>{% endfor %}</ul></td>
+      <td><ul>{% for i in record.titles.all %}<li>{{ i.title|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>{% endfor %}</ul></td>
+    </tr>
+    <tr>
+      <td>{% trans 'abstracts' %}</td>
+      <td><ul>{% for i in record.abstracts.all %}<li>{{ i.abstract|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>{% endfor %}</ul></td>
     </tr>
     <tr>
       <td>{% trans 'added titles' %}</td>
-      <td><ul>{% for i in record.addedTitles.all %}<li>{{ i.title|default:'' }}</li>{% endfor %}</ul></td>
+      <td><ul>{% for i in record.addedTitles.all %}<li>{{ i.title|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>{% endfor %}</ul></td>
     </tr>
     <tr>
       <td>{% trans 'titles main document' %}</td>
-      <td><ul>{% for i in record.titlesMainDocument.all %}<li>{{ i.title|default:'' }}</li>{% endfor %}</ul></td>
+      <td><ul>{% for i in record.titlesMainDocument.all %}<li>{{ i.title|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>{% endfor %}</ul></td>
     </tr>
     <tr>
       <td>{% trans 'edition statement' %}</td>
@@ -81,6 +85,7 @@
               <li>{% trans 'City' %} : {{ i.imprintCity|default:'' }}</li>
               <li>{% trans 'Publisher' %} : {{ i.publisher|default:'' }}</li>
               <li>{% trans 'Date' %} : {{ i.imprintDate|default:'' }}</li>
+              <li>{% trans 'Language' %} : {{ i.lang|default:'' }}</li>
             </ul>
           </li>
           {% endfor %}
@@ -89,7 +94,7 @@
     </tr>
     <tr>
       <td>{% trans 'collations' %}</td>
-      <td><ul>{% for i in record.collations.all %}<li>{{ i.collation|default:'' }}</li>{% endfor %}</ul></td>
+      <td><ul>{% for i in record.collations.all %}<li>{{ i.collation|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>{% endfor %}</ul></td>
     </tr>
     <tr>
       <td>{% trans 'volume issues' %}</td>
@@ -100,6 +105,7 @@
             <ul class="list-unstyled">
               <li>{% trans 'Volume' %} : {{ i.volume|default:'' }}</li>
               <li>{% trans 'Number' %} : {{ i.number|default:'' }}</li>
+              <li>{% trans 'Language' %} : {{ i.lang|default:'' }}</li>
             </ul>
           </li>
           {% endfor %}
@@ -111,17 +117,17 @@
       <td><ul>{% for k,v in projects_labels.items %}<li>{{ v }} <small class="text-muted">({{ k }})</small></li>{% endfor %}</ul></td>
     </tr>
     <tr>
-      <td>{% trans 'periodicals' %}</td>{# ajouter langue #}
-      <td><ul>{% for i in record.periodicals.all %}<li>{{ i.label|default:'' }}</li>{% endfor %}</ul></td>
+      <td>{% trans 'periodicals' %}</td>
+      <td><ul>{% for i in record.periodicals.all %}<li>{{ i.label|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>{% endfor %}</ul></td>
     </tr>
     <tr>
-      <td>{% trans 'meetings' %}</td>{# ajouter langue #}
+      <td>{% trans 'meetings' %}</td>
       <td>
         <ul>
           {% for i in record.meetings.all %}
           <li>
             <ul class="list-unstyled">
-              <li>{{ i.label|default:'' }}</li>
+              <li>{{ i.label|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>
               <li>{% trans 'Number' %} : {{ i.meetingNumber|default:'' }}</li>
               <li>{% trans 'Place' %} : {{ i.meetingPlace|default:'' }}</li>
               <li>{% trans 'Date' %} : {{ i.meetingDate|default:'' }}</li>
@@ -133,13 +139,13 @@
       </td>
     </tr>
     <tr>
-      <td>{% trans 'series' %}</td>{# ajouter langue #}
+      <td>{% trans 'series' %}</td>
       <td>
         <ul>
           {% for i in record.series.all %}
           <li>
             <ul class="list-unstyled">
-              <li>{{ i.title|default:'' }}</li>
+              <li>{{ i.title|default:'' }}{% if i.lang %} <small class="text-muted">({{ i.lang }})</small>{% endif %}</li>
               {% if i.volume %}<li>{% trans 'Volume' %} : {{ i.volume|default:'' }}</li>{% endif %}
             </ul>
           </li>
@@ -160,7 +166,7 @@
       <td><ul>{% for k,v in subjectCorporateBodies_labels.items %}<li>{{ v }} <small class="text-muted">({{ k }})</small></li>{% endfor %}</ul></td>
     </tr>
     <tr>
-      <td>{% trans 'subject meetings' %}</td>{# ajouter langue #}
+      <td>{% trans 'subject meetings' %}</td>
       <td>
         <ul>
           {% for i in record.subjectMeetings.all %}
@@ -182,7 +188,7 @@
       <td><ul>{% for k,v in corporateAuthors_labels.items %}<li>{{ v }} <small class="text-muted">({{ k }})</small></li>{% endfor %}</ul></td>
     </tr>
     <tr>
-      <td>{% trans 'Urls' %}</td>{# ajouter langue #}
+      <td>{% trans 'Urls' %}</td>
       <td>
         <ul>
           {% for i in record.urls.all %}