improve

[ikiwiki.git] / doc / todo.mdwn

diff --git a/doc/todo.mdwn b/doc/todo.mdwn
index 6ea63829a05bdd07066073dcdd04f832ada0636c..fa48f1aec7cb6f061618752203791db4b075a4cd 100644 (file)
--- a/doc/todo.mdwn
+++ b/doc/todo.mdwn
@@ -1,19 +1,5 @@
 ## online page editing
 
-* Missing conflict detection, just overwrites changes and does not svn up
-  first..
-
-  How to resolve this? Would this work when saving a page?
-
-  1. write changes to wc
-  2. svn up (so it can merge with any other changes)
-  3. check for conflicts
-  4. if conflicts, read in page w/conflict markers, svn revert page, and display resolution form
-  5. otherwise, svn commit
-  6. if commit fails, perhaps we were raced and there are conflicts still; so check for conflicts and if found, goto 2.
-
-  Note that unless we use `svn lock`, we really can't "warn" about concurrent edits and such the way other wikis do, which is ok, since that system sucks anyway. Using svn up for smart merging will be much nicer most of the time.
-   
 * Eventually, might want page deletion.
 * Eventually, might want file upload.
 
@@ -45,6 +31,9 @@ is built. (As long as all changes to all pages is ok.)
      page that lets them tune it, and probably choose literal or glob by
      default.
 
+     I think that the new globlist() function should do everything you need.
+     Adding a field to the prefs page will be trivial --[[Joey]]
+
   The first cut, I suppose, could use one sendmail process to batch-mail all
   subscribers for a given page.  However, in the long run, I can see users
   demanding a bit of feature creep:
@@ -86,7 +75,9 @@ case.
 
 ## html
 
-Make the html valid. Add css.
+Make the html valid. Add css and prettify. Make RecentChanges use table for formatting, and images to indicate web vs svn commits and to link to diffs.
+
+All of this should be doable w/o touching a single line of code, just editing the [[templates]] BTW.
 
 ## sigs
 
@@ -101,21 +92,11 @@ design goals for ikiwiki: keeping as much markup as possible out of the
 wiki and not adding nonstandard markup. And it's not significantly hard to
 type "--\[[Joey]]", and as to the date, we do have page history.
 
-## recentchanges links to commit diffs
-
-Would take a bit more viewcvs integration, let the be a "[diff]" link in
-recentchanges that goes to the diff for any listed change.
-
 ## recentchanges more than 100
 
 Possibly add "next 100" link to it, but OTOH, you can just use svn log if
 you need that data..
 
-## base wiki
-
-Need a toned down version of this wiki with a basic frontpage, sandbox and
-docs to use as a seed for new wikis.
-
 ## search
 
 * full text (use third-party tools?)
@@ -126,10 +107,17 @@ docs to use as a seed for new wikis.
 
 Might be nice to support automatically generating an index based on headers in a page, for long pages. The question is, how to turn on such an index?
 
-## page locking
+## basewiki underlay
+
+Rather than copy the basewii around everywhere, it should be configured to
+underlay the main srcdir, and pages be rendered from there if not in the
+srcdir. This would allow upgrades to add/edit pages in the basewiki.
+
+Impementaion will be slightly tricky since currently ikiwiki is hardcoded
+in many places to look in srcdir for pages.
 
-Some wikis will need the abiity to lock a page, or the whole wiki, so that only admins can edit them. Probably using the same globbing as for recentchanges mails to determine what to lock. 
+## Logo
 
-Probably it's ok if locking is only supported for web commits.
+ikiwiki needs a logo. I'm thinking something simple like the word "ikiwiki" with the first "k" backwards; drawn to show that it's "wiki" reflected.
 
 ## [[Bugs]]