Merge pull request #2 from EbookFoundation/kim-ui

Kim ui
pull/3/head
tmitche2 2020-02-13 20:14:14 -05:00 committed by GitHub
commit 56312205b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 181 deletions

View File

@ -50,7 +50,7 @@ def index():
#print(results)
return render_template('base.html', title=title)
return render_template('search/index.html', title=title)
def proc_results(r):

View File

@ -1,39 +1,36 @@
body, html {
height: 100%;
}
.bg{
/* background-image: url("background-gray.png"); */
background: url('books.jpg');
height:100%;
width:100%
background: url('books.jpg') no-repeat;
background-size:cover;
}
.search {
/* position:relative; */
width: fit-content;
.content{
margin-left:auto;
margin-right:auto;
/*padding: 30px 20px;*/
/* padding-top:10%; */
background-color:#E4E6E9;
border: solid #969FAA 8px;
border-radius: 46px;
border: solid #969FAA 3px;
border-radius: 35px;
text-align: center;
width: 60%;
padding: 20px 30px;
}
.search p {
.content p {
line-height: 1.5em;
width: 75%;
margin-left:auto;
margin-right:auto;
/* width: 75%; */
}
h1{
margin:0px;
#cprr {
width:75%
}
/* h1{
margin: 0px 0px 10px 0px;
} */
input {
width: 80%;
width: 75%;
height:30px;
padding-left: 5px;
margin-bottom:10px;
@ -77,8 +74,6 @@ button{
padding-right: 15px
}
/* FOR THE RESULTS PAGE */
.results {
@ -103,25 +98,4 @@ button{
border: solid #969FAA 4px;
border-radius: 20px;
margin-bottom: 20px;
}
/* FOR THE ABOUT PAGE */
.about {
/* position:relative; */
width: 65%;
margin-left:auto;
margin-right:auto;
padding: 30px 20px;
/* padding-top:10%; */
background-color:#E4E6E9;
border: solid #969FAA 8px;
border-radius: 46px;
text-align: center;
}
.about p {
line-height: 1.5em;
width: 95%;
margin-left:auto;
margin-right:auto;
}

View File

@ -1,52 +1,10 @@
<!DOCTYPE html>
<html lang ="en">
{% extends 'base.html' %}
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous">
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js" integrity="sha384-wfSDF2E50Y2D1uUdj0O3uMBJnjuUD4Ih7YwaYd1iqfktj0Uod8GCExl3Og8ifwB6" crossorigin="anonymous"></script>
<script src="https://code.jquery.com/jquery-3.4.1.slim.min.js" integrity="sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
<link rel="stylesheet" href="/static/styles.css">
<head>
<title>Copyright Renewals</title>
</head>
<body>
<nav class="navbar navbar-expand-lg navbar-dark bg-dark">
<a class="navbar-brand" href="#">Copyright Renewals</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
<li class="nav-item active">
<a class="nav-link" href="/">Search <span class="sr-only"></span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="about">About Us <span class="sr-only"></span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="#">Copyrights <span class="sr-only">(current)</span></a>
</li>
<li class="nav-item active">
<a class="nav-link" href="#">NYPL <span class="sr-only">(current)</span></a>
</li>
</ul>
</div>
</nav>
<div class="bg">
<div class="body">
<div class="about">
<h1>About</h1>
<p>Many books published between 1923 through 1977 may be in the public domain either because their copyright was not registered, or because their copyrights were not renewed after an initial term. Unfortunately, determining the copyright status of these books requires a review of the copyright records of registration and renewal. Unfortunately, these records were all on paper. Digital scans of these records were made, and are available from the Internet Archive, but searching the scans is not easy.</p>
<p>To make this task more manageable, work has gone underway to convert the Catalog of Copyright Entries (CCEs) into well-structured XML data. The CCEs are comprised of about 450,000 pages and are printed compilations of brief registration and renewal records. These records were published by the Copyright Office at regular intervals, ranging in length from semi-weekly to semi-annually. The CCEs are divided by classes of works, such as books, periodicals, music, drama, maps, photographs, etc. Conversion of a set of 10,000 pages of book registration records published between 1923 and 1964 has been completed, and the result is publicly <a href="https://github.com/NYPL/catalog_of_copyright_entries_project">available</a>.</p>
<p>This website serves as a user-friendly interface for librarians, archivists, and rights researchers to make use of the XML data.</p>
</div>
</div></div>
</body>
</html>
{% block content %}
<!-- <div class="about"> -->
<h1>About</h1>
<p>Many books published between 1923 through 1977 may be in the public domain either because their copyright was not registered, or because their copyrights were not renewed after an initial term. Unfortunately, determining the copyright status of these books requires a review of the copyright records of registration and renewal. Unfortunately, these records were all on paper. Digital scans of these records were made, and are available from the Internet Archive, but searching the scans is not easy.</p>
<p>To make this task more manageable, work has gone underway to convert the Catalog of Copyright Entries (CCEs) into well-structured XML data. The CCEs are comprised of about 450,000 pages and are printed compilations of brief registration and renewal records. These records were published by the Copyright Office at regular intervals, ranging in length from semi-weekly to semi-annually. The CCEs are divided by classes of works, such as books, periodicals, music, drama, maps, photographs, etc. Conversion of a set of 10,000 pages of book registration records published between 1923 and 1964 has been completed, and the result is publicly <a href="https://github.com/NYPL/catalog_of_copyright_entries_project">available</a>.</p>
<p>This website serves as a user-friendly interface for librarians, archivists, and rights researchers to make use of the XML data.</p>
<!-- </div> -->
{% endblock %}

View File

@ -45,21 +45,9 @@
</div>
</nav>
<div class="bg">
<div class="py-5 text-center">
<div class="search">
<h1>Copyright Search</h1>
<p>Search for copyright registrations and renewals on books from the Catalog of Copyright Entries.</p>
<p>Find a book:</p>
<form>
<input type="text" name="title" id="title" placeholder="Title" autocomplete="off"><br>
<input type="text" name="author" placeholder="Author" autocomplete="off"><br>
<input type="text" name="publisher" placeholder="Publisher" autocomplete="off"><br>
<input type="text" name="registration" placeholder="Registration Number" autocomplete="off"><br>
<input type="text" name="renewal" placeholder="Renewal Number" autocomplete="off"><br>
<input type="submit" value="Search" class="btn">
</form>
</div>
<div class="py-5 text-center">
<div class= "content">
{% block content %}{% endblock %}
</div>
</div>

View File

@ -1,74 +1,17 @@
{% extends 'base.html' %}
{% block header %}
<h2>{% block title %}Find Copyright Entries{% endblock %}</h2>
{% endblock %}
{% block content %}
<div class="grid-row">
<div class="tablet:grid-col-8">
<h3>Search</h3>
<form method="get" class="usa-form">
<fieldset class="usa-fieldset">
<legend>Search Type</legend>
<div class="usa-radio">
<input class="usa-radio__input" id="type_ft" type="radio"
{% if search_type == "ft" %}checked{% endif %} name="type"
value="ft">
<label class="usa-radio__label" for="type_ft">Full Text</label>
</div>
<div class="usa-radio">
<input class="usa-radio__input" id="type_registration" type="radio"
{% if search_type == "reg" %}checked{% endif %} name="type"
value="reg">
<label class="usa-radio__label" for="type_registration">Registration Number</label>
</div>
<div class="usa-radio">
<input class="usa-radio__input" id="type_renewal" type="radio"
{% if search_type == "ren" %}checked{% endif %} name="type"
value="ren">
<label class="usa-radio__label" for="type_renewal">Renewal Number</label>
</div>
</fieldset>
<label for="term" class="usa-label">Search For</label>
<input name="term" id="term" required class="usa-input"
{% if term %} value="{{ term }}" {% endif %} >
<input type="submit" value="Search" class="usa-button">
</form>
</div>
<div class="tablet:grid-col">
<h3>Search Hints</h3>
<ul>
<li>Use “Full Text” for authors, titles, and publishers</li>
<li>Use quotation marks to search phrases (for example &quot;Grapes of Wrath&quot;)</li>
<li>Searches are case insensitive</li>
<li>Renewal numbers look like <tt>R12345</tt> or <tt>RE12345</tt></li>
<li>Registration numbers look like <tt>A12345</tt>, <tt>BB12345</tt>, <tt>D12345</tt>. That is, they start with many letters or combination of letters, but not “R” or “RE”</li>
</ul>
</div>
</div>
{% if results %}
<h2>Results</h2>
{% include "search/paging.html" %}
<ul class="usa-list usa-list--unstyled">
{% for result in results %}
{% if result['type'] %}
<li>{% include "search/render_renewal.html" %}</li>
{% else %}
<li>{% include "search/render_registration.html" %}</li>
{% endif %}
{% endfor %}
</ul>
{% endif %}
{% include "search/paging.html" %}
{% block content %}
<!-- <div class="search"> -->
<h1>Copyright Search</h1>
<p id="cprr">Search for copyright registrations and renewals on books from the Catalog of Copyright Entries.</p>
<p>Find a book:</p>
<form>
<input type="text" name="title" id="title" placeholder="Title" autocomplete="off"><br>
<input type="text" name="author" placeholder="Author" autocomplete="off"><br>
<input type="text" name="publisher" placeholder="Publisher" autocomplete="off"><br>
<input type="text" name="registration" placeholder="Registration Number" autocomplete="off"><br>
<input type="text" name="renewal" placeholder="Renewal Number" autocomplete="off"><br>
<input type="submit" value="Search" class="btn">
</form>
<!-- </div> -->
{% endblock %}