Merge branch 'master' of github.com:dementrock/mitx into discussion

lms/lib/comment_client.py

@@ -105,9 +105,9 @@ def _perform_request(method, url, data_or_params=None, *args, **kwargs):
     else:
         response = requests.request(method, url, params=data_or_params)
     if 200 < response.status_code < 500:
-        raise CommentClientException(response.text)
+        raise CommentClientError(response.text)
     elif response.status_code == 500:
-        raise CommentClientUnknownException(response.text)
+        raise CommentClientUnknownError(response.text)
     else:
         if kwargs.get("raw", False):
             return response.text

lms/templates/courseware.html

@@ -28,28 +28,8 @@
   
    <%static:js group='courseware'/>
 
-  <script type="text/x-mathjax-config">
-    MathJax.Hub.Config({
-      tex2jax: {
-        inlineMath: [
-          ["$","$"],
-        ],
-        displayMath: [
-          ["$$","$$"],
-        ]
-      }
-    });
-  </script>
+  <%include file="discussion/_js_dependencies.html" />
   
-  <!-- This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
-       It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of
-       MathJax extension libraries -->
-  <script type="text/javascript" src="/static/js/vendor/mathjax-MathJax-c9db6ac/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/split.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/jquery.ajaxfileupload.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/Markdown.Converter.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/Markdown.Sanitizer.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/Markdown.Editor.js')}"></script>
 
   <!-- TODO: http://docs.jquery.com/Plugins/Validation -->
   <script type="text/javascript">

lms/templates/discussion/_js_dependencies.html

+
+<%namespace name='static' file='../static_content.html'/>
+
+<!-- The configuration below is different from the main mathjax config because dollar signs make it easier
+       to integrate with Markdown.  -->
+  <script type="text/x-mathjax-config">
+    MathJax.Hub.Config({
+      tex2jax: {
+        inlineMath: [
+          ["$","$"],
+        ],
+        displayMath: [
+          ["$$","$$"],
+        ]
+      }
+    });
+  </script>
+
+  ## This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
+  ## It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of MathJax extension libraries
+  <script type="text/javascript" src="/static/js/vendor/mathjax-MathJax-c9db6ac/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/split.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/jquery.ajaxfileupload.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/Markdown.Converter.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/Markdown.Sanitizer.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/Markdown.Editor.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/jquery.autocomplete.js')}"></script>
+  <script type="text/javascript" src="${static.url('js/vendor/jquery.tagsinput.js')}"></script>
+  <link href="${static.url('css/vendor/jquery.tagsinput.css')}" rel="stylesheet" type="text/css">
+  <link href="${static.url('css/vendor/jquery.autocomplete.css')}" rel="stylesheet" type="text/css">

lms/templates/discussion/index.html

@@ -8,33 +8,7 @@
 </%block>
 
 <%block name="js_extra">
-  <!-- The configuration below is different from the main mathjax config because dollar signs make it easier
-       to integrate with Markdown.  -->
-  <script type="text/x-mathjax-config">
-    MathJax.Hub.Config({
-      tex2jax: {
-        inlineMath: [
-          ["$","$"],
-        ],
-        displayMath: [
-          ["$$","$$"],
-        ]
-      }
-    });
-  </script>
-
-  ## This must appear after all mathjax-config blocks, so it is after the imports from the other templates.
-  ## It can't be run through static.url because MathJax uses crazy url introspection to do lazy loading of MathJax extension libraries
-  <script type="text/javascript" src="/static/js/vendor/mathjax-MathJax-c9db6ac/MathJax.js?config=TeX-MML-AM_HTMLorMML-full"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/split.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/jquery.ajaxfileupload.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/Markdown.Converter.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/Markdown.Sanitizer.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/Markdown.Editor.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/jquery.autocomplete.js')}"></script>
-  <script type="text/javascript" src="${static.url('js/vendor/jquery.tagsinput.js')}"></script>
-  <link href="${static.url('css/vendor/jquery.tagsinput.css')}" rel="stylesheet" type="text/css">
-  <link href="${static.url('css/vendor/jquery.autocomplete.css')}" rel="stylesheet" type="text/css">
+<%include file="_js_dependencies.html" />
 </%block>
 
 <%include file="../course_navigation.html" args="active_page='discussion'" />