Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
start converting the admin ui to bootstrap 4
  • Loading branch information
kraih committed Jan 25, 2018
1 parent 437c3d7 commit 0f834ca
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 114 deletions.
4 changes: 2 additions & 2 deletions lib/Minion.pm
Expand Up @@ -771,7 +771,7 @@ L<http://creativecommons.org/licenses/by-sa/4.0>.
=head2 Bootstrap
Copyright (C) 2011-2016 Twitter, Inc.
Copyright (C) 2011-2018 The Bootstrap Authors.
Licensed under the MIT License, L<http://creativecommons.org/licenses/MIT>.
Expand Down Expand Up @@ -825,7 +825,7 @@ Paul Williams
=head1 COPYRIGHT AND LICENSE
Copyright (C) 2014-2017, Sebastian Riedel and others.
Copyright (C) 2014-2018, Sebastian Riedel and others.
This program is free software, you can redistribute it and/or modify it under
the terms of the Artistic License version 2.0.
Expand Down
27 changes: 0 additions & 27 deletions lib/Mojolicious/Plugin/Minion/resources/public/minion/app.css
@@ -1,10 +1,3 @@
body {
margin-bottom: 60px;
}
html {
min-height: 100%;
position: relative;
}
div.stats {
border: solid 1px #777;
border-radius: 4px;
Expand All @@ -22,9 +15,6 @@ div.stats .stats-body {
padding: 15px 15px 0;
text-align: center;
}
.center-md p {
padding-top: 8px;
}
.expand.accordion-toggle {
vertical-align: middle;
}
Expand All @@ -45,16 +35,6 @@ div.stats .stats-body {
.hiddenRow {
padding: 0 !important;
}
.label-pill {
border-radius: 10rem;
padding-bottom: 0.3em;
padding-left: 0.8em;
padding-right: 0.8em;
padding-top: 0.3em;
}
.pagination {
margin: 0px !important;
}
.table td {
border: 0 !important;
}
Expand All @@ -73,11 +53,4 @@ div.stats .stats-body {
.center-md ul {
float: none !important;
}
.navbar-nav {
margin-left: -15px !important;
}
.navbar-right {
float: left !important;
margin-left: -15px !important;
}
}

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Expand Up @@ -3,13 +3,14 @@
<title><%= title() || 'Minion' %></title>
<meta name="viewport" content="width=device-width, initial-scale=1">
%= javascript '/mojo/jquery/jquery.js'
%= javascript '/minion/bootstrap/bootstrap.js'
%= stylesheet '/minion/bootstrap/bootstrap.css'
%= javascript '/minion/moment/moment.js'
%= javascript '/minion/d3/d3.js'
%= javascript '/minion/epoch/epoch.js'
%= stylesheet '/minion/epoch/epoch.css'
%= stylesheet '/minion/fontawesome/fontawesome.css'
%= javascript '/minion/popper/popper.js'
%= javascript '/minion/bootstrap/bootstrap.js'
%= stylesheet '/minion/bootstrap/bootstrap.css'
%= stylesheet '/minion/app.css'
%= javascript '/minion/app.js'
<script>
Expand All @@ -22,84 +23,75 @@
%= content_for 'head'
</head>
<body>
<nav class="navbar navbar-default navbar-static-top">
<nav class="navbar navbar-expand-lg navbar-light bg-light">
<div class="container">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed"
data-toggle="collapse" data-target=".navbar-collapse"
aria-expanded="false">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
%= link_to 'minion_dashboard' => (class => 'navbar-brand') => begin
<picture>
<img src="<%= url_for '/minion/logo-black.png' %>"
srcset="<%= url_for '/minion/logo-black-2x.png' %> 2x">
</picture>
% end
</div>
<div class="collapse navbar-collapse">
<ul class="nav navbar-nav">
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">
<ul class="navbar-nav mr-auto">
% my $jobs = url_for 'minion_jobs';
<li>
<li class="nav-item">
<a href="<%= $jobs->query(state => 'inactive') %>">
Inactive
<span class="label label-pill label-info
<span class="badge badge-pill badge-info
minion-stats-inactive-jobs">
0
</span>
</a>
</li>
<li>
<li class="nav-item">
<a href="<%= $jobs->query(state => 'failed') %>">
Failed
<span class="label label-pill label-danger
<span class="badge badge-pill badge-danger
minion-stats-failed-jobs">
0
</span>
</a>
</li>
<li>
<li class="nav-item">
<a href="<%= $jobs->query(state => 'finished') %>">
Finished
<span class="label label-pill label-success
<span class="badge badge-pill badge-success
minion-stats-finished-jobs">
0
</span>
</a>
</li>
<li>
<li class="nav-item">
<a href="<%= $jobs->query(state => 'active') %>">
Active
<span class="label label-pill label-warning
<span class="badge badge-pill badge-warning
minion-stats-active-jobs">
0
</span>
</a>
</li>
<li>
<li class="nav-item">
<a href="<%= url_for 'minion_locks' %>">
Locks
<span class="label label-pill label-default
<span class="badge badge-pill badge-secondary
minion-stats-active-locks">
0
</span>
</a>
</li>
<li>
<li class="nav-item">
<a href="<%= url_for 'minion_workers' %>">
Workers
<span class="label label-pill label-default
<span class="badge badge-pill badge-secondary
minion-stats-workers">
0
</span>
</a>
</li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li>
<li class="nav-item">
<a href="<%= url_for $return_to %>">
<i class="fas fa-sign-out-alt" aria-hidden="true"></i>
Back to Site
Expand Down
Expand Up @@ -2,10 +2,10 @@
<ul class="pagination pull-right">
% for my $i (10, 20, 50, 100) {
% if ($limit == $i) {
<li class="active"><a><%= $i %></a></li>
<li class="page-item active"><a class="page-link"><%= $i %></a></li>
% }
% else {
<li><%= link_to $i => url_with->query([limit => $i]) %></li>
<li class="page-item"><%= link_to $i => url_with->query([limit => $i]) => (class => 'page-link') %></li>
% }
% }
</ul>
Expand Down
Expand Up @@ -9,21 +9,21 @@
<nav class="text-center">
<ul class="pagination">
% if ($current_page == 1) {
<li class="disabled">
<a>First</a>
<li class="page-item disabled">
<a class="page-link">First</a>
% }
% else {
<li>
<a href="<%= url_with->query([offset => 0]) %>">First</a>
<li class="page-item">
<a class="page-link" href="<%= url_with->query([offset => 0]) %>">First</a>
% }
</li>
% if ($current_page == 1) {
<li class="disabled">
<a>Previous</a>
<li class="page-item disabled">
<a class="page-link">Previous</a>
% }
% else {
<li>
<a href="<%= url_with->query([offset => $prev_offset]) %>">Previous</a>
<li class="page-item">
<a class="page-link" href="<%= url_with->query([offset => $prev_offset]) %>">Previous</a>
% }
</li>
% my $start = $current_page >= 3 ? $current_page - 2 : 1;
Expand All @@ -32,34 +32,34 @@
% my $end = $last_page < ($start + 4) ? $last_page : $start + 4;
% for my $i ($start .. $end) {
% if ($i == $current_page) {
<li class="active"><a><%= $i %></a></li>
<li class="page-item active"><a class="page-link"><%= $i %></a></li>
% }
% else {
<li>
<a href="<%= url_with->query([offset => ($i - 1) * $limit]) %>">
<li class="page-item">
<a class="page-link" href="<%= url_with->query([offset => ($i - 1) * $limit]) %>">
<%= $i %>
</a>
</li>
% }
% }
% if ($current_page >= $last_page) {
<li class="disabled">
<a>Next</a>
<li class="page-item disabled">
<a class="page-link">Next</a>
% }
% else {
<li>
<a href="<%= url_with->query([offset => $next_offset]) %>">
<li class="page-item">
<a class="page-link" href="<%= url_with->query([offset => $next_offset]) %>">
Next
</a>
% }
</li>
% if ($current_page >= $last_page) {
<li class="disabled">
<a>Last</a>
<li class="page-item disabled">
<a class="page-link">Last</a>
% }
% else {
<li>
<a href="<%= url_with->query([offset => $last_offset]) %>">Last</a>
<li class="page-item">
<a class="page-link" href="<%= url_with->query([offset => $last_offset]) %>">Last</a>
% }
</li>
</ul>
Expand Down
Expand Up @@ -5,34 +5,26 @@

% my ($parents, $children, $id) = @{$job}{qw(parents children worker)};
% if (@$parents || @$children || $id) {
<div class="btn-group">
<div class="dropdown">
<button type="button"
class="btn btn-default btn-xs dropdown-toggle"
data-toggle="dropdown" aria-haspopup="true"
class="btn btn-outline-secondary dropdown-toggle"
id="dropdownMenuButton" data-toggle="dropdown" aria-haspopup="true"
aria-expanded="false">
Related
<span class="caret"></span>
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu">
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
% if (@$parents) {
<li>
<%= link_to
Parents => url_for('minion_jobs')->query(id => $parents) %>
</li>
Parents => url_for('minion_jobs')->query(id => $parents) => (class => 'dropdown-item') %>
% }
% if (@$children) {
<li>
<%= link_to
Children => url_for('minion_jobs')->query(id => $children) %>
</li>
Children => url_for('minion_jobs')->query(id => $children) => (class => 'dropdown-item') %>
% }
% if ($id) {
<li>
<%= link_to Worker => url_for('minion_workers')->query(id => $id) %>
</li>
<%= link_to Worker => url_for('minion_workers')->query(id => $id) => (class => 'dropdown-item') %>
% }
</ul>
</div>
</div>
% }
% end
Expand All @@ -42,13 +34,13 @@
%= form_for 'minion_manage_jobs' => begin
<div class="row center-md">
<div class="col-md-4 btn-group" role="group">
<button class="btn btn-default" name="do" value="retry" type="submit">
<button class="btn btn-outline-secondary" name="do" value="retry" type="submit">
<i class="fas fa-redo" aria-hidden="true"></i> Retry
</button>
<button class="btn btn-default" name="do" value="stop" type="submit">
<button class="btn btn-outline-secondary" name="do" value="stop" type="submit">
<i class="fas fa-ban" aria-hidden="true"></i> Stop
</button>
<button class="btn btn-default" name="do" value="remove" type="submit">
<button class="btn btn-outline-secondary" name="do" value="remove" type="submit">
<i class="fas fa-times" aria-hidden="true"></i> Remove
</button>
</div>
Expand Down Expand Up @@ -108,16 +100,16 @@
<td class="accordion-toggle collapsed" data-toggle="collapse"
data-target="#job<%= $i %>">
% if ($job->{state} eq 'active') {
<span class="label label-warning">active</span>
<span class="badge badge-warning">active</span>
% }
% elsif ($job->{state} eq 'failed') {
<span class="label label-danger">failed</span>
<span class="badge badge-danger">failed</span>
% }
% elsif ($job->{state} eq 'finished') {
<span class="label label-success">finished</span>
<span class="badge badge-success">finished</span>
% }
% else {
<span class="label label-info">inactive</span>
<span class="badge badge-info">inactive</span>
% }
</td>
<td class="accordion-toggle collapsed expand"
Expand Down
Expand Up @@ -5,7 +5,7 @@
%= form_for 'minion_unlock' => begin
<div class="row center-md">
<div class="col-md-4 btn-group" role="group">
<button class="btn btn-default" type="submit">
<button class="btn btn-outline-secondary" type="submit">
<i class="fas fa-lock"></i> Unlock
</button>
</div>
Expand Down

0 comments on commit 0f834ca

Please sign in to comment.