diff --git a/app/scss/custom.scss b/app/scss/custom.scss index 66634857..559fea88 100644 --- a/app/scss/custom.scss +++ b/app/scss/custom.scss @@ -3,6 +3,10 @@ @import "packagegrid.scss"; @import "comments.scss"; +.dropdown-menu { + margin-top: 0; +} + .dropdown:hover .dropdown-menu { display: block; } @@ -21,6 +25,10 @@ text-decoration: none; } +.card .table { + margin-bottom: 0; +} + .btn-download { color: #fff; background-color: #00b05c; diff --git a/app/templates/macros/topics.html b/app/templates/macros/topics.html index b38286b7..a3d40c6e 100644 --- a/app/templates/macros/topics.html +++ b/app/templates/macros/topics.html @@ -1,5 +1,5 @@ {% macro render_topics_table(topics, show_author=True) -%} - +
diff --git a/app/templates/packages/view.html b/app/templates/packages/view.html index 30ca4240..89174a0d 100644 --- a/app/templates/packages/view.html +++ b/app/templates/packages/view.html @@ -146,76 +146,76 @@ -
- {% if not package.license.is_foss and not package.media_license.is_foss and package.type != package.type.TXP %} - {% set package_warning="Non-free code and media." %} - {% elif not package.license.is_foss and package.type != package.type.TXP %} - {% set package_warning="Non-free code." %} - {% elif not package.media_license.is_foss %} - {% set package_warning="Non-free media." %} - {% endif %} - {% if package_warning %} + {% if not package.license.is_foss and not package.media_license.is_foss and package.type != package.type.TXP %} + {% set package_warning="Non-free code and media." %} + {% elif not package.license.is_foss and package.type != package.type.TXP %} + {% set package_warning="Non-free code." %} + {% elif not package.media_license.is_foss %} + {% set package_warning="Non-free media." %} + {% endif %} + {% if package_warning %} +
Warning: {{ package_warning }}
+
+ {% endif %} +
Id
+ + + + + {% if package.provides %} + + + + {% endif %} -
Name{{ package.name }}
Provides{% for meta in package.provides %} + {{ meta.name }} + {%- if not loop.last %} + , + {% endif %} + {% endfor %}
- - - - - {% if package.provides %} - - - - - {% endif %} - - - - - - - - - - - - - - - - - - - -
Name{{ package.name }}
Provides{% for meta in package.provides %} - {{ meta.name }} - {%- if not loop.last %} - , - {% endif %} - {% endfor %}
Author - - {{ package.author.display_name }} - -
Type{{ package.type.value }}
License - {% if package.license == package.media_license %} - {{ package.license.name }} - {% elif package.type == package.type.TXP %} - {{ package.media_license.name }} - {% else %} - {{ package.license.name }} for code,
- {{ package.media_license.name }} for media. - {% endif %} -
Added{{ package.created_at | datetime }}
Tags - {% for t in package.tags %} - {{ t.title }} - {% else %} - No tags. - {% endfor %} -
- + + Author + + + {{ package.author.display_name }} + + + + + Type + {{ package.type.value }} + + + License + + {% if package.license == package.media_license %} + {{ package.license.name }} + {% elif package.type == package.type.TXP %} + {{ package.media_license.name }} + {% else %} + {{ package.license.name }} for code,
+ {{ package.media_license.name }} for media. + {% endif %} + + + + Added + {{ package.created_at | datetime }} + + + Tags + + {% for t in package.tags %} + {{ t.title }} + {% else %} + No tags. + {% endfor %} + + {% if package.type == package.type.MOD %} diff --git a/app/templates/users/user_profile_page.html b/app/templates/users/user_profile_page.html index 11208499..da9f8ca1 100644 --- a/app/templates/users/user_profile_page.html +++ b/app/templates/users/user_profile_page.html @@ -7,72 +7,74 @@ {% block content %} {% if not current_user.is_authenticated and user.rank == user.rank.NOT_JOINED and user.forums_username %} -
- Is this you? Claim your account now! +
+ Claim - Claim + Is this you? Claim your account now!
{% endif %} -
-

{{ user.display_name }}

+
+
+
+

{{ user.display_name }}

+ + + + + + + +
Rank: + {{ user.rank.getTitle() }} +
Accounts: + {% if user.forums_username %} + + Minetest Forum + + {% elif user == current_user %} + No forum account + {% endif %} - - - - - - - - + {% if user == current_user %} - 🌎 + + + + {% endif %} - - - {% if user == current_user %} - - - - - {% endif %} -
Rank: - {{ user.rank.getTitle() }} -
Accounts: - {% if user.forums_username %} - - Minetest Forum - - {% elif user == current_user %} - No forum account - {% endif %} + {% if (user.forums_username and user.github_username) or user == current_user %} + | + {% endif %} - {% if (user.forums_username and user.github_username) or user == current_user %} - | - {% endif %} - - {% if user.github_username %} - GitHub - {% elif user == current_user %} - Link Github - {% endif %} + {% if user.github_username %} + GitHub + {% elif user == current_user %} + Link Github + {% endif %} + {% if user == current_user %} + 🌎 + {% endif %} +
Password: + {% if user.password %} + Set | Change + {% else %} + Not set | Set + {% endif %} +
Password: - {% if user.password %} - Set | Change - {% else %} - Not set | Set - {% endif %} -
- +
+
+
{% if form %} {% from "macros/forms.html" import render_field, render_submit_field %} -
-

Edit Details

- -
-
-
+
+
+

Edit Details

+
+ {{ form.hidden_tag() }} {% if user.checkPerm(current_user, "CHANGE_DNAME") %} @@ -89,27 +91,26 @@ {% endif %} {{ render_submit_field(form.submit, tabindex=280) }} -
+
- +
{% endif %} +
{% from "macros/packagegridtile.html" import render_pkggrid %} {{ render_pkggrid(packages, show_author=False) }} {% if topics_to_add %} -
-

Unadded Packages

+
+

Unadded Packages

-
-

- List of your forum topics which do not have a matching package. -

+

+ List of your forum topics which do not have a matching package. +

- {% from "macros/topics.html" import render_topics_table %} - {{ render_topics_table(topics_to_add, show_author=False) }} -
+ {% from "macros/topics.html" import render_topics_table %} + {{ render_topics_table(topics_to_add, show_author=False) }}
{% endif %}