signup and search enhancements

tjcsl · Sep 12, 2015 · c2c1191 · c2c1191
1 parent fb10b3e
commit c2c1191
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 6 deletions.
diff --git a/intranet/static/css/eighth.signup.css b/intranet/static/css/eighth.signup.css
@@ -356,6 +356,14 @@ h5.hidden {
     display: none;
 }
 
+#activity-list h5 .clear-button {
+    float: right;
+    margin-top: 4px;
+    margin-right: 0;
+    height: 16px;
+    padding-bottom: 3px;
+}
+
 #activity-list li {
     height: 26px;
     line-height: 26px;

diff --git a/intranet/static/css/responsive.css b/intranet/static/css/responsive.css
@@ -112,6 +112,11 @@
     .eighth-signup .middle .desktop-info {
         display: none;
     }
+
+
+    .eighth-signup #activity-list h5 .clear-button {
+        margin-right: 20px;
+    }
 }
 
 #activity-picker .backbtn {
@@ -193,6 +198,11 @@
     .block-title .block-comments > span {
         display: none;
     }
+
+
+    .eighth-signup #activity-list h5 .clear-button {
+        margin-right: 0;
+    }
 }
 
 @media (max-width: 500px) {

diff --git a/intranet/static/css/schedule.widget.css b/intranet/static/css/schedule.widget.css
@@ -78,7 +78,7 @@
 }
 
 .chevron.schedule-right {
-    float: right;
+/*    float: right;*/
 }
 
 .chevron.schedule-left {

diff --git a/intranet/static/js/eighth/signup.search.js b/intranet/static/js/eighth/signup.search.js
@@ -2,10 +2,16 @@ $(document).ready(function() {
 
     searchDebug = false;
 
-    eighthSearch = function() {
+    clearSearch = function() {
+        $("#activity-picker .search-wrapper input").val("").trigger("keyup");
+    }
+
+    eighthSearch = function(q) {
         var _st = +new Date();
+
         var searchStr = $(this).val().toLowerCase();
         searchStr = $.trim(searchStr);
+
         var searchSplit = [];
         if(searchStr.indexOf('"') != -1) {
             var quoteSplit = searchStr.split('"');
@@ -33,6 +39,12 @@ $(document).ready(function() {
             }
         }
 
+        if(searchStr.length == 0) {
+            $(".sticky-header.all-header").html("All");
+        } else {
+            $(".sticky-header.all-header").html("Search Results<a class='button small-button clear-button' onclick='clearSearch()'>Clear</span>");
+        }
+
         // console.log("query:", searchStr);
 
         var results = [];

diff --git a/intranet/static/js/schedule.js b/intranet/static/js/schedule.js
@@ -1,12 +1,12 @@
 $(document).ready(function() {
 
     scheduleBind = function() {
-        $(".schedule-outer .schedule-left").click(function() {
+        $(".schedule-outer .schedule-left").click(function(event) {
             event.preventDefault();
             scheduleView(-1);
         });
 
-        $(".schedule-outer .schedule-right").click(function() {
+        $(".schedule-outer .schedule-right").click(function(event) {
             event.preventDefault();
             scheduleView(1);
         });

diff --git a/intranet/templates/eighth/signup.html b/intranet/templates/eighth/signup.html
@@ -357,7 +357,7 @@ <h4>
                         <i class="fa fa-arrow-up"></i>
                     </span>
                     <p>
-                        Choose an eighth period block above,<br />
+                        Choose an Eighth Period block above,<br />
                         then select an activity from the list below.
                     </p>
                 </div>
@@ -382,7 +382,7 @@ <h4>
             <div id="activity-list" data-toggle-favorite-endpoint="{% url 'eighth_toggle_favorite' %}">
                 <h5 class="sticky-header favorites-header">Favorites</h5>
                 <ul class="favorite-activities"></ul>
-                <h5 class="sticky-header">All</h5>
+                <h5 class="sticky-header all-header">All</h5>
                 <ul class="all-activities"></ul>
                 <ul class="search-noresults">
                     <li>