# HG changeset patch # User durandn # Date 1475759358 -7200 # Node ID 43aa7c58904894819d8bf31dfc09f6a163da648b # Parent 1c7cce1966659456347890a7e57f3fa6edd1cd5c Work on pagination: collection_home mostly, a few touches on item_detail and detail_annotations #39 diff -r 1c7cce196665 -r 43aa7c589048 src/iconolab/static/iconolab/css/iconolab.css --- a/src/iconolab/static/iconolab/css/iconolab.css Thu Oct 06 15:07:50 2016 +0200 +++ b/src/iconolab/static/iconolab/css/iconolab.css Thu Oct 06 15:09:18 2016 +0200 @@ -120,10 +120,28 @@ } /* COLLECTION HOME PAGE */ + +.collection-summary{ + padding-bottom: 15px; + width: 100% +} + +.collection-container{ + width:100%; +} + +.collection-home-title{ + padding-bottom: 15px; +} + +.tab-selector{ + margin-top: 15px; +} + .image-list-wrapper{ - margin-top: 15px; - margin-left:10px; + margin-top: 15px; } + li.image-list-li{ margin-bottom: 5px; width: 370px; @@ -182,4 +200,20 @@ dl.legals-dl dd{ margin-left: 10px; +} + +/* HOME PAGE STYLE */ + +.show-complete-link, .hide-complete-link{ + cursor: pointer; +} + +/* - COLLECTION HOME STYLE */ + +.collection-summary{ + margin-bottom: 15px; +} + +.description-col{ + padding: 10px; } \ No newline at end of file diff -r 1c7cce196665 -r 43aa7c589048 src/iconolab/templates/iconolab/collection_home.html --- a/src/iconolab/templates/iconolab/collection_home.html Thu Oct 06 15:07:50 2016 +0200 +++ b/src/iconolab/templates/iconolab/collection_home.html Thu Oct 06 15:09:18 2016 +0200 @@ -7,60 +7,247 @@ {% load iconolab_tags %} {% block content %} -

{{collection.verbose_name}}


- - - -
- {% include "partials/image_annotations_list.html" with annotation_list=recent_annotations.all %} -
- -
- {% include "partials/image_annotations_list.html" with annotation_list=revised_annotations.all %} -
- -
- {% include "partials/image_annotations_list.html" with annotation_list=contribution_calls_annotations_list %} -
- -
- -
- + +
+ +

+ {{collection.description | safe}} + {% if collection.complete_description %} Voir plus{% endif %} +

+

+ {{collection.complete_description | safe}} + Voir moins +

+
+ +
+
+ +
+
+
+
+ {% include "partials/image_annotations_list.html" with annotation_list=recent_list %} + {% if recent_list %} + + {% if recent_list.has_previous or recent_list.has_next %} + + {% endif %} + {% endif %} +
+
+
+
+ {% include "partials/image_annotations_list.html" with annotation_list=revised_list %} + {% if revised_list %} + {{revised_list.paginator.per_page}} + + {% if revised_list.has_previous or revised_list.has_next %} + + {% endif %} + {% endif %} +
+
+
+
+ {% include "partials/image_annotations_list.html" with annotation_list=contributions_list %} + {% if contributions_list %} + + {% if contributions_list.has_previous or contributions_list.has_next %} + + {% endif %} + {% endif %} +
+
+
+
+ + + {% if items_list.has_previous or items_list.has_next %} + + {% endif %} +
+
{% endblock %} {% block footer_js %} {% endblock %} \ No newline at end of file diff -r 1c7cce196665 -r 43aa7c589048 src/iconolab/templates/iconolab/detail_annotation.html --- a/src/iconolab/templates/iconolab/detail_annotation.html Thu Oct 06 15:07:50 2016 +0200 +++ b/src/iconolab/templates/iconolab/detail_annotation.html Thu Oct 06 15:09:18 2016 +0200 @@ -144,16 +144,13 @@