Merge pull request #53 from collective/multi_galleries

Support several galleries at the same time.
collective · Apr 1, 2013 · 31f34a0 · 31f34a0
2 parents 537b24d + cd02578
commit 31f34a0
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 17 deletions.
diff --git a/src/collective/nitf/static/galleria-theme/galleria.nitf_theme.css b/src/collective/nitf/static/galleria-theme/galleria.nitf_theme.css
@@ -214,3 +214,11 @@
     background-image: url(++resource++collective.galleria/classic-map.png);
     background-repeat: no-repeat;
 }
+
+#mediabox {
+	/* must be initially hidden */
+
+	/* place overlay on top of other elements */
+	z-index:10000;
+	height: 500px; width: 500px;
+}
diff --git a/src/collective/nitf/templates/scrollable.pt b/src/collective/nitf/templates/scrollable.pt
@@ -95,7 +95,7 @@
 
     <fieldset id="related-items" tal:condition="exists:context/relatedItems">
         <legend i18n:translate="">Related items</legend>
-        <tal:relateditems tal:content="structure view/w/IRelatedItems.relatedItems/render" />
+        <tal:relateditems tal:content="structure view/w/IRelatedItems.relatedItems/render|nothing" />
     </fieldset>
 
     <fieldset id="folder-listing">

diff --git a/src/collective/nitf/templates/view.pt b/src/collective/nitf/templates/view.pt
@@ -6,20 +6,6 @@
       metal:use-macro="context/main_template/macros/master"
       i18n:domain="collective.nitf">
 
-<head>
-    <metal:block fill-slot="style_slot">
-        <style>
-            #mediabox {
-			    /* must be initially hidden */
-
-			    /* place overlay on top of other elements */
-			    z-index:10000;
-			    height: 500px; width: 500px;
-			}
-		</style>
-    </metal:block>
-</head>
-
 <body>
 
     <div tal:replace="structure provider:plone.abovecontenttitle" />
@@ -47,7 +33,10 @@
             <div class="newsImageContainer"
                 tal:define="image context/getImage"
                 tal:condition="image">
-                <a src="@@nitf_galleria" id="parent-fieldname-image">
+                <a href="@@nitf_galleria"
+                   id="parent-fieldname-image"
+                   class="parent-nitf-image"
+                   tal:attributes="href string:${context/absolute_url}/@@nitf_galleria">
                    <img src="" alt=""
                        tal:replace="structure python: image.tag(scale='mini', css_class='newsImage nitf')" /></a>
                 <p class="discreet"
@@ -79,7 +68,7 @@
 	                (function($) {
 	                    "use strict";
 	                    $(document).ready(function() {
-	                        $("#parent-fieldname-image").prepOverlay({
+	                        $(".parent-nitf-image").prepOverlay({
 							    subtype: 'ajax',
 							    filter: '#content-core > *',
 							    width: '524px',