Git-Mirrors/brozzler
1
0
Fork 0
mirror of https://github.com/internetarchive/brozzler.git synced 2025-08-02 11:36:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace jobs page with home page which also lists services

Browse source
This commit is contained in:
Noah Levitt 2015-11-12 02:57:27 +00:00
parent 343b5c0f82
commit 998c3975b2
6 changed files with 49 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
webconsole/static/index.html
View file

@ -3,7 +3,9 @@
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes" />
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
<title>Brozzler Console</title> <title>Brozzler Console</title>
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap.css">
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap-theme.css"> <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.5/css/bootstrap-theme.css">

12
webconsole/static/js/app.js
View file

@ -12,10 +12,6 @@ brozzlerConsoleApp.config(["$routeProvider", "$locationProvider",
templateUrl: "/static/partials/workers.html", templateUrl: "/static/partials/workers.html",
controller: "WorkersListController" controller: "WorkersListController"
}). }).
when("/jobs", {
templateUrl: "/static/partials/jobs.html",
controller: "JobsListController"
}).
when("/jobs/:id", { when("/jobs/:id", {
templateUrl: "/static/partials/job.html", templateUrl: "/static/partials/job.html",
controller: "JobController" controller: "JobController"
@ -25,7 +21,8 @@ brozzlerConsoleApp.config(["$routeProvider", "$locationProvider",
controller: "SiteController" controller: "SiteController"
}). }).
when("/", { when("/", {
redirectTo: "/jobs" templateUrl: "/static/partials/home.html",
controller: "HomeController"
}). }).
otherwise({ otherwise({
template: '<div> <div class="page-header"> <h1>Not Found</h1> </div> <div class="row"> <div class="col-sm-12"> How the heck did you get here? </div> </div> </div> ', template: '<div> <div class="page-header"> <h1>Not Found</h1> </div> <div class="row"> <div class="col-sm-12"> How the heck did you get here? </div> </div> </div> ',
@ -53,11 +50,14 @@ brozzlerConsoleApp.filter("byteformat", function() {
var brozzlerControllers = angular.module("brozzlerControllers", []); var brozzlerControllers = angular.module("brozzlerControllers", []);
brozzlerControllers.controller("JobsListController", ["$scope", "$http", brozzlerControllers.controller("HomeController", ["$scope", "$http",
function($scope, $http) { function($scope, $http) {
$http.get("/api/jobs").success(function(data) { $http.get("/api/jobs").success(function(data) {
$scope.jobs = data.jobs; $scope.jobs = data.jobs;
}); });
$http.get("/api/services").success(function(data) {
$scope.services = data.services;
});
}]); }]);
brozzlerControllers.controller("WorkersListController", ["$scope", "$http", brozzlerControllers.controller("WorkersListController", ["$scope", "$http",

33
webconsole/static/partials/jobs.html → webconsole/static/partials/home.html
View file

@ -1,5 +1,5 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="active">Jobs</li> <li class="active">Home</li>
</ol> </ol>
<div class="page-header"> <div class="page-header">
@ -9,6 +9,37 @@
</div> </div>
<div> <div>
<h2>Services</h2>
<p><a href="/workers">Brozzler Workers</a></p>
<div class="row">
<div class="col-sm-12">
<table class="table table-striped">
<thead>
<tr>
<th>role</th>
<th>host</th>
<th>pid</th>
<th>load</th>
<th>first heartbeat</th>
<th>last heartbeat</th>
</tr>
</thead>
<tbody>
<tr ng-repeat="service in services">
<td>{{service.role}}</td>
<td>{{service.host}}</td>
<td>{{service.pid}}</td>
<td>{{service.load}}</td>
<td>{{service.first_heartbeat}}</td>
<td>{{service.last_heartbeat}}</td>
</tr>
</tbody>
</table>
</div>
</div>
<h2>Jobs</h2> <h2>Jobs</h2>
<div class="row"> <div class="row">

4
webconsole/static/partials/job.html
View file

@ -1,6 +1,6 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/jobs">Jobs</a></li> <li><a href="/">Home</a></li>
<li class="active">{{job.id}}</li> <li class="active">Job {{job.id}}</li>
</ol> </ol>
<div class="page-header"> <div class="page-header">

4
webconsole/static/partials/site.html
View file

@ -1,6 +1,6 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/jobs">Jobs</a></li> <li><a href="/">Home</a></li>
<li><a href="/jobs/{{site.job_id}}">{{site.job_id}}</a></li> <li><a href="/jobs/{{site.job_id}}">Job {{site.job_id}}</a></li>
<li class="active">{{site.seed}}</li> <li class="active">{{site.seed}}</li>
</ol> </ol>

6
webconsole/static/partials/workers.html
View file

@ -1,4 +1,5 @@
<ol class="breadcrumb"> <ol class="breadcrumb">
<li><a href="/">Home</a></li>
<li class="active">Workers</li> <li class="active">Workers</li>
</ol> </ol>
@ -13,10 +14,11 @@
<div class="row"> <div class="row">
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6" ng-repeat="worker in workers"> <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6" ng-repeat="worker in workers">
{{worker.host}} <div>{{worker.host}}</div>
<iframe style="width:45rem;height:32rem;" <iframe style="width:45rem;height:32rem;"
ng-src="{{'/static/noVNC/vnc.html?host=' + worker.host + '&port=' + worker.vnc_websocket_port + '&autoconnect=1&resize=downscale'}}"> ng-src="{{'/static/noVNC/vnc.html?host=' + worker.host + '&port=8901&autoconnect=1&resize=downscale'}}">
</iframe> </iframe>
</div> </div>
</div> </div>
</div> </div>