X-Git-Url: https://scm.cri.ensmp.fr/git/Plinn.git/blobdiff_plain/de068d5b8a1fd46a70f75f4e20e581ee846f866d..a64e2b9f04f229ad4a045a2594451f731a1dc864:/skins/photo_theme/folder_contents_macros.pt

diff --git a/skins/photo_theme/folder_contents_macros.pt b/skins/photo_theme/folder_contents_macros.pt
index 00d2ee9..b359ad3 100644
--- a/skins/photo_theme/folder_contents_macros.pt
+++ b/skins/photo_theme/folder_contents_macros.pt
@@ -16,7 +16,7 @@
     <div style="display:none">
       <span id="FolderUrl" tal:content="here/absolute_url" >Folder url for script</span>
       <span tal:condition="options/form/is_orderable" tal:omit-tag="">
-	      <span id="FirstItemPos" tal:content="python:listItemInfos[0]['position']">first batch item position</span>
+	      <span id="FirstItemPos" tal:content="batch_dict/firstItemPos">first batch item position</span>
 	      <span id="BatchNavigationSize" tal:content="batch/size"></span>
 	    </span>
     </div>
@@ -39,7 +39,7 @@
 				</tr>
 			</thead>
 			<tbody id="FolderListingBody">
-<tbody tal:repeat="item_info listItemInfos" tal:omit-tag="">
+<tbody tal:repeat="item_info listItemInfos" tal:omit-tag="" metal:define-macro="itemListing">
 		    <tr class="" tal:attributes="class python: (even and 'even') or 'odd'" tal:define="even repeat/item_info/even">
 		      <td><img src="." alt="lock" height="16" width="16" border="0"
 		               tal:condition="python:not isAnon and item_info['lock']"
@@ -65,9 +65,6 @@
 		      <td>
 		        <span tal:replace="item_info/modified">2001</span>
 		      </td>
-		      <td>
-		        <span tal:replace="item_info/position">1</span>
-		      </td>
 		    </tr>
 </tbody>
 	   	</tbody>
@@ -77,7 +74,7 @@
       <span metal:use-macro="here/batch_macros/macros/navigation">batch navigation</span>
     </div>
 		<script type="text/javascript">
-		//<!--
+		(function(){
 			// variables for drag-and-drop ordered support
 			var ddEnabled = false
 			try {
@@ -91,11 +88,7 @@
 			var listing = document.getElementById("FolderListingBody");
 
 			if (ddEnabled) {
-				var rows = listing.getElementsByTagName("TR")
-				for ( var i = 0 ; i < rows.length ; i++ )
-					rows[i].pos = i + firstItemPos;
-
-				var fDDcontroler = new FolderDDropControler(listing);
+				var fDDcontroler = new FolderDDropControler(listing, firstItemPos);
 				var topNavBatchBar		= document.getElementById("topNavBatchBar");
 				var bottomNavBatchBar	= document.getElementById("bottomNavBatchBar");
 				if (topNavBatchBar && bottomNavBatchBar) {
@@ -110,8 +103,11 @@
 				addListener(topNavBatchBar, "click", loadListing);
 				addListener(bottomNavBatchBar, "click", loadListing);
 			}
+			
+			var uploadUrl = absolute_url() + '/put_upload';
+      new DDFolderUploader(document.getElementById('ForematterCell'), uploadUrl, listing);
 
-		//-->
+		}());
 		</script>
   </body>