diff --git a/components/includes/simplecart.inc b/components/includes/simplecart.inc index ce6d6707543e00529ad49f41a57d0f4014a045d5..37a4c3be518d76b0deee6b044db7aae2bc210ea7 100755 --- a/components/includes/simplecart.inc +++ b/components/includes/simplecart.inc @@ -45,4 +45,5 @@ </div> - </div> \ No newline at end of file + </div> + diff --git a/components/services/home/html.template b/components/services/home/html.template index 7bb4fc88ca2c84185ca266201d72055b759173b2..30e1e8a21d57ea7da2b731bb657b06c79bee29ca 100644 --- a/components/services/home/html.template +++ b/components/services/home/html.template @@ -213,8 +213,7 @@ <div class="row"> <div style="width: 80%; margin: auto; margin-bottom: 70px; margin-top: 30px;"> - <!-- <div class="alert alert-warning"><p><i class="fa fa-warning"></i> Siste frist for bestilling av bilder fra Billedsamlingen før sommeren er 19. juni.</p></div> ---> + <!-- <div class="alert alert-warning"><p><i class="fa fa-warning"></i> Siste frist for bestilling av bilder fra Billedsamlingen før sommeren er 2. juli.</p></div>--> <!--<div class="alert alert-danger" role="alert"><strong>Søket er utilgjengelig.</strong> Marcus har tekniske problemer og vi jobber med å fikse de. Søket er forhåpentligvis snart tilbake!</div>--> <form style="width: 100%; margin: auto; border-bottom: 1px dotted #666" role="search" method="get" action="/search"> diff --git a/components/types/bibo__Document/html.template b/components/types/bibo__Document/html.template index 1eaac3d19bc52088a5580d3870b9c6bec4a0f7ee..f466360d2920db11186003b0f94e199ac5b7ea0d 100755 --- a/components/types/bibo__Document/html.template +++ b/components/types/bibo__Document/html.template @@ -518,7 +518,11 @@ <li><i>{{ first.physical.physicalCondition.value }}</i></li> {% endif %} {% if first.physical.physicalDescription.value != null %} - <li>{{ first.physical.physicalDescription.value }}</li> + {% for row in models.physical %} + {% ifchanged row.physicalDescription.value %} + <li>{{ row.physicalDescription.value }}</li> + {% endifchanged %} + {% endfor %} {% endif %} </ul> {% endif %} @@ -558,4 +562,4 @@ <!-- END MAIN-BODY/CONTAINER --> </body> -</html> \ No newline at end of file +</html> diff --git a/components/types/ubbont__Photograph/html.template b/components/types/ubbont__Photograph/html.template index 12b54ad85f87e7a773ad31ec5c592e0552d8d010..2ae7ba874ae2ff2eee6d9b02449e2fb1f319927b 100755 --- a/components/types/ubbont__Photograph/html.template +++ b/components/types/ubbont__Photograph/html.template @@ -339,7 +339,7 @@ {%endif%} </div> - + <div class="col-md-8 col-md-pull-4"> @@ -540,9 +540,14 @@ {% if first.physical.physicalCondition.value != null %} <li><i>{{ first.physical.physicalCondition.value }}</i></li> {% endif %} - {% if first.physical.physicalDescription.value != null %} - <li>{{ first.physical.physicalDescription.value }}</li> - {% endif %} + +{% if first.physical.physicalDescription.value != null %} + {% for row in models.physical %} + {% ifchanged row.physicalDescription.value %} + <li>{{ row.physicalDescription.value }}</li> + {% endifchanged %} + {% endfor %} + {% endif %} </ul> {% endif %}