First pass at getting both independent and in-course wiki viewing.

lms/djangoapps/simplewiki/urls.py

+from django.conf.urls.defaults import patterns, url
+
+namespace_regex = r"[a-zA-Z\d_-]+"
+article_slug = r'/(?P<article_path>' + namespace_regex + r'/[a-zA-Z\d_-]*)'
+namespace = r'/(?P<namespace>' + namespace_regex + r')'
+
+urlpatterns = patterns('',
+        url(r'^$', 'simplewiki.views.root_redirect', name='wiki_root'),
+        url(r'^view' + article_slug, 'simplewiki.views.view', name='wiki_view'),
+        url(r'^view_revision/(?P<revision_number>[0-9]+)' + article_slug, 'simplewiki.views.view_revision', name='wiki_view_revision'),
+        url(r'^edit' + article_slug, 'simplewiki.views.edit', name='wiki_edit'),
+        url(r'^create' + article_slug, 'simplewiki.views.create', name='wiki_create'),
+        url(r'^history' + article_slug + r'(?:/(?P<page>[0-9]+))?$', 'simplewiki.views.history', name='wiki_history'),
+        url(r'^search_related' + article_slug, 'simplewiki.views.search_add_related', name='search_related'),
+        url(r'^random/?$', 'simplewiki.views.random_article', name='wiki_random'),
+        url(r'^revision_feed/([0-9]+)$', 'simplewiki.views.revision_feed', name='wiki_revision_feed'),
+        url(r'^search' + namespace + r'?$', 'simplewiki.views.search_articles', name='wiki_search_articles'),    
+        url(r'^list' + namespace + r'?$', 'simplewiki.views.search_articles', name='wiki_list_articles'), #Just an alias for the search, but you usually don't submit a search term
+)

lms/templates/simplewiki/simplewiki_base.html

@@ -5,7 +5,7 @@
 
 <%!
   from django.core.urlresolvers import reverse
-  from simplewiki.views import wiki_article_reverse, wiki_namespace_reverse
+  from simplewiki.views import wiki_reverse
 %>
 
 <%block name="headextra">
@@ -20,7 +20,7 @@
     var x = window.onload;
     window.onload = function(){
         var options = {
-        script: "${ wiki_article_reverse('search_related', wiki_article, course)}/?self=${wiki_article.pk}&",
+        script: "${ wiki_reverse('search_related', wiki_article, course)}/?self=${wiki_article.pk}&",
         json: true,
         varname: "query",
         maxresults: 35,
@@ -70,7 +70,9 @@
 
 <%block name="bodyextra">
 
+%if course:
 <%include file="../course_navigation.html" args="active_page='wiki'" />
+%endif
 
 <section class="main-content">
   <div class="wiki-wrapper">
@@ -80,7 +82,7 @@
       <ul class="action">
         <li>
           <h3>
-            <a href="${wiki_namespace_reverse("wiki_list_articles", namespace, course)}">All Articles</a>
+            <a href="${wiki_reverse("wiki_list_articles", course=course, namespace=namespace)}">All Articles</a>
           </h3>
         </li>
 
@@ -91,7 +93,7 @@
 
           <div id="wiki_create_form">
             <%
-              baseURL = reverse("wiki_create", kwargs={"course_id" : course.id, "article_path" : course.wiki_namespace + "/" })
+              baseURL = wiki_reverse("wiki_create", course=course, kwargs={"article_path" : namespace + "/" })
             %>
             <form method="GET" onsubmit="this.action='${baseURL}' + this.wiki_article_name.value.replace(/([^a-zA-Z0-9\-])/g, '');">
               <div>
@@ -108,7 +110,7 @@
         </li>
 
         <li class="search">
-          <form method="GET" action='${wiki_namespace_reverse("wiki_search_articles", namespace, course)}'>
+          <form method="GET" action='${wiki_reverse("wiki_search_articles", course=course, namespace=namespace)}'>
             <label class="wiki_box_title">Search</label>
             <input type="text" placeholder="Search" name="value" id="wiki_search_input" style="width: 71%" value="${wiki_search_query if wiki_search_query is not UNDEFINED else '' |h}"/>
             <input type="submit" id="wiki_search_input_submit" value="Go!" style="width: 20%" />
@@ -132,15 +134,15 @@
           <ul>
 
             <li>
-              <a href="${ wiki_article_reverse('wiki_view', wiki_article, course)}" class="view">View</a>
+              <a href="${ wiki_reverse('wiki_view', wiki_article, course)}" class="view">View</a>
             </li>
 
             <li>
-              <a href="${ wiki_article_reverse('wiki_edit', wiki_article, course)}" class="edit">Edit</a>
+              <a href="${ wiki_reverse('wiki_edit', wiki_article, course)}" class="edit">Edit</a>
             </li>
 
             <li>
-              <a href="${ wiki_article_reverse('wiki_history', wiki_article, course)}" class="history">History</a>
+              <a href="${ wiki_reverse('wiki_history', wiki_article, course)}" class="history">History</a>
             </li>
           </ul>
         </header>

lms/templates/simplewiki/simplewiki_edit.html

@@ -29,26 +29,26 @@ ${"Edit " + wiki_title + " - " if wiki_title is not UNDEFINED else ""}MITx 6.002
 <script>
 	$(function(){
     $(document).ready(function() {
-      
-      var editor = CodeMirror.fromTextArea(document.getElementById("id_contents"), {
-        mode: 'mitx_markdown',
-        matchBrackets: true,
-        theme: "default",
-        lineWrapping: true,
-      });
-      
-      //Store the inital contents so we can compare for unsaved changes
-      var initial_contents = editor.getValue();
-      
-      window.onbeforeunload = function askConfirm() { //Warn the user before they navigate away
-        if ( editor.getValue() != initial_contents ) {
-          return "You have made changes to the article that have not been saved yet.";
-        }
-      };
-      
-      $("#submit_edit").click(function() {
-        initial_contents = editor.getValue();
-      });
+      //TODO: Re-enable this once the styling supports it
+      // var editor = CodeMirror.fromTextArea(document.getElementById("id_contents"), {
+      //   mode: 'mitx_markdown',
+      //   matchBrackets: true,
+      //   theme: "default",
+      //   lineWrapping: true,
+      // });
+      // 
+      // //Store the inital contents so we can compare for unsaved changes
+      // var initial_contents = editor.getValue();
+      // 
+      // window.onbeforeunload = function askConfirm() { //Warn the user before they navigate away
+      //   if ( editor.getValue() != initial_contents ) {
+      //     return "You have made changes to the article that have not been saved yet.";
+      //   }
+      // };
+      // 
+      // $("#submit_edit").click(function() {
+      //   initial_contents = editor.getValue();
+      // });
       
     });
   });

lms/templates/simplewiki/simplewiki_history.html

@@ -6,7 +6,7 @@
 
 <%!
     from django.core.urlresolvers import reverse
-    from simplewiki.views import wiki_article_reverse
+    from simplewiki.views import wiki_reverse
 %>
 
 <%block name="wiki_page_title">
@@ -65,10 +65,10 @@ ${ wiki_article.title }
             <tr>
                 <td colspan="4">
                     %if wiki_prev_page:
-                        <a href="${wiki_article_reverse('wiki_history', wiki_article, course, kwargs={'page' : wiki_prev_page})}">Previous page</a>
+                        <a href="${wiki_reverse('wiki_history', wiki_article, course, kwargs={'page' : wiki_prev_page})}">Previous page</a>
                     %endif
                     %if wiki_next_page:
-                        <a href="${wiki_article_reverse('wiki_history', wiki_article, course, kwargs={'page' : wiki_next_page})}">Next page</a>
+                        <a href="${wiki_reverse('wiki_history', wiki_article, course, kwargs={'page' : wiki_next_page})}">Next page</a>
                     %endif
                 </td>
             </tr>

lms/templates/simplewiki/simplewiki_searchresults.html

@@ -5,7 +5,7 @@
 <%block name="title"><title>Wiki - Search Results - MITx 6.002x</title></%block>
 
 <%!
-    from simplewiki.views import wiki_article_reverse
+    from simplewiki.views import wiki_reverse
 %>
 
 <%block name="wiki_page_title">
@@ -23,7 +23,7 @@ Displaying all articles
 <ul class="article-list">
 %for article in wiki_search_results:
 <% article_deleted = not article.current_revision.deleted == 0 %>
-<li><h3><a href="${wiki_article_reverse("wiki_view", article, course)}">${article.title} ${'(Deleted)' if article_deleted else ''}</a></h3></li>
+<li><h3><a href="${wiki_reverse("wiki_view", article, course)}">${article.title} ${'(Deleted)' if article_deleted else ''}</a></h3></li>
 %endfor
 
 %if not wiki_search_results: 

lms/urls.py

@@ -85,23 +85,10 @@ if settings.COURSEWARE_ENABLED:
     )
     
     # Multicourse wiki
-    namespace_regex = r"[a-zA-Z\d_-]+"
-    article_slug = r'/(?P<article_path>' + namespace_regex + r'/[a-zA-Z\d_-]*)'
-    namespace = r'/(?P<namespace>' + namespace_regex + r')'
     urlpatterns += (
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/$', 'simplewiki.views.root_redirect', name='wiki_root'),
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/view' + article_slug, 'simplewiki.views.view', name='wiki_view'),
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/view_revision/(?P<revision_number>[0-9]+)' + article_slug, 'simplewiki.views.view_revision', name='wiki_view_revision'),
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/edit' + article_slug, 'simplewiki.views.edit', name='wiki_edit'),
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/create' + article_slug, 'simplewiki.views.create', name='wiki_create'),
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/history' + article_slug + r'(?:/(?P<page>[0-9]+))?$', 'simplewiki.views.history', name='wiki_history'),
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/search_related' + article_slug, 'simplewiki.views.search_add_related', name='search_related'),
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/random/?$', 'simplewiki.views.random_article', name='wiki_random'),
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/revision_feed/([0-9]+)$', 'simplewiki.views.revision_feed', name='wiki_revision_feed'),
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/search' + namespace + r'?$', 'simplewiki.views.search_articles', name='wiki_search_articles'),    
-        url(r'^courses/(?P<course_id>[^/]*)/wiki/list' + namespace + r'?$', 'simplewiki.views.search_articles', name='wiki_list_articles'), #Just an alias for the search, but you usually don't submit a search term
+        url(r'^wiki/', include('simplewiki.urls')),
+        url(r'^courses/(?P<course_id>[^/]*)/wiki/', include('simplewiki.urls')),
     )
-    
 
 if settings.ENABLE_MULTICOURSE:
 	urlpatterns += (url(r'^mitxhome$', 'multicourse.views.mitxhome'),)