From 530184405147dbebfaa99f1c4de14d8a93ef376c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Jun 2011 15:21:59 -0400 Subject: WIP (cherry picked from commit b66261d08bb978a1c5b1fe02ef25b49b4cd9d9e6) --- .templates/editpage.tmpl | 85 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 78 insertions(+), 7 deletions(-) (limited to '.templates') diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl index 1ecbd0a9..b151fd05 100644 --- a/.templates/editpage.tmpl +++ b/.templates/editpage.tmpl @@ -1,3 +1,5 @@ + +
@@ -43,21 +45,90 @@ if there are questions.

Attachments -
- + - - - + +
+
+
+ + + -
+ + + + + + + + + + + +
+
+ + +
" />
+ + -
-- cgit v1.2.3 From 52ffbc165735ebbf8c1f61faa5b84dae8eb4246b Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Jun 2011 18:37:12 -0400 Subject: WIP (cherry picked from commit f77452b7caa7346625882d20f396b7154cda6a54) --- .templates/editpage.tmpl | 73 +++++++++++++----------------------------------- 1 file changed, 20 insertions(+), 53 deletions(-) (limited to '.templates') diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl index b151fd05..d2f68074 100644 --- a/.templates/editpage.tmpl +++ b/.templates/editpage.tmpl @@ -45,38 +45,25 @@ if there are questions.

Attachments -
-
- - - - - - -
+ + + + + + + - - - - - - -
@@ -124,6 +86,11 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
+ + + + +
-- cgit v1.2.3 From c033aed1c05231bad75841824803af38c6bbb3a6 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 15 Jun 2011 19:08:40 -0400 Subject: load attachment javascript into template the clean way (cherry picked from commit e2b43578a677894d23fa526d9201e5a89b231abc) --- .templates/editpage.tmpl | 8 -------- 1 file changed, 8 deletions(-) (limited to '.templates') diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl index d2f68074..ed12b98f 100644 --- a/.templates/editpage.tmpl +++ b/.templates/editpage.tmpl @@ -1,5 +1,3 @@ - -
@@ -47,12 +45,6 @@ if there are questions.

Attachments
- - - - - - -- cgit v1.2.3 From 43a3e7e5a316c063ee2ec671a9df312b7798b377 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 11 Jul 2011 21:38:48 -0400 Subject: 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. (cherry picked from commit 20577d8ecb18f7954a97800cb9b9dca981d2b53e) --- .templates/editpage.tmpl | 2 -- 1 file changed, 2 deletions(-) (limited to '.templates') diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl index ed12b98f..0dd86c10 100644 --- a/.templates/editpage.tmpl +++ b/.templates/editpage.tmpl @@ -80,9 +80,7 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget
- -
-- cgit v1.2.3 From aba24efd8c926d7032af4477b4a88da628ba5454 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 12 Jul 2011 15:16:44 -0400 Subject: auto-check just uploaded attachments This may make it easier to eg, Insert Links after dropping in a lot of files. (cherry picked from commit 1aad46e15e4329eff066fc8a68719e0c27f07891) --- .templates/editpage.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.templates') diff --git a/.templates/editpage.tmpl b/.templates/editpage.tmpl index 0dd86c10..cafb653b 100644 --- a/.templates/editpage.tmpl +++ b/.templates/editpage.tmpl @@ -62,7 +62,7 @@ $(function () { $('#fileupload').fileupload(); }); // initialize upload widget