Commit 8c8260a2 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

End of day commit

parent 8fb8e4b0

sopds_web_backend/templates/sopds_logo.html

+11 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  <div class="show-for-medium medium-4 large-3 column" style="padding:0rem 0rem 0rem 1rem;"><img src="{% static "images/sopds_logo.gif" %}"></div>



  <div class="small-12 medium-8 large-9 column" style="padding:0.2rem 1rem 0 1rem;">

  <form method="get" action="/web/search/books/">

  <form method="get" action="/web/search/books/" id="searchform">

  {% csrf_token %}

    <div class="input-group">
@@ -26,8 +26,8 @@ 
	  <fieldset class="large-12 columns">

	    <legend>Choose Search Type:</legend>

	    <input type="radio" name="searchtype" value="m" id="title" onClick="SetSearch()" checked>  <label for="title">Title</label>

	    <input type="radio" name="searchtype" value="a" id="author" onClick="SetSearch()"><label for="author">Author</label>

	    <input type="radio" name="searchtype" value="s" id="series" onClick="SetSearch()"><label for="series">Series</label>

	    <input type="radio" name="searchtype" value="m" id="author" onClick="SetSearch()"><label for="author">Author</label>

	    <input type="radio" name="searchtype" value="m" id="series" onClick="SetSearch()"><label for="series">Series</label>

	  </fieldset>

	  </div>

	</div>
@@ -38,5 +38,12 @@ 
</div>



  <script>    	

	function SetSearch() {$('#main_searchbox').attr( "placeholder","Search by "+$("input[name='searchtype']:radio:checked").attr("id") );}	   

	function SetSearch() {

	         var searchtype = $("input[name='searchtype']:radio:checked").attr("id");

	         $('#main_searchbox').attr( "placeholder","Search by "+ searchtype);

	         if (searchtype == "title") $('#searchform').attr( "action","{% url "web:searchbooks" %}");

	         if (searchtype == "author") $('#searchform').attr( "action","{% url "web:searchauthors" %}");

	         if (searchtype == "series") $('#searchform').attr( "action","{% url "web:searchseries" %}");	

	         $('#search-dropdown').foundation('close');         

	}	   

  </script>
 
 No newline at end of file

sopds_web_backend/urls.py

+7 −5
Original line number Diff line number Diff line
@@ -11,11 +11,13 @@ urlpatterns = [ 
#    url(r'^search/books/(?P<searchtype>as)/(?P<searchterms>.+)/',views.SelectSeriesView, name='searchbooks'), 

#    url(r'^search/books/u/0/',views.SearchBooksView, name='bookshelf'),

    

    url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/(?P<page>\d+)/',views.SearchAuthorsViews, name='searchauthors'),

    url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/',views.SearchAuthorsViews, name='searchauthors'),       

    url(r'^search/authors/',views.SearchAuthorsViews, name='searchauthors'),             

#    url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/(?P<page>\d+)/',views.SearchAuthorsViews, name='searchauthors'),

#    url(r'^search/authors/(?P<searchtype>[bme])/(?P<searchterms>.+)/',views.SearchAuthorsViews, name='searchauthors'),       

       

    url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/(?P<page>\d+)/',views.SelectSeriesView, name='searchseries'),

    url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/',views.SelectSeriesView, name='searchseries'), 

    url(r'^search/series/',views.SelectSeriesView, name='searchseries'),    

#    url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/(?P<page>\d+)/',views.SelectSeriesView, name='searchseries'),

#    url(r'^search/series/(?P<searchtype>[bmae])/(?P<searchterms>.+)/',views.SelectSeriesView, name='searchseries'), 

        

#    url(r'^search/(?P<searchterms>.+)/',feeds.SearchTypesFeed(), name='searchtypes'),      

    url(r'^',views.hello, name='main'),