Updates per core.sr.ht centered redesign
This commit is contained in:
Drew DeVault
parent
b46f03ea64
commit
2f4969d504
|
|
@ -1,40 +1,38 @@
|
|||
{% extends "layout-full.html" %}
|
||||
{% extends "layout.html" %}
|
||||
{% block body %}
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12 header-tabbed">
|
||||
<div class="header-tabbed">
|
||||
<div class="container">
|
||||
{% macro link(path, title) %}
|
||||
<a
|
||||
class="nav-link {% if view == title %}active{% endif %}"
|
||||
href="{{ path }}">{{ title }}</a>
|
||||
{% endmacro %}
|
||||
<ul class="nav nav-tabs">
|
||||
<h2>
|
||||
<a href="{{ tracker.owner|user_url }}">{{ tracker.owner }}</a
|
||||
>/{{ tracker.name }}
|
||||
</h2>
|
||||
{% macro link(path, title) %}
|
||||
<a
|
||||
class="nav-link {% if view == title %}active{% endif %}"
|
||||
href="{{ path }}">{{ title }}</a>
|
||||
{% endmacro %}
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link"
|
||||
href="{{tracker|tracker_url}}"
|
||||
>{{icon("caret-left")}} back</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
{{link(url_for(".settings_details_GET",
|
||||
owner=tracker.owner.canonical_name,
|
||||
name=tracker.name), "details")}}
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
{{link(url_for(".settings_access_GET",
|
||||
owner=tracker.owner.canonical_name,
|
||||
name=tracker.name), "access")}}
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
{{link(url_for(".settings_delete_GET",
|
||||
owner=tracker.owner.canonical_name,
|
||||
name=tracker.name), "delete")}}
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link"
|
||||
href="{{tracker|tracker_url}}"
|
||||
>{{icon("caret-left")}} back</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
{{link(url_for(".settings_details_GET",
|
||||
owner=tracker.owner.canonical_name,
|
||||
name=tracker.name), "details")}}
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
{{link(url_for(".settings_access_GET",
|
||||
owner=tracker.owner.canonical_name,
|
||||
name=tracker.name), "access")}}
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
{{link(url_for(".settings_delete_GET",
|
||||
owner=tracker.owner.canonical_name,
|
||||
name=tracker.name), "delete")}}
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "layout-full.html" %}
|
||||
{% extends "layout.html" %}
|
||||
{% block title %}
|
||||
<title>
|
||||
{{ ticket.ref() }}: {{ ticket.title }}
|
||||
|
|
@ -7,78 +7,74 @@
|
|||
</title>
|
||||
{% endblock %}
|
||||
{% block body %}
|
||||
<div class="container-fluid">
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
<h2 style="margin: 0;">
|
||||
<span class="d-block d-md-inline">
|
||||
<div>
|
||||
<a href="{{ tracker.owner|user_url }}"
|
||||
>{{ tracker.owner }}</a>/<a href="{{ tracker|tracker_url }}"
|
||||
>{{ tracker.name }}</a>#{{ ticket.scoped_id }}<span
|
||||
class="d-none d-md-inline">:</span>
|
||||
</span>
|
||||
<span id="title-field" class="d-block d-md-inline">
|
||||
</div>
|
||||
<div id="title-field">
|
||||
{{ticket.title}}
|
||||
</span>
|
||||
</div>
|
||||
</h2>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="header-tabbed">
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12 header-tabbed" style="border: none; margin: 0;">
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="nav-item">
|
||||
<a href="{{ ticket|ticket_url }}"
|
||||
class="nav-link active">view</a>
|
||||
</li>
|
||||
{% if TicketAccess.edit in access %}
|
||||
<li class="nav-item">
|
||||
<a href="{{ ticket|ticket_edit_url }}"
|
||||
class="nav-link">edit</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if current_user %}
|
||||
<li class="flex-grow-1 d-none d-sm-block"></li>
|
||||
<li class="nav-item d-none d-sm-block">
|
||||
{% if not tracker_sub %}
|
||||
<form method="POST" action="{{url_for("ticket." +
|
||||
("disable_notifications" if ticket_sub else "enable_notifications"),
|
||||
owner=tracker.owner.canonical_name,
|
||||
name=tracker.name,
|
||||
ticket_id=ticket.scoped_id)}}">
|
||||
{{csrf_token()}}
|
||||
<div class="container">
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="nav-item">
|
||||
<a href="{{ ticket|ticket_url }}"
|
||||
class="nav-link active">view</a>
|
||||
</li>
|
||||
{% if TicketAccess.edit in access %}
|
||||
<li class="nav-item">
|
||||
<a href="{{ ticket|ticket_edit_url }}"
|
||||
class="nav-link">edit</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
{% if current_user %}
|
||||
<li class="flex-grow-1 d-none d-sm-block"></li>
|
||||
<li class="nav-item d-none d-sm-block">
|
||||
{% if not tracker_sub %}
|
||||
<form method="POST" action="{{url_for("ticket." +
|
||||
("disable_notifications" if ticket_sub else "enable_notifications"),
|
||||
owner=tracker.owner.canonical_name,
|
||||
name=tracker.name,
|
||||
ticket_id=ticket.scoped_id)}}">
|
||||
{{csrf_token()}}
|
||||
{% else %}
|
||||
<div>
|
||||
{% endif %}
|
||||
<button
|
||||
class="nav-link active"
|
||||
{% if tracker_sub %}
|
||||
title="you are subscribed to all activity on this tracker"
|
||||
disabled
|
||||
{% else %}
|
||||
<div>
|
||||
type="submit"
|
||||
{% endif %}
|
||||
<button
|
||||
class="nav-link active"
|
||||
{% if tracker_sub %}
|
||||
title="You are subscribed to all activity on this tracker"
|
||||
disabled
|
||||
{% else %}
|
||||
type="submit"
|
||||
{% endif %}
|
||||
>
|
||||
{{icon("envelope-o")}}
|
||||
{% if ticket_sub or tracker_sub %}
|
||||
Disable notifications
|
||||
{% else %}
|
||||
Enable notifications
|
||||
{% endif %}
|
||||
{{icon("caret-right")}}
|
||||
</button>
|
||||
{% if not tracker_sub %}
|
||||
</form>
|
||||
>
|
||||
{{icon("envelope-o")}}
|
||||
{% if ticket_sub or tracker_sub %}
|
||||
disable notifications
|
||||
{% else %}
|
||||
</div>
|
||||
enable notifications
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
{{icon("caret-right")}}
|
||||
</button>
|
||||
{% if not tracker_sub %}
|
||||
</form>
|
||||
{% else %}
|
||||
</div>
|
||||
{% endif %}
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@
|
|||
{% endmacro %}
|
||||
{% block content %}
|
||||
<div class="row">
|
||||
<div class="col-md-10">
|
||||
<div class="col-md-12">
|
||||
<form method="POST">
|
||||
{{csrf_token()}}
|
||||
<div class="form-group {{valid.cls("tracker_any_access")}}">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{% extends "layout-full.html" %}
|
||||
{% extends "layout.html" %}
|
||||
{% block title %}
|
||||
<title>
|
||||
labels
|
||||
|
|
@ -9,28 +9,28 @@
|
|||
</title>
|
||||
{% endblock %}
|
||||
{% block body %}
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-md-12 header-tabbed">
|
||||
<h2>
|
||||
<a href="{{ tracker.owner|user_url }}">{{ tracker.owner }}</a
|
||||
>/{{ tracker.name }}
|
||||
</h2>
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ tracker|tracker_url }}">
|
||||
{{icon('caret-left')}} back
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active"
|
||||
href="{{ tracker|tracker_labels_url }}">labels</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="header-tabbed">
|
||||
<div class="container">
|
||||
<h2>
|
||||
<a href="{{ tracker.owner|user_url }}">{{ tracker.owner }}</a
|
||||
>/{{ tracker.name }}
|
||||
</h2>
|
||||
<ul class="nav nav-tabs">
|
||||
<li class="nav-item">
|
||||
<a class="nav-link" href="{{ tracker|tracker_url }}">
|
||||
{{icon('caret-left')}} back
|
||||
</a>
|
||||
</li>
|
||||
<li class="nav-item">
|
||||
<a class="nav-link active"
|
||||
href="{{ tracker|tracker_labels_url }}">labels</a>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
<div class="container">
|
||||
<div class="row">
|
||||
<div class="col-xl-5 col-lg-6 col-md-8">
|
||||
<div class="col-md-8">
|
||||
{% if tracker.description %}
|
||||
{{ tracker.description | md }}
|
||||
{% endif %}
|
||||
|
|
@ -69,48 +69,47 @@
|
|||
{% else %}
|
||||
<p>No labels defined.</p>
|
||||
{% endif %}
|
||||
|
||||
<hr />
|
||||
|
||||
{% if is_owner %}
|
||||
<h3 style="margin-top: 1rem">Add label</h3>
|
||||
|
||||
<form method="POST">
|
||||
{{csrf_token()}}
|
||||
<div class="form-row">
|
||||
<div class="col-auto">
|
||||
<div class="form-group" style="width: 4rem">
|
||||
<label for="color">Color</label>
|
||||
<input
|
||||
type="color"
|
||||
class="form-control {{ valid.cls("color") }}"
|
||||
id="color"
|
||||
name="color"
|
||||
style="height: 2.2rem"
|
||||
value="{{ color or "#ffffff" }}" />
|
||||
{{valid.summary("color")}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div class="form-group">
|
||||
<label for="name">Name</label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control {{ valid.cls("name") }}"
|
||||
maxlength="2048"
|
||||
id="name"
|
||||
name="name"
|
||||
value="{{ name or "" }}" />
|
||||
{{valid.summary("name")}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Add {{icon("caret-right")}}
|
||||
</button>
|
||||
</form>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% if is_owner %}
|
||||
<div class="container">
|
||||
<h3 style="margin-top: 1rem">Add label</h3>
|
||||
|
||||
<form method="POST">
|
||||
{{csrf_token()}}
|
||||
<div class="form-row">
|
||||
<div class="col-auto">
|
||||
<div class="form-group" style="width: 4rem">
|
||||
<label for="color">Color</label>
|
||||
<input
|
||||
type="color"
|
||||
class="form-control {{ valid.cls("color") }}"
|
||||
id="color"
|
||||
name="color"
|
||||
style="height: 2.2rem"
|
||||
value="{{ color or "#ffffff" }}" />
|
||||
{{valid.summary("color")}}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col">
|
||||
<div class="form-group">
|
||||
<label for="name">Name</label>
|
||||
<input
|
||||
type="text"
|
||||
class="form-control {{ valid.cls("name") }}"
|
||||
maxlength="2048"
|
||||
id="name"
|
||||
name="name"
|
||||
value="{{ name or "" }}" />
|
||||
{{valid.summary("name")}}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<button type="submit" class="btn btn-primary">
|
||||
Add {{icon("caret-right")}}
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
|
|
|
|||
Loading…
Reference in New Issue