Commit Graph

15249 Commits (4272e1e56d1ebd82d50473f4d68565a1dd8f2c89)

Author SHA1 Message Date
Joey Hess c901e1e80c move image 2011-06-15 19:48:33 -04:00
Joey Hess c9781b20bf added jquery templates 2011-06-15 19:33:22 -04:00
Joey Hess b85485aaa2 typo 2011-06-15 19:31:11 -04:00
Joey Hess f3fd7696cf added jquery-ui for attachment interface 2011-06-15 19:30:34 -04:00
Joey Hess 8363107a9e use jquery underlay 2011-06-15 19:16:08 -04:00
Joey Hess a695b5b2f8 updated jquery and made it its own underlay 2011-06-15 19:15:06 -04:00
Joey Hess e2b43578a6 load attachment javascript into template the clean way 2011-06-15 19:08:40 -04:00
Joey Hess 3a939f05c5 update copyright 2011-06-15 18:56:36 -04:00
Joey Hess f183fed372 deleted a lot of code ikiwiki does not need
removed most of the css, going for standard plain ikiwiki look

Removed support for image previews, file size limits, delete buttons,
maximum number of files, file size display. Ikiwiki handles all that.

Turned on autoupload.
2011-06-15 18:45:32 -04:00
Joey Hess 9a4e7b6500 add the blueimp jquery fileupload widget
from http://aquantum-demo.appspot.com/file-upload
git version 7f89121

removed some files ikiwiki does not need
2011-06-15 18:41:50 -04:00
Joey Hess f77452b7ca WIP 2011-06-15 18:37:12 -04:00
Joey Hess 00c0677588 fix removal of staged attachments 2011-06-15 17:46:08 -04:00
Joey Hess b66261d08b WIP 2011-06-15 15:21:59 -04:00
privat 40690fd3a1 New bug report 2011-06-15 15:16:35 +00:00
http://smcv.pseudorandom.co.uk/ fe2876e257 removed 2011-06-15 14:14:34 +00:00
privat 855bc1c1f6 New bug report 2011-06-15 13:23:25 +00:00
privat 456c79f1bd semi-solved it seems 2011-06-15 13:22:08 +00:00
privat fa2f288570 new bug report 2011-06-15 12:56:40 +00:00
privat 860c2c84d9 removed 2011-06-15 12:49:11 +00:00
privat de8a69d931 Test of a subpage of sandbox 2011-06-15 12:48:44 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYJcmOv1Z1i9HjFcBuW340oJdGjvo5adc 8b7b64986f 2011-06-15 04:06:35 +00:00
https://www.google.com/accounts/o8/id?id=AItOawkYJcmOv1Z1i9HjFcBuW340oJdGjvo5adc 837a9a9cda 2011-06-15 04:05:33 +00:00
Joey Hess c4154e8a45 Merge branch 'master' of ssh://git.ikiwiki.info 2011-06-14 16:28:09 -04:00
Joey Hess 176c7f3ff3 implement renaming of held attachments
This is somewhat suboptimal, it does not update links to the renamed file,
or show a result message.
2011-06-14 16:02:09 -04:00
Joey Hess 2e086b3263 remove trailing slash from attachment_holding_dir
If it's passed a filename, it should return the filename inside the holding
dir. If passed a page, the directory sans slash. All code adds the slash.
2011-06-14 15:49:33 -04:00
Joey Hess d4254c7f97 more generic interface 2011-06-14 15:31:58 -04:00
Joey Hess 49e7bc2535 bugfixes 2011-06-14 15:19:23 -04:00
Joey Hess a61849e954 bugfix for attachments of non-index pages 2011-06-14 15:07:34 -04:00
Joey Hess 04b2a4d676 fix removal of helf attachments
Left out confirmation of removal for held attachments because
a) they're not in the wiki yet, so confirmation is a bit unnecessary
b) it would be hard
c) eases later integration of jquery file upload interface

Also changed where attachments of index are held (to match where they're
stored in the srcdir).

Note that the attachment formbuilder hook was made to run last, so that
the list of attachments is not generated before removal, in the fast path
w/o confirm.
2011-06-14 14:44:20 -04:00
Joey Hess c55a32d3e1 fixed previewing of attachments from holding area 2011-06-14 14:08:13 -04:00
Joey Hess d4d2327400 fixed saving attachments on page save
Also saved on preview, but previewing is a bit broken, does not see the
newly saved attachment yet.
2011-06-14 13:59:56 -04:00
Joey Hess e2cb19ed9e attachment list includes new attachments in holding area
Note that it's possible for an attachment in the holding area to be older
than an attachemnt in the wiki with the same name. I intentionally
show the one in the holding area in this (unlikely) case, since saving the
page will overwrite the wiki's file with the held attachment. It does not
seem worth the bother of doing something more intelligent, since in this
case two people have basically conflicted with one-another.. and both
attachment contents will be stored in revision control in case it needs to
be sorted out.

I had to remove the hyperlink for attachments in the holding area, since
they're not yet live on the web. This could be annoying/confusing. Added
a moseover notice instead.
2011-06-14 13:49:41 -04:00
Joey Hess 8619faaa8b untaint and linkpage the page name used in attachment holding directory 2011-06-14 13:41:07 -04:00
Joey Hess 1d951583a6 store filename in holding dir in linkpage form
Avoids any unpleasantness with .. or other special chars in the attachment
filename.
2011-06-14 13:38:37 -04:00
Joey Hess e08daac239 store attachments in holding area; commit to wiki on page save
This makes uploading a lot of attachments somewhat faster, because
the user does not need to wait for a long website refresh after each
upload. Still probably somewhat slow, since ikiwiki has to run for each
upload.

More importantly, this opens the door for integration of things like
the jquery file upload interface, which allow drag-n-drop and multiple
file uploads to be queued and then ran.

It uses rcs_commit_staged, which leaves out tla and mercurual which lack
that, but since rename, remove, autoindex, etc also use that, I think it's
fine for attachments to also depend on it.

The attachment list is currently broken; it does not look in the holding
area yet, and its links to the attached files won't work since they're not
yet in the wiki. previewing is also currently broken.

Work sponsored by TOVA.
2011-06-14 13:34:36 -04:00
Joey Hess 4c96fce144 refactor 2011-06-14 13:06:59 -04:00
http://jmtd.livejournal.com/ 56370d3ac7 s/as-is/as pre-formatted/ 2011-06-14 11:04:28 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI babf328004 finding, the one morth 2011-06-14 02:49:27 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI 34eda677bd doings 2011-06-14 02:45:29 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI 030adf9c4a findings 2011-06-14 00:01:42 +00:00
Joey Hess 38dd85c799 Merge branch 'master' of ssh://git.ikiwiki.info 2011-06-13 12:50:26 -04:00
Joey Hess d93842ffc7 improve usage message 2011-06-13 12:20:21 -04:00
http://cdombroski.myopenid.com/ 9be66582f0 2011-06-13 15:47:24 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI e1823ced8b these too
This reverts commit 9cd14cda88
2011-06-13 02:10:53 +00:00
https://www.google.com/accounts/o8/id?id=AItOawnxp2XU8gIribhhGhGuYtU6eMMwHv5gUGI f2facbb028 we can see the fnords
This reverts commit 950d6ce453
2011-06-13 02:10:32 +00:00
https://www.google.com/accounts/o8/id?id=AItOawko7YtFjsEK_d2RYWu7Bbd7svypodeTLkc 9cd14cda88 2011-06-13 00:14:23 +00:00
https://www.google.com/accounts/o8/id?id=AItOawko7YtFjsEK_d2RYWu7Bbd7svypodeTLkc 950d6ce453 lorem ipsum text 2011-06-13 00:13:21 +00:00
http://profjim.myopenid.com/ 4bb78a5103 Added a comment 2011-06-12 20:20:13 +00:00
http://profjim.myopenid.com/ 84d0ec4898 Initial post 2011-06-12 20:18:14 +00:00
Joey Hess 303d3c90a7 what? 2011-06-11 14:29:38 -04:00