Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GUI updates - metadata order, preview scroll issue, padding/margins #143

Merged
merged 3 commits into from
Aug 1, 2020
Merged

GUI updates - metadata order, preview scroll issue, padding/margins #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d18a66
Change metadata order and fix scroll issue
havatv Jul 27, 2020
90a55e6
Add margin
havatv Jul 27, 2020
e0bdfd5
Move the collection description down into the table in the collection…
havatv Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 23 additions & 48 deletions resources/template/collection_details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,39 @@
<body>
<div class="panel panel-primary">

<div class="panel-heading">
<div class="panel-heading"; style="margin:5px">
<h2 class="panel-title">{{ collection.name }}</h2>
</div>

<div class="panel-body">
<blockquote>{{ collection.description }}</blockquote>
<table class="table">
<tr>
<td><b>URL</b></td><td>{{ collection.repository_url }}</td>
<td><b>Description</b></td><td>{{ collection.description }}</td>
</tr>
<tr>
<tr>
<td><b>Tags</b></td><td>{{ collection.tags }}</td>
</tr>
{% if collection.resources_html != '<i>Unknown before installation</i>' %}
<tr>
<td><b>Resources</b></td><td>{{ collection.resources_html }}</td>
</tr>

{% endif %}
{% if collection.preview|length > 0 %}
<tr>
<td><b>Author</b></td><td>{{ collection.author }}</td>
<td><b>Preview{% if collection.preview|length > 1 %}s</b>&nbsp;({{ collection.preview|length }}){% endif %}</td>
<td>
{% for preview in collection.preview %}
{% if loop.index > 1 %}
<hr>
{% endif %}
<img src="{{ preview }}">
{% endfor %}
</td>
</tr>
{% endif %}
<tr>
<td><b>E-mail</b></td><td>{{ collection.author_email }}</td>
<td><b>URL</b></td><td>{{ collection.repository_url }}</td>
</tr>
{% if collection.license and collection.license != None %}
<tr>
Expand All @@ -61,50 +72,14 @@ <h2 class="panel-title">{{ collection.name }}</h2>
</tr>
{% endif %}
{% endif %}

<tr>
<td><b>Author</b></td><td>{{ collection.author }}</td>
</tr>
<tr>
<td><b>E-mail</b></td><td>{{ collection.author_email }}</td>
</tr>
</table>

{% if collection.preview|length != 0 %}
<!-- Preview Images -->
<div id="preview-carousel" class="carousel slide" data-ride="carousel">
<!-- Indicators -->
<ol class="carousel-indicators">
{% for preview in collection.preview %}
{% if loop.index == 1 %}
<li data-target="#preview-carousel"
data-slide-to="{{ loop.index - 1 }}" class="active">
</li>
{% else %}
<li data-target="#preview-carousel"
data-slide-to="{{ loop.index - 1 }}">
</li>
{% endif %}
{% endfor %}
</ol>

<!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox">
{% for preview in collection.preview %}
{% if loop.index == 1 %}
<div class="item active">
{% else %}
<div class="item">
{% endif %}
<img src="{{ preview }}">
</div>
{% endfor %}
</div> <!-- endof carouse-inner -->

<!-- Controls -->
<a class="left carousel-control" href="#preview-carousel" role="button" data-slide="prev">
<span class="glyphicon glyphicon-chevron-left"></span>
</a>
<a class="right carousel-control" href="#preview-carousel" role="button" data-slide="next">
<span class="glyphicon glyphicon-chevron-right"></span>
</a>

</div> <!-- endof preview-carousel -->
{% endif %}
</div>

</div> <!-- endof panel panel-primary -->
Expand Down
4 changes: 2 additions & 2 deletions resources/template/tab_description.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<body>
<div class="panel panel-primary">

<div class="panel-heading">
<div class="panel-heading"; style="margin:5px">
<h2 class="panel-title">{{ title }}</h2>
</div>

<div class="panel-body">
<div class="panel-body"; style="margin:5px">
<blockquote>{{ description }}</blockquote>
</div>

Expand Down