Merge branch 'master' into asset-pipeline

Conflicts: static/js/application.js
2012-05-21 14:53:16 -04:00
parent ed3f081701 431704ac88
commit 8a89309338
15 changed files with 63 additions and 36 deletions
--- a/templates/simplewiki_base.html
+++ b/templates/simplewiki_base.html
@@ -74,7 +74,7 @@
 <section class="main-content">
  <div class="wiki-wrapper">
    <%block name="wiki_panel">
-    <div id="wiki_panel">
+    <div aria-label="Wiki Navigation" id="wiki_panel">
    <h2>Course Wiki</h2>
      <%
          if (wiki_article is not UNDEFINED):