Skip to content

Commit

Permalink
Merge pull request #888 from fabiolb/bugfix/886_fix_admin_ui
Browse files Browse the repository at this point in the history 
update materialize bits. see issue #886
  • Loading branch information
@nathanejohnson
nathanejohnson committed Jul 15, 2022
2 parents add1b3c + 1c3ed44 commit 3f07a4a
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 19 deletions.
9 changes: 5 additions & 4 deletions admin/ui/manual.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ var tmplManual = template.Must(template.New("manual").Funcs(funcs).Parse( // lan
<a href="/" class="brand-logo"><img alt="Fabio Logo" style="margin: 15px 0" class="logo" src="/assets/logo.bw.svg"> {{if .Title}} - {{.Title}}{{end}}</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a href="/routes">Routes</a></li>
<li><a class="dropdown-button" href="#!" data-activates="overrides">Overrides<i class="material-icons right">arrow_drop_down</i></a></li>
<li><a class="dropdown-trigger dropdown-button" href="#" data-target="overrides">Overrides<i class="material-icons right">arrow_drop_down</i></a></li>
<li><a href="https://github.com/fabiolb/fabio/blob/master/CHANGELOG.md">{{.Version}}</a></li>
<li><a href="https://github.com/fabiolb/fabio">Github</a></li>
</ul>
Expand Down Expand Up @@ -104,21 +104,22 @@ var tmplManual = template.Must(template.New("manual").Funcs(funcs).Parse( // lan
<script>
$(function(){
$('.dropdown-trigger').dropdown();
let params={};window.location.search.replace(/[?&]+([^=&]+)=([^&]*)/gi,function(str,key,value){params[key] = value;});
$.get({{.APIPath}}, function(data) {
const $ta1 = $("#textarea1");
const $ta1 = $("#textarea1");
$("input[name=version]").val(data.version);
$("textarea>label").val("Version " + data.version);
$ta1.val(data.value);
$ta1.trigger('autoresize');
M.textareaAutoResize($('#textarea1'));
});
$.get('/api/paths', function(data) {
const d = $("#overrides");
$.each(data, function(idx, val) {
let path = val;
if (val === "") {
if (val == "") {
val = "default"
}
d.append(
Expand Down
33 changes: 18 additions & 15 deletions admin/ui/route.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ var tmplRoutes = template.Must(template.New("routes").Parse( // language=HTML
<meta charset="utf-8">
<title>fabio{{if .Title}} - {{.Title}}{{end}}</title>
<script type="text/javascript" src="/assets/code.jquery.com/jquery-3.6.0.min.js"></script>
<link href="/assets/fonts/material-icons.css" rel="stylesheet">
<link rel="stylesheet" href="/assets/cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
<script src="/assets/cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<link href="/assets/fonts/material-icons.css" rel="stylesheet">
<link rel="stylesheet" href="/assets/cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
<script src="/assets/cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
<style type="text/css">
Expand All @@ -49,7 +49,7 @@ var tmplRoutes = template.Must(template.New("routes").Parse( // language=HTML
<div class="nav-wrapper">
<a href="/" class="brand-logo">fabio{{if .Title}} - {{.Title}}{{end}}</a>
<ul id="nav-mobile" class="right hide-on-med-and-down">
<li><a class="dropdown-button" href="#!" data-activates="overrides">Overrides<i class="material-icons right">arrow_drop_down</i></a></li>
<li><a class="dropdown-trigger dropdown-button" href="#" data-target="overrides">Overrides<i class="material-icons right">arrow_drop_down</i></a></li>
<li><a href="https://github.com/fabiolb/fabio/blob/master/CHANGELOG.md">{{.Version}}</a></li>
<li><a href="https://github.com/fabiolb/fabio">Github</a></li>
</ul>
Expand All @@ -76,6 +76,7 @@ var tmplRoutes = template.Must(template.New("routes").Parse( // language=HTML
$(function(){
let params={};window.location.search.replace(/[?&]+([^=&]+)=([^&]*)/gi,function(str,key,value){params[key] = value;});
$('.dropdown-trigger').dropdown();
function renderRoutes(routes) {
const $table = $('table.routes');
Expand All @@ -90,19 +91,21 @@ $(function(){
let $tbody = $('<tbody />');
for (let i=0; i < routes.length; i++) {
const r = routes[i];
if (routes != null) {
for (let i=0; i < routes.length; i++) {
const r = routes[i];
const $tr = $('<tr />')
const $tr = $('<tr />')
$tr.append($('<td />').text(i+1));
$tr.append($('<td />').text(r.service));
$tr.append($('<td />').text(r.src));
$tr.append($('<td />').append($('<a />').attr('href', r.dst).text(r.dst)));
$tr.append($('<td />').text(r.opts));
$tr.append($('<td />').text((r.weight * 100).toFixed(2) + '%'));
$tr.append($('<td />').text(i+1));
$tr.append($('<td />').text(r.service));
$tr.append($('<td />').text(r.src));
$tr.append($('<td />').append($('<a />').attr('href', r.dst).text(r.dst)));
$tr.append($('<td />').text(r.opts));
$tr.append($('<td />').text((r.weight * 100).toFixed(2) + '%'));
$tr.appendTo($tbody);
$tr.appendTo($tbody);
}
}
$table.empty().
Expand Down Expand Up @@ -141,7 +144,7 @@ $(function(){
const d = $("#overrides");
$.each(data, function(idx, val) {
let path = val;
if (val === "") {
if (val == "") {
val = "default"
}
d.append(
Expand Down

0 comments on commit 3f07a4a

Please sign in to comment.