diff options
-rw-r--r-- | python/fatcat/routes.py | 6 | ||||
-rw-r--r-- | python/fatcat/templates/base.html | 17 | ||||
-rw-r--r-- | python/fatcat/templates/home.html | 31 | ||||
-rw-r--r-- | python/fatcat/templates/release_view.html | 124 |
4 files changed, 131 insertions, 47 deletions
diff --git a/python/fatcat/routes.py b/python/fatcat/routes.py index 77aecff3..5bd68ba1 100644 --- a/python/fatcat/routes.py +++ b/python/fatcat/routes.py @@ -86,11 +86,15 @@ def release_view(ident): try: entity = api.get_release(str(ident)) files = api.get_release_files(str(ident)) + container = None + if entity.container_id is not None: + container = api.get_container(entity.container_id) except ApiException as ae: abort(ae.status) authors = [c for c in entity.contribs if c.role in ('author', None)] authors = sorted(authors, key=lambda c: c.index) - return render_template('release_view.html', release=entity, authors=authors, files=files) + return render_template('release_view.html', release=entity, + authors=authors, files=files, container=container) @app.route('/release/lookup', methods=['GET']) def release_lookup(): diff --git a/python/fatcat/templates/base.html b/python/fatcat/templates/base.html index ac6fef43..ab6c13ad 100644 --- a/python/fatcat/templates/base.html +++ b/python/fatcat/templates/base.html @@ -36,11 +36,11 @@ <div class="ui simple dropdown item"> demo-user <i class="dropdown icon"></i> <div class="menu"> - <a class="item" href="/editgroup/current">Open Submissions</a> - <a class="item" href="/editor/demo-user/changelog">Edit History</a> + <a class="item" href="/editgroup/current"><i class="edit icon"></i>Edits in Progress</a> + <a class="item" href="/editor/demo-user/changelog"><i class="history icon"></i>History</a> <div class="divider"></div> - <a class="item" href="/editor/demo-user">Account</a> - <a class="item" href="/logout">Logout</a> + <a class="item" href="/editor/demo-user"><i class="user icon"></i>Account</a> + <a class="item" href="/logout"><i class="sign out icon"></i>Logout</a> </div> </div> @@ -48,8 +48,13 @@ </div> </header> -<main class="ui main text container" style="margin-top: 4em; margin-bottom: 2em;"> -{% block body %}Nothing to see here.{% endblock %} +<!-- 4em top margin is "enough" --> +<main class="ui main container" style="margin-top: 6em; margin-bottom: 2em;"> +{% block fullbody %} + <div class="ui container text"> + {% block body %}Nothing to see here.{% endblock %} + </div> +{% endblock %} </main> diff --git a/python/fatcat/templates/home.html b/python/fatcat/templates/home.html index 47759126..0ec0bd18 100644 --- a/python/fatcat/templates/home.html +++ b/python/fatcat/templates/home.html @@ -1,5 +1,6 @@ {% extends "base.html" %} {% block body %} +<div class="ui container text"> <h1>Welcome to fatcat!</h1> @@ -13,27 +14,35 @@ URLs), a <a href="https://api.fatcat.wiki">documented API</a>, and work/release indexing (aka, linking together of pre-prints and final copies). <a href="/about">Read more...</a> -<table> +<br><br> + +<table class="ui single line table"> +<thead> +<tr><th>Entity + <th>Actions + <th>Examples +</thead> <tr><td><b>Container</b> <td><a href="/container/create">Create</a> - <td>Example <a href="/container/00000000-0000-0000-1111-000000000002">Fake</a> - <a href="/container/00000000-0000-0000-1111-000000000003">Real</a> + <td><a href="/container/00000000-0000-0000-1111-000000000002">Fake</a> + <br><a href="/container/00000000-0000-0000-1111-000000000003">Real</a> <tr><td><b>Creator</b> <td><a href="/creator/create">Create</a> - <td>Example <a href="/creator/00000000-0000-0000-2222-000000000002">Fake</a> - <a href="/creator/00000000-0000-0000-2222-000000000003">Real</a> + <td><a href="/creator/00000000-0000-0000-2222-000000000002">Fake</a> + <br><a href="/creator/00000000-0000-0000-2222-000000000003">Real</a> <tr><td><b>File</b> <td><a href="/file/create">Create</a> - <td>Example <a href="/file/00000000-0000-0000-3333-000000000002">Fake</a> - <a href="/file/00000000-0000-0000-3333-000000000003">Real</a> + <td><a href="/file/00000000-0000-0000-3333-000000000002">Fake</a> + <br><a href="/file/00000000-0000-0000-3333-000000000003">Real</a> <tr><td><b>Release</b> <td><a href="/release/create">Create</a> - <td>Example <a href="/release/00000000-0000-0000-4444-000000000002">Fake</a> - <a href="/release/00000000-0000-0000-4444-000000000003">Real</a> + <td><a href="/release/00000000-0000-0000-4444-000000000002">Fake</a> + <br><a href="/release/00000000-0000-0000-4444-000000000003">Real</a> <tr><td><b>Work</b> <td><a href="/work/create">Create</a> - <td>Example <a href="/work/00000000-0000-0000-5555-000000000002">Fake</a> - <a href="/work/00000000-0000-0000-5555-000000000003">Real</a> + <td><a href="/work/00000000-0000-0000-5555-000000000002">Fake</a> + <br><a href="/work/00000000-0000-0000-5555-000000000003">Real</a> </table> +</div> {% endblock %} diff --git a/python/fatcat/templates/release_view.html b/python/fatcat/templates/release_view.html index 09a0b97b..4d67644d 100644 --- a/python/fatcat/templates/release_view.html +++ b/python/fatcat/templates/release_view.html @@ -1,35 +1,52 @@ {% extends "base.html" %} -{% block body %} +{% block fullbody %} -<h1>{{ release.title }}</h1> +<div class="ui stackable mobile reversed grid centered"> +<div class="one wide column"></div> +<div class="ten wide column"> + +<h1 class="ui header">{{ release.title }} +<div class="sub header"><code>release {{ release.ident }}</code></div></h1> {% for contrib in authors %} {% if contrib.creator_id %} - <a href="/creator/{{contrib.creator_id}}">{{ contrib.raw }}</a> + <b><a href="/creator/{{contrib.creator_id}}">{{ contrib.raw }}</a></b> {% else %} {{ contrib.raw }} {% endif %} {% endfor %} <br><br> -<p><b>fatcat Work:</b> <a href="/work/{{ release.work_id }}"><code>{{ release.work_id }}</code></a> +{% if release.release_date != None %}<p><b>Date (published):</b> {{ release.release_date }}{% endif %} {% if release.doi != None %} -<p><b>DOI:</b> <a href="https://doi.org/{{ release.doi }}"><code>{{ release.doi }}</code></a> +<br><b>DOI:</b> <a href="https://doi.org/{{ release.doi }}"><code>{{ release.doi }}</code></a> +{% endif %} +{% if release.language != None %} +<br><b>Primary Language:</b> <code>{{ release.language }}</code> (<a href="https://www.loc.gov/standards/iso639-2/php/langcodes_name.php?iso_639_1={{ release.language }}">lookup ISO-639 code</a>) +{% endif %} + +<div class="ui segment"> +{% if container and release.release_status == 'published' %} +<div class="ui top attached label"> +Published as a <i>{{ release.release_type }}</i> in <a href="/container/{{ container.ident }}">{{ container.name }}</a> +{% if container.extra.is_oa %} (open access!){% endif %} +</div> {% endif %} +{% if container.issnl != None %}<br><b>ISSN-L:</b> {{ container.issnl }}{% endif %} +{% if release.volume != None %}<br><b>Volume:</b> {{ release.volume }}{% endif %} +{% if release.issue != None %}<br><b>Issue:</b> {{ release.issue }}{% endif %} +{% if release.pages != None %}<br><b>Page(s):</b> {{ release.pages }}{% endif %} +{% if release.publisher != None %}<br><b>Publisher:</b> {{ release.publisher }}{% endif %} +{% if release.release_status != None %}<br><b>Release Status:</b> {{ release.release_status }}{% endif %} +{% if release.release_type != None %}<br><b>Release Type:</b> {{ release.release_type}}{% endif %} +</div> +There may be other versions or releases (pre-prints, publications, etc) linked +to the same work: +<a href="/work/{{ release.work_id }}"><code>{{ release.work_id }}</code></a> + {% if release.isbn13 != None %} <p><b>ISBN-13:</b> <code>{{ release.isbn13 }}</code> (<a href="https://openlibrary.org/search?isbn={{ release.isbn13 }}">openlibrary.org</a>) {% endif %} -{% if release.language != None %} -<p><b>Primary Language:</b> <code>{{ release.language }}</code> (<a href="https://www.loc.gov/standards/iso639-2/php/langcodes_name.php?iso_639_1={{ release.language }}">lookup ISO-639 code</a>) -{% endif %} -{% if release.volume != None %}<p><b>Volume:</b> {{ release.volume }}{% endif %} -{% if release.issue != None %}<p><b>Issue:</b> {{ release.issue }}{% endif %} -{% if release.pages != None %}<p><b>Pages:</b> {{ release.pages }}{% endif %} -{% if release.publisher != None %}<p><b>Publisher:</b> {{ release.publisher }}{% endif %} -{% if release.release_date != None %}<p><b>Date (published):</b> {{ release.release_date }}{% endif %} -{% if release.release_status != None %}<p><b>Publication Status:</b> {{ release.release_status }}{% endif %} -{% if release.release_type != None %}<p><b>Publication Type:</b> {{ release.release_type}}{% endif %} -<p><b>fatcat Release Identifier:</b> <code>{{ release.ident }}</code> (revision #{{ release.revision }}, {{ release.state }}) {% if release.extra != None %} <p><b>Additional Metadata (raw JSON):</b> <pre>{{ release.extra }}</pre> @@ -41,34 +58,52 @@ Raw JSON Object: --> <br> +<h3>Files</h3> {% if files != [] %} -<p>Files believed to represent this release: -<ul> +Believed to represent this release... +<table class="ui table"> + <thead> + <tr><th>SHA-1 + <th>Size (bytes) + <th>File Type + <th>Links + </thead> + <tbody> {% for file in files %} - <li><a href="/file/{{ file.ident }}">{{ file.sha1}}</a> ({{ file.size }} bytes), at <a href="{{ file.url }}">{{ file.url }}</a> + <tr><td><a href="/file/{{ file.ident }}">{{ file.sha1}}</a> + <td>{{ file.size }} + <td>{{ file.mimetype }} + <td><a href="{{ file.url }}">{{ file.url.split('/')[2] }}</a> + <br><a href="https://web.archive.org/web/2/{{ file.url }}">web.archive.org</a> {% endfor %} + </tbody> +</table> </ul> {% else %} -<p>There are no known files associated with this release (you could try other -releases for this work?). +<p>There are no known files associated with this release (you could try +<a href="/work/{{ release.work_id }}">other releases for this work?</a>). {% endif %} <br> +<h3>All Contributors</h3> {% if release.contribs.size != 0 %} -<p>Full list of contributors (not just authors): -<table> - <tr><th>Role - <th>Attribution Order - <th>Name +<table class="ui table"> + <thead> + <tr><th>Attribution Order + <th>Name + <th>Role + </thead> + <tbody> {% for contrib in release.contribs %} - <tr><td>{{ contrib.role or '' }} - <td>{{ contrib.index }} + <tr><td>{{ contrib.index }} {% if contrib.creator_id %} <td><a href="/creator/{{contrib.creator_id}}">{{ contrib.raw }}</a> {% else %} <td>{{ contrib.raw }} {% endif %} + <td>{{ contrib.role or '' }} {% endfor %} + </tbody> </table> {% else %} <p>Contributors (authors, etc) not known. @@ -76,7 +111,8 @@ releases for this work?). <br> {% if release.refs.size != 0 %} -<p>References (this work citing other works): +<h3>References</h3> +This release citing other releases. <ul> {% for ref in release.refs %} <li>{{ ref.raw }} @@ -89,4 +125,34 @@ releases for this work?). <p>No reference list available. {% endif %} +</div> +<div class="five wide column"> + +<a href="#" class="ui top attached fluid huge green button"><i class="file pdf outline icon"></i>Download Full Text</a> +<div class="ui segment attached"> + +A Bunch Of Other Content... + +<ul> + <li><a>and links!</a> + <li><a>and links!</a> + <li><a>and links!</a> +</ul> + +Over here +</div><div class="ui segment attached"> +<b>DOI </b> <a href="https://doi.org/{{ release.doi }}">{{ release.doi }}</a> + +</div><div class="ui segment attached"> +<b>Fatcat Bits</b> +<p>Revision #{{ release.revision }}. State is "{{ release.state }}" + +</div> +<div class="two ui buttons bottom attached"> + <a href="#" class="ui blue button">Edit Metadata</a> + <a href="#" class="ui button">View History</a> +</div> + +</div> +</div> {% endblock %} |