LibreGaming
/
contentdb
14
0
Fork 0
Code Issues 13 Pull Requests Projects Releases Wiki Activity

Improve card and user profile formatting

This commit is contained in:
rubenwardy 2018-12-22 12:36:49 +00:00
parent 5dcff01436
commit 09a201759b
4 changed files with 141 additions and 132 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/scss/custom.scss
View File

@ -3,6 +3,10 @@
@import "packagegrid.scss"; @import "packagegrid.scss";
@import "comments.scss"; @import "comments.scss";
.dropdown-menu {
margin-top: 0;
}
.dropdown:hover .dropdown-menu { .dropdown:hover .dropdown-menu {
display: block; display: block;
} }
@ -21,6 +25,10 @@
text-decoration: none; text-decoration: none;
} }
.card .table {
margin-bottom: 0;
}
.btn-download { .btn-download {
color: #fff; color: #fff;
background-color: #00b05c; background-color: #00b05c;

2
app/templates/macros/topics.html
View File

@ -1,5 +1,5 @@
{% macro render_topics_table(topics, show_author=True) -%} {% macro render_topics_table(topics, show_author=True) -%}
<table> <table class="table">
<tr> <tr>
<th>Id</th> <th>Id</th>
<th></th> <th></th>

6
app/templates/packages/view.html
View File

@ -146,7 +146,6 @@
</div> </div>
</div> </div>
<div class="card-body">
{% if not package.license.is_foss and not package.media_license.is_foss and package.type != package.type.TXP %} {% 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." %} {% set package_warning="Non-free code and media." %}
{% elif not package.license.is_foss and package.type != package.type.TXP %} {% elif not package.license.is_foss and package.type != package.type.TXP %}
@ -155,11 +154,13 @@
{% set package_warning="Non-free media." %} {% set package_warning="Non-free media." %}
{% endif %} {% endif %}
{% if package_warning %} {% if package_warning %}
<div class="card-body">
<div class="alert alert-danger"> <div class="alert alert-danger">
<b>Warning:</b> {{ package_warning }} <b>Warning:</b> {{ package_warning }}
</div> </div>
</div>
{% endif %} {% endif %}
<table> <table class="table">
<tr> <tr>
<td>Name</td> <td>Name</td>
<td>{{ package.name }}</td> <td>{{ package.name }}</td>
@ -216,7 +217,6 @@
</td> </td>
</table> </table>
</div> </div>
</div>
{% if package.type == package.type.MOD %} {% if package.type == package.type.MOD %}
<div class="card my-4"> <div class="card my-4">

41
app/templates/users/user_profile_page.html
View File

@ -7,17 +7,19 @@
{% block content %} {% block content %}
{% if not current_user.is_authenticated and user.rank == user.rank.NOT_JOINED and user.forums_username %} {% if not current_user.is_authenticated and user.rank == user.rank.NOT_JOINED and user.forums_username %}
<div class="box box_grey alert alert-info"> <div class="alert alert-info alert alert-info">
Is this you? Claim your account now! <a class="float-right btn btn-default btn-sm"
href="{{ url_for('user_claim_page', username=user.forums_username) }}">Claim</a>
<a class="alert_right button" href="{{ url_for('user_claim_page', username=user.forums_username) }}">Claim</a> Is this you? Claim your account now!
</div> </div>
{% endif %} {% endif %}
<div class="box box_grey"> <div class="row mb-3">
<h2>{{ user.display_name }}</h2> <div class="col-sm-6">
<div class="card">
<table class="box-body"> <h2 class="card-header">{{ user.display_name }}</h2>
<table class="table">
<tr> <tr>
<td>Rank:</td> <td>Rank:</td>
<td> <td>
@ -63,16 +65,16 @@
</tr> </tr>
{% endif %} {% endif %}
</table> </table>
</div> </div>
</div>
{% if form %} {% if form %}
{% from "macros/forms.html" import render_field, render_submit_field %} {% from "macros/forms.html" import render_field, render_submit_field %}
<div class="box box_grey"> <div class="col-sm-6">
<h2>Edit Details</h2> <div class="card">
<h2 class="card-header">Edit Details</h2>
<div class="card-body">
<form action="" method="POST" class="form box-body" role="form"> <form action="" method="POST" class="form box-body" role="form">
<div class="row">
<div class="col-sm-6 col-md-5 col-lg-4">
{{ form.hidden_tag() }} {{ form.hidden_tag() }}
{% if user.checkPerm(current_user, "CHANGE_DNAME") %} {% if user.checkPerm(current_user, "CHANGE_DNAME") %}
@ -89,28 +91,27 @@
{% endif %} {% endif %}
{{ render_submit_field(form.submit, tabindex=280) }} {{ render_submit_field(form.submit, tabindex=280) }}
</div>
</div>
</form> </form>
</div> </div>
</div>
</div>
{% endif %} {% endif %}
</div>
{% from "macros/packagegridtile.html" import render_pkggrid %} {% from "macros/packagegridtile.html" import render_pkggrid %}
{{ render_pkggrid(packages, show_author=False) }} {{ render_pkggrid(packages, show_author=False) }}
{% if topics_to_add %} {% if topics_to_add %}
<div class="box box_grey"> <div class="card mt-3">
<h2>Unadded Packages</h2> <h2 class="card-header">Unadded Packages</h2>
<div class="box-body"> <p class="card-body">
<p>
List of your forum topics which do not have a matching package. List of your forum topics which do not have a matching package.
</p> </p>
{% from "macros/topics.html" import render_topics_table %} {% from "macros/topics.html" import render_topics_table %}
{{ render_topics_table(topics_to_add, show_author=False) }} {{ render_topics_table(topics_to_add, show_author=False) }}
</div> </div>
</div>
{% endif %} {% endif %}
{% endblock %} {% endblock %}