Skip to content

fix(semantic): improve HTML semantics across templates #1721

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

Open
miaulalala wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(semantic): improve HTML semantics across templates #1721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 18 additions & 1 deletion nextcloudappstore/core/static/assets/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,10 +593,27 @@ form .text-danger {
box-shadow: none;
}

.sorting {
.sorting-row {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 4px;
margin: 0 15px 15px 15px;
}

.sorting {
margin: 0;
flex-shrink: 0;
}

form.filters {
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 4px;
margin-left: auto;
}

.sorting .glyphicon {
margin-left: -2px;
margin-right: 3px;
Expand Down
4 changes: 2 additions & 2 deletions nextcloudappstore/core/templates/app/detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ <h1>{{ object.name }}</h1>
{% if object.is_featured %}<span class="tag featured">{% trans "Featured" %}</span>{% endif %}
{% if object.is_orphan %}<span class="tag tag-danger">{% trans "Orphan / Looking for Maintainer" %}</span>{% endif %}
</div>
<div class="app-meta col-md-4 col-sm-12">
<aside class="app-meta col-md-4 col-sm-12" aria-label="{% trans 'App information' %}">
<section>
<h5>{% trans "Highest Nextcloud version" %}</h5>
{% with latest_releases_by_platform_v|sort_by_version:'asc'|last as latest_release %}
Expand Down Expand Up @@ -189,7 +189,7 @@ <h5>{% trans 'Need Enterprise Support?' %}</h5>
{% trans 'Recommended for large Nextcloud installations only.' %}
</section>
{% endif %}
</div>
</aside>

<section class="app-description markdown loading"></section>

Expand Down
60 changes: 30 additions & 30 deletions nextcloudappstore/core/templates/app/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,77 +16,77 @@

<div class="row row-no-gutters">
<div class="col-md-12">
<div class="sorting-row">
<ul class="nav-tabs nav sorting">
<li role="presentation" class="{% if not request.GET.order_by or request.GET.order_by == 'relevance' %}active{% endif %}">
<li class="{% if not request.GET.order_by or request.GET.order_by == 'relevance' %}active{% endif %}">
<a href="{{ request.url }}?order_by=relevance&amp;ordering=desc{% if url_params.search_filters %}&amp;{{ url_params.search_filters }}{% endif %}">
<span class="icon icon-relevance{% if not request.GET.order_by or request.GET.order_by == 'relevance' %} icon-white{% else %}-outline{% endif %}"></span>
{% trans 'Relevance' %}
</a>
</li>
<li role="presentation" class="{% if request.GET.order_by == 'rating_overall' %}active{% endif %}">
<li class="{% if request.GET.order_by == 'rating_overall' %}active{% endif %}">
<a href="{{ request.url }}?order_by=rating_overall&amp;ordering=desc{% if url_params.search_filters %}&amp;{{ url_params.search_filters }}{% endif %}">
<span class="icon icon-star-plus{% if request.GET.order_by == 'rating_overall' %} icon-white{% else %}-outline{% endif %}"></span>
{% trans 'Rating' %}
</a>
</li>
{% if request.GET.order_by == 'name' and request.GET.ordering == 'asc' %}
<li role="presentation" class="{% if request.GET.order_by == 'name' %}active{% endif %}">
<li class="{% if request.GET.order_by == 'name' %}active{% endif %}">
<a href="{{ request.url }}?order_by=name&amp;ordering=desc{% if url_params.search_filters %}&amp;{{ url_params.search_filters }}{% endif %}">
<span class="icon icon-sort-alphabetical-variant {% if request.GET.order_by == 'name' %}icon-white{% endif %}"></span>
{% trans 'Alphabetically' %}
</a>
</li>
{% elif request.GET.order_by == 'name' and request.GET.ordering == 'desc' %}
<li role="presentation" class="{% if request.GET.order_by == 'name' %}active{% endif %}">
<li class="{% if request.GET.order_by == 'name' %}active{% endif %}">
<a href="{{ request.url }}?order_by=name&amp;ordering=asc{% if url_params.search_filters %}&amp;{{ url_params.search_filters }}{% endif %}">
<span class="icon icon-sort-alphabetical-variant {% if request.GET.order_by == 'name' %}icon-white{% endif %}" style="transform: rotateZ(180deg)"></span>
{% trans 'Alphabetically' %}
</a>
</li>
{% else %}
<li role="presentation" class="{% if request.GET.order_by == 'name' %}active{% endif %}">
<li class="{% if request.GET.order_by == 'name' %}active{% endif %}">
<a href="{{ request.url }}?order_by=name&amp;ordering=asc{% if url_params.search_filters %}&amp;{{ url_params.search_filters }}{% endif %}">
<span class="icon icon-sort-alphabetical-variant {% if request.GET.order_by == 'name' %}icon-white{% endif %}"></span>
{% trans 'Alphabetically' %}
</a>
</li>
{% endif %}
<li role="presentation" class="{% if request.GET.order_by == 'last_release' %}active{% endif %}">
<li class="{% if request.GET.order_by == 'last_release' %}active{% endif %}">
<a href="{{ request.url }}?order_by=last_release&amp;ordering=desc{% if url_params.search_filters %}&amp;{{ url_params.search_filters }}{% endif %}">
<span class="icon icon-rocket-launch{% if request.GET.order_by == 'last_release' %} icon-white{% else %}-outline{% endif %}"></span>
{% trans 'Latest release' %}
</a>
</li>
<li role="presentation" class="{% if request.GET.order_by == 'rating_recent' %}active{% endif %}">
<li class="{% if request.GET.order_by == 'rating_recent' %}active{% endif %}">
<a href="{{ request.url }}?order_by=rating_recent&amp;ordering=desc{% if url_params.search_filters %}&amp;{{ url_params.search_filters }}{% endif %}">
<span class="icon icon-timer-star{% if request.GET.order_by == 'rating_recent' %} icon-white{% else %}-outline{% endif %}"></span>
{% trans 'Rating (recent)' %}
</a>
</li>
<li role="presentation" class="filters">
<form method="get" action="{{ request.path }}" name="filter-form" id="filter-form">
{% if not is_featured_category %}
<label class="checkbox-group" for="featured-checkbox">
{% trans 'Featured' %}
<input type="checkbox" class="auto-submit" id="featured-checkbox" name="is_featured" value="true" {% if request.GET.is_featured == 'true' %}checked{% endif %}>
<span class="checkmark"></span>
</label>
{% endif %}
{% if request.user.is_authenticated %}
<label class="checkbox-group" for="myapps-checkbox">
{% trans 'My apps' %}
<input type="checkbox" class="auto-submit" id="myapps-checkbox" name="maintainer" value="{{ request.user.username }}" {% if request.GET.maintainer == request.user.username %}checked{% endif %}>
<span class="checkmark"></span>
</label>
{% endif %}

{# Include all GET arguments that should be preserved when applying a filter. #}
{% if request.GET.search %}<input type="hidden" name="search" value="{{ request.GET.search }}">{% endif %}
{% if request.GET.order_by %}<input type="hidden" name="order_by" value="{{ request.GET.order_by }}">{% endif %}
{% if request.GET.ordering %}<input type="hidden" name="ordering" value="{{ request.GET.ordering }}">{% endif %}
</form>
</li>
</ul>
<form method="get" action="{{ request.path }}" name="filter-form" id="filter-form" class="filters">
{% if not is_featured_category %}
<label class="checkbox-group" for="featured-checkbox">
{% trans 'Featured' %}
<input type="checkbox" class="auto-submit" id="featured-checkbox" name="is_featured" value="true" {% if request.GET.is_featured == 'true' %}checked{% endif %}>
<span class="checkmark"></span>
</label>
{% endif %}
{% if request.user.is_authenticated %}
<label class="checkbox-group" for="myapps-checkbox">
{% trans 'My apps' %}
<input type="checkbox" class="auto-submit" id="myapps-checkbox" name="maintainer" value="{{ request.user.username }}" {% if request.GET.maintainer == request.user.username %}checked{% endif %}>
<span class="checkmark"></span>
</label>
{% endif %}

{# Include all GET arguments that should be preserved when applying a filter. #}
{% if request.GET.search %}<input type="hidden" name="search" value="{{ request.GET.search }}">{% endif %}
{% if request.GET.order_by %}<input type="hidden" name="order_by" value="{{ request.GET.order_by }}">{% endif %}
{% if request.GET.ordering %}<input type="hidden" name="ordering" value="{{ request.GET.ordering }}">{% endif %}
</form>
</div>
</div>
</div>

Expand Down
2 changes: 1 addition & 1 deletion nextcloudappstore/core/templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
</div>
{% block content %}{% endblock %}
</div>
<footer class="navbar-default" id="footer">
<footer class="site-footer" id="footer">
<div class="container">
<ul class="nav navbar-nav">
<li class="nav-link">
Expand Down
2 changes: 0 additions & 2 deletions nextcloudappstore/core/templates/nav.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@
{% trans 'Upload app release' %}
</a>
</li>
{% endif %}
{% if request.user.is_authenticated %}
<li class="nav-link">
<a href="{% url 'integration-scaffold' %}">
<span class="icon material-symbols-outlined">integration_instructions</span>
Expand Down
Loading