From: Kaltar5679 Date: Mon, 8 Jun 2015 09:28:37 +0000 (+0200) Subject: change CSS for playlist X-Git-Tag: 1.6a^2~15^2~29^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=0717c08ad2546413d2c940df8b8eb14cd557a7e3;p=telemeta.git change CSS for playlist --- diff --git a/examples/sandbox/src/django-haystack b/examples/sandbox/src/django-haystack index cecb459f..bd60745c 160000 --- a/examples/sandbox/src/django-haystack +++ b/examples/sandbox/src/django-haystack @@ -1 +1 @@ -Subproject commit cecb459ff4468a79a43cead3d09e213d0980c080 +Subproject commit bd60745ce82318b1819768c9a31db0579228654d diff --git a/src/django-haystack b/src/django-haystack index 0576c809..60985266 160000 --- a/src/django-haystack +++ b/src/django-haystack @@ -1 +1 @@ -Subproject commit 0576c8093caf59bebedce75e0d711aacfd36f03f +Subproject commit 609852661e5090d05ea04db9292ba109ce169027 diff --git a/telemeta/static/telemeta/css/lists_sorttable.css b/telemeta/static/telemeta/css/lists_sorttable.css index 8582d434..b471940f 100644 --- a/telemeta/static/telemeta/css/lists_sorttable.css +++ b/telemeta/static/telemeta/css/lists_sorttable.css @@ -1,6 +1,6 @@ /* tables */ table.listing thead tr th, table.listing tfoot tr th { - padding-right: 15px; + } table.listing thead tr .header { background-image: url(images/bg.gif); diff --git a/telemeta/templates/telemeta/lists.html b/telemeta/templates/telemeta/lists.html index 0a0fc359..96d83060 100644 --- a/telemeta/templates/telemeta/lists.html +++ b/telemeta/templates/telemeta/lists.html @@ -112,9 +112,9 @@ - + - + @@ -124,7 +124,7 @@ {% for resource in playlist.resources %} - -
{% trans "Title" %}{% trans "Title" %} {% trans "Type" %}{% trans "Code" %}{% trans "Code" %} {% trans "Recordist" %} {% trans "Recording period" %} {% trans "Digitized" %}
+ {% if resource.type == "item" and not resource.element == None %} {{ resource.element }} {% endif %} @@ -140,7 +140,7 @@ {% if resource.element == None %}{% trans "deleted" %}{% endif %} {{ resource.type }} + {{ resource.element.public_id }} {{ resource.element.apparent_collector }}