Modal should not animate... the bootstrap animation is loo choppy

README.md

 django-wiki
 ===========
 
-*Last update: 2012-08-17*
+*Last update: 2012-08-22*
 
 Demo here, sign up for an account to see the notification system.
 
@@ -10,7 +10,11 @@ Demo here, sign up for an account to see the notification system.
 NB!! *THIS IS A WORK IN PROGRESS*
 ---------------------------------
 
-This is where it all begins. In *<1 week* we should have a wiki system appealing to any kind of Django developer out there. Here is the manifest (so far):
+Currently, the whole API is subject to change. That means, that if you use the wiki, you should use it *as it is* and not access any internals or spend time overriding templates or writing plugins... **yet!** But the games will soon begin.
+
+Please refer to the [TODO](https://github.com/benjaoming/django-wiki/blob/master/TODO.md)
+
+This is where it all begins. In *less than 1 week* we should have a wiki system appealing to any kind of Django developer out there. Here is the manifest (so far):
 
  * **Be pluggable and light-weight.** Don't integrate optional features in the core.
  * **Be open.** Make an extension API that allows the ecology of the wiki to grow. After all, Wikipedia consists of some [680 extensions](http://svn.wikimedia.org/viewvc/mediawiki/trunk/extensions/) written for MediaWiki.

TODO.md

-Not implemented - will be ASAP
+Roadmap to RC1...
 ==============================
 
+Unfinished
+----------
+
  * Notification system **Almost done** (email notifications)
  * Circuit Editor plugin
  * Example plugin
@@ -11,6 +14,18 @@ Not implemented - will be ASAP
  * Finish all class-based views
  * Embeddable article template tag
  * "Fix Wiki URL bug in the footnotes plugin for python-markdown" ?
+ * CodeMirror to be distributed with default setup
+ 
+### Management script
+
+ * Cleanup deleted Image's image files
+ * Cleanup attachments
+ * Cleanup revisions + plugin revisions
+ * django_notify: send out email notifications
+
+Done
+----
+
  * Implement notifications, revision log messages and user messages thoroughly **Pretty much done**
  * View source for read-only articles + locked status **Done**
  * Index views for urlpaths **Done**
@@ -25,7 +40,7 @@ Not implemented - will be ASAP
  * Handling WikiLinks and detecting broken links in markdown extension **Done**
  
 Ideas
-=====
+-----
 
  * Build menus of hierarchies and use bootstrap scrollspy. Add through plugin.
  * Notification system should be it's own separate app
@@ -35,15 +50,7 @@ Ideas
  * Add revision conflict detection for concurrent editing **DONE**
  * Make a comments plugin for commenting inline
 
-Management script
-=================
-
- * Cleanup deleted Image's image files
- * Cleanup attachments
- * Cleanup revisions + plugin revisions
- * django_notify: send out email notifications
-
 Postponed
-=================
+---------
 
 * Make dependency on django_notify optional

wiki/templates/wiki/edit.html

@@ -44,7 +44,7 @@
         {% endif %}
         
     </div>
-    <div class="modal hide fade" id="previewModal" style="width: 80%; min-height: 500px; margin-left: -40%;">
+    <div class="modal hide" id="previewModal" style="width: 80%; min-height: 500px; margin-left: -40%;">
       <div class="modal-body">
         <iframe name="previewWindow" style="width: 100%; min-height: 400px; border: 0;" frameborder="0"></iframe>
       </div>

wiki/templates/wiki/history.html

@@ -142,7 +142,7 @@
     
   </div>
   <input type="hidden" name="r" value="" />
-  <div class="modal hide fade" id="previewModal" style="width: 80%; margin-left: -40%;">
+  <div class="modal hide" id="previewModal" style="width: 80%; margin-left: -40%;">
     <div class="modal-body">
       <iframe name="previewWindow" style="width: 100%; height: 100%; border: 0;" frameborder="0"></iframe>
     </div>
@@ -165,7 +165,7 @@
     </div>
   </div>
 
-  <div class="modal hide fade" id="mergeModal" style="width: 80%; margin-left: -40%;">
+  <div class="modal hide" id="mergeModal" style="width: 80%; margin-left: -40%;">
     <div class="modal-header">
       <h1>{% trans "Merge with current" %}</h1>
       <p class="lead"><span class="icon-info-sign"></span> {% trans "When you merge a revision with the current, all data will be retained from both versions and merged at its approximate location from each revision." %} <strong>{% trans "After this, it's important to do a manual review." %}</strong></p>