diff options
Diffstat (limited to 'website/static')
| -rw-r--r-- | website/static/website/js/cloud.js | 21 | ||||
| -rw-r--r-- | website/static/website/templates/index.html | 29 |
2 files changed, 39 insertions, 11 deletions
diff --git a/website/static/website/js/cloud.js b/website/static/website/js/cloud.js index 43f035f..f2f7f19 100644 --- a/website/static/website/js/cloud.js +++ b/website/static/website/js/cloud.js @@ -905,6 +905,21 @@ $(document.body).ready(function() { }); }); /********************************************/ + /********************************************/ + /********************************************/ + /********* search feature *******************/ + /********************************************/ + $(document).on("change", "input[type=radio][name=optradio]", function() { + if (this.value == 'bybook') { + $("#searched_code").hide(); + $("#searched_book").show(); + } + else if (this.value == 'bycode') { + $("#searched_code").show(); + $("#searched_book").hide(); + } + }); + /********************************************/ $(document).on("click", "#search", function() { ajax_loader(this); $("#relevant").html(''); @@ -923,7 +938,7 @@ $(document.body).ready(function() { $("#relevant").html('<h2>Relevant</h2><hr>'); for (var i = 0; i < data.length; i++) { $("#relevant").append( - '<a href="?book_id=' + data[i].ids + '" class="">' + data[i].book + + '<a href="?book_id=' + data[i].id + '" class="">' + data[i].book + ' (Author: ' + data[i].author + ')</a><hr>'); } @@ -986,7 +1001,7 @@ $(document.body).ready(function() { $("#popular").html('<h2>Popular</h2><hr>'); for (var i = 0; i < data.length; i++) { $("#popular").append( - '<a href="?book_id=' + data[i].ids + '" class="">' + data[i].book + + '<a href="?book_id=' + data[i].id + '" class="">' + data[i].book + ' (Author: ' + data[i].author + ')</a><hr>'); } ajax_loader("clear"); @@ -1003,7 +1018,7 @@ $(document.body).ready(function() { $("#recent").html('<h2>Recent</h2><hr>'); for (var i = 0; i < data.length; i++) { $("#recent").append( - '<a href="?book_id=' + data[i].ids + '" class="">' + data[i].book + + '<a href="?book_id=' + data[i].id + '" class="">' + data[i].book + ' (Author: ' + data[i].author + ')</a><hr>'); } ajax_loader("clear"); diff --git a/website/static/website/templates/index.html b/website/static/website/templates/index.html index 18dd01b..27dbca9 100644 --- a/website/static/website/templates/index.html +++ b/website/static/website/templates/index.html @@ -45,9 +45,9 @@ <div class="collapse navbar-collapse" id="collapsibleNavbar"> <ul class="navbar-nav ml-auto"> {% if user and not user.is_anonymous %} {% if not user.is_staff %} - <!--> <li class="nav-item"> + <li class="nav-item"> <a class="nav-link" href="" id="search_book" data-toggle="modal" data-target="#search_wrapper">Search Book</a> - </li> --> + </li> <li class="nav-item"> <a class="nav-link" href="" id="about-us" data-toggle="modal" data-target="#about_wrapper">About</a> </li> @@ -69,9 +69,9 @@ <a style="color:red">Hello, {{ user.get_full_name }}!</a> </li> {% else %} - <!-- > <li class="nav-item"> - <a class="nav-link" href="" id="search_book" data-toggle="modal" data-target="#search_wrapper">Search Book</a> - </li> --> + <li class="nav-item"> + <a class="nav-link" href="" id="search_book" data-toggle="modal" data-target="#search_wrapper">Search</a> + </li> <li class="nav-item"> <a class="nav-link" href="" id="about-us" data-toggle="modal" data-target="#about_wrapper">About</a> </li> @@ -500,21 +500,34 @@ <!-- Modal Header --> <div class="modal-header"> - <h4 class="modal-title">Search book</h4> + <h4 class="modal-title">Search</h4> <button type="button" class="close" data-dismiss="modal">×</button> </div> <!-- Modal body --> <div class="modal-body"> <div class="input-group"> - <input id="search-input" type="text" class="form-control" placeholder="Enter book or author name"> + <input id="search-input" type="text" class="form-control" placeholder="Enter book/author name or code string"> <span class="input-group-btn"> <button id="search" class="btn btn-info" type="button">Search</button> </span> </div> + + <div class="custom-control custom-radio"> + <label class="radio-inline"><input type="radio" value="bybook" name="optradio" checked="checked"> Search by book/author name</label> + <label class="radio-inline"><input type="radio" value="bycode" name="optradio"> Search by code</label> + </div> </div> <div class="container"> - <div class="row"> + <div id="searched_book" class="row"> + <div id="relevant" class="col-4 small"> + </div> + <div id="popular" class="col-4 small bg-light text-primary" style="word-wrap: break-word;overflow:auto;"> + </div> + <div id="recent" class="col-4 small bg-light text-primary" style="word-wrap: break-word;overflow:auto;"> + </div> + </div> + <div id="searched_code" class="row"> <div id="relevant" class="col-4 small"> </div> <div id="popular" class="col-4 small bg-light text-primary" style="word-wrap: break-word;overflow:auto;"> |