From f9089319d39f379e6b33584305df4ba317e23e5c Mon Sep 17 00:00:00 2001 From: rubenwardy Date: Wed, 3 Feb 2021 17:40:03 +0000 Subject: [PATCH] Improve package page sidebar --- app/scss/components.scss | 51 +++ app/scss/packages.scss | 38 ++- app/templates/base.html | 2 +- app/templates/macros/reviews.html | 4 +- app/templates/packages/view.html | 546 +++++++++++++++--------------- 5 files changed, 355 insertions(+), 286 deletions(-) diff --git a/app/scss/components.scss b/app/scss/components.scss index 36b607c5..554e009c 100644 --- a/app/scss/components.scss +++ b/app/scss/components.scss @@ -217,3 +217,54 @@ blockquote { border-top-right-radius: 0; } } + +.info-sidebar { + color: #999; + + h3 { + color: #aaa; + } + + & > h3:first-of-type { + margin-top: 0; + } + + dt { + font-weight: normal; + } + + dd { + font-weight: bold; + max-height: 300px; + overflow-y: auto; + } + + .badge, .list-group-item-action { + color: #ddd; + } + + & > .btn.btn-secondary { + color: #ddd; + background-color: #303030; + border-color: #444; + + &:hover { + background-color: #444; + } + } +} + +.panel { + background: #2c2c2c; + padding: 1.25rem; + border: 1px solid rgba(0,0,0,0.125); + border-radius: .25rem; + + & > *:first-child { + margin-top: 0 !important; + } + + & > *:last-child { + margin-bottom: 0 !important; + } +} diff --git a/app/scss/packages.scss b/app/scss/packages.scss index 1a9aebc6..e87f4a61 100644 --- a/app/scss/packages.scss +++ b/app/scss/packages.scss @@ -1,24 +1,30 @@ -.screenshot_list, .screenshot_list li, .screenshot_list li a { +.screenshot_list { list-style: none; - margin: 0; padding: 0; -} + margin: 0 0 2em; -.screenshot_list li { - display: inline-block; - vertical-align: middle; - margin: 5px; - padding: 0; -} + li, li a { + list-style: none; + margin: 0; + padding: 0; + } -.screenshot_list li a { - display: block; -} + li { + display: inline-block; + vertical-align: middle; + margin: 5px; + padding: 0; -.screenshot_list img { - width: 200px; - height: 133px; - object-fit: cover; + a { + display: block; + } + } + + img { + width: 200px; + height: 133px; + object-fit: cover; + } } .screenshot-add { diff --git a/app/templates/base.html b/app/templates/base.html index ec0875c0..92f26e79 100644 --- a/app/templates/base.html +++ b/app/templates/base.html @@ -6,7 +6,7 @@ {% block title %}title{% endblock %} - {{ config.USER_APP_NAME }} - + diff --git a/app/templates/macros/reviews.html b/app/templates/macros/reviews.html index 0389c222..0ff41c36 100644 --- a/app/templates/macros/reviews.html +++ b/app/templates/macros/reviews.html @@ -65,9 +65,9 @@ {% endif %} {% else %} -

+

  • {{ _("No reviews, yet.") }} -

    +
    • {% endfor %} {% endmacro %} diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html index 9b2c8703..02a7a5d4 100644 --- a/app/templates/packages/view.html +++ b/app/templates/packages/view.html @@ -34,6 +34,27 @@ background-repeat: no-repeat; background-position: center;">
    +
    + {% if package.checkPerm(current_user, "EDIT_PACKAGE") %} + + + {{ _("Edit") }} + + {% endif %} + {% if package.checkPerm(current_user, "MAKE_RELEASE") %} + + + {{ _("Release") }} + + {% endif %} + {% if package.checkPerm(current_user, "DELETE_PACKAGE") or package.checkPerm(current_user, "UNAPPROVE_PACKAGE") %} + + + {{ _("Remove") }} + + {% endif %} +
    +

    {{ package.title }}

    @@ -67,20 +88,28 @@
    - + {{ package.author.display_name }} - + {{ package.downloads }} - + {{ threads | length }} + + + + +{{ package.reviews | selectattr("recommends") | list | length }} + / + -{{ package.reviews | rejectattr("recommends") | list | length }} + + {% if package.website %} @@ -173,177 +202,256 @@ {% endif %}
    - - - {% if package.checkPerm(current_user, "ADD_SCREENSHOTS") %} - - - Edit - - {% endif %} - - - -
    - {{ package.desc | markdown }} -
    - -
    - -

    Ratings and Reviews

    - - {% from "macros/reviews.html" import render_reviews, render_review_form, render_review_preview %} - {% if current_user.is_authenticated %} - {% if has_review %} -

    - - {{ _("Edit Review") }} - + {% endif %}

    - {% elif current_user in package.maintainers %} -

    - {{ _("You can't review your own package.") }} -

    - {% else %} - {{ render_review_preview(package) }} - {% endif %} - {% else %} - {{ render_review_preview(package) }} - {% endif %} - {{ render_reviews(package.reviews, current_user) }} - - {% if alternatives %} -

    Related

    - - {% from "macros/packagegridtile.html" import render_pkggrid %} - {{ render_pkggrid(alternatives) }} - {% endif %} - - {% if similar_topics %} -

    Similar Forum Topics

    - - {% endif %} - - {% if package.checkPerm(current_user, "EDIT_PACKAGE") %} -

    Badges

    - -

    - {{ package.makeShield("title") | markdown }} -

    - -

    - 

    {{ package.makeShield("title") }}
    -

    - -

    - {{ package.makeShield("downloads") | markdown }} -

    - -

    - 

    {{ package.makeShield("downloads") }}
    -

    - {% endif %} + +
    {% endblock %}