Merge pull request #6 from epfl-idevelop/marc21xml-2

css corrected
epfl-si · Feb 20, 2018 · 1d6d79f · 1d6d79f
2 parents 3b552b7 + 7ae4900
commit 1d6d79f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/infoscience_exports/exports/static/css/export.css b/infoscience_exports/exports/static/css/export.css
@@ -2,7 +2,13 @@ body {
 	background-color: rgb(245, 245, 245);
 }
 
-.marc21xm-record-template1 {
+.marc21xm-records-template {
 	margin-top: 40px;
 	margin-bottom: 40px;
 }
+
+.marc21xm-records {
+	padding-top: 8px;
+	padding-bottom: 7px;
+	border-bottom: 1px dotted #000;
+}
diff --git a/infoscience_exports/exports/templates/exports/export_list.html b/infoscience_exports/exports/templates/exports/export_list.html
@@ -13,12 +13,13 @@ <h1>Exports Listing</h1>
 		<li class="list-group-item">
 			<div>
 				<p>{{ object.user }}</p>
-				<h4 class="marc21xml-title">{{ object.name }}</h4>
+				<h4>{{ object.name }}</h4>
 				<p>{% trans "url" %}: <a href="{{ object.url }}">{{ object.url }}</a></p>
 				<p>
 				<a class="btn btn-primary" href="{{ object.get_absolute_url }}" role="button">{% trans "Details" %}</a>
 				<a class="btn btn-primary" href="{% url 'crud:export-update' object.pk %}" role="button">{% trans "Update" %}</a>
 				<a class="btn btn-primary" href="{% url 'crud:export-delete' object.pk %}" role="button">{% trans "Delete" %}</a>
+				<a class="btn btn-success" href="#" role="button">{% trans "Preview" %}</a>
 				</p>
 			</div>
 		</li>
@@ -27,21 +28,21 @@ <h4 class="marc21xml-title">{{ object.name }}</h4>
 		{% endfor %}
 	</ul>
 
-	{% for article in marc21xml %}
-	<div class="marc21xm-record-template1">
-		<p>
-		{% if article.Authors %}<span>{% include "exports/export_list_list.html" with objects_css='marc21xml-author' objects=article.Authors %}.</span>{% endif %}
-		{% if article.Title_All %}<span style="font-style: italic">{{ article.Title_All }}.</span>{% endif %}
-		{% if article.Publisher %}<span>{{ article.Publisher }}</span>{% endif %}
-		{% if article.Publisher_Date %}{% if article.Publisher %}, {% endif %}<span>{{ article.Publisher_Date }}</span>{% endif %}
-		</p>
-		<span><a href="http://infoscience.epfl.ch/record/{{ article.Id }}?ln=en">{% trans "Detailed record" %}</a></span>
-		<p>
-		{% if not article.last %}<div style="width:100%; border-bottom: 1px dotted #000;"></div>{% endif %}
+	<div class="marc21xm-records-template">
+		{% for article in marc21xml %}
+		<div class="marc21xm-records">
+			<p>
+			{% if article.Authors %}<span>{% include "exports/objects_list.html" with objects_css='marc21xml-author' objects=article.Authors %}.</span>{% endif %}
+			{% if article.Title_All %}<span style="font-style: italic">{{ article.Title_All }}.</span>{% endif %}
+			{% if article.Publisher %}<span>{{ article.Publisher }}</span>{% endif %}
+			{% if article.Publisher_Date %}{% if article.Publisher %}, {% endif %}<span>{{ article.Publisher_Date }}</span>{% endif %}
+			</p>
+			<span><a href="http://infoscience.epfl.ch/record/{{ article.Id }}?ln=en">{% trans "Detailed record" %}</a></span>
+		</div>
+		{% empty %}
+		<p>{% trans "No records" %}.</p>
+		{% endfor %}
 	</div>
-	{% empty %}
-	<p>{% trans "No items" %}.</p>
-	{% endfor %}
 
 	{% if is_paginated %}
 	<div class="pagination">
@@ -58,4 +59,4 @@ <h4 class="marc21xml-title">{{ object.name }}</h4>
 	    </span>
 	</div>
 	{% endif %}
-{% endblock %}
+{% endblock %}
diff --git a/...s/templates/exports/export_list_list.html → ...ports/templates/exports/objects_list.html b/...s/templates/exports/export_list_list.html → ...ports/templates/exports/objects_list.html