Merge branch 'master' of github.com:FinalsClub/karmaworld

Conflicts:
	karmaworld/templates/courses/course_list.html

diff --cc karmaworld/assets/css/global.css
Simple merge

diff --cc karmaworld/templates/courses/course_list.html
index fa71d4260fd81a8fdc1c85a6699644b912151826,b65e596b3d22b20b12c9e949a8669218f3eb6220..536c28d4758989548c6e5b0ab634e573528a2566
--- 1/karmaworld/templates/courses/course_list.html
--- 2/karmaworld/templates/courses/course_list.html
+++ b/karmaworld/templates/courses/course_list.html
@@@ -14,67 -14,14 +14,68 @@@
  {% block pagescripts %}
  <script src="stylesheet" href="{{ STATIC_URL }}/js/responsive-tables.js"></script>
  <script src="{{ STATIC_URL }}/js/jquery.tablesorter.min.js"></script>
 +<script src="{{ STATIC_URL }}/js/jquery.tablesorter.widgets.min.js"></script>
+ <script src="{{ STATIC_URL }}/js/bootstrap-modal.js" ></script>
  <script>
  $(document).ready(function()
 -    {
 -        $("#course_list").tablesorter();
 +{
 +  $("#course_list").tablesorter(
 +  {
 +    widgets: ["filter", "zebra"], 
 +    headers: { 3: { filter: false, sorter: true }, 4: { filter: false, sorter: true } },
 +    widgetOptions : 
 +    { 
 +      // This isn't working how I hoped. It appears that tablesorter isn't actually changing the 
 +      // even odd in accordance with the filter 
 +      zebra : [ "odd", "even" ],
 +
 +      //Resizable widget: If this option is set to false, resized column widths will not be saved. 
 +      //Previous saved values will be restored on page reload. 
 +      resizable: false, 
 +
 +      // If there are child rows in the table (rows with class name from "cssChildRow" option) 
 +      // and this option is true and a match is found anywhere in the child row, then it will make that row 
 +      // visible; default is false 
 +      filter_childRows : false, 
 + 
 +      // if true, a filter will be added to the top of each table column; 
 +      // disabled by using -> headers: { 1: { filter: false } } OR add class="filter-false" 
 +      // if you set this to false, make sure you perform a search using the second method below 
 +      filter_columnFilters : true, 
 +
 +      // css class applied to the table row containing the filters & the inputs within that row 
 +      //filter_cssFilter : 'tablesorter-filter', 
 + 
 +      // add custom filter functions using this option 
 +      // see the filter widget custom demo for more specifics on how to use this option 
 +      filter_functions : null, 
 + 
 +      // if true, filters are collapsed initially, but can be revealed by hovering over the grey bar immediately 
 +      // below the header row. Additionally, tabbing through the document will open the filter row when an input gets focus 
 +      filter_hideFilters : false, 
 + 
 +      // Set this option to false to make the searches case sensitive 
 +      filter_ignoreCase : true, 
 + 
 +      // jQuery selector string of an element used to reset the filters 
 +      filter_reset : 'button.reset', 
 + 
 +      // Delay in milliseconds before the filter widget starts searching; This option prevents searching for 
 +      // every character while typing and should make searching large tables faster. 
 +      filter_searchDelay : 150, 
 + 
 +      // Set this option to true to use the filter to find text from the start of the column 
 +      // So typing in "a" will find "albert" but not "frank", both have a's; default is false 
 +      filter_startsWith : false, 
 + 
 +      // Filter using parsed content for ALL columns 
 +      // be careful on using this on date columns as the date is parsed and stored as time in seconds 
 +      filter_useParsedData : false 
      }
 -);
 -console.log('tablesorter called');
 +  });
 +});
 +
 +console.log('tablesorter finished');
  </script>
  {% endblock %}