From 64bb8e084d56712426a580424bbea10580ed97dc Mon Sep 17 00:00:00 2001 From: Rachel Kim Date: Wed, 4 Mar 2020 01:37:23 -0500 Subject: [PATCH] Revamped results UI --- cce_search/static/styles.css | 58 +++++----- cce_search/templates/base.html | 4 +- cce_search/templates/search/cceid.html | 6 +- cce_search/templates/search/index.html | 7 +- .../templates/search/new_registration.html | 103 ++++++++++++++++++ cce_search/templates/search/new_renewal.html | 51 +++++++++ cce_search/templates/search/paging.html | 4 +- .../search/render_child_renewal.html | 12 +- .../templates/search/render_registration.html | 9 +- 9 files changed, 201 insertions(+), 53 deletions(-) create mode 100644 cce_search/templates/search/new_registration.html create mode 100644 cce_search/templates/search/new_renewal.html diff --git a/cce_search/static/styles.css b/cce_search/static/styles.css index e0fffff..299ff24 100644 --- a/cce_search/static/styles.css +++ b/cce_search/static/styles.css @@ -12,13 +12,13 @@ body, html { text-align: center; width: 60%; padding: 20px 30px; + text-align: center; } .content p { line-height: 1.5em; margin-left:auto; margin-right:auto; - /* width: 75%; */ } #cprr { @@ -26,16 +26,14 @@ body, html { } input { - width: 75%; + width: 85%; height:30px; padding-left: 5px; margin-bottom:10px; } -button{ - width: 10%; - border-radius: 5px; - margin-top:10px; +.btn{ + margin-top: 0.75em } .header { @@ -48,36 +46,15 @@ button{ top: 0; } -.totheleft{ - float:left; - color:white; - font-size:40px; - text-align:center; - padding: 10px 10px; - text-decoration: none; -} -.totheright { - float:right; - color:white; - font-size:20px; - text-align:center; - padding: 20px 20px; - text-decoration: none; -} - -.totheright a { - color:white; - text-decoration:none; - padding-right: 15px -} - /* FOR THE RESULTS PAGE */ .results { /* position:relative; */ - width: 80%; + width: 70%; margin-left:auto; margin-right:auto; + margin-top: 1em; + margin-bottom: 1em; padding: 30px 20px; /* padding-top:10%; */ background-color:#E4E6E9; @@ -85,6 +62,27 @@ button{ border-radius: 46px; } +h3 { + margin-bottom: 1rem; +} + +ul { + margin-bottom: 0; +} + +.results p { + margin: 0; +} + +th { + width: 20%; +} + +.table-bordered td, .table-bordered th { + border: 2px solid black; + background-color: white; +} + .title { width: fit-content; margin-left:auto; diff --git a/cce_search/templates/base.html b/cce_search/templates/base.html index 29eccde..09c1f2f 100644 --- a/cce_search/templates/base.html +++ b/cce_search/templates/base.html @@ -33,7 +33,7 @@ Search
  • - About Us + About Us
  • Copyrights Catalog @@ -44,9 +44,7 @@ -
    {% block content %}{% endblock %} -
    \ No newline at end of file diff --git a/cce_search/templates/search/cceid.html b/cce_search/templates/search/cceid.html index 19a7a28..9516bbf 100644 --- a/cce_search/templates/search/cceid.html +++ b/cce_search/templates/search/cceid.html @@ -6,9 +6,11 @@ {% block content %} {% if result["type"] %} -{% include "search/render_renewal.html" %} +{% include "search/new_renewal.html" %} {% else %} -{% include "search/render_registration.html" %} +
    + {% include "search/new_registration.html" %} +
    {% endif %} {% endblock %} diff --git a/cce_search/templates/search/index.html b/cce_search/templates/search/index.html index 87641cc..dec80b6 100644 --- a/cce_search/templates/search/index.html +++ b/cce_search/templates/search/index.html @@ -9,14 +9,15 @@ {% for result in results %}
    - {% include "search/render_registration.html" %} + + {% include "search/new_registration.html" %}
    {% endfor %} {% else %}
    -
    +

    Copyright Search

    Search for copyright registrations and renewals on books from the Catalog of Copyright Entries.

    Find a book:

    @@ -26,7 +27,7 @@


    - +
    diff --git a/cce_search/templates/search/new_registration.html b/cce_search/templates/search/new_registration.html new file mode 100644 index 0000000..419eefb --- /dev/null +++ b/cce_search/templates/search/new_registration.html @@ -0,0 +1,103 @@ +

    Registration {{ result['registrations'][0]['number'] }}

    + + + + + + + + + + + + + + + {% if result['copies'] %} + + + + + {% endif %} + + {% if result['copy_date'] %} + + + + + {% endif %} + + {% if result['description'] %} + + + + + {% endif %} + + {% if result['pub_date'] %} + + + + + {% endif %} + + {% if result['publishers'] %} + + + + + {% endif %} + + + + + + + + + + + + + + + + + + +
    Title{{ result['title'] }}
    Authors + {% for a in result['authors'] %} +

    {{ a }}

    + {% endfor %} +
    Registrations + {% for r in result['registrations'] %} +

    {{ r['number'] }} {{ r['date'] }}

    + {% endfor %} +
    Copies{{ result['copies'] }}
    Copy Date{{ result['copy_date'] }}
    Description{{ result['description'] }}
    Publication Date{{ result['pub_date'] }}
    Publishers + {% for p in result['publishers'] %} +

    {{p}}

    + {% endfor %} +
    Renewals + {% if result['is_post_1963'] %} + Works published after 1963 do not require renewal and are in copyright + {% else %} + {% if result['renewals'] %} + {% for renewal in result['renewals'] %} + {% include "search/render_child_renewal.html" %} + {% endfor %} + {% else %} + No renewals found + {% endif %} + {% endif %} + {% if result['is_foreign'] %} +
    See note on Foreign publications + {% endif %} + + {% if result['is_interim'] %} +
    See note on Interim registrations + {% endif %} +
    Source + + {{ result['source']['year'] }} p. {{ result['source']['page'] }} + +
    Original{{ result['original'] }}
    CCEID{{ result['uuid'] }}
    \ No newline at end of file diff --git a/cce_search/templates/search/new_renewal.html b/cce_search/templates/search/new_renewal.html new file mode 100644 index 0000000..a2577fa --- /dev/null +++ b/cce_search/templates/search/new_renewal.html @@ -0,0 +1,51 @@ +

    Renewal {{ result['renewal_num'] }}

    + + + + + + + + + + + + + + + + + + + {% if result['new_matter'] %} + + + + + {% endif %} + + {% if result['notes'] %} + + + + + {% endif %} + + {% if result['source'] %} + + + + + {% endif %} + + + + + + +
    Title{{ result['title'] }}
    Authors{{ result['author'] }}
    Renewal{{ result['renewal_num'] }} {{ result['renewal_date'] }}
    Claimants + {% for c in result['claimants'] %} +

    {{ c['name'] }} ({{ c['type'] }})

    + {% endfor %} +
    New Matter{{ result['new_matter'] }}
    Notes{{ result['notes'] }}
    Original{{ result['source'] }}
    CCEID{{ result['uuid'] }} +
    \ No newline at end of file diff --git a/cce_search/templates/search/paging.html b/cce_search/templates/search/paging.html index 5f35ec5..64826e1 100644 --- a/cce_search/templates/search/paging.html +++ b/cce_search/templates/search/paging.html @@ -29,10 +29,10 @@ Last {% endif %} - +
    - Back To Search + Back To Search

    {% else %} diff --git a/cce_search/templates/search/render_child_renewal.html b/cce_search/templates/search/render_child_renewal.html index a5181b4..01194c7 100644 --- a/cce_search/templates/search/render_child_renewal.html +++ b/cce_search/templates/search/render_child_renewal.html @@ -1,17 +1,13 @@ -
    - +

    {{ renewal['renewal_num'] }} {{ renewal['renewal_date'] }} - -

    +

    -
    -
    +

    {{ renewal['author'] }} {{ renewal['title'] }} -

    +

      {% for cl in renewal['claimants'] %}
    • {{ cl['name'] }} ({{ cl['type'] }})
      • {% endfor %}
    -
    diff --git a/cce_search/templates/search/render_registration.html b/cce_search/templates/search/render_registration.html index 1a8b053..843f81e 100644 --- a/cce_search/templates/search/render_registration.html +++ b/cce_search/templates/search/render_registration.html @@ -1,16 +1,15 @@ -

    Registration {{ result['registrations'][0]['number'] }}

    -
    Title
    -
    {{ result['title'] }}
    +
    Title
    +
    {{ result['title'] }}
    -
    Authors
    +
    Authors
    {% for a in result['authors'] %} -
    -{{ a }}
    +
    -{{ a }}
    {% endfor %}