diff options
Diffstat (limited to 'views')
| -rw-r--r-- | views/index.hbs | 27 | ||||
| -rw-r--r-- | views/layouts/layout.hbs | 12 |
2 files changed, 25 insertions, 14 deletions
diff --git a/views/index.hbs b/views/index.hbs index b77d5d6..4d5f3f7 100644 --- a/views/index.hbs +++ b/views/index.hbs @@ -3,7 +3,7 @@ <div class="header-content"> - <form action="/search/courses" method="get" id="search-field"> + <form action="/" method="get" id="search-field"> <section class="header-content-inner"> <p><strong>The solutions to all your problems</strong></p> <hr> <!-- Divider --> @@ -59,13 +59,24 @@ </ul> </div> - <!-- Search bar --> - <input type="text" - id = "user-input" - class="form-control" - aria-label="..." - name="search" - placeholder="Enter course name"> + <!-- Search bar courses (shown by default) --> + <div id="custom-autocomplete"> + <input type="text" + id = "user-input-course" + class="form-control typeahead" + aria-label="..." + name="search" + placeholder="Enter course code eg. CSC148"> + </div> + <!-- Search bar users (hidden by default) --> + <input type="text" + id = "user-input-users" + class="form-control" + aria-label="..." + name="search" + placeholder="Enter user info" + style="display:none"> + <!-- Prompt Search --> <span class="input-group-btn"> <button id = 'go-button' diff --git a/views/layouts/layout.hbs b/views/layouts/layout.hbs index 42eaff6..062518f 100644 --- a/views/layouts/layout.hbs +++ b/views/layouts/layout.hbs @@ -13,7 +13,7 @@ <!--Bootstrap File--> <link rel="stylesheet" href="/assets/css/bootstrap.min.css"> <link rel="stylesheet" href="/assets/css/creative.css"> - + <link rel="stylesheet" href="/assets/css/typeheadjs.css" title="typehead css" type="text/css"> <!-- Partial Scripts, Order important --> {{# if userProfile}} <link href="/assets/css/user_profile.css" rel="stylesheet" type="text/css"> @@ -28,8 +28,9 @@ crossorigin="anonymous"> <!--JS--> - <script src="/assets/js/jquery-2.2.4.min.js"></script> - <script src="/assets/js/bootstrap.min.js"></script> + <script type="text/javascript" src="/assets/js/jquery-2.2.4.min.js"></script> + <script type="text/javascript" src="/assets/js/bootstrap.min.js"></script> + <script type="text/javascript" src="/assets/js/typeaheadPlusBloodhound.js"></script> <script src="/assets/js/script.js"></script> <script src="/socket.io/socket.io.js"></script> @@ -40,10 +41,9 @@ <script src="/assets/js/admin_panel.js"></script> {{/if}} {{# if homePage }} - <script src="/assets/js/home_page.js"></script> + <script type="text/javascript" src="/assets/js/home_page.js"></script> {{/if}} - </head> <body> {{# if noHeader}} @@ -58,4 +58,4 @@ {{/if}} </body> -</html>
\ No newline at end of file +</html> |