Skip to Content

Changes for page Attachments

Last modified by Ludovic Dubost on 2024/07/22 15:50
From version 1.1
edited by Ludovic Dubost
on 2014/03/30 19:46
Change comment: Imported from XAR
To version 5.1
edited by Ludovic Dubost
on 2017/03/08 18:02
Change comment: Install extension [org.xwiki.platform:xwiki-platform-attachment-ui-9.1.1]

Summary

Details

Page properties
Content
... ... @@ -10,7 +10,10 @@
10 10   #set ($sortedAttachments = $sorttool.sort($attachmentList, 'date:desc'))
11 11   #set ($lastAttachment = $sortedAttachments.get(0))
12 12   #end
13 - $response.sendRedirect($targetDocument.getURL($docAction, "$!{fieldname}=$!{lastAttachment.filename}&form_token=$!{escapetool.url($request.get('form_token'))}"))
13 + $response.sendRedirect($targetDocument.getURL($docAction, $escapetool.url({
14 + $fieldname: $lastAttachment.filename,
15 + 'form_token': $request.form_token
16 + })))
14 14   #stop
15 15  #end
16 16  {{/velocity}}
... ... @@ -101,10 +101,10 @@
101 101   #if ($attachment)
102 102   #if ($attachment.isImage() && $options.displayImage)
103 103   #set ($attachmentDocument = $attachment.getDocument())
104 -[[[[image:${attachmentDocument.fullName}@${attachment.filename}||width=160]]>>attach:${attachmentDocument.fullName}@${attachment.filename}||rel="lightbox[attachments]"]]
107 +[[[[image:${attachmentDocument.fullName}@${attachment.filename}||width=180]]>>attach:${attachmentDocument.fullName}@${attachment.filename}||rel="lightbox[attachments]"]]
105 105   #else
106 106   * (% class="mime" %){{html wiki=false clean=false}}#mimetypeimg($attachment.getMimeType().toLowerCase() $attachment.getFilename().toLowerCase()){{/html}}(%%) (% class="filename" %)$attachment.getFilename()(% %)
107 - * v$attachment.getVersion() (#dynamicsize($attachment.filesize))
110 + * v$attachment.getVersion() (#dynamicsize($attachment.longSize))
108 108   * $services.localization.render('core.viewers.attachments.author', [$!{xwiki.getUserName($attachment.author, false)}]) $services.localization.render('core.viewers.attachments.date', [$!{xwiki.formatDate($attachment.date, 'dd/MM/yyyy hh:mm')}])
109 109   * (% class="buttonwrapper" %)[[${services.localization.render("${translationPrefix}.actions.download")}>>attach:${attachment.getDocument()}@${attachment.filename}||title="$services.localization.render("${translationPrefix}.actions.download")" rel="__blank" class="button"]](%%)
110 110   #end
... ... @@ -152,7 +152,7 @@
152 152  <form action="$targetAttachDocument.getURL('upload')" enctype="multipart/form-data" method="post" id="uploadAttachment" class="uploadAttachment xform">
153 153   <div class="gallery_upload_input">
154 154   #if (${options.rawfilter} != '')
155 - <span class="xHint">$services.localization.render("${translationPrefix}.upload.hint", [${options.rawfilter}])</span>
158 + <span class="xHint">$escapetool.xml($services.localization.render("${translationPrefix}.upload.hint", [${options.rawfilter}]))</span>
156 156   #end
157 157   <input type="file" name="filepath" id="attachfile" class="attachment" size="30" title="$!{escapetool.xml($options.rawfilter)}"/>
158 158   <input type="hidden" name="xredirect" value="$xwiki.getDocument($attachmentPickerDocName).getURL('get', "xaction=postUpload&amp;docAction=$!{escapetool.url($options.get('docAction'))}&amp;targetdocname=$!{escapetool.url($targetAttachDocument.fullName)}&amp;docname=$!{escapetool.url($targetDocument.fullName)}&amp;fieldname=$!{escapetool.url($options.get('classname'))}_$!{escapetool.url($options.get('object'))}_$!{escapetool.url($options.get('property'))}&amp;form_token=$!{services.csrf.getToken()}")" />
... ... @@ -205,11 +205,6 @@
205 205  
206 206  {{velocity}}
207 207  #if ($request.docname)
208 - ###if ($request.xpage == 'plain')
209 - ## ## IE6 + XHR + gzip compression = BOOM!
210 - ## ## This disables the automatic gzip compression
211 - ## $response.setContentType('multipart/formdata')
212 - ###end
213 213   #set ($targetDocument = $xwiki.getDocument($request.docname))
214 214   #if ($request.targetdocname)
215 215   ## Use the target document if it exists.
XWiki.JavaScriptExtension[0]
Code
... ... @@ -270,11 +270,7 @@
270 270   );
271 271   dialog.shortcuts.close.keys = [];
272 272   dialog.showDialog();
273 - if (window.browser.isIE6x) {
274 - dialog.dialog.down().setStyle({position: "absolute"});
275 - } else {
276 - dialog.dialog.down().setStyle({position: "fixed"});
277 - }
273 + dialog.dialog.down().setStyle({position: "fixed"});
278 278   dialog.dialog.setStyle({top: document.viewport.getScrollOffsets().top + "px", position: "absolute"});
279 279   dialog.dialogBox.setStyle({overflow: "hidden", width: "80%", margin: "0 10%"});
280 280   new Ajax.Updater(loading.up(), url, {
XWiki.StyleSheetExtension[0]
Code
... ... @@ -10,11 +10,6 @@
10 10  #set ($imgSize = $mathtool.sub($boxSize, $mathtool.mul($boxPadding, 2)))
11 11  #set ($actionsHeight = 20)
12 12  #set ($actionsWidth = 16)
13 -#macro (__css3 $rule)
14 - ${rule};
15 - -moz-${rule};
16 - -webkit-${rule};
17 -#end
18 18  /*--------------------------------------------------------*/
19 19  /* Attachment picker layout fixes */
20 20  .attachment-picker p {
... ... @@ -32,7 +32,7 @@
32 32  .gallery_attachmentbox {
33 33   background: $theme.pageContentBackgroundColor;
34 34   border: 1px solid $theme.borderColor;
35 - #__css3('border-radius: 5px')
30 + border-radius: 5px;
36 36   float: left;
37 37   margin: ${boxMargin}px;
38 38   overflow: hidden;
... ... @@ -39,19 +39,11 @@
39 39   position: relative;
40 40   width: ${boxSize}px;
41 41  }
42 -/* Broken IE6 box model, add the border width to the total width. */
43 -* html .gallery_attachmentbox {
44 - width: ${mathtool.add($boxSize, 2)}px;
45 -}
46 46  .gallery .current {
47 47   background-color: $theme.highlightColor;
48 48   border-width: 3px;
49 49   margin: 3px;
50 50  }
51 -/* Broken IE6 box model, add the border width to the total width. */
52 -* html .gallery .current {
53 - width: ${mathtool.add($boxSize, 6)}px;
54 -}
55 55  .gallery .current .gallery_attachmenttitle {
56 56   font-weight: bold;
57 57  }
... ... @@ -62,7 +62,7 @@
62 62  .gallery_attachmenttitle {
63 63   background: $theme.backgroundSecondaryColor;
64 64   border-bottom: 1px dotted $theme.borderColor;
65 - #__css3('border-radius: 5px 5px 0px 0px')
52 + border-radius: 5px 5px 0px 0px;
66 66   font-size: 85%;
67 67   padding: 3px ${boxPadding}px;
68 68   overflow: hidden;