From 8d199a53d10f31e7fff008ca33cfdee7671ef702 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Thu, 6 Oct 2011 15:57:48 +0200
Subject: Sync with ikiwiki 3.20110905.

---
 editpage.tmpl        | 42 +++++++++++++++++++++++++++++++++++-------
 openid-selector.tmpl |  2 +-
 rssitem.tmpl         |  4 ++--
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/editpage.tmpl b/editpage.tmpl
index d6ad806..696c8dc 100644
--- a/editpage.tmpl
+++ b/editpage.tmpl
@@ -26,20 +26,48 @@
 <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" checked 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>
-<TMPL_IF NAME="ATTACHMENT_LIST">
-<tr><td colspan="2"><TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE></td></tr>
-</TMPL_IF>
 </table>
 </div>
+<TMPL_VAR FIELD-ATTACHMENT>
+<noscript><TMPL_VAR FIELD-UPLOAD></noscript>
+<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE>
+</div> 
+</div>
 </TMPL_IF>
 <TMPL_VAR FORM-END>
 <TMPL_VAR WMD_PREVIEW>
-
 <TMPL_IF NAME="PAGE_PREVIEW">
 <hr />
 <div class="header">
diff --git a/openid-selector.tmpl b/openid-selector.tmpl
index 0659ee5..b6be272 100644
--- a/openid-selector.tmpl
+++ b/openid-selector.tmpl
@@ -1,4 +1,4 @@
-<script type="text/javascript" src="ikiwiki/openid/jquery.js"></script>
+<script type="text/javascript" src="ikiwiki/jquery.min.js"></script>
 <script type="text/javascript" src="ikiwiki/openid/openid-jquery.js"></script>
 <script type="text/javascript">
 $(document).ready(function() {
diff --git a/rssitem.tmpl b/rssitem.tmpl
index 272b340..831daa8 100644
--- a/rssitem.tmpl
+++ b/rssitem.tmpl
@@ -6,9 +6,9 @@
 	<title><TMPL_VAR TITLE></title>
 </TMPL_IF>
 <TMPL_IF GUID>
-	<guid isPermaLink="no"><TMPL_VAR GUID></guid>
+	<guid isPermaLink="false"><TMPL_VAR GUID></guid>
 <TMPL_ELSE>
-	<guid isPermaLink="no"><TMPL_VAR URL></guid>
+	<guid isPermaLink="false"><TMPL_VAR URL></guid>
 </TMPL_IF>
 	<link><TMPL_VAR PERMALINK></link>
 <TMPL_IF CATEGORIES>
-- 
cgit v1.2.3