-
+
+
+
+
+ Type keywords of your course's name or the course code (e.g. PSYCH 2B03)
+
+
-
-
+
-
-
-
-
-
-
+ name="title">
+
+
+
+
+
+
+
+
+
+
-
-
- Type keywords of your course's name or the course code (e.g. PSYCH 2B03)
-
-
-
+
+
+
diff --git a/src/search.py b/src/search.py
index ee04eb3..a9c67d0 100755
--- a/src/search.py
+++ b/src/search.py
@@ -20,8 +20,8 @@ es = elasticsearch.Elasticsearch()
def summarize(text):
splitted = text.split(" ")
- if len(splitted) > 4:
- return " ".join(splitted[0:4]) + ".."
+ if len(splitted) > 6:
+ return " ".join(splitted[0:6]) + ".."
return text
def sectionToJSON(section):
@@ -204,7 +204,7 @@ def searchTerms(terms):
if obj.books:
secs["books"] = [
{
- "booktitle" : summarize(book[0]),
+ "booktitle" : book[0],
"bookauthor" : book[1],
"bookprice" : book[2]
}
diff --git a/src/styles/bootstrap.min.css b/src/styles/bootstrap.min.css
new file mode 100644
index 0000000..85a05da
--- /dev/null
+++ b/src/styles/bootstrap.min.css
@@ -0,0 +1,14 @@
+/*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ */
+
+/*!
+ * Generated using the Bootstrap Customizer (https://getbootstrap.com/customize/?id=d32a97d05a9759eaf2e6b0452078ee0d)
+ * Config saved to config.json and https://gist.github.com/d32a97d05a9759eaf2e6b0452078ee0d
+ *//*!
+ * Bootstrap v3.3.7 (http://getbootstrap.com)
+ * Copyright 2011-2016 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
+ *//*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}*:before,*:after{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}html{font-size:10px;-webkit-tap-highlight-color:rgba(0,0,0,0)}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:14px;line-height:1.42857143;color:#333;background-color:#fff}input,button,select,textarea{font-family:inherit;font-size:inherit;line-height:inherit}a{color:#337ab7;text-decoration:none}a:hover,a:focus{color:#23527c;text-decoration:underline}a:focus{outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}figure{margin:0}img{vertical-align:middle}.img-responsive{display:block;max-width:100%;height:auto}.img-rounded{border-radius:6px}.img-thumbnail{padding:4px;line-height:1.42857143;background-color:#fff;border:1px solid #ddd;border-radius:4px;-webkit-transition:all .2s ease-in-out;-o-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}hr{margin-top:20px;margin-bottom:20px;border:0;border-top:1px solid #eee}.sr-only{position:absolute;width:1px;height:1px;margin:-1px;padding:0;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}[role="button"]{cursor:pointer}.clearfix:before,.clearfix:after{content:" ";display:table}.clearfix:after{clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-right{float:right !important}.pull-left{float:left !important}.hide{display:none !important}.show{display:block !important}.invisible{visibility:hidden}.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}.hidden{display:none !important}.affix{position:fixed}@-ms-viewport{width:device-width}.visible-xs,.visible-sm,.visible-md,.visible-lg{display:none !important}.visible-xs-block,.visible-xs-inline,.visible-xs-inline-block,.visible-sm-block,.visible-sm-inline,.visible-sm-inline-block,.visible-md-block,.visible-md-inline,.visible-md-inline-block,.visible-lg-block,.visible-lg-inline,.visible-lg-inline-block{display:none !important}@media (max-width:767px){.visible-xs{display:block !important}table.visible-xs{display:table !important}tr.visible-xs{display:table-row !important}th.visible-xs,td.visible-xs{display:table-cell !important}}@media (max-width:767px){.visible-xs-block{display:block !important}}@media (max-width:767px){.visible-xs-inline{display:inline !important}}@media (max-width:767px){.visible-xs-inline-block{display:inline-block !important}}@media (min-width:768px) and (max-width:991px){.visible-sm{display:block !important}table.visible-sm{display:table !important}tr.visible-sm{display:table-row !important}th.visible-sm,td.visible-sm{display:table-cell !important}}@media (min-width:768px) and (max-width:991px){.visible-sm-block{display:block !important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline{display:inline !important}}@media (min-width:768px) and (max-width:991px){.visible-sm-inline-block{display:inline-block !important}}@media (min-width:992px) and (max-width:1199px){.visible-md{display:block !important}table.visible-md{display:table !important}tr.visible-md{display:table-row !important}th.visible-md,td.visible-md{display:table-cell !important}}@media (min-width:992px) and (max-width:1199px){.visible-md-block{display:block !important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline{display:inline !important}}@media (min-width:992px) and (max-width:1199px){.visible-md-inline-block{display:inline-block !important}}@media (min-width:1200px){.visible-lg{display:block !important}table.visible-lg{display:table !important}tr.visible-lg{display:table-row !important}th.visible-lg,td.visible-lg{display:table-cell !important}}@media (min-width:1200px){.visible-lg-block{display:block !important}}@media (min-width:1200px){.visible-lg-inline{display:inline !important}}@media (min-width:1200px){.visible-lg-inline-block{display:inline-block !important}}@media (max-width:767px){.hidden-xs{display:none !important}}@media (min-width:768px) and (max-width:991px){.hidden-sm{display:none !important}}@media (min-width:992px) and (max-width:1199px){.hidden-md{display:none !important}}@media (min-width:1200px){.hidden-lg{display:none !important}}.visible-print{display:none !important}@media print{.visible-print{display:block !important}table.visible-print{display:table !important}tr.visible-print{display:table-row !important}th.visible-print,td.visible-print{display:table-cell !important}}.visible-print-block{display:none !important}@media print{.visible-print-block{display:block !important}}.visible-print-inline{display:none !important}@media print{.visible-print-inline{display:inline !important}}.visible-print-inline-block{display:none !important}@media print{.visible-print-inline-block{display:inline-block !important}}@media print{.hidden-print{display:none !important}}
\ No newline at end of file
diff --git a/src/styles/search.scss b/src/styles/search.scss
index cc27e0d..57f027e 100644
--- a/src/styles/search.scss
+++ b/src/styles/search.scss
@@ -4,6 +4,10 @@ header {
color: $blue;
}
+.form-group {
+ margin: auto;
+}
+
.wraptext {
white-space: pre-wrap !important;
}
@@ -77,17 +81,52 @@ a {
margin-right: 0px !important;
}
-.form-item {
- padding-left: 5px;
- padding-right: 5px;
- margin-right: -15px;
+.search {
+ max-width: 60%;
+ margin-bottom: 10px;
+ margin-left: auto;
+ margin-right: auto;
+ @media (max-width: 735px) {
+ max-width: 80%;
+ }
+ @media (max-width: 480px) {
+ max-width: 100%;
+ margin-bottom: 10px;
+ }
+}
+
+.semester {
+ margin-bottom: 10px;
+ margin-right: 5px;
+ @media (max-width: 480px) {
+ max-width: 100%;
+ margin-bottom: 10px;
+ }
+}
+
+.search-btn {
+ margin-bottom: 10px;
+ margin-left: 5px;
+ @media (max-width: 480px) {
+ max-width: 100%;
+ margin-bottom: 10px;
+ }
+}
+
+.search-controls {
+ margin-top: 5px;
+ margin-left: 20%;
}
.title {
font-weight: bolder;
- @media (min-width: 480px) {
- margin-left: 80px;
- }
+ float: right;
+ margin-right: 10%;
+}
+
+.header-text {
+ margin: auto;
+ max-width: 80%;
}
.ui-autocomplete {
@@ -135,13 +174,18 @@ a {
}
.logo {
- margin-top: 20px;
- margin-left: -175px;
+ float: left;
+ margin-left: -20%;
+ margin-top: 15px;
+ @media (max-width: 480px) {
+ margin-left: 45% !important;
+ }
}
.page-top {
font-size: 15px;
- width: 50% !important;
+ margin: auto;
+ width: 80% !important;
}
.help-toast {
diff --git a/src/templates/search.html b/src/templates/search.html
index 9debd7c..cf96a4d 100644
--- a/src/templates/search.html
+++ b/src/templates/search.html
@@ -1,50 +1,44 @@
-{% extends "bootstrap/base.html" %}
-{% block head %}
- {{super()}}
-
+