Note search
authorCharles Connell <charles@connells.org>
Wed, 26 Mar 2014 14:48:08 +0000 (10:48 -0400)
committerCharles Connell <charles@connells.org>
Wed, 26 Mar 2014 14:48:08 +0000 (10:48 -0400)
karmaworld/assets/js/course-detail.js
karmaworld/templates/courses/course_detail.html
karmaworld/templates/courses/course_list.html

index ebdaabdcfae0c9cf1d851aee168a5c9f018b8b1d..b3f99410239ff7123d48ac7fca9db48238e7d214 100644 (file)
@@ -134,11 +134,6 @@ $(function() {
       'aaSorting': [[1,'desc']]
     });
 
-    // wire up search box
-    $('input.search-notes').keyup(function() {
-      dataTable.fnFilter($(this).val());
-    });
-
     // wire up sort chooser
     $('select.course-sort').change(function() {
       dataTable.fnSort([[$(this).val(), 'desc']]);
index d2bcd12e9672537b502898c2709327a31e980cbe..ea074d5415a4e62e7583dc4004bb58f23285d2dc 100644 (file)
         {{ file_upload_form.fp_file }}
       </div>
       <div class="small-12 large-6 columns">
-        <form class="search-notes adelle-sans" action="{% url 'note_search' %}" method="GET">
+        <form class="search-notes" action="{% url 'note_search' %}" method="GET">
           <input name="query" class="search-notes" type="text" placeholder="Search Notes" />
-          <input type="hidden" name="course_id" value="{{ course.id }}">
-          <button type="submit" class="inline-button">Search</button>
+          <input type="hidden" name="course_id" value="{{ course.id }}" />
+          <button type="submit" class="inline-button"><i class="fa fa-search"></i></button>
         </form>
       </div>
       <div class="large-4 columns show-for-large-up">
index 9989c4d4857329c8b424ab37d1123fc62ea404a5..c2cdd87ae3af468a7aaa895e30897f2a6942576c 100644 (file)
@@ -44,7 +44,9 @@
       </div>
       <div class="row">
         <div class="small-12 columns">
-          <button id="intro-video-button">Watch the video&nbsp;&nbsp;<i class='fa fa-caret-right'></i></button>
+          <a href="{% url 'about' %}">
+            <button id="intro-video-button">Watch the video&nbsp;&nbsp;<i class='fa fa-caret-right'></i></button>
+          </a>
         </div>
       </div>
     </div>