Skip to content

Commit

Permalink
Integrated Bootstrap in the User Interface and made some improvements…
Browse files Browse the repository at this point in the history
… and code clean ups.
  • Loading branch information
MoeweX authored and StephanEwen committed Mar 25, 2014
1 parent 3b3260a commit cc8e16e
Show file tree
Hide file tree
Showing 54 changed files with 15,896 additions and 818 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ Christoph Brücke
Ufuk Celebi <[email protected]>
Stephan Ewen <[email protected]>
Hasan Gürcan <[email protected]>
Jonathan Hasenburg <[email protected]>
Arvid Heise
Michael Huelfenhausen
Fabian Hueske <[email protected]>
Expand Down
208 changes: 120 additions & 88 deletions stratosphere-runtime/resources/web-docs-infoserver/analyze.html
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,88 +1,120 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http:https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<title>Stratosphere JobManager</title>
<meta http-equiv="content-type" content="text/html; charset=UTF-8">
<link rel="stylesheet" type="text/css" href="css/nephelefrontend.css">
<link rel="stylesheet" type="text/css" href="css/timeline.css">
<script type="text/javascript" src="js/jquery.js"></script>
<script type="text/javascript" src="js/jcanvas.min.js"></script>
<script type="text/javascript" src="js/jquery.flot.min.js"></script>
<script type="text/javascript" src="js/jquery.flot.categories.min.js"></script>
<script type="text/javascript" src="js/jquery.flot.time.min.js"></script>
<script type="text/javascript" src="js/jquery.flot.stack.js"></script>
<script type="text/javascript" src="js/googlejsapi.js"></script>
<script type="text/javascript" src="js/timeline.js"></script>
<script type="text/javascript" src="js/helpers.js"></script>
<script type="text/javascript" src="js/analyzer.js"></script>
</head>
<body>
<div id="page-sidebar">
<div id="header-logo">
<img width="230" alt="Stratosphere Logo" src="img/StratosphereLogo.png">
</div>
<div class="scrollable-content active" id="sidebar-menu" style="overflow: hidden; height: 130px;" tabindex="5000">
<ul style="">
<li>
<a title="Dashboard" href="index.html">
Job Manager
</a>
</li>
<li>
<a title="Components"target="_blank" href="logInfo">
Log
</a>
</li>
<li>
<a title="Components"target="_blank" href="logInfo?get=stdout">
Stdout
</a>
</li>
</ul>
</div>
</div>
<div id="page-main">
<div id="page-main-wrapper">
<div id="page-content">
<div class="contentbox">
<h3 class="contentbox-header">
<span id="jobtitle">Job Overview</span>
</h3>
<div id="jobs" class="contentbox-wrapper">
<div id="started">
Scheduled: <span id="time"></span>
</div>
<div id="runtime">
Runtime: <span id="run"></span>
</div>
<div id="endstatus">
Status: <span id="status"></span>
</div>
<div id="control">
<span id="flow" class="btn">Flow Layout</span><span id="stack" class="btn">Stack Layout</span>
</div>
<div id="job_timeline">
</div>
</div>
</div>
<div class="contentbox">
<h3 class="contentbox-header">
<span>Tasks</span>
</h3>
<div id="vertices" class="contentbox-wrapper">
Select a task by clicking on the corresponding bar in the Job Overview section.
</div>
</div>

<div class="contentbox">
<h3 class="contentbox-header">
<span>Accumulator Results</span>
</h3>
<div id="accumulators" class="contentbox-wrapper">
The job does not have any accumulators
</div>
</div>

</body>
</html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">

<title>Dashboard - Stratosphere</title>

<!-- Bootstrap core CSS -->
<link href="css/bootstrap.css" rel="stylesheet">

<!-- Add custom CSS here -->
<link href="css/sb-admin.css" rel="stylesheet">
<link rel="stylesheet" href="font-awesome/css/font-awesome.min.css">

<!-- Page Specific CSS -->
<link rel="stylesheet" type="text/css" href="css/nephelefrontend.css" />
<link rel="stylesheet" type="text/css" href="css/timeline.css">

<!-- Scripts from Bootstrap -->
<script src="js/jquery-1.10.2.js"></script>
<script src="js/bootstrap.js"></script>

<!-- Scripts from Stratosphere -->
<script type="text/javascript" src="js/jquery.flot.min.js"></script>
<script type="text/javascript" src="js/helpers.js"></script>
<script type="text/javascript" src="js/jcanvas.min.js"></script>
<script type="text/javascript" src="js/googlejsapi.js"></script>
<script type="text/javascript" src="js/timeline.js"></script>
<script type="text/javascript" src="js/helpers.js"></script>
<script type="text/javascript" src="js/analyzer.js"></script>
</head>

<body>

<div id="wrapper">

<!-- Sidebar -->
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Stratosphere</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav side-nav">
<li><a href="index.html"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li><a href="history.html"><i class="fa fa-bar-chart-o"></i> History</a></li>
</ul>

<ul class="nav navbar-nav navbar-right navbar-user">
<li class="dropdown user-dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-archive"></i> Log Files<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="logInfo"><i class="fa fa-keyboard-o"></i> Log Info</a></li>
<li><a href="logInfo?get=stdout"><i class="fa fa-keyboard-o"></i> Stdout</a></li>
</ul>
</li>
</ul>
</div><!-- /.navbar-collapse -->
</nav>

<div id="page-wrapper">
<div class="panel panel-primary">
<div class="panel-heading">
<h3 id="jobtitle" class="panel-title"> Running Jobs</h3>
</div>
<div id="jobs" class="panel-body">
<div id="started">
Scheduled: <span id="time"></span>
</div>
<div id="runtime">
Runtime: <span id="run"></span>
</div>
<div id="endstatus">
Status: <span id="status"></span>
</div>
<div id="control">
<!-- <span id="flow" class="btn">Flow Layout</span><span id="stack" class="btn">Stack Layout</span> -->
<div class="btn-toolbar">
<button id="flow" type="button" class="btn btn-info">Flow Layout</button>
<button id="stack" type="button" class="btn btn-info">Stack Layout</button>
</div>
</div>
<div id="job_timeline"></div>
</div>
</div>
<div class="panel panel-primary">
<div class="panel-heading">
<h3 class="panel-title"> Tasks</h3>
</div>
<div id="vertices" class="panel-body">
Select a task by clicking on the corresponding bar in the Job Overview section.
</div>
</div>

<div class="panel panel-primary">
<div class="panel-heading">
<div class="panel-title">Accumulator Results</div>
</div>
<div id="accumulators" class="panel-body">
The job does not have any accumulators
</div>
</div>

</div><!-- /#page-wrapper -->

</div><!-- /#wrapper -->

</body>
</html>
85 changes: 85 additions & 0 deletions stratosphere-runtime/resources/web-docs-infoserver/blank-page.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="description" content="">
<meta name="author" content="">

<title>Dashboard - Stratosphere</title>

<!-- Bootstrap core CSS -->
<link href="css/bootstrap.css" rel="stylesheet">

<!-- Add custom CSS here -->
<link href="css/sb-admin.css" rel="stylesheet">
<link rel="stylesheet" href="font-awesome/css/font-awesome.min.css">

<!-- Page Specific CSS -->
<link rel="stylesheet" type="text/css" href="css/nephelefrontend.css" />

<!-- Scripts from Bootstrap -->
<script src="js/jquery-1.10.2.js"></script>
<script src="js/bootstrap.js"></script>

<!-- Scripts from Stratosphere -->
<script type="text/javascript" src="js/jquery.flot.min.js"></script>
<script type="text/javascript" src="js/helpers.js"></script>
<script type="text/javascript" src="js/jobmanagerFrontend.js"></script>
<script type="text/javascript" src="js/jcanvas.min.js"></script>
</head>

<body>

<div id="wrapper">

<!-- Sidebar -->
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Stratosphere</a>
</div>

<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav side-nav">
<li class="active"><a href="index.html"><i class="fa fa-dashboard"></i> Dashboard</a></li>
<li><a href="history.html"><i class="fa fa-bar-chart-o"></i> History</a></li>
</ul>

<ul class="nav navbar-nav navbar-right navbar-user">
<li class="dropdown user-dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-archive"></i> Log Files<b class="caret"></b></a>
<ul class="dropdown-menu">
<li><a href="logInfo"><i class="fa fa-keyboard-o"></i> Log Info</a></li>
<li><a href="logInfo?get=stdout"><i class="fa fa-keyboard-o"></i> Stdout</a></li>
</ul>
</li>
</ul>
</div><!-- /.navbar-collapse -->
</nav>

<div id="page-wrapper">

<div class="row">
<div class="col-lg-12">
<h1>Blank Page <small>A Blank Slate</small></h1>
<ol class="breadcrumb">
<li><a href="index.html"><i class="icon-dashboard"></i> Dashboard</a></li>
<li class="active"><i class="icon-file-alt"></i> Blank Page</li>
</ol>
</div>
</div><!-- /.row -->

</div><!-- /#page-wrapper -->

</div><!-- /#wrapper -->

</body>
</html>
Loading

0 comments on commit cc8e16e

Please sign in to comment.