wes
/
TextbookEngine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

styling changes

master
wes 8 years ago
parent
e09df03050
commit
1d023d61fe
7 changed files with 74 additions and 61 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      src/scripts/results.tag
  2. 31
      src/scripts/search.tag
  3. 14
      src/styles/bootstrap.min.css
  4. 18
      src/styles/search.scss
  5. 48
      src/templates/search.html
  6. 18
      src/visualize.py
  7. 1
      src/website.py

5
src/scripts/results.tag
View File

@ -1,6 +1,9 @@
<results>
<div if={notLoading} class="courses container">
<row class="course-row columns" each={ rows } data="{ this }" classrow={ row }></row>
<row if={rows.length > 0} class="course-row columns" each={ rows } data="{ this }" classrow={ row }></row>
<div if={rows.length <= 0} class="empty">
No Results, Sorry!
</div>
</div>
<script>
clicker() {

31
src/scripts/search.tag
View File

@ -2,13 +2,21 @@
<form class="form-horizontal search-form" onsubmit={ submit } type="submit"method="get">
<div class="form-group">
<div class="container">
<div class="container">
<div class="columns">
<div if={ false }
class="help-toast toast toast-primary">
<button onclick={ clearhelp }
class="btn btn-clear float-right">
</button>
Type keywords of your course's name or the course code (e.g. PSYCH 2B03)
</div>
</div>
<div class="columns">
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12">
<input onfocus={ showhelp }
class="form-input search"
placeholder="Description"
placeholder="Course Description"
type="text"
name="title">
</input>
@ -17,28 +25,25 @@
<div class="columns">
<div class="col-sm-6 col-md-6 col-lg-6">
<select class="semester form-select pull-right" aria-labelledby="dLabel" name="sem">
<select class="semester form-select float-right" aria-labelledby="dLabel" name="sem">
<option value="Fall">Fall</option>
<option value="Winter" selected>Winter</option>
<option value="Spring/Summer">Spring/Summer</option>
</select>
</div>
<div class="col-sm-6 col-md-6 col-lg-6">
<button class="search-btn btn btn-primary pull-left" type="submit">Search</button>
<button
class="search-btn btn btn-primary float-left tooltip tooltip-bottom"
data-tooltip="Search by keywords"
type="submit">
Search
</button>
</div>
</div>
</div>
</div>
</form>
<div if={ opts.showHelp }
class="help-toast toast toast-primary">
<button onclick={ clearhelp }
class="btn btn-clear float-right">
</button>
Type keywords of your course's name or the course code (e.g. PSYCH 2B03)
</div>
<div if={ opts.booksLoading } class="search-load">
</div>

14
src/styles/bootstrap.min.css
View File

File diff suppressed because one or more lines are too long

18
src/styles/search.scss
View File

@ -97,6 +97,7 @@ a {
.semester {
margin-bottom: 10px;
margin-right: 5px;
@media (max-width: 480px) {
max-width: 100%;
margin-bottom: 10px;
@ -105,6 +106,7 @@ a {
.search-btn {
margin-bottom: 10px;
margin-left: 5px;
@media (max-width: 480px) {
max-width: 100%;
margin-bottom: 10px;
@ -118,6 +120,13 @@ a {
.title {
font-weight: bolder;
float: right;
margin-right: 10%;
}
.header-text {
margin: auto;
max-width: 80%;
}
.ui-autocomplete {
@ -165,12 +174,17 @@ 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;
margin: auto;
width: 80% !important;
}

48
src/templates/search.html
View File

@ -1,12 +1,16 @@
{% extends "bootstrap/base.html" %}
{% block head %}
{{super()}}
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="viewport" content="width=device-width, initial-scale=1">
<header class="text-center nav navbar">
<section class="page-top navbar-section">
<div class="container">
<div class="container header-text">
<div class="columns">
<div class="title col-sm-12 col-md-12 col-lg-12"><h1>TextBook Commons</h1></div>
<div class="col-sm-9 col-md-9 col-lg-9 text-center">
<h1 class="title">TextBook Commons</h1>
</div>
<div class="col-sm-3 col-md-3 col-lg-3">
<figure class="logo avatar avatar-xl">
<img src="https://mgoal.ca/goal.png" />
</figure>
</div>
</div>
<div class="columns">
<div class="title col-sm-12 col-md-12 col-lg-12">
@ -17,34 +21,24 @@
<search></search>
</section>
</header>
{% endblock %}
<html>
<figure class="avatar avatar-xl">
<img src="https://mgoal.ca/goal_small.png" />
</figure>
<body>
{% block content %}
<body>
<results></results>
{% endblock %}
<footer class="footer">
</footer>
{% block styles %}
{{super()}}
<link rel="stylesheet" href="/styles/spectre.min.css">
<link rel="stylesheet" href="/styles/search.min.css">
{% endblock %}
{% block scripts %}
{{super()}}
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/riot/2.6.7/riot+compiler.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ramda/0.22.1/ramda.min.js"></script>
<script type="text/javascript" src="/scripts/tags.min.js"></script>
<script type="text/javascript" src="/scripts/search.min.js"></script>
{% endblock %}
</body>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/riot/2.6.7/riot+compiler.min.js"></script>
<script type="text/javascript" src="//cdnjs.cloudflare.com/ajax/libs/ramda/0.22.1/ramda.min.js"></script>
<script type="text/javascript" src="/scripts/tags.min.js"></script>
<script type="text/javascript" src="/scripts/search.min.js"></script>
<script src="https://code.jquery.com/jquery-2.2.4.min.js"
integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44="
crossorigin="anonymous">
</script>
</body>
</html>

18
src/visualize.py
View File

@ -9,24 +9,8 @@ from operator import attrgetter
import pygal
import csv
class Textbook(object):
def __init__(self, dept, code, title, author, price):
self.dept = dept
self.code = code
self.title = title
self.author = author
self.price = float(price)
def __repr__(self):
return "Dept = %s, Code = %s, %s by %s, costs $%s" % (self.dept,
self.code,
self.title,
self.author,
self.price)
def courses():
with open("./books.csv", "r") as books:
with open("./mcmaster/courses.csv", "r") as books:
booksreader = csv.reader(books)
for row in booksreader:
yield row

1
src/website.py
View File

@ -142,7 +142,6 @@ def ClassSearch(configfile=None):
app = Flask(__name__)
app.register_blueprint(blueprint, url_prefix="/search")
Bootstrap(app)
#app.config["scripts"] = "./scripts"
#app.config["styles"] = "./styles"
return app

Write Preview
Loading…
Cancel
Save