diff options
| author | rubenwardy <rw@rubenwardy.com> | 2020-09-16 21:52:40 +0100 |
|---|---|---|
| committer | rubenwardy <rw@rubenwardy.com> | 2020-09-16 21:55:52 +0100 |
| commit | 380c88b5a351f78943c2cc0de01f38f3d645ef74 (patch) | |
| tree | df27f9eccae7ac16a199261526b8c4b64ce93c52 | |
| parent | dd1288dc3cd6520ec7a89b4a132745a4e97dc16c (diff) | |
| download | cheatdb-package_states.tar.xz | |
Improve release approval section appearancepackage_states
| -rw-r--r-- | app/templates/macros/package_approval.html | 2 | ||||
| -rw-r--r-- | app/templates/packages/view.html | 40 | ||||
| -rw-r--r-- | migrations/versions/b3c7ff6655af_.py | 1 |
3 files changed, 23 insertions, 20 deletions
diff --git a/app/templates/macros/package_approval.html b/app/templates/macros/package_approval.html index acabe98..ffbb3de 100644 --- a/app/templates/macros/package_approval.html +++ b/app/templates/macros/package_approval.html @@ -8,7 +8,7 @@ {% for state in package.getNextStates(current_user) %} <form class="col-auto" method="post" action="{{ package.getSetStateURL(state) }}"> <input type="hidden" name="csrf_token" value="{{ csrf_token() }}" /> - <input class="btn btn-sm btn-secondary" type="submit" value="{{ state.verb() }}" /> + <input class="btn btn-sm btn-primary" type="submit" value="{{ state.verb() }}" /> </form> {% endfor %} </div> diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html index 45079e0..af54e07 100644 --- a/app/templates/packages/view.html +++ b/app/templates/packages/view.html @@ -26,6 +26,7 @@ {% endif %} {% set release = package.getDownloadRelease() %} +<main> <header class="jumbotron pb-3" style="background: linear-gradient(rgba(0, 0, 0, 0.4), rgba(0, 0, 0, 0.7)), url('{{ package.getMainScreenshotURL() }}'); background-size: cover; @@ -135,26 +136,28 @@ </header> {% if not package.approved %} - <aside class="container mt-4"> - {% from "macros/package_approval.html" import render_banners %} - {{ render_banners(package, current_user, topic_error, topic_error_lvl, similar_topics) }} - - {% if review_thread and review_thread.checkPerm(current_user, "SEE_THREAD") %} - <h2>{% if review_thread.private %}🔒{% endif %} {{ review_thread.title }}</h2> - {% if review_thread.private %} - <p><i> - This thread is only visible to the package owner and users of - Editor rank or above. - </i></p> - {% endif %} + <section class="my-4 pb-3" style="border-bottom: 1px solid rgba(0,0,0,0.5);"> + <div class="container"> + {% from "macros/package_approval.html" import render_banners %} + {{ render_banners(package, current_user, topic_error, topic_error_lvl, similar_topics) }} + + {% if review_thread and review_thread.checkPerm(current_user, "SEE_THREAD") %} + <h2>{% if review_thread.private %}🔒{% endif %} {{ review_thread.title }}</h2> + {% if review_thread.private %} + <p><i> + This thread is only visible to the package owner and users of + Editor rank or above. + </i></p> + {% endif %} - {% from "macros/threads.html" import render_thread %} - {{ render_thread(review_thread, current_user) }} - {% endif %} - </aside> + {% from "macros/threads.html" import render_thread %} + {{ render_thread(review_thread, current_user) }} + {% endif %} + </div> + </section> {% endif %} - <main class="container mt-4"> + <section class="container mt-4"> <aside class="float-right ml-4" style="width: 18rem;"> <div class="card mb-4"> <div class="card-header"> @@ -481,5 +484,6 @@ <pre><code>{{ package.makeShield("downloads") }}</code></pre> </p> {% endif %} - </main> + </section> +</main> {% endblock %} diff --git a/migrations/versions/b3c7ff6655af_.py b/migrations/versions/b3c7ff6655af_.py index 3e49102..ff9a3ae 100644 --- a/migrations/versions/b3c7ff6655af_.py +++ b/migrations/versions/b3c7ff6655af_.py @@ -24,7 +24,6 @@ def upgrade(): op.execute("UPDATE package SET state='APPROVED' WHERE approved=true") op.execute("UPDATE package SET state='DELETED' WHERE soft_deleted=true") op.drop_column('package', 'approved') - op.drop_column('package', 'updated_at') op.drop_column('package', 'soft_deleted') # ### end Alembic commands ### |