aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-07-11 21:38:48 -0400
committerJoey Hess <joey@kitenet.net>2011-07-11 21:38:48 -0400
commit20577d8ecb18f7954a97800cb9b9dca981d2b53e (patch)
tree8012dd6d8b6e85db0e4be9016ebfa4bd2348eafe
parentd23786cb6c5b3320d4b0c45df3424acea51e90ad (diff)
downloadikiwiki-20577d8ecb18f7954a97800cb9b9dca981d2b53e.tar
ikiwiki-20577d8ecb18f7954a97800cb9b9dca981d2b53e.tar.gz
Display attachment manipulation links always, since attachments can be uploaded via javascript.
Could arrange for them to be in a span that is hidden when there are no attachments and make the javascript upload unhide it; this is a quick fix.
-rw-r--r--debian/changelog2
-rw-r--r--templates/editpage.tmpl2
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 6ef9650b9..0c55d4afa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.20110712) UNRELEASED; urgency=low
* attachment: Bugfix to create directory when moving attachment out of
holding area.
+ * Display attachment manipulation links always, since attachments can be
+ uploaded via javascript.
-- Joey Hess <joeyh@debian.org> Mon, 11 Jul 2011 21:35:20 -0400
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index efe077f84..27c4aa6ed 100644
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -62,9 +62,7 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
</div>
<TMPL_VAR FIELD-ATTACHMENT>
<noscript><TMPL_VAR FIELD-UPLOAD></noscript>
-<TMPL_IF NAME="ATTACHMENT_LIST">
<TMPL_VAR FIELD-LINK><TMPL_VAR FIELD-RENAME><TMPL_VAR FIELD-REMOVE>
-</TMPL_IF>
</div>
</div>
</TMPL_IF>