Use vertical nav

This commit is contained in:
rubenwardy 2021-05-04 21:52:43 +01:00
parent 1389cf450c
commit f5aee035b3
5 changed files with 40 additions and 31 deletions

@ -25,6 +25,17 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
{% if package %}
<h2 class="mt-0">{{ _("Edit Details") }}</h2>
{% else %}
<h2 class="mt-0">
{{ _("Create Package") }}
{% if author != current_user %}
for {{ author.display_name }}
{% endif %}
</h2>
{% endif %}
{% if not package %} {% if not package %}
<div class="alert alert-info"> <div class="alert alert-info">
<a class="float-right btn btn-sm btn-default" href="{{ url_for('flatpage', path='policy_and_guidance') }}">{{ _("View") }}</a> <a class="float-right btn btn-sm btn-default" href="{{ url_for('flatpage', path='policy_and_guidance') }}">{{ _("View") }}</a>

@ -4,8 +4,8 @@
{{ _("Edit Maintainers") }} {{ _("Edit Maintainers") }}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h2 class="mt-0">{{ _("Maintainers") }}</h2>
{% from "macros/forms.html" import render_submit_field, render_field %} {% from "macros/forms.html" import render_submit_field, render_field %}
<p> <p>
{{ _("Maintainers are given write access to the package.") }} {{ _("Maintainers are given write access to the package.") }}

@ -1,40 +1,38 @@
{% extends "base.html" %} {% extends "base.html" %}
{% block container %} {% block container %}
<main class="container mt-4">
{% if tabs %} {% if tabs %}
<nav class="pt-4 tabs-container"> <div class="row">
<div class="container"> <div class="col-md-3 mb-4">
<a class="float-right btn btn-primary" href="{{ package.getDetailsURL() }}"> <div class="list-group">
{{ _("View Package") }} <a class="list-group-item list-group-item-action" href="{{ package.getDetailsURL() }}">
</a> <span class="row m-0 p-0">
<h1 class="mb-5"> <span class="col-auto m-0 p-0">
<a href="{{ package.getDetailsURL() }}"> <img class="img-fluid user-photo img-thumbnail img-thumbnail-1"
{{ package.title }} src="{{ package.getThumbnailOrPlaceholder(1) }}" alt="Thumbnail" style="max-height: 20px;">
</span>
<span class="col m-0 p-0 pl-2">
{{ package.title }}
</span>
</span>
</a> </a>
</h1>
<ul class="nav nav-tabs">
{% for item in tabs %} {% for item in tabs %}
<li class="nav-item"> <a href="{{ item.url }}"
<a href="{{ item.url }}" class="nav-link {% if item.id == current_tab %}active{% endif %}"> class="list-group-item list-group-item-action {% if item.id == current_tab %}active{% endif %}">
{{ item.title }} {{ item.title }}
</a> </a>
</li>
{% endfor %} {% endfor %}
</ul> </div>
</div> </div>
</nav> <div class="col-md-9">
{% endif %} {% endif %}
{% if tabs %} {{ self.content() }}
<main class="container mt-5">
{{ self.content() }}
</main>
{% else %}
<main class="container mt-4">
<h1 class="mb-4">{{ self.title() }}</h1>
{{ self.content() }} {% if tabs %}
</main> </div>
</div>
{% endif %} {% endif %}
</main>
{% endblock %} {% endblock %}

@ -6,7 +6,7 @@ Remove {{ package.title }}
{% block content %} {% block content %}
<form method="POST" action=""> <form method="POST" action="">
<h2>Remove {{ package.title }}</h2> <h2 class="mt-0">Remove {{ package.title }}</h2>
<p> <p>
In order to avoid data loss, you cannot permanently delete packages. In order to avoid data loss, you cannot permanently delete packages.
You can remove them from ContentDB, which will cause them to not be You can remove them from ContentDB, which will cause them to not be

@ -454,6 +454,7 @@
{% from "macros/releases.html" import render_releases %} {% from "macros/releases.html" import render_releases %}
{{ render_releases(releases, package, current_user) }} {{ render_releases(releases, package, current_user) }}
</ul> </ul>
<h3> <h3>
{% if package.approved and package.checkPerm(current_user, "CREATE_THREAD") %} {% if package.approved and package.checkPerm(current_user, "CREATE_THREAD") %}
<div class="btn-group float-right"> <div class="btn-group float-right">
@ -462,7 +463,6 @@
{% endif %} {% endif %}
Threads Threads
</h3> </h3>
<div class="list-group"> <div class="list-group">
{% from "macros/threads.html" import render_compact_threadlist %} {% from "macros/threads.html" import render_compact_threadlist %}
{{ render_compact_threadlist(threads) }} {{ render_compact_threadlist(threads) }}