From 38d03a59c1988a4fc2f8b272fa0039640b5ba094 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 15:21:34 -0400 Subject: [PATCH 001/172] update old code to update database --- src/goasearch.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/goasearch.py b/src/goasearch.py index b661f87..a0852fc 100755 --- a/src/goasearch.py +++ b/src/goasearch.py @@ -1,7 +1,8 @@ #! /usr/bin/python2 from search import indexListing from textbookExceptions import UnIndexable -from mcmaster.classes import allCourses, classToJSON, indexListing +from mcmaster.classes import allCourses +from search import indexListing, createIndex from itertools import imap try: @@ -11,7 +12,7 @@ except Exception as e: print e print "Downloading course info" -for c in imap(classToJSON, allCourses()): +for c in allCourses(): try: print indexListing(c) except UnIndexable as e: From de31af2a3910fecb06f18d466bf9f900cc1b2eec Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 15:30:41 -0400 Subject: [PATCH 002/172] convert course to json before indexing --- src/search.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/search.py b/src/search.py index 848b455..f95cbdf 100755 --- a/src/search.py +++ b/src/search.py @@ -106,11 +106,12 @@ def indexListing(course): } """ - courseID = hashsec(course) + json_course = classToJSON(course) + courseID = hashsec(json_course) print es.index(index="oersearch", doc_type="course", id=courseID, - body=course) + body=json_course) # For every course we index, we also create a resource for it # This should be an idempotent operation because we're putting it in couchdb From b792a5041a980c22beb18d15c5cb836a0863beaf Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 16:41:52 -0400 Subject: [PATCH 003/172] remove books with no adoption / not real books --- src/scripts/results.tag | 1 + src/scripts/search.js | 19 +++++++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/scripts/results.tag b/src/scripts/results.tag index fc51318..99136aa 100644 --- a/src/scripts/results.tag +++ b/src/scripts/results.tag @@ -7,6 +7,7 @@ var self = this; results_passer.on("new_results", function(data) { console.log("new search results detected"); + console.log(data); self.rows = data; self.update(); }); diff --git a/src/scripts/search.js b/src/scripts/search.js index 8fe25b4..e2b8a1b 100644 --- a/src/scripts/search.js +++ b/src/scripts/search.js @@ -8,11 +8,9 @@ function makeResourceGetter(self) { "author" : this.bookauthor }; var url = "/search/resources"; - console.log(params); $.getJSON(url, { data : JSON.stringify(params) }).done(function(results) { - if (results.iarchive) { self.iarchive = results.iarchive[0]; } @@ -65,7 +63,24 @@ function autocomplete(element, endpoint) { }); } +function realBook(book) { + var noAdoption = book.booktitle.indexOf("No Adoption"); + var noBooks = book.booktitle.indexOf("No Textbooks"); + return ((noAdoption == -1) && + (noBooks == -1)); +} + function filterCourses(courses) { + var books; + + for (var i in courses) { + books = courses[i].books; + if ((books.length > 0) && + (!realBook(books[0]))) { + courses[i].books = ""; + } + } + return courses.filter( function (c) { return c.prof != "Staff"; From fe786884d401d4cbd5ff075e244a3bed125635fa Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 16:56:40 -0400 Subject: [PATCH 004/172] loading thingy --- src/scripts/search.tag | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 5154ca8..e8fe892 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,15 +16,22 @@ +
+
+var that = this; function submit(ev) { console.log("submitted"); + that.opts.booksLoading = true; + that.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); + that.opts.booksLoading = false; + that.update(); }); } From 95335f74577f3c213d39e151872e8c52f5801b58 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 16:57:50 -0400 Subject: [PATCH 005/172] loading thingy --- src/scripts/search.tag | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index e8fe892..94618b6 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -23,15 +23,12 @@ var that = this; function submit(ev) { console.log("submitted"); - that.opts.booksLoading = true; - that.update(); + console.log(that); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); - that.opts.booksLoading = false; - that.update(); }); } From c0346543dc33dc71d8bda3218766d70622252964 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 16:58:38 -0400 Subject: [PATCH 006/172] loading thingy --- src/scripts/search.tag | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 94618b6..ecd00fb 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -18,9 +18,7 @@
- - -var that = this; +console.log(this); function submit(ev) { console.log("submitted"); console.log(that); @@ -32,3 +30,4 @@ function submit(ev) { results_passer.trigger("new_results", cgroups); }); } + From 075512a733b5bdcef287681919ab5c1fea17b3b6 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 16:59:35 -0400 Subject: [PATCH 007/172] loading thingy --- src/scripts/search.tag | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index ecd00fb..6e9507b 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -21,13 +21,16 @@ console.log(this); function submit(ev) { console.log("submitted"); - console.log(that); + that.opts.booksLoading = true; + that.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); + that.opts.booksLoading = false; + that.update(); }); } From 943d9a8facd07516fb3454a7f669320a8ed8e262 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:00:34 -0400 Subject: [PATCH 008/172] loading thingy --- src/scripts/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.js b/src/scripts/search.js index e2b8a1b..c553117 100644 --- a/src/scripts/search.js +++ b/src/scripts/search.js @@ -48,7 +48,7 @@ function ResultsPasser() { var results_passer = new ResultsPasser(); -riot.mount("search"); +riot.mount("search", {booksLoading : false}); riot.mount("results"); function autocomplete(element, endpoint) { From 39128977327ceda5c2db1228316c226fa541aefa Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:01:52 -0400 Subject: [PATCH 009/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 6e9507b..4713203 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -18,7 +18,7 @@
-console.log(this); +var that = this; function submit(ev) { console.log("submitted"); that.opts.booksLoading = true; From b5ab67eb95d903414b6b8944ca5038ca2866f24b Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:02:37 -0400 Subject: [PATCH 010/172] loading thingy --- src/scripts/search.tag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 4713203..45b0085 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -22,6 +22,7 @@ var that = this; function submit(ev) { console.log("submitted"); that.opts.booksLoading = true; + console.log(that.opts.booksLoading); that.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, From cccd17441d47d26630bc9c297add6a63e8aab2ed Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:03:47 -0400 Subject: [PATCH 011/172] loading thingy --- src/scripts/search.tag | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 45b0085..952ef03 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -21,17 +21,12 @@ var that = this; function submit(ev) { console.log("submitted"); - that.opts.booksLoading = true; - console.log(that.opts.booksLoading); - that.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); - that.opts.booksLoading = false; - that.update(); }); } From 3ef4a3b0b3ed17b80501938e648befe33cf67146 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:04:25 -0400 Subject: [PATCH 012/172] loading thingy --- src/scripts/search.tag | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 952ef03..5154ca8 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,9 +16,8 @@ -
-
-var that = this; + + function submit(ev) { console.log("submitted"); var params = $(ev.currentTarget).serialize(); @@ -29,4 +28,3 @@ function submit(ev) { results_passer.trigger("new_results", cgroups); }); } - From bbb5393de8e0612e5ded3622f6c73a3c8a09e2d5 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:05:08 -0400 Subject: [PATCH 013/172] loading thingy --- src/scripts/search.js | 2 +- src/scripts/search.tag | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.js b/src/scripts/search.js index c553117..0400a80 100644 --- a/src/scripts/search.js +++ b/src/scripts/search.js @@ -48,7 +48,7 @@ function ResultsPasser() { var results_passer = new ResultsPasser(); -riot.mount("search", {booksLoading : false}); +riot.mount("search", {booksLoading : true}); riot.mount("results"); function autocomplete(element, endpoint) { diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 5154ca8..0656c80 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,6 +16,8 @@ +
+
function submit(ev) { From 325aa392a54b98865bb5a93e109f335453123d0f Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:05:42 -0400 Subject: [PATCH 014/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 0656c80..5ec1938 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,7 +16,7 @@ -
+
From da16bf2cc11b9ea1d34ac3668abf0eb5a8941269 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:06:27 -0400 Subject: [PATCH 015/172] loading thingy --- src/scripts/search.js | 2 +- src/scripts/search.tag | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.js b/src/scripts/search.js index 0400a80..c553117 100644 --- a/src/scripts/search.js +++ b/src/scripts/search.js @@ -48,7 +48,7 @@ function ResultsPasser() { var results_passer = new ResultsPasser(); -riot.mount("search", {booksLoading : true}); +riot.mount("search", {booksLoading : false}); riot.mount("results"); function autocomplete(element, endpoint) { diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 5ec1938..7df813b 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -19,14 +19,18 @@
- +var that = this; function submit(ev) { console.log("submitted"); + that.opts.booksLoading = true; + that.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); + that.opts.booksLoading = false; + that.update(); }); } From 81fbffea6f35e97296749b71dcf5f0a7f0c02083 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:06:51 -0400 Subject: [PATCH 016/172] loading thingy --- src/scripts/search.tag | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 7df813b..1c1ab21 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -22,15 +22,11 @@ var that = this; function submit(ev) { console.log("submitted"); - that.opts.booksLoading = true; - that.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); - that.opts.booksLoading = false; - that.update(); }); } From caca7e3e903397259e78674105c93ebc81ffc6c3 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:07:20 -0400 Subject: [PATCH 017/172] loading thingy --- src/scripts/search.tag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 1c1ab21..2de7f78 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -22,6 +22,7 @@ var that = this; function submit(ev) { console.log("submitted"); + console.log(that); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, function(courses) { From 88680a7479269d5264b69b41638909d9315da5a4 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:08:03 -0400 Subject: [PATCH 018/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 2de7f78..f549bbf 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -18,7 +18,6 @@
- var that = this; function submit(ev) { console.log("submitted"); @@ -31,3 +30,4 @@ function submit(ev) { results_passer.trigger("new_results", cgroups); }); } + From 2721bdcd0d6b9175df827a70f383f733670cb7c3 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:08:32 -0400 Subject: [PATCH 019/172] loading thingy --- src/scripts/search.tag | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index f549bbf..db1dbae 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -19,6 +19,8 @@
var that = this; + + function submit(ev) { console.log("submitted"); console.log(that); @@ -30,4 +32,3 @@ function submit(ev) { results_passer.trigger("new_results", cgroups); }); } - From 5f247b8d4cc48afc6c0c2a77cf2e15d621490bc5 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:09:14 -0400 Subject: [PATCH 020/172] loading thingy --- src/scripts/search.tag | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index db1dbae..ac27a45 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -18,9 +18,7 @@
-var that = this; - - + + From 265345be62836136b09ca21f3690432a202f7463 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:10:37 -0400 Subject: [PATCH 021/172] loading thingy --- src/scripts/search.tag | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index ac27a45..164ae8b 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -18,7 +18,10 @@
+ + - From 3a3dcc55941a454b6e971c9f840afa69bb98d9fc Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:12:04 -0400 Subject: [PATCH 022/172] loading thingy --- src/scripts/search.tag | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 164ae8b..fc19e2f 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -21,7 +21,6 @@ From b3811648a8a7dd1d0f5952bf07a99d7fe337bc7d Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:13:02 -0400 Subject: [PATCH 024/172] loading thingy --- src/scripts/search.tag | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index f2a1a7b..3ef51bd 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -19,10 +19,9 @@
- + From b2257455749a1e298bbd77aa1458b8e8f61277cc Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:13:46 -0400 Subject: [PATCH 025/172] loading thingy --- src/scripts/search.tag | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 3ef51bd..50e860f 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,8 +16,6 @@
-
-
From 11c37f2f27b0348463e703e7babda5ba7be354de Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:14:37 -0400 Subject: [PATCH 027/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index f07b561..7f88fb0 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -23,7 +23,7 @@ function submit(ev) { $.getJSON("/search/fc?"+params, function(courses) { var fcourses = filterCourses(courses); - var cgroups = groupsof(4, fcourses); + var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); }); } From fa7907b72871530900c79c9617daf836372b45b3 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:15:46 -0400 Subject: [PATCH 028/172] loading thingy --- src/scripts/search.tag | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 7f88fb0..bbee3d9 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,6 +16,9 @@ + function submit(ev) { console.log("submitted"); From 5b945b35061bd503c5a9ee02709f49d9317bd6f4 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:16:12 -0400 Subject: [PATCH 029/172] loading thingy --- src/scripts/search.tag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index bbee3d9..fb5b5da 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -21,6 +21,7 @@ var that = this; function submit(ev) { + console.log(that); console.log("submitted"); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, From db31aa451ec51ca17f4b7c31defe07c8386b0b25 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:17:06 -0400 Subject: [PATCH 030/172] loading thingy --- src/scripts/search.tag | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index fb5b5da..8a21e68 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -18,8 +18,6 @@ - function submit(ev) { console.log(that); console.log("submitted"); @@ -31,3 +29,5 @@ function submit(ev) { results_passer.trigger("new_results", cgroups); }); } + + From 786ed34e632c0bb0c0deeed453f9591439cb4cc2 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:20:24 -0400 Subject: [PATCH 031/172] loading thingy --- src/scripts/search.tag | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 8a21e68..25e0d63 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -1,5 +1,5 @@ -
+
@@ -16,10 +16,8 @@
- - From aaec97affb90c98ad4bd8dfe2c0fc705a19836ac Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:20:45 -0400 Subject: [PATCH 032/172] loading thingy --- src/scripts/search.tag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 25e0d63..7d197ab 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -19,6 +19,7 @@ function submit(ev) { console.log("submitted"); + console.log(this); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, function(courses) { From f9011b72efc9760afb49a32276562c3759e30d06 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:21:37 -0400 Subject: [PATCH 033/172] loading thingy --- src/scripts/search.tag | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 7d197ab..e549356 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -19,12 +19,15 @@ function submit(ev) { console.log("submitted"); - console.log(this); + this.opts.booksLoading = true; + this.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); + this.opts.booksLoading = false; + this.update(); }); } From e0f856d407cb89ae11bc8c979dccf180b2a1db08 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:22:09 -0400 Subject: [PATCH 034/172] loading thingy --- src/scripts/search.tag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index e549356..64601c1 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -19,6 +19,7 @@ function submit(ev) { console.log("submitted"); + console.log(this); this.opts.booksLoading = true; this.update(); var params = $(ev.currentTarget).serialize(); From 6d4b985e3a029ec1fc6676a24e5e2a2178bc2d03 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:22:46 -0400 Subject: [PATCH 035/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 64601c1..5dc374d 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -30,5 +30,5 @@ function submit(ev) { results_passer.trigger("new_results", cgroups); this.opts.booksLoading = false; this.update(); - }); + }).bind(this); } From 8f7740c548ad6e9ccebe7ac66407ed8fc0169daa Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:23:14 -0400 Subject: [PATCH 036/172] loading thingy --- src/scripts/search.tag | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 5dc374d..4b466ee 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -24,11 +24,11 @@ function submit(ev) { this.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, - function(courses) { + (function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); this.opts.booksLoading = false; this.update(); - }).bind(this); + }).bind(this)); } From e5fec3fe5bf4c8c3c92aba5ecb5b0bf1b57f7827 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:24:28 -0400 Subject: [PATCH 037/172] loading thingy --- src/scripts/search.tag | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 4b466ee..e556e3a 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -19,16 +19,13 @@ function submit(ev) { console.log("submitted"); - console.log(this); this.opts.booksLoading = true; this.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, - (function(courses) { + function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); - this.opts.booksLoading = false; - this.update(); - }).bind(this)); + }); } From 0a3e9ab41d3bc8bd8cb240f148e81b288ee109f8 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:26:18 -0400 Subject: [PATCH 038/172] loading thingy --- src/scripts/search.tag | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index e556e3a..a2d0fa7 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,16 +16,21 @@ +
+
function submit(ev) { console.log("submitted"); + console.log(this); this.opts.booksLoading = true; this.update(); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, - function(courses) { + (function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); - }); + this.opts.booksLoading = false; + this.update(); + }).bind(this)); } From 0f4cb05472abe6010ab92b5e821e3d0185e632d3 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:26:52 -0400 Subject: [PATCH 039/172] loading thingy --- src/scripts/search.tag | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index a2d0fa7..9243e79 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -30,7 +30,5 @@ function submit(ev) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); - this.opts.booksLoading = false; - this.update(); }).bind(this)); } From 50738e75baa706899794894baf225b72c698d6b9 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:29:11 -0400 Subject: [PATCH 040/172] loading thingy --- src/scripts/search.tag | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 9243e79..d4c6e82 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -20,10 +20,12 @@ function submit(ev) { + ev.preventDefault(); console.log("submitted"); console.log(this); - this.opts.booksLoading = true; + this.booksLoading = true; this.update(); + console.log(this.opts.booksLoading); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, (function(courses) { From ecc94ebb40e4ae8e86e1c186a37c918301dc6f84 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:41:53 -0400 Subject: [PATCH 041/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index d4c6e82..152bec6 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -25,7 +25,7 @@ function submit(ev) { console.log(this); this.booksLoading = true; this.update(); - console.log(this.opts.booksLoading); + console.log(this.booksLoading); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, (function(courses) { From efd88d951d6e3bdeac247fa44375d3790218e056 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:42:26 -0400 Subject: [PATCH 042/172] loading thingy --- src/scripts/search.tag | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 152bec6..0d17142 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -22,15 +22,15 @@ function submit(ev) { ev.preventDefault(); console.log("submitted"); - console.log(this); this.booksLoading = true; this.update(); - console.log(this.booksLoading); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, (function(courses) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); + this.booksLoading = false; + this.update(); }).bind(this)); } From 4e7fc193fa8a4ba6ab1fff48322229b876b214ad Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:47:43 -0400 Subject: [PATCH 043/172] loading thingy --- src/scripts/search.tag | 2 +- src/styles/search.css | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 0d17142..d95f299 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,7 +16,7 @@ -
+
function submit(ev) { diff --git a/src/styles/search.css b/src/styles/search.css index 1a7aa07..7f2f07b 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -6,6 +6,12 @@ header { white-space: pre-wrap !important; } +.search-load { + border-radius: 2.9rem !important; + width: 3rem !important; + height: 2.8rem !important; +} + .body { color: #1c75bc; } From 2fd81936dcc4e385691ed39aebb8f1c032990827 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:48:26 -0400 Subject: [PATCH 044/172] loading thingy --- src/styles/search.css | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index 7f2f07b..bdeaf77 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -7,9 +7,6 @@ header { } .search-load { - border-radius: 2.9rem !important; - width: 3rem !important; - height: 2.8rem !important; } .body { From f8a90dfeb8377162ce8f141625d321957a03dc7d Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:49:06 -0400 Subject: [PATCH 045/172] loading thingy --- src/scripts/search.tag | 2 +- src/styles/search.css | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index d95f299..ec81ad7 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,7 +16,7 @@
-
+
function submit(ev) { diff --git a/src/styles/search.css b/src/styles/search.css index bdeaf77..47bb852 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -7,6 +7,9 @@ header { } .search-load { + border-radius: 2.9rem; + width: 3rem; + height: 2.8rem; } .body { From a7e16a1956f60811b0eff709dbdd082c228df2aa Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 17:51:35 -0400 Subject: [PATCH 046/172] loading thingy --- src/scripts/search.tag | 2 +- src/styles/search.css | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index ec81ad7..acce2ca 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -16,7 +16,7 @@
-
+
function submit(ev) { diff --git a/src/styles/search.css b/src/styles/search.css index 47bb852..02633de 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -7,9 +7,28 @@ header { } .search-load { + color: transparent !important; + min-height: 1.6rem; + pointer-events: none; + position: relative; +} + +.search-load::after { + -webkit-animation: loading 500ms infinite linear; + animation: loading 500ms infinite linear; + border: .2rem solid #5764c6; border-radius: 2.9rem; - width: 3rem; + border-right-color: transparent; + border-top-color: transparent; + content: ""; + display: block; height: 2.8rem; + left: 50%; + margin-left: -.8rem; + margin-top: -.8rem; + position: absolute; + top: 50%; + width: 3rem; } .body { From 3567bf2e0f43ffe41de438dc52452e0c514a3434 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:01:44 -0400 Subject: [PATCH 047/172] loading thingy --- src/scripts/results.tag | 10 +++++++++- src/scripts/search.js | 2 +- src/scripts/search.tag | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/scripts/results.tag b/src/scripts/results.tag index 99136aa..5f1d0d6 100644 --- a/src/scripts/results.tag +++ b/src/scripts/results.tag @@ -1,14 +1,22 @@ -
+
this.rows = []; var self = this; + +results_passer.on("loading", + function() { + self.notLoading = false; + self.update(); + }); + results_passer.on("new_results", function(data) { console.log("new search results detected"); console.log(data); self.rows = data; + self.notLoading = true; self.update(); }); diff --git a/src/scripts/search.js b/src/scripts/search.js index c553117..1acb7d4 100644 --- a/src/scripts/search.js +++ b/src/scripts/search.js @@ -49,7 +49,7 @@ function ResultsPasser() { var results_passer = new ResultsPasser(); riot.mount("search", {booksLoading : false}); -riot.mount("results"); +riot.mount("results", {notLoading : true}); function autocomplete(element, endpoint) { // The element should be an input class diff --git a/src/scripts/search.tag b/src/scripts/search.tag index acce2ca..d7cbe97 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -24,6 +24,7 @@ function submit(ev) { console.log("submitted"); this.booksLoading = true; this.update(); + results_passer.trigger("loading"); var params = $(ev.currentTarget).serialize(); $.getJSON("/search/fc?"+params, (function(courses) { From b929db07dfb45a61bee69ebe8b77f8d17f9f1447 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:05:53 -0400 Subject: [PATCH 048/172] loading thingy --- src/templates/search.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/templates/search.html b/src/templates/search.html index 90c984e..d3dc711 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -6,6 +6,9 @@

TextBook Commons

+
+ +
Type in the name of your course and start saving money on your books
From 94475dd40f8aaee2efc711c1dcd23aa87637a276 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:06:28 -0400 Subject: [PATCH 049/172] loading thingy --- src/templates/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/search.html b/src/templates/search.html index d3dc711..b923035 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -7,7 +7,7 @@

TextBook Commons

- +
Type in the name of your course and start saving money on your books
From 2e87b4dc3b39aa4c63187483516bc88e5e7ab381 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:08:03 -0400 Subject: [PATCH 050/172] loading thingy --- src/templates/search.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index b923035..c7a3cff 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -6,9 +6,6 @@

TextBook Commons

-
- -
Type in the name of your course and start saving money on your books
@@ -16,6 +13,9 @@ {% endblock %} +
+ +
{% block content %} From 1acc5c2f74697a0f9af6a340ad593db4fbe0601d Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:09:40 -0400 Subject: [PATCH 051/172] loading thingy --- src/templates/search.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index c7a3cff..0297ef2 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -13,10 +13,10 @@ {% endblock %} -
- -
+
+ +
{% block content %} From 981bd789fe593788eb89137197d06b8f0d09d353 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:10:34 -0400 Subject: [PATCH 052/172] loading thingy --- src/templates/search.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index 0297ef2..774cbfd 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -14,11 +14,10 @@ {% endblock %} + {% block content %}
- {% block content %} - {% endblock %} From 330167188577f91a6dff375eac253e0c20d5e668 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:11:03 -0400 Subject: [PATCH 053/172] loading thingy --- src/templates/search.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index 774cbfd..803dcbd 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -15,9 +15,7 @@ {% block content %} -
- -
+ {% endblock %} From f7561cc8281fa4bc997f0eefcf66c99d45f8282e Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:11:29 -0400 Subject: [PATCH 054/172] loading thingy --- src/templates/search.html | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index 803dcbd..42a0794 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -15,9 +15,6 @@ {% block content %} - - - {% endblock %}
From ebbef26a040eaf9b68598bf91e3e8a4ddec344ed Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:12:12 -0400 Subject: [PATCH 055/172] loading thingy --- src/templates/search.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/templates/search.html b/src/templates/search.html index 42a0794..cadb615 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -6,6 +6,9 @@

TextBook Commons

+
+ +
Type in the name of your course and start saving money on your books
@@ -13,8 +16,14 @@ {% endblock %} +
+ +
{% block content %} + + + {% endblock %}
From d668d70a0931084b0e8300f4395a41a74d055f59 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:14:47 -0400 Subject: [PATCH 056/172] NOPE --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f4fe988..ffe7e04 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ clean: install: $(MAKE) clean; $(MAKE); - rm -rf ${SRV_ROOT}build/; - cp -rT ./build ${SRV_ROOT}build/; + rm -rf /srv/http/build/; + cp -rT ./build /srv/http/build/; cp -rT ./build/scripts/ ${SRV_ROOT}scripts/; cp -rT ./build/styles/ ${SRV_ROOT}styles/; - cp search.ini ${SRV_ROOT}build/; + cp search.ini /srv/http/build/; From b1d3f7716156660b148a1de8ffa78ca72743b9dd Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:16:53 -0400 Subject: [PATCH 057/172] loading thingy --- src/templates/search.html | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index cadb615..fc7d971 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -5,10 +5,14 @@
-

TextBook Commons

-
- -
+
+

TextBook Commons

+
+
+
+ +
+
Type in the name of your course and start saving money on your books
From a5b0a633e917bbb7ef6fa9292966a387c630583f Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:17:38 -0400 Subject: [PATCH 058/172] loading thingy --- src/templates/search.html | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index fc7d971..5309ccd 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -5,14 +5,12 @@
-
+

TextBook Commons

-
-
-
+
Type in the name of your course and start saving money on your books
From a7ef34477bdc2c45598f002c888a7a397139067c Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:18:46 -0400 Subject: [PATCH 059/172] loading thingy --- src/templates/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/search.html b/src/templates/search.html index 5309ccd..7790a08 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -5,7 +5,7 @@
-
+

TextBook Commons

From 71a348aeee0b9e0fbb3067ce7d225b812f8be221 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:19:24 -0400 Subject: [PATCH 060/172] loading thingy --- src/templates/search.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index 7790a08..f8351bf 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -6,8 +6,8 @@
-

TextBook Commons

-
+

TextBook Commons

+
From d0a5f50690fa0db5a1105e4f090d658a245a1e8e Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:20:14 -0400 Subject: [PATCH 061/172] loading thingy --- src/templates/search.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index f8351bf..626bc43 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -5,12 +5,10 @@
-
-

TextBook Commons

-
- -
-
+

TextBook Commons

+
+ +
Type in the name of your course and start saving money on your books
From 30f49aa030708e8b3f7f7496e25ab084f6047a5e Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:21:38 -0400 Subject: [PATCH 062/172] loading thingy --- src/templates/search.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index 626bc43..61e65d3 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -5,10 +5,12 @@
-

TextBook Commons

-
- -
+
+

TextBook Commons

+
+ +
+
Type in the name of your course and start saving money on your books
From 56b6e4390920f73415af4e1fb1116f3c37648d91 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:25:05 -0400 Subject: [PATCH 063/172] loading thingy --- src/templates/search.html | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index 61e65d3..b52c8af 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -3,18 +3,15 @@ {{super()}}
+
-
-
-

TextBook Commons

-
- -
-
-
Type in the name of your course and start saving money on your books
-
- +

TextBook Commons

+
+ +
+
Type in the name of your course and start saving money on your books
+
{% endblock %} From 72a3d08f3de65f800a5c42372b1dbec8d5607fc4 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:25:48 -0400 Subject: [PATCH 064/172] loading thingy --- src/templates/search.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/templates/search.html b/src/templates/search.html index b52c8af..bd863d8 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -6,6 +6,8 @@

TextBook Commons

+
+
From 766534e62d8ed7311e142167baf77d5ab7b9cc94 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:27:01 -0400 Subject: [PATCH 065/172] loading thingy --- src/templates/search.html | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index bd863d8..de2286c 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -3,7 +3,7 @@ {{super()}}
-
+

TextBook Commons

@@ -12,8 +12,9 @@
-
Type in the name of your course and start saving money on your books
- +
+
Type in the name of your course and start saving money on your books
+ {% endblock %} From e13991c12ddc2309db7140437cb55da312043b93 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:27:55 -0400 Subject: [PATCH 066/172] loading thingy --- src/templates/search.html | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index de2286c..c23de6f 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -3,18 +3,15 @@ {{super()}}
-
+
+

TextBook Commons

+
+ +
-

TextBook Commons

+
Type in the name of your course and start saving money on your books
+
-
-
- -
-
-
-
Type in the name of your course and start saving money on your books
-
{% endblock %} From bb5ca75fc46f8c7ffbbba981a2f72ba1129f45b2 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:29:44 -0400 Subject: [PATCH 067/172] loading thingy --- src/templates/search.html | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index c23de6f..b114b55 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -4,10 +4,16 @@
-

TextBook Commons

-
- -
+
+
+

TextBook Commons

+
+
+ +
+
+
+
Type in the name of your course and start saving money on your books
From c9675976033f5c1fef47e8fc281cdebba0ecf1fa Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:30:25 -0400 Subject: [PATCH 068/172] loading thingy --- src/templates/search.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index b114b55..a8c1635 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -6,8 +6,8 @@
-

TextBook Commons

-
+

TextBook Commons

+
From d8f779004e96906331126c3299d5f2b669397d6c Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:31:14 -0400 Subject: [PATCH 069/172] loading thingy --- src/styles/search.css | 16 ++-------------- src/templates/search.html | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index 02633de..a426ec0 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -120,20 +120,8 @@ a { background-image: none; } -.logo-div { - height:67px; - width:150px; - margin-right:1%; - margin-bottom: 0%; - margin-top:1%; - margin-left:2%; - background-size: 100%; - background-size: cover; - -webkit-background-size: cover; - -o-background-size: cover; - background-size: cover; - background-position: center center; - /*background-image: url('https://mgoal.ca/goal_transp.png');*/ +.logo { + margin-top: -10px; } .title-div { diff --git a/src/templates/search.html b/src/templates/search.html index a8c1635..e4b06e1 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -7,7 +7,7 @@

TextBook Commons

-
+
{% endblock %} From 7defbaad8a7a30bd6cce46564c613a9b8e923390 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:41:53 -0400 Subject: [PATCH 076/172] loading thingy --- src/styles/search.css | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index ad44222..73ec45f 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -128,7 +128,3 @@ a { .title { margin-left: 30px; } - -.title-div { - font-size: 25px; -} From 887d28bc791b03e9277b91ceeb385393dfd6d0ff Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:45:38 -0400 Subject: [PATCH 077/172] loading thingy --- src/scripts/search.tag | 7 ++++++- src/templates/search.html | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 52b4e39..668f5b7 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -4,7 +4,12 @@
- +
From f16d3bc8f00c62b836b993333be7e28b02bdd182 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:47:48 -0400 Subject: [PATCH 079/172] loading thingy --- src/scripts/search.tag | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 305d5e1..cb20173 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -3,14 +3,8 @@
-
- - +
+
From eed27b24dafb23e282dd76d34c03d5a1ba7307e6 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:53:29 -0400 Subject: [PATCH 081/172] loading thingy --- src/styles/search.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index 73ec45f..2123a50 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -122,9 +122,9 @@ a { .logo { margin-top: 20px; - margin-left: -30px; + margin-left: -20px; } .title { - margin-left: 30px; + margin-left: 20px; } From 5bfeed1bf9300058601c4dd49021b4df4e8c03ed Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:55:27 -0400 Subject: [PATCH 082/172] loading thingy --- src/styles/search.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index 2123a50..f5cdc34 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -122,9 +122,7 @@ a { .logo { margin-top: 20px; - margin-left: -20px; } .title { - margin-left: 20px; } From 8e28847532adf3428c0e635672f07c03ca1984c7 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:56:15 -0400 Subject: [PATCH 083/172] loading thingy --- src/styles/search.css | 2 ++ src/templates/search.html | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index f5cdc34..73ec45f 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -122,7 +122,9 @@ a { .logo { margin-top: 20px; + margin-left: -30px; } .title { + margin-left: 30px; } diff --git a/src/templates/search.html b/src/templates/search.html index 1260f3b..e9684e9 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -6,8 +6,8 @@
-

TextBook Commons

- -
Search for your course and start saving money on your books
+
{% endblock %} From 3d3277a0acea7891270406cb08ee466cc7426dac Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 18:59:57 -0400 Subject: [PATCH 088/172] loading thingy --- src/templates/search.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index 9ddbbe5..d9ff836 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -3,7 +3,6 @@ {{super()}}
-

TextBook Commons

@@ -18,7 +17,6 @@
Search for your course and start saving money on your books
-
{% endblock %} From 6bbfda7e6e28341b4c256750695b81fe14c3cad6 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:01:23 -0400 Subject: [PATCH 089/172] loading thingy --- src/templates/search.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index d9ff836..a01aca0 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -3,20 +3,20 @@ {{super()}}
-
-
-

TextBook Commons

- -
-
Search for your course and start saving money on your books
- -
+
Search for your course and start saving money on your books
+ +
{% endblock %} From 6a2e43ec6a9bae775fe6e8b310bce2431c5c9fe2 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:02:31 -0400 Subject: [PATCH 090/172] loading thingy --- src/templates/search.html | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index a01aca0..543ef6a 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -3,20 +3,22 @@ {{super()}}
-
-
-
-

TextBook Commons

-
+
Search for your course and start saving money on your books
+ + +
{% endblock %} From cd86679662b6af5ae8747da157efbaa01a9d21f6 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:03:53 -0400 Subject: [PATCH 091/172] loading thingy --- src/styles/search.css | 2 +- src/templates/search.html | 26 ++++++++++++-------------- 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index ad44222..1a61810 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -129,6 +129,6 @@ a { margin-left: 30px; } -.title-div { +.page-top { font-size: 25px; } diff --git a/src/templates/search.html b/src/templates/search.html index 543ef6a..79ab689 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -3,22 +3,20 @@ {{super()}}
-
-
-
-
-

TextBook Commons

- +
+
+
+

TextBook Commons

+
-
Search for your course and start saving money on your books
- -
-
+
+
Search for your course and start saving money on your books
+ +
{% endblock %} From 34814a6f2b417d0cfeb38bc1fbfea48fb375397a Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:04:15 -0400 Subject: [PATCH 092/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 1a61810..5f3fc61 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -130,5 +130,5 @@ a { } .page-top { - font-size: 25px; + font-size: 15px; } From cd3d7140f7bbe8ecc3d09b4e3afa5e83bb7d72d2 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:04:43 -0400 Subject: [PATCH 093/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 5f3fc61..a5c2ce4 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -122,7 +122,7 @@ a { .logo { margin-top: 20px; - margin-left: -30px; + margin-left: -70px; } .title { From 9293943c91f8cc49dcbe2ddd63bd0183b4f69740 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:05:04 -0400 Subject: [PATCH 094/172] loading thingy --- src/styles/search.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index a5c2ce4..8a02526 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -122,11 +122,9 @@ a { .logo { margin-top: 20px; - margin-left: -70px; } .title { - margin-left: 30px; } .page-top { From 45e185e3292713fbf5bf4705086f8c44874766d7 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:05:51 -0400 Subject: [PATCH 095/172] loading thingy --- src/styles/search.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/search.css b/src/styles/search.css index 8a02526..07243c8 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -129,4 +129,5 @@ a { .page-top { font-size: 15px; + max-width: 70%; } From c427cd2d3cc0536e8787eaf7350fb6f7b5b341eb Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:06:10 -0400 Subject: [PATCH 096/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 07243c8..8eafa63 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -129,5 +129,5 @@ a { .page-top { font-size: 15px; - max-width: 70%; + width: 70% !important; } From 8ceae6beb55c9379c79148bd62f1358df4c3c1f7 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:06:31 -0400 Subject: [PATCH 097/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 8eafa63..44d5197 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -129,5 +129,5 @@ a { .page-top { font-size: 15px; - width: 70% !important; + width: 50% !important; } From 4facf9f9b9989bd6314b4ada7fc8dbb6a00cecf5 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:07:35 -0400 Subject: [PATCH 098/172] loading thingy --- src/styles/search.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index 44d5197..ae24377 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -68,8 +68,8 @@ a { } .form-item { - padding-left: 15px; - padding-right: 15px; + padding-left: 5px; + padding-right: 5px; } #title { From b629a58fa54ff59bf5a207949598247773941ccc Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:08:03 -0400 Subject: [PATCH 099/172] loading thingy --- src/styles/search.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/search.css b/src/styles/search.css index ae24377..315562f 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -70,6 +70,7 @@ a { .form-item { padding-left: 5px; padding-right: 5px; + margin-right: -15px; } #title { From 5c3922b7a59bd91a8feb74253f55290f79c0c4e2 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:08:35 -0400 Subject: [PATCH 100/172] loading thingy --- src/styles/search.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles/search.css b/src/styles/search.css index 315562f..9ae9b38 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,9 +123,11 @@ a { .logo { margin-top: 20px; + margin-left: -30px; } .title { + margin-left: 30px; } .page-top { From dc021d7c216b96ee36033638cfa15cf739d703c9 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:08:57 -0400 Subject: [PATCH 101/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 9ae9b38..4e775ca 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,7 +123,7 @@ a { .logo { margin-top: 20px; - margin-left: -30px; + margin-left: -130px; } .title { From e73c489154d48e226f7eb2cc08d4d209ff4bfac5 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:09:22 -0400 Subject: [PATCH 102/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 4e775ca..f15975a 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,7 +123,7 @@ a { .logo { margin-top: 20px; - margin-left: -130px; + margin-left: -150px; } .title { From ee38d93bfb267832b8b06849c69a2dc045d77649 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:09:40 -0400 Subject: [PATCH 103/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index f15975a..8192eff 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,7 +123,7 @@ a { .logo { margin-top: 20px; - margin-left: -150px; + margin-left: -170px; } .title { From 3e6ecb3133a2df59ac99b41cdb90ece5d7679d65 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:10:01 -0400 Subject: [PATCH 104/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 8192eff..103228f 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -127,7 +127,7 @@ a { } .title { - margin-left: 30px; + margin-left: 60px; } .page-top { From a2c7097af867d2a47afa05f5ac59ffb595a1f7f7 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:10:34 -0400 Subject: [PATCH 105/172] loading thingy --- src/styles/search.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index 103228f..cec7e3d 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,11 +123,11 @@ a { .logo { margin-top: 20px; - margin-left: -170px; + margin-left: -75px; } .title { - margin-left: 60px; + margin-left: 75px; } .page-top { From 319cba1ba4299a21bee1ee797d3ed6f37e4ce046 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:11:04 -0400 Subject: [PATCH 106/172] loading thingy --- src/styles/search.css | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index cec7e3d..315562f 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,11 +123,9 @@ a { .logo { margin-top: 20px; - margin-left: -75px; } .title { - margin-left: 75px; } .page-top { From 35a8a9567b569cc5b40c08a7123fdd399e367dfb Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:12:47 -0400 Subject: [PATCH 107/172] loading thingy --- src/templates/search.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/templates/search.html b/src/templates/search.html index 79ab689..c39dab6 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -3,7 +3,7 @@ {{super()}}
-
+

TextBook Commons

From ce6dc50c95c02b7aca383c630429198cfa6f3378 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:13:33 -0400 Subject: [PATCH 108/172] loading thingy --- src/styles/search.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/styles/search.css b/src/styles/search.css index 315562f..479aaac 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,9 +123,11 @@ a { .logo { margin-top: 20px; + margin-right: 20px; } .title { + margin-left: 20px; } .page-top { From 755f9e36fc834f66db674da488bcb9adf8cde55b Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:13:54 -0400 Subject: [PATCH 109/172] loading thingy --- src/styles/search.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index 479aaac..1a5ded2 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,11 +123,11 @@ a { .logo { margin-top: 20px; - margin-right: 20px; + margin-right: 120px; } .title { - margin-left: 20px; + margin-left: 120px; } .page-top { From b041c5d3aba539236615a81acbd6282d531583d2 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:14:31 -0400 Subject: [PATCH 110/172] loading thingy --- src/styles/search.css | 1 - 1 file changed, 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 1a5ded2..c0772f7 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,7 +123,6 @@ a { .logo { margin-top: 20px; - margin-right: 120px; } .title { From 54226c94d3355488e2e067389f052b3baa9cd7a6 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:14:56 -0400 Subject: [PATCH 111/172] loading thingy --- src/styles/search.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/search.css b/src/styles/search.css index c0772f7..48bcbf9 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,6 +123,7 @@ a { .logo { margin-top: 20px; + margin-left: -100px; } .title { From 930e0b4ff7f1d16b7738ce855713d3dafe814ffa Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:15:17 -0400 Subject: [PATCH 112/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 48bcbf9..1da2ee9 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,7 +123,7 @@ a { .logo { margin-top: 20px; - margin-left: -100px; + margin-left: -150px; } .title { From 36179f15d8c6f34cefecd7fb9b43b22e7f964f6b Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:15:38 -0400 Subject: [PATCH 113/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 1da2ee9..1dff3c1 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,7 +123,7 @@ a { .logo { margin-top: 20px; - margin-left: -150px; + margin-left: -170px; } .title { From 9731c5eadb286fcb3aacc0d8eeb4a424b6a8a920 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:15:58 -0400 Subject: [PATCH 114/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 1dff3c1..d87dbbe 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -123,7 +123,7 @@ a { .logo { margin-top: 20px; - margin-left: -170px; + margin-left: -175px; } .title { From a84c5b18a8de954827b645a42d7a540c5516a7b8 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:18:27 -0400 Subject: [PATCH 115/172] loading thingy --- src/templates/search.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/templates/search.html b/src/templates/search.html index c39dab6..9e8f654 100644 --- a/src/templates/search.html +++ b/src/templates/search.html @@ -6,8 +6,8 @@
-

TextBook Commons

- -
- +
+ Type a few words of your course's name or the course code (e.g. PSYCH 2B03)
From e129eb71fd6097b4c5dd5b211395528366a83d51 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:35:03 -0400 Subject: [PATCH 128/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index d6b0e21..8f878f8 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -140,5 +140,5 @@ a { } .help-toast { - font-size: 0.5em !important; + font-size: 0.85em; } From d20d1d4a603f5e4e6f97cadda840d03b65e0f5a7 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:35:24 -0400 Subject: [PATCH 129/172] loading thingy --- src/styles/search.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/search.css b/src/styles/search.css index 8f878f8..272b5e9 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -141,4 +141,5 @@ a { .help-toast { font-size: 0.85em; + max-width: 50%; } From b99dac64ecadc70e8ffadbae2b65acbeca80aa1e Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:36:02 -0400 Subject: [PATCH 130/172] loading thingy --- src/styles/search.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/styles/search.css b/src/styles/search.css index 272b5e9..39485db 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -140,6 +140,6 @@ a { } .help-toast { - font-size: 0.85em; - max-width: 50%; + font-size: 0.75em; + max-width: 60%; } From 708b3a8883157f8cf4e7c21f72c4e8d192a50b61 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:36:32 -0400 Subject: [PATCH 131/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index 39485db..ffb853d 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -141,5 +141,5 @@ a { .help-toast { font-size: 0.75em; - max-width: 60%; + max-width: 55%; } From 8fb2f9b8157b304fa2096f4de311ae43aa96dd3a Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:36:55 -0400 Subject: [PATCH 132/172] loading thingy --- src/styles/search.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/search.css b/src/styles/search.css index ffb853d..1a7dec8 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -142,4 +142,5 @@ a { .help-toast { font-size: 0.75em; max-width: 55%; + margin-top: -10px; } From cf464551110d5ae93d6c39f6cbb9beb66da59ac9 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:39:00 -0400 Subject: [PATCH 133/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index b543338..5a48209 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -20,7 +20,7 @@
-
+
Type a few words of your course's name or the course code (e.g. PSYCH 2B03)
From 5527af4df6b557b43d8aa19d5df29e8b66be66fd Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:46:30 -0400 Subject: [PATCH 134/172] loading thingy --- src/styles/search.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/styles/search.css b/src/styles/search.css index 1a7dec8..c023339 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -140,6 +140,7 @@ a { } .help-toast { + background-color: #1c75bc; font-size: 0.75em; max-width: 55%; margin-top: -10px; From 738a0ca0dcbc62a1937670576efc703d5b02b0e9 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:46:47 -0400 Subject: [PATCH 135/172] loading thingy --- src/styles/search.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/styles/search.css b/src/styles/search.css index c023339..7acac89 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -140,7 +140,7 @@ a { } .help-toast { - background-color: #1c75bc; + background-color: #1c75bc !important; font-size: 0.75em; max-width: 55%; margin-top: -10px; From 0e587b39812c6055ad2c859fe66f7c03e0c3b5ea Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:48:56 -0400 Subject: [PATCH 136/172] loading thingy --- src/scripts/search.js | 5 ++++- src/scripts/search.tag | 11 ++++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.js b/src/scripts/search.js index 1acb7d4..c4d8ad1 100644 --- a/src/scripts/search.js +++ b/src/scripts/search.js @@ -48,7 +48,10 @@ function ResultsPasser() { var results_passer = new ResultsPasser(); -riot.mount("search", {booksLoading : false}); +riot.mount("search", { + showHelp : true, + booksLoading : false + }); riot.mount("results", {notLoading : true}); function autocomplete(element, endpoint) { diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 5a48209..3c299b5 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -21,12 +21,21 @@
- + Type a few words of your course's name or the course code (e.g. PSYCH 2B03)
+var that = this; +function clearHelp() { + that.showHelp = false; + that.update(); +} + function submit(ev) { ev.preventDefault(); console.log("submitted"); From 5a68f684cab22c0434d4e089f6851fb79e538ca6 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:50:28 -0400 Subject: [PATCH 137/172] loading thingy --- src/scripts/search.tag | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 3c299b5..20df464 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -20,9 +20,9 @@
-
- Type a few words of your course's name or the course code (e.g. PSYCH 2B03) @@ -30,10 +30,10 @@
-var that = this; +var self = this; function clearHelp() { - that.showHelp = false; - that.update(); + self.showHelp = false; + self.update(); } function submit(ev) { From 897573fde1f84eebccb593e7a7e6d54a3f1a29ac Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:51:57 -0400 Subject: [PATCH 138/172] loading thingy --- src/scripts/search.tag | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 20df464..2cf6c10 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -20,7 +20,7 @@
-
-
Type a few words of your course's name or the course code (e.g. PSYCH 2B03)
-
+
function clearHelp() { - this.showHelp = false; + this.opts.showHelp = false; this.update(); } function submit(ev) { ev.preventDefault(); console.log("submitted"); - this.booksLoading = true; + this.opts.booksLoading = true; this.update(); results_passer.trigger("loading"); var params = $(ev.currentTarget).serialize(); @@ -48,7 +48,7 @@ function submit(ev) { var fcourses = filterCourses(courses); var cgroups = groupsof(3, fcourses); results_passer.trigger("new_results", cgroups); - this.booksLoading = false; + this.opts.booksLoading = false; this.update(); }).bind(this)); } From f90d4aede6b31c544ddbd3fc5130744e59283339 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 19:55:45 -0400 Subject: [PATCH 140/172] loading thingy --- src/scripts/search.js | 2 +- src/scripts/search.tag | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/scripts/search.js b/src/scripts/search.js index c4d8ad1..77c4bfa 100644 --- a/src/scripts/search.js +++ b/src/scripts/search.js @@ -49,7 +49,7 @@ function ResultsPasser() { var results_passer = new ResultsPasser(); riot.mount("search", { - showHelp : true, + showHelp : false, booksLoading : false }); riot.mount("results", {notLoading : true}); diff --git a/src/scripts/search.tag b/src/scripts/search.tag index b87e39a..5b9763c 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -4,7 +4,7 @@
- +
+
Date: Mon, 8 Aug 2016 20:06:34 -0400 Subject: [PATCH 146/172] loading thingy --- src/scripts/search.tag | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 500b5c2..d954f11 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -36,10 +36,10 @@
-var showedHelp = false; +this.showedHelp = false; function showHelp() { - if (!showedHelp) { + if (!this.showedHelp) { this.opts.showHelp = true; this.update(); } @@ -47,7 +47,7 @@ function showHelp() { function clearHelp() { this.opts.showHelp = false; - showedHelp = true; + this.showedHelp = true; this.update(); } From 8d436a805481972dacff1055d3bd2cd6505bfc23 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:08:28 -0400 Subject: [PATCH 147/172] loading thingy --- src/scripts/search.tag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index d954f11..c8a8818 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -46,6 +46,7 @@ function showHelp() { } function clearHelp() { + console.log("CLEAR HELP FIRED"); this.opts.showHelp = false; this.showedHelp = true; this.update(); From a005d24e98201e64380abadbcfc79ba1d4275458 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:09:03 -0400 Subject: [PATCH 148/172] loading thingy --- src/scripts/search.tag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index c8a8818..89822ee 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -53,6 +53,7 @@ function clearHelp() { } function clearHelpTemp() { + console.log("CLEAR HELP TEMP FIRED"); this.opts.showHelp = false; this.update(); } From f14d2fb48e74f4f646821d2884d0a2e3a71175fa Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:14:07 -0400 Subject: [PATCH 149/172] loading thingy --- src/scripts/search.tag | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 89822ee..ec91aeb 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -4,7 +4,7 @@
- -this.showedHelp = false; +var showedHelp = false; function showHelp() { - if (!this.showedHelp) { + if (!showedHelp) { + showedHelp = true; this.opts.showHelp = true; this.update(); } } function clearHelp() { - console.log("CLEAR HELP FIRED"); - this.opts.showHelp = false; - this.showedHelp = true; - this.update(); -} - -function clearHelpTemp() { - console.log("CLEAR HELP TEMP FIRED"); this.opts.showHelp = false; this.update(); } From 8859cac6044674cf9433fa375e9bc86e482e5cd9 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:15:13 -0400 Subject: [PATCH 150/172] loading thingy --- src/scripts/search.tag | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index ec91aeb..f74b683 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -4,8 +4,7 @@
- Date: Mon, 8 Aug 2016 20:20:57 -0400 Subject: [PATCH 151/172] loading thingy --- src/scripts/search.tag | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index f74b683..537e6b5 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -42,6 +42,10 @@ function showHelp() { showedHelp = true; this.opts.showHelp = true; this.update(); + window.setTimeout( + (function() { + clearHelp.bind(this)(); + }).bind(this), 2000); } } From 50766ac96bcc0e9eec975b4baa3a463e6d8b2301 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:21:28 -0400 Subject: [PATCH 152/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 537e6b5..fe8f480 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -45,7 +45,7 @@ function showHelp() { window.setTimeout( (function() { clearHelp.bind(this)(); - }).bind(this), 2000); + }).bind(this), 15000); } } From 8b7daccf9acf9561d79f3cc127f637e5459e5f2c Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:23:11 -0400 Subject: [PATCH 153/172] loading thingy --- src/scripts/search.tag | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index fe8f480..3d8c864 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -39,17 +39,22 @@ var showedHelp = false; function showHelp() { if (!showedHelp) { - showedHelp = true; this.opts.showHelp = true; this.update(); window.setTimeout( (function() { - clearHelp.bind(this)(); + clearHelpTemp.bind(this)(); }).bind(this), 15000); } } function clearHelp() { + showedHelp = true; + this.opts.showHelp = false; + this.update(); +} + +function clearHelpTemp() { this.opts.showHelp = false; this.update(); } From a47b96a322caf1cf6fa221e3186774b421b13f92 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:23:50 -0400 Subject: [PATCH 154/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 3d8c864..d8e65e9 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -44,7 +44,7 @@ function showHelp() { window.setTimeout( (function() { clearHelpTemp.bind(this)(); - }).bind(this), 15000); + }).bind(this), 10000); } } From 0cb64320625fb7719777355527c0bce199adc0c8 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:25:59 -0400 Subject: [PATCH 155/172] loading thingy --- src/scripts/search.tag | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index d8e65e9..f41a8e7 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -36,15 +36,20 @@ var showedHelp = false; +var waiting = false; function showHelp() { if (!showedHelp) { this.opts.showHelp = true; this.update(); - window.setTimeout( + if (!waiting) { + waiting = true; + window.setTimeout( (function() { + waiting = false; clearHelpTemp.bind(this)(); }).bind(this), 10000); + } } } From f121d57966db1b2fd1a2a5b65f80d9ef60ee4303 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:27:46 -0400 Subject: [PATCH 156/172] loading thingy --- src/scripts/search.tag | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index f41a8e7..95a4fc9 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -18,7 +18,9 @@
- +
From efbadf51de83b8a844092a08d923ea291b14ca3a Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:28:16 -0400 Subject: [PATCH 157/172] loading thingy --- src/scripts/search.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 95a4fc9..78a68cf 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -18,7 +18,7 @@
-
From fe5449fe9864d5c66192929ac932465ea18ad42d Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:28:53 -0400 Subject: [PATCH 158/172] loading thingy --- src/scripts/search.tag | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 78a68cf..2ba3e97 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -18,9 +18,7 @@
- +
@@ -69,6 +67,7 @@ function clearHelpTemp() { function submit(ev) { ev.preventDefault(); console.log("submitted"); + clearHelp(); this.opts.booksLoading = true; this.update(); results_passer.trigger("loading"); From 265303b78101744ea715354d90e3b5ea4072194f Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:29:27 -0400 Subject: [PATCH 159/172] loading thingy --- src/scripts/search.tag | 1 - 1 file changed, 1 deletion(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 2ba3e97..f41a8e7 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -67,7 +67,6 @@ function clearHelpTemp() { function submit(ev) { ev.preventDefault(); console.log("submitted"); - clearHelp(); this.opts.booksLoading = true; this.update(); results_passer.trigger("loading"); From 4b630ebbcdd37f371555416ea1b382f91d88d380 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:29:58 -0400 Subject: [PATCH 160/172] loading thingy --- src/scripts/search.tag | 1 + 1 file changed, 1 insertion(+) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index f41a8e7..580f238 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -65,6 +65,7 @@ function clearHelpTemp() { } function submit(ev) { + clearHelp(); ev.preventDefault(); console.log("submitted"); this.opts.booksLoading = true; From a6f0e958f47e23c86faa374d40fe7f54055a2fbb Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:31:03 -0400 Subject: [PATCH 161/172] loading thingy --- src/scripts/search.tag | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 580f238..88d0476 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -35,18 +35,18 @@
-var showedHelp = false; -var waiting = false; +this.showedHelp = false; +this.waiting = false; function showHelp() { - if (!showedHelp) { + if (!this.showedHelp) { this.opts.showHelp = true; this.update(); if (!waiting) { waiting = true; window.setTimeout( (function() { - waiting = false; + this.waiting = false; clearHelpTemp.bind(this)(); }).bind(this), 10000); } @@ -54,7 +54,7 @@ function showHelp() { } function clearHelp() { - showedHelp = true; + this.showedHelp = true; this.opts.showHelp = false; this.update(); } @@ -65,8 +65,9 @@ function clearHelpTemp() { } function submit(ev) { - clearHelp(); ev.preventDefault(); + this.showedHelp = true; + this.opts.showHelp = false; console.log("submitted"); this.opts.booksLoading = true; this.update(); From cd8fe1ad07a429ee1e5d42b22186a68940b81afa Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:43:57 -0400 Subject: [PATCH 162/172] loading thingy --- src/scripts/book.tag | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/scripts/book.tag b/src/scripts/book.tag index 5a987c4..146d00d 100644 --- a/src/scripts/book.tag +++ b/src/scripts/book.tag @@ -2,7 +2,10 @@

-
From 51fdf7f8eeaf68b5297c8ec3b07fa69ad9517524 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:44:36 -0400 Subject: [PATCH 163/172] loading thingy --- src/scripts/book.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/book.tag b/src/scripts/book.tag index 146d00d..2a72fee 100644 --- a/src/scripts/book.tag +++ b/src/scripts/book.tag @@ -3,7 +3,7 @@

From fe302b9596d2a740a030bf0229011f402c9859a4 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:46:39 -0400 Subject: [PATCH 165/172] loading thingy --- src/scripts/book.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/book.tag b/src/scripts/book.tag index 5a987c4..e0f7820 100644 --- a/src/scripts/book.tag +++ b/src/scripts/book.tag @@ -2,7 +2,7 @@

-
From 8e7a4992098dec569fe585cdad38d81c969b0643 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:47:19 -0400 Subject: [PATCH 166/172] loading thingy --- src/scripts/book.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/book.tag b/src/scripts/book.tag index e0f7820..224cce2 100644 --- a/src/scripts/book.tag +++ b/src/scripts/book.tag @@ -2,7 +2,7 @@

-
From b2ed2a34493fbe5c19f9fdaa006fa6ca2d124bee Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:48:43 -0400 Subject: [PATCH 167/172] loading thingy --- src/scripts/book.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/book.tag b/src/scripts/book.tag index 224cce2..5a987c4 100644 --- a/src/scripts/book.tag +++ b/src/scripts/book.tag @@ -2,7 +2,7 @@

-
From 6cdcd6fdec3214b64d4b281dd516477aa9646ee0 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:50:06 -0400 Subject: [PATCH 168/172] loading thingy --- src/scripts/book.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/book.tag b/src/scripts/book.tag index 5a987c4..6b568c2 100644 --- a/src/scripts/book.tag +++ b/src/scripts/book.tag @@ -1,7 +1,7 @@

-

+
From c955f088e064e1fb39d6fd11b26cbed5789ba037 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:50:35 -0400 Subject: [PATCH 169/172] loading thingy --- src/scripts/book.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/book.tag b/src/scripts/book.tag index 6b568c2..5a987c4 100644 --- a/src/scripts/book.tag +++ b/src/scripts/book.tag @@ -1,7 +1,7 @@

-

+
From 8191c531b45ca6b0887644576fa89f432b4e83e1 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:53:05 -0400 Subject: [PATCH 170/172] loading thingy --- src/scripts/class.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/class.tag b/src/scripts/class.tag index cf4e64c..658ea90 100644 --- a/src/scripts/class.tag +++ b/src/scripts/class.tag @@ -5,7 +5,7 @@
Running: { sem }
-
From 74f5d38330192756651e4bde7c848d407a8ae155 Mon Sep 17 00:00:00 2001 From: wes Date: Mon, 8 Aug 2016 20:53:43 -0400 Subject: [PATCH 171/172] loading thingy --- src/scripts/class.tag | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/class.tag b/src/scripts/class.tag index 658ea90..cf4e64c 100644 --- a/src/scripts/class.tag +++ b/src/scripts/class.tag @@ -5,7 +5,7 @@
Running: { sem }
-
From 25fe57e450a5362a66a1f08388839dbffda0c6a8 Mon Sep 17 00:00:00 2001 From: wes Date: Tue, 9 Aug 2016 00:57:59 -0400 Subject: [PATCH 172/172] fix bugs with filtering semester, various responsiveness and aesthetic fixes --- src/mcmaster/classes.py | 13 +++++++++++-- src/scripts/book.tag | 2 +- src/scripts/class.tag | 4 ++-- src/scripts/search.tag | 2 +- src/search.py | 2 ++ src/styles/search.css | 14 ++++++++++++-- 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/mcmaster/classes.py b/src/mcmaster/classes.py index 2103c30..d6d2ca6 100755 --- a/src/mcmaster/classes.py +++ b/src/mcmaster/classes.py @@ -118,10 +118,19 @@ class Section(dict): self.time = time.encode("UTF-8") self.loc = loc.encode("UTF-8") self.prof = prof.encode("UTF-8") - self.sem = sem.encode("UTF-8") + self._sem = sem.encode("UTF-8") self._date = False self._day = False + @property + def sem(self): + if self._sem == fall: + return "Fall" + elif self._sem == winter: + return "Winter" + else: + return "Spring/Summer" + @property def date(self): if self.time != "TBA": @@ -341,7 +350,7 @@ def getCourses(semester, threadcount=10): def allCourses(): return chain.from_iterable( - (getCourses(sem, threadcount=10) + (getCourses(sem, threadcount=25) for sem in (fall, winter, spring_summer))) if __name__ == "__main__": diff --git a/src/scripts/book.tag b/src/scripts/book.tag index 5a987c4..8565193 100644 --- a/src/scripts/book.tag +++ b/src/scripts/book.tag @@ -23,7 +23,7 @@

-

+

Couldn't find anything, sorry :(

diff --git a/src/scripts/class.tag b/src/scripts/class.tag index cf4e64c..f428c4d 100644 --- a/src/scripts/class.tag +++ b/src/scripts/class.tag @@ -21,8 +21,8 @@
-

No books at this time

-

Check back later, or verify the course has books

+

No books at this time

+

Check back later, or verify the course has books

diff --git a/src/scripts/search.tag b/src/scripts/search.tag index 88d0476..fed9c83 100644 --- a/src/scripts/search.tag +++ b/src/scripts/search.tag @@ -14,7 +14,7 @@
diff --git a/src/search.py b/src/search.py index f95cbdf..33aeb22 100755 --- a/src/search.py +++ b/src/search.py @@ -9,6 +9,7 @@ from json import dumps, loads from itertools import chain, imap from hashlib import sha1 +from syslog import syslog from textbookExceptions import UnIndexable @@ -170,6 +171,7 @@ def searchTerms(terms): """ Run a search for courses """ + syslog(repr(terms)) # A list of all the queries we want to run qs = [searchers[field](term) for diff --git a/src/styles/search.css b/src/styles/search.css index 51da650..8df8cfc 100644 --- a/src/styles/search.css +++ b/src/styles/search.css @@ -43,9 +43,18 @@ a { background-color: #1c75bc !important; } -.courses { +@media (min-width: 1335px) { + .courses { margin-top: 100px; max-width: 75%; + } +} + +@media (max-width: 1366px) { + .courses { + margin-top: 100px; + max-width: 85%; + } } .course { @@ -140,8 +149,9 @@ a { } .help-toast { - background-color: #1c75bc !important; + background-color: rgba(28,117,188, 0.7) !important; font-size: 0.8em; max-width: 55%; margin-top: -10px; + border: none; }