Merge branch 'master' into bootstrap4

diff --cc Makefile.am
Simple merge

diff --cc src/templates/mirrors/detail.html
index 70e78ef3538d15acbcba268225e954138000e449,edf219fcf33aaf0755cd02cf73a91496eb4f1ca5..5940b14cb912284acacbc7f5ea60766e5151a830
--- 1/src/templates/mirrors/detail.html
--- 2/src/templates/mirrors/detail.html
+++ b/src/templates/mirrors/detail.html
@@@ -3,50 -3,49 +3,50 @@@
  {% block title %}{{ _("Mirror: %s") % mirror.hostname }}{% end block %}
  
  {% block body %}
 -      <ul class="breadcrumb">
 -              <li>
 -                      <a href="/">{{ _("Home") }}</a>
 -                      <span class="divider">/</span>
 -              </li>
 -              <li>
 -                      <a href="/mirrors">{{ _("Mirrors") }}</a>
 -                      <span class="divider">/</span>
 -              </li>
 -              <li class="active">
 -                      <a href="/mirror/{{ mirror.hostname }}">{{ mirror.hostname }}</a>
 -              </li>
 -      </ul>
 +      <div class="row">
 +              <div class="col-12 col-sm-12 col-md-12 col-lg-12 col-xl-12">
 +                      <nav aria-label="breadcrumb" role="navigation">
 +                              <ol class="breadcrumb">
 +                                      <li class="breadcrumb-item"><a href="/">{{ _("Home") }}</a></li>
 +                                      <li class="breadcrumb-item"><a href="/mirrors">{{ _("Mirrors") }}</a></li>
 +                                      <li class="breadcrumb-item active">
 +                                              <a href="/mirror/{{ mirror.hostname }}">{{ mirror.hostname }}</a>
 +                                      </li>
 +                              </ol>
 +                      </nav>
 +              </div>
 +      </div>
  
 -      {% if current_user and current_user.has_perm("manage_mirrors") %}
 -              <div class="btn-group pull-right">
 -                      <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
 -                              {{ _("Actions") }} <span class="caret"></span>
 -                      </a>
 -                      <ul class="dropdown-menu">
 -                              <li>
 -                                      <a href="/mirror/{{ mirror.hostname }}/edit">
 -                                              <i class="icon-edit"></i>
 -                                              {{ _("Edit settings") }}
 -                                      </a>
 -                              </li>
  
 -                              <li class="divider"></li>
 -                              <li>
 -                                      <a href="/mirror/{{ mirror.hostname }}/delete">
 -                                              <i class="icon-trash"></i>
 -                                              {{ _("Delete mirror") }}
 -                                      </a>
 -                              </li>
 -                      </ul>
 +      <div class="row">
 +              <div class="col-12 col-sm-12 col-md-6 col-lg-9 col-xl-9">
 +                      <h2 style="word-wrap: break-word;">
 +                              {{ _("Mirror: %s") % mirror.hostname }} <br>
-                               <small class="text-muted">{{ _("hosted by %s") % mirror.owner }}</small>
++                              <small class="text-muted">{{ mirror.owner }}</small>
 +                      </h2>
                </div>
 -      {% end %}
 -
 -      <div class="page-header">
 -              <h2>
 -                      {{ _("Mirror: %s") % mirror.hostname }}
 -                      <small>{{ mirror.owner }}</small>
 -              </h2>
 +              {% if current_user and current_user.has_perm("manage_mirrors") %}
 +                      <div class="col-12 col-sm-12 col-md-6 col-lg-3 col-xl-3">
 +                              <div class="dropdown justify-content-center justify-content-lg-end justify-content-xl-end">
 +                                      <button class="btn dropdown-toggle" type="button" id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 +                                              {{ _("Actions") }}
 +                                      </button>
 +                                      <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
 +                                              <a class="dropdown-item" href="/mirror/new">
 +                                                      <i class="icon-asterisk"></i> {{ _("Add new mirror") }}
 +                                              </a>
 +                                              <a class="dropdown-item" href="/mirror/{{ mirror.hostname }}/edit">
 +                                                      <i class="icon-edit"></i>
 +                                                      {{ _("Edit settings") }}
 +                                              </a>
 +                                              <a class="dropdown-item" href="/mirror/{{ mirror.hostname }}/delete">
 +                                                      <i class="icon-trash"></i>
 +                                                      {{ _("Delete mirror") }}
 +                                              </a>
 +                                      </div>
 +                              </div>
 +                      </div>
 +              {% end %}
        </div>
  
        <div class="row">