]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Merge commit 'd4a0732752e79b57509cee33001ab757132366c5' into sipb
authorAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:53:56 +0000 (00:53 -0500)
committerAnders Kaseorg <andersk@mit.edu>
Fri, 31 Jan 2014 05:53:56 +0000 (00:53 -0500)
Conflicts:
IkiWiki/Wrapper.pm

1  2 
IkiWiki/CGI.pm
IkiWiki/Wrapper.pm
templates/editpage.tmpl

diff --cc IkiWiki/CGI.pm
Simple merge
index 80091f5a6cc8240eb367eee653e07859354937a4,d39a3ea402d153db93c34dd1e1aef751954a7e79..f9630a982c3de2d87671d044425c758860f97b07
@@@ -48,8 -48,8 +48,8 @@@ sub gen_wrapper () 
        my @envsave;
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
 -                     HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
 +                     HTTP_COOKIE REMOTE_USER HTTPS SSL_CLIENT_S_DN_CN REDIRECT_STATUS
-                      HTTP_HOST SERVER_PORT HTTPS
+                      HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
                       REDIRECT_URL} if $config{cgi};
        my $envsave="";
        foreach my $var (@envsave) {
index 70bbfb28f06237c2ddfb9235386b7882453c0768,efe077f84ad07dfc3eee8403333a7137e57de1db..e9bcbedbb6929606e597c45c99fdc648fb7d4ac9
  <TMPL_IF NAME="FIELD-ATTACHMENT">
  <a class="toggle" href="#attachments">Attachments</a>
  <div class="<TMPL_VAR ATTACHMENTS-CLASS>" id="attachments">
- <table>
- <tr><td colspan="5"><TMPL_VAR FIELD-ATTACHMENT><TMPL_VAR FIELD-UPLOAD></td></tr>
+ <div id="fileupload"> 
+ <script>
+ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
+ </script>
+ <script id="template-upload" type="text/x-jquery-tmpl"> 
+     <tr class="template-upload{{if error}} ui-state-error{{/if}}">
+         <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td>
+         {{if error}}
+         <td class="error" colspan="2">failed!</td>
+         {{else}}
+         <td class="progress" colspan="2"><div></div></td>
+         <td class="start"><button>Start</button></td>
+         {{/if}}
+         <td class="cancel"><button>Cancel</button></td>
+     </tr>
+ </script> 
+ <script id="template-download" type="text/x-jquery-tmpl"> 
+     <tr class="template-download{{if error}} ui-state-error{{/if}}">
+         <td><input type="checkbox" name="attachment_select" value="${name}" />${name}</td>
+         <td>${humansize}</td>
+         {{if error}}
+         <td class="error" colspan="2">failed!</td>
+         {{else}}
+         <td>${stored_msg}</td>
+         {{/if}}
+     </tr>
+ </script> 
+ <div class="fileupload-content">
+ <table class="files">
  <TMPL_LOOP NAME="ATTACHMENT_LIST">
- <tr><td><TMPL_VAR FIELD-SELECT><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
+ <tr><td><input type="checkbox" name="attachment_select" value="<TMPL_VAR NAME ESCAPE="HTML">" /><TMPL_VAR LINK></td><td><TMPL_VAR SIZE></td><td><TMPL_VAR MTIME></td></tr>
  </TMPL_LOOP>
+ </table>
+ </div>
+ <TMPL_VAR FIELD-ATTACHMENT>
+ <noscript><TMPL_VAR FIELD-UPLOAD></noscript>
  <TMPL_IF NAME="ATTACHMENT_LIST">
- <tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
+ <TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE>
  </TMPL_IF>
- </table>
+ </div> 
  </div>
  </TMPL_IF>
 +<div class="license">
 +    <p>By submitting content to this wiki, you agree to release your work under
 +    the dual license of</p>
 +    <ul>
 +      <li>the Creative Commons Attribution-Share Alike license, and</li>
 +      <li>the GNU Free Documentation License, with no Invariant Sections, no
 +         Front-Cover Texts, and no Back-Cover-Texts.</li>
 +    </ul>
 +</div>
  <TMPL_VAR FORM-END>
  <TMPL_VAR WMD_PREVIEW>
  <TMPL_IF NAME="PAGE_PREVIEW">
  <hr />
  <div class="header">