Merge branch 'webmin-link-formatting' into webmin-via-url-path

This commit is contained in:
PiSCSI User 2023-11-15 02:01:01 +00:00
commit 018fd7e590
3 changed files with 20 additions and 11 deletions

View File

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-external-link"><path d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"></path><polyline points="15 3 21 3 21 9"></polyline><line x1="10" y1="14" x2="21" y2="3"></line></svg>

After

Width:  |  Height:  |  Size: 388 B

View File

@ -971,6 +971,10 @@ section#services li.disabled {
background: url("icons/cloud-off.svg") no-repeat left center; background: url("icons/cloud-off.svg") no-repeat left center;
} }
section#services li.extlink {
background: url("icons/external-link.svg") no-repeat left center;
}
/* /*
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
Drives page Drives page

View File

@ -120,18 +120,20 @@
<ul class="service_status"> <ul class="service_status">
{% if netatalk_configured %} {% if netatalk_configured %}
<li class="service-item enabled"> <li class="service-item enabled">
{{ _("Mac AFP file sharing is enabled.") }} {{ _("Mac AFP file sharing is enabled.") }}
{% else %} {% else %}
<li class="service-item disabled"> <li class="service-item disabled">
{{ _("Mac AFP file sharing is disabled.") }} {{ _("Mac AFP file sharing is disabled.") }}
{% endif %} {% endif %}
</li> </li>
{% if webmin_configured %} {% if webmin_configured %}
<li> <ul>
<a href="https://{{ env["ip_addr"] }}:10000/netatalk2/" target=\"_blank\"> <li class="service-item extlink">
{{ _("Manage the AFP server") }} <a href="../webmin/netatalk2/" target=\"_blank\">
</a> {{ _("Manage the AFP server") }}
</li> </a>
</li>
</ul>
{% endif %} {% endif %}
{% if samba_configured %} {% if samba_configured %}
<li class="service-item enabled"> <li class="service-item enabled">
@ -142,11 +144,13 @@
{% endif %} {% endif %}
</li> </li>
{% if webmin_configured %} {% if webmin_configured %}
<li> <ul>
<a href="https://{{ env["ip_addr"] }}:10000/samba/" target=\"_blank\"> <li class="service-item extlink">
{{ _("Manage the SMB server") }} <a href="../webmin/samba/" target=\"_blank\">
</a> {{ _("Manage the SMB server") }}
</li> </a>
</li>
</ul>
{% endif %} {% endif %}
{% if ftp_configured %} {% if ftp_configured %}
<li class="service-item enabled"> <li class="service-item enabled">