Index: PhotoUpload
===================================================================
--- PhotoUpload	(revision 8808)
+++ PhotoUpload	(working copy)
@@ -10,16 +10,17 @@
 <creator>XWiki.jerome</creator>
 <author>XWiki.Admin</author>
 <customClass></customClass>
-<contentAuthor>XWiki.jerome</contentAuthor>
+<contentAuthor>XWiki.Admin</contentAuthor>
 <creationDate>1194607560000</creationDate>
-<date>1199896998000</date>
-<contentUpdateDate>1202988798000</contentUpdateDate>
-<version>1.1</version>
+<date>1207057613000</date>
+<contentUpdateDate>1207057613000</contentUpdateDate>
+<version>3.1</version>
 <title></title>
 <template></template>
 <defaultTemplate></defaultTemplate>
 <validationScript></validationScript>
 <comment></comment>
+<minorEdit>false</minorEdit>
 <object>
 <class>
 <name>XWiki.TagClass</name>
@@ -53,132 +54,132 @@
 <tags/>
 </property>
 </object>
-<content>## ============================================
-## Photo upload form
-## ============================================
-## Form for uploading a photo in a gallery.
-## This sheet is intended to be displayed in a
-## iframe when viewing a gallery in "inline"
-## "mode". See NBSheets.PhotoGalery
-## ============================================
-&lt;script type="text/javascript"&gt;
-function init() {
-  if(document.all)
-    h=document.body.scrollHeight;
- else h=document.body.offsetHeight;
-    window.parent.setsize(h+50);
-} 
-&lt;/script&gt;
-&lt;body onload="init()"&gt;
-{pre}
-&lt;script type="text/javascript"&gt;
-function updateAttachName(form, msg) {
-  var fname = form.filepath.value;
-  if (fname == "") {
-    return false;
-  }
-  var i = fname.lastIndexOf('\\');
-  if (i == -1){
-    i = fname.lastIndexOf('/');
-  }
-  fname = fname.substring(i + 1);
-  if (form.filename.value == fname){
-    return true;
-  }
-  if (form.filename.value == ""){
-    form.filename.value = fname;
-  }
-  else {
-    if (confirm(msg + " '" + fname + "' ?")){
-      form.filename.value = fname;
-    }
-  }
-  return true;
-}
-&lt;/script&gt;
-&lt;style&gt;
-div.gallery-item-edit {
-  border-style:solid;
-  border-width:1px;
-  float:left;
-  margin:10px 10px 0pt 0pt;
-  text-align:center;
-  width:120px;
-  height:120px;
-  border-color:#ccc;
-}
-&lt;/style&gt;
-{/pre}
-#set($gallery = $request.gallery)
-## ---------------------
-## Post upload treatment
-## ---------------------
-#if($request.post &amp;&amp; $request.post!="")
- #set($pDoc = $xwiki.getDocument("${doc.space}.${gallery}_${request.post}"))
- #if(!$pDoc.isNew())
-  #set($ok = $pDoc.setParent("${doc.space}.${gallery}"))
-  #set($ok = $pDoc.save())
-  #info("$msg.get('space.photos.gallery.uploadsuccess')")
- #end
-#end
-## -----------
-## Upload Form
-## -----------
-#set($photoId = $xwiki.generateRandomString(12))
-#set($targetDocname = "${doc.space}.${gallery}_${photoId}")
-#set($action = $xwiki.getURL("${targetDocname}","upload"))
-&lt;form action="${action}" enctype="multipart/form-data" method="post"&gt;
-&lt;div&gt;
-#set($redirecturl=$doc.getURL("view","xpage=plain&amp;do=upload&amp;gallery=${request.gallery}&amp;post=${photoId}"))
- &lt;input type="hidden" name="xredirect" value="${redirecturl}" /&gt;
-        &lt;div&gt;&lt;input id="xwikiuploadname" type="hidden" name="filename" value="" size="40"/&gt;&lt;/div&gt;
-        &lt;div&gt;&lt;input id="xwikiuploadfile" type="file" name="filepath" value="" size="40"/&gt;&lt;/div&gt;
-        &lt;div&gt;
-        &lt;input type="submit" value="$msg.get('commons.form.validate')" onclick="return updateAttachName(this.form, '$msg.get('commons.form.replacefile');" class="button"/&gt;
-        &lt;/div&gt;
-&lt;/div&gt;
-&lt;/form&gt;
-## -----------
-## Photos list
-## -----------
-&lt;div style="color:#64839A;font-family:Arial,Helvetica,"Bitstream Vera Sans",sans-serif;font-size:62.5%;"&gt;$msg.get('space.photos.gallery.existingphotos')&lt;/div&gt;
-#set($hql = "where doc.web='${doc.space}' and doc.name like '${gallery}_%'")
-#set($photoList = $xwiki.searchDocuments($hql))
-#set($galleryDoc = "${doc.space}.${gallery}")
-#set($galleryURL = $xwiki.getURL("${galleryDoc}","inline"))
-&lt;div id="gallery"&gt;
-#foreach($dName in $photoList)
- #set($pDoc = $xwiki.getDocument($dName))
- #if($pDoc.getAttachmentList().size() &gt; 0)
- #set($photo = $pDoc.getAttachmentList().get(0))
- #if($photo.isImage())
-   #set($filename = $photo.filename)
-   #set($width=$xwiki.image.getWidth($pDoc.fullName,${filename}))
-   #set($height=$xwiki.image.getHeight($pDoc.fullName,${filename}))
-   #set($maxsize=100)
-   #if($width &gt; $height)
-     #set($imageurl=$pDoc.getAttachmentURL(${filename},'download',"width=$maxsize"))
-   #else
-     #set($imageurl=$pDoc.getAttachmentURL(${filename},'download',"height=$maxsize"))
-   #end
-   &lt;div class="gallery-item-edit"&gt;
-    #if($filename.length() &gt; 16)
-     #set($abbr = "${filename.substring(0,15)}...")
-    #else
-     #set($abbr = $filename)
-    #end
-     &lt;acronym title="${filename}" style="font-size:12px;"&gt;&lt;b&gt;$abbr&lt;/b&gt;&lt;/acronym&gt;&lt;br /&gt;
-     #if($width &gt; $height)
-            &lt;img src="${imageurl}" width="100"/&gt;&lt;br /&gt; 
-     #else
-            &lt;img src="${imageurl}" height="80"/&gt;&lt;br /&gt; 
-     #end
-     &lt;a class="gallery-item" style="font-size:11px;" href='${pDoc.getURL("delete","xredirect=${galleryURL}")}' target="_parent"&gt;$msg.get('commons.actions.delete')&lt;/a&gt;
-  &lt;/div&gt;
-  #end
-  #end
-#end
-&lt;/div&gt;
-&lt;div style="clear:both;"&gt;&lt;/div&gt;
+<content>## ============================================
+## Photo upload form
+## ============================================
+## Form for uploading a photo in a gallery.
+## This sheet is intended to be displayed in a
+## iframe when viewing a gallery in "inline"
+## "mode". See NBSheets.PhotoGalery
+## ============================================
+&lt;script type="text/javascript"&gt;
+function init() {
+  if(document.all)
+    h=document.body.scrollHeight;
+ else h=document.body.offsetHeight;
+    window.parent.setsize(h+50);
+} 
+&lt;/script&gt;
+&lt;body onload="init()"&gt;
+{pre}
+&lt;script type="text/javascript"&gt;
+function updateAttachName(form, msg) {
+  var fname = form.filepath.value;
+  if (fname == "") {
+    return false;
+  }
+  var i = fname.lastIndexOf('\\');
+  if (i == -1){
+    i = fname.lastIndexOf('/');
+  }
+  fname = fname.substring(i + 1);
+  if (form.filename.value == fname){
+    return true;
+  }
+  if (form.filename.value == ""){
+    form.filename.value = fname;
+  }
+  else {
+    if (confirm(msg + " '" + fname + "' ?")){
+      form.filename.value = fname;
+    }
+  }
+  return true;
+}
+&lt;/script&gt;
+&lt;style&gt;
+div.gallery-item-edit {
+  border-style:solid;
+  border-width:1px;
+  float:left;
+  margin:10px 10px 0pt 0pt;
+  text-align:center;
+  width:120px;
+  height:120px;
+  border-color:#ccc;
+}
+&lt;/style&gt;
+{/pre}
+#set($gallery = $request.gallery)
+## ---------------------
+## Post upload treatment
+## ---------------------
+#if($request.post &amp;&amp; $request.post!="")
+ #set($pDoc = $xwiki.getDocument("${doc.space}.${gallery}_${request.post}"))
+ #if(!$pDoc.isNew())
+  #set($ok = $pDoc.setParent("${doc.space}.${gallery}"))
+  #set($ok = $pDoc.save())
+  #info("$msg.get('space.photos.gallery.uploadsuccess')")
+ #end
+#end
+## -----------
+## Upload Form
+## -----------
+#set($photoId = $xwiki.generateRandomString(12))
+#set($targetDocname = "${doc.space}.${gallery}_${photoId}")
+#set($action = $xwiki.getURL("${targetDocname}","upload"))
+&lt;form action="${action}" enctype="multipart/form-data" method="post"&gt;
+&lt;div&gt;
+#set($redirecturl=$doc.getURL("view","xpage=plain&amp;do=upload&amp;gallery=${request.gallery}&amp;post=${photoId}"))
+ &lt;input type="hidden" name="xredirect" value="${redirecturl}" /&gt;
+        &lt;div&gt;&lt;input id="xwikiuploadname" type="hidden" name="filename" value="" size="40"/&gt;&lt;/div&gt;
+        &lt;div&gt;&lt;input id="xwikiuploadfile" type="file" name="filepath" value="" size="40"/&gt;&lt;/div&gt;
+        &lt;div&gt;
+        &lt;input type="submit" value="$msg.get('commons.form.validate')" onclick="return updateAttachName(this.form, '$msg.get('commons.form.replacefile');" class="button"/&gt;
+        &lt;/div&gt;
+&lt;/div&gt;
+&lt;/form&gt;
+## -----------
+## Photos list
+## -----------
+&lt;div style="color:#64839A;font-family:Arial,Helvetica,"Bitstream Vera Sans",sans-serif;font-size:62.5%;"&gt;$msg.get('space.photos.gallery.existingphotos')&lt;/div&gt;
+#set($hql = "where doc.web='${doc.space}' and doc.name like '${gallery}_%' order by doc.creationDate desc")
+#set($photoList = $xwiki.searchDocuments($hql))
+#set($galleryDoc = "${doc.space}.${gallery}")
+#set($galleryURL = $xwiki.getURL("${galleryDoc}","inline"))
+&lt;div id="gallery"&gt;
+#foreach($dName in $photoList)
+ #set($pDoc = $xwiki.getDocument($dName))
+ #if($pDoc.getAttachmentList().size() &gt; 0)
+ #set($photo = $pDoc.getAttachmentList().get(0))
+ #if($photo.isImage())
+   #set($filename = $photo.filename)
+   #set($width=$xwiki.image.getWidth($pDoc.fullName,${filename}))
+   #set($height=$xwiki.image.getHeight($pDoc.fullName,${filename}))
+   #set($maxsize=100)
+   #if($width &gt; $height)
+     #set($imageurl=$pDoc.getAttachmentURL(${filename},'download',"width=$maxsize"))
+   #else
+     #set($imageurl=$pDoc.getAttachmentURL(${filename},'download',"height=$maxsize"))
+   #end
+   &lt;div class="gallery-item-edit"&gt;
+    #if($filename.length() &gt; 16)
+     #set($abbr = "${filename.substring(0,15)}...")
+    #else
+     #set($abbr = $filename)
+    #end
+     &lt;acronym title="${filename}" style="font-size:12px;"&gt;&lt;b&gt;$abbr&lt;/b&gt;&lt;/acronym&gt;&lt;br /&gt;
+     #if($width &gt; $height)
+            &lt;img src="${imageurl}" width="100"/&gt;&lt;br /&gt; 
+     #else
+            &lt;img src="${imageurl}" height="80"/&gt;&lt;br /&gt; 
+     #end
+     &lt;a class="gallery-item" style="font-size:11px;" href='${pDoc.getURL("delete","xredirect=${galleryURL}")}' target="_parent"&gt;$msg.get('commons.actions.delete')&lt;/a&gt;
+  &lt;/div&gt;
+  #end
+  #end
+#end
+&lt;/div&gt;
+&lt;div style="clear:both;"&gt;&lt;/div&gt;
 &lt;/body&gt;</content>
 </xwikidoc>