prefs page implemented

[ikiwiki.git] / doc / todo.mdwn

diff --git a/doc/todo.mdwn b/doc/todo.mdwn
index 6ea63829a05bdd07066073dcdd04f832ada0636c..d8c5a5b8b549b66f51cb4aa4b047f6e9c6bd0bbc 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.
 
@@ -86,7 +72,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 +89,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?)
@@ -132,4 +110,8 @@ Some wikis will need the abiity to lock a page, or the whole wiki, so that only
 
 Probably it's ok if locking is only supported for web commits.
 
+## Logo
+
+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]]