item/collection dublincore + fixbug css

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index dfcf8c4ff5b3d214b3a49fe99807af5ce70a1e65..40081dadfd7a972d478264446c9892a6030ee91d 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -31,6 +31,7 @@ h3 {
 #content ul, #content ol {
     padding: 5px;
     padding-left: 15px;
+    font-size: 0.9em;
 }
 #content li {
     padding: 3px;
@@ -188,11 +189,12 @@ table.listing tbody tr.even { background-color: #fcfcfc }
 table.listing tbody tr.odd { background-color: #f7f7f7 }
 table.listing tbody tr:hover { background: #f7f8fa !important }
 
-/*
+
 #content {
     position: relative;
+    margin-bottom: 2em;
 } 
-*/
+
 /* Forms */
 input, textarea, select { margin: 2px }
 input, select { vertical-align: middle }
@@ -238,7 +240,7 @@ label.disabled { color: #d7d7d7 }
 /* HTML dublin core display */
 
 table.dublincore { width: auto; }
-table.dublincore caption {
+h4.dublincore {
     text-align: left;
     padding: 5px 0 10px;
     font-weight: bold;
@@ -343,7 +345,7 @@ div.extraInfos .nett {
     height: 0;
     margin-bottom: -5px;
 }
-dl.listing {
+dl {
     position: relative;
     margin: 0;
     margin-bottom: .5em;
@@ -351,7 +353,7 @@ dl.listing {
 /* ie5 mac \*/
 dt { clear: both; }
 /* end hack */
-dl.listing dt, dl.listing dd {
+dl dt, dl dd {
     position: relative;
     float: left;
     margin: 0;
@@ -372,6 +374,48 @@ dl.listing dd {
     width: 70%;
     font-weight: bold;
 }
+dl.dublincore dt {
+    margin-right: .8em;
+    width: 28em !important;
+    font-style: italic;
+}
+dl.dublincore dd {
+    width: 50em;
+    font-weight: bold;
+}
+dl.dublincore dt span {
+    width: 18em;
+    display: block;
+    float: left;
+    font-style: normal;
+    background-color: #f9f9f9;
+    border: 1px solid #eee;
+    border-right: 3px solid #ddd;
+    padding-left: .3em;
+    margin-right: 1.2em;
+    color: #444; 
+}
+dl.dublincore .caption {
+    background-color: #B8B7C1;
+    margin: .5em 0;
+    border-bottom: 1px dotted #666;
+    padding-top: .4em;
+    padding-bottom: .4em;
+    padding-left: .3em;
+    color: #fff;
+    font-weight: bold;
+    border-right: 1px solid #fff;
+}
+dl.dublincore dt.caption span {
+    background-color: #B8B7C1;
+    border: none;
+    border-right: 1px solid #fff;
+    color: #fff;
+}
+dl.dublincore dd.caption {
+    padding-bottom: .4em;
+    padding-left: .4em;
+}
 .extraInfos h4 {
     /*background: #B8B7C1 url(extra_bg.gif) no-repeat right top;*/
     background-color: #B8B7C1;

diff --git a/telemeta/htdocs/css/telemeta_ie.css b/telemeta/htdocs/css/telemeta_ie.css
index 4f33f5f7e544901f801c408b44e9ed2fa1f7a1d0..8792fb62b480d4133a2c00891d0387e7e17c150c 100644 (file)
--- a/telemeta/htdocs/css/telemeta_ie.css
+++ b/telemeta/htdocs/css/telemeta_ie.css
@@ -1,6 +1,9 @@
 dl.listing {
     width: 68em;
+    clear: both;
+    margin-top: .4em;
 }
 dl.listing dd {
     width: 50em;
+    margin-top: .2em;
 }
\ No newline at end of file

diff --git a/telemeta/templates/base.html b/telemeta/templates/base.html
index 82daae6bf892cb37dbe429b5d7767edb6a3201c0..83cf2bcfe8d822e2660956b8031f98863d2c3e58 100644 (file)
--- a/telemeta/templates/base.html
+++ b/telemeta/templates/base.html
@@ -46,6 +46,7 @@
 
 <div id="content">
 {% block content %}{% endblock %}
+<div class="nett"></div>
 </div>
 
 <div id="footer">

diff --git a/telemeta/templates/collection_detail_dc.html b/telemeta/templates/collection_detail_dc.html
index 4c64e42d093202b427d9cec5690b6641b8b56bc6..7d08ea2e53cc6de1efa1790122f527eea1cbe405 100644 (file)
--- a/telemeta/templates/collection_detail_dc.html
+++ b/telemeta/templates/collection_detail_dc.html
@@ -8,28 +8,15 @@
 {% endblock %}
 
 {% block content %}
-    
-    <table class="dublincore listing">
-    <caption>Dublin Core Expression</caption>
-    <thead>
-        <tr><th>Element</th><th>Refinement</th><th>Value</th></tr>
-    </thead>
-    <tbody>
+    <h4 class="dublincore">Dublin Core Expression</h4>
+    <dl class="dublincore">
+        <dt class="caption"><span>Element</span>Refinement</dt><dd class="caption">Value</dd>
         {% for element in object.to_dublincore.elements %}
-            {% if element.value %}
-            <tr><th>{{ element.name }}</th>
-            <td>{{ element.refinement|default:"&nbsp;" }}</td>
-            <td>{{ element.value }}</td></tr>
-            {% endif %}
+        {% if element.value %}
+        <dt><span>{{ element.name }}</span>{{ element.refinement|default:"&nbsp;" }}</dt><dd>{% ifequal element.field "collection" %}<a href="{% url telemeta-collection-dublincore item.collection.id|urlencode %}">{{ element.value }}</a>{% else %}{{ element.value }}{% endifequal %}</dd>
+        {% endif %}
         {% endfor %}
-        {% for item in object.ordered_items %}
-            <tr><th>relation</th><td>hasPart</td><td>
-            <a href="{% url telemeta-item-dublincore item.id|urlencode %}">
-                {{ item.id }}</a>
-            </td></tr>
-        {% endfor %}
-    </tbody>
-    </table>
+    </dl>
 {% endblock %}
 {% else %}
     <p>No such collection</p>

diff --git a/telemeta/templates/mediaitem_detail_dc.html b/telemeta/templates/mediaitem_detail_dc.html
index ff96fb8764af357752a8b4fce624e3823f99bf5e..fc16c79c1b88863930b20d5af473ba8c38e61f30 100644 (file)
--- a/telemeta/templates/mediaitem_detail_dc.html
+++ b/telemeta/templates/mediaitem_detail_dc.html
@@ -1,39 +1,25 @@
 {% extends "base.html" %}
 {% load telemeta_utils %}
 
+{% if item %}
 {% block submenu %}
-    <a href="{% url telemeta-item-detail item.id|urlencode %}">
-        Normal View</a>
+    <h3>Item: {{ item.title }}</h3>
+    <div><a href="{% url telemeta-item-detail item.id|urlencode %}">Normal View</a></div>
 {% endblock %}
 
 {% block content %}
-{% if item %}
-    <h3>Item: {{ item.title }}</h3>
-    <table class="dublincore listing">
-    <caption>Dublin Core Expression</caption>
-    <thead>
-        <tr><th>Element</th><th>Refinement</th><th>Value</th></tr>
-    </thead>
-    <tbody>
+    <h4 class="dublincore">Dublin Core Expression</h4>
+    <dl class="dublincore">
+        <dt class="caption"><span>Element</span>Refinement</dt><dd class="caption">Value</dd>
         {% for element in item.to_dublincore.elements %}
-            {% if element.value %}
-                <tr><th>{{ element.name }}</th>
-                <td>{{ element.refinement|default:"&nbsp;" }}</td>
-                <td>
-                {% ifequal element.field "collection" %}
-                    <a href="{% url telemeta-collection-dublincore item.collection.id|urlencode %}">
-                        {{ element.value }}</a>
-                {% else %}
-                    {{ element.value }}
-                {% endifequal %}
-                </td>
-                </tr>
-            {% endif %}
+        {% if element.value %}
+        <dt><span>{{ element.name }}</span>{{ element.refinement|default:"&nbsp;" }}</dt><dd>{% ifequal element.field "collection" %}<a href="{% url telemeta-collection-dublincore item.collection.id|urlencode %}">{{ element.value }}</a>{% else %}{{ element.value }}{% endifequal %}</dd>
+        {% endif %}
         {% endfor %}
-    </tbody>
-    </table>
+    </dl>
+{% endblock %}
 {% else %}
     <p>No such item</p>
 {% endif %}
-{% endblock %}
+