提交 758db365 编写于 作者: F Fabian Hueske

[FLINK-1136] Replaced Flink logo in web submission client

Added Flink logo to JobManager web interface.
Updated Run Example Quickstart screenshots
Removed old gradients and unused image files from submission client.

This closes #145.
上级 e2fd615c
......@@ -100,7 +100,6 @@ input
margin: 5px;
text-align: left;
background-color: white;
background-image: url('../img/GradientBoxes.png');
background-repeat: no-repeat;
background-position: right;
height: 100px;
......
......@@ -122,7 +122,6 @@
div.canvas
{
background-color: white;
background-image: url('../img/gradient.jpg');
background-repeat: no-repeat;
background-position: top right;
padding: 0px;
......@@ -132,7 +131,6 @@ div.canvas
div.propertyCanvas
{
background-color: white;
background-image: url('../img/gradient.jpg');
background-repeat: no-repeat;
background-position: top right;
......
......@@ -7,30 +7,30 @@
<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/pactgraphs.css" />
<link rel="stylesheet" type="text/css" href="css/graph.css" />
<link rel="stylesheet" type="text/css" href="css/overlay.css" />
<link rel="stylesheet" type="text/css" href="css/bootstrap.css" /> <!-- Changed Stuff -->
<script type="text/javascript" src="js/jquery-2.1.0.js"></script>
<script type="text/javascript" src="js/graphCreator.js"></script>
<script type="text/javascript" src="js/d3.js" charset="utf-8"></script>
<script type="text/javascript" src="js/dagre-d3.js"></script>
<script type="text/javascript" src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/jquery.tools.min.js"></script>
<script type="text/javascript" src="js/program.js"></script>
<link rel="stylesheet" type="text/css" href="css/nephelefrontend.css" />
<link rel="stylesheet" type="text/css" href="css/pactgraphs.css" />
<link rel="stylesheet" type="text/css" href="css/graph.css" />
<link rel="stylesheet" type="text/css" href="css/overlay.css" />
<link rel="stylesheet" type="text/css" href="css/bootstrap.css" /> <!-- Changed Stuff -->
<script type="text/javascript" src="js/jquery-2.1.0.js"></script>
<script type="text/javascript" src="js/graphCreator.js"></script>
<script type="text/javascript" src="js/d3.js" charset="utf-8"></script>
<script type="text/javascript" src="js/dagre-d3.js"></script>
<script type="text/javascript" src="js/bootstrap.min.js"></script>
<script type="text/javascript" src="js/jquery.tools.min.js"></script>
<script type="text/javascript" src="js/program.js"></script>
</head>
<body>
<div class="mainHeading" style="min-width: 1225px;">
<h1 style="margin-top:0"><img src="img/FlinkLogo.png" width="326" height="100" alt="Flink Logo" />Flink Query Interface
<div style="position:absolute; top:40px; right:110px;">
<button id="zoomIn" type="button" class="btn btn-default">Zoom In</button>
<button id="zoomOut" type="button" class="btn btn-default">Zoom Out</button>
</div>
<h1 style="margin-top:0"><img src="img/flink-logo.png" width="100" height="100" alt="Flink Logo" />Flink Web Submission Client
<div style="position:absolute; top:40px; right:110px;">
<button id="zoomIn" type="button" class="btn btn-default">Zoom In</button>
<button id="zoomOut" type="button" class="btn btn-default">Zoom Out</button>
</div>
</h1>
</div>
......@@ -73,7 +73,7 @@
<input id="upload_file_name_text" type="text" name="file_name" disabled="disabled" style="position: absolute; top: 0px; right: 85px; width: 380px; z-index: 3;"/>
<input type="button" value="Browse" style="width: 75px; position: absolute; right: 0px; top: 0px; z-index: 1;" />
<input id="upload_file_input" class="translucent" type="file" name="upload_jar_file" style="position: absolute; right: 0px; top: 0px; height: 30px; width=75px; z-index: 2;" />
</div>
</div>
</form>
<div class="footer" style="text-align: right;">
<span id="upload_error_text" class="error_text"></span>
......@@ -81,12 +81,12 @@
</div>
</div>
</div>
<!-- the overlay -->
<div class="simple_overlay" id="propertyO">
<div id="propertyCanvas" class="propertyCanvas">
</div>
</div>
<!-- the overlay -->
<div class="simple_overlay" id="propertyO">
<div id="propertyCanvas" class="propertyCanvas">
</div>
</div>
</body>
</html>
......@@ -136,7 +136,7 @@ public abstract class GUIServletStub extends HttpServlet {
// write the header
writer.println("<body>");
writer.println(" <div class=\"mainHeading\">");
writer.println(" <h1 style=\"margin-top:0\"><img src=\"img/FlinkLogo.png\" width=\"326\" height=\"100\" alt=\"Flink Logo\" align=\"middle\"/>Flink Query Interface"
writer.println(" <h1 style=\"margin-top:0\"><img src=\"img/flink-logo.png\" width=\"100\" height=\"100\" alt=\"Flink Logo\" align=\"middle\"/>Flink Web Submission Client"
+ "<div style='position:absolute; top:40px; right:110px;'>"
+ "<button id='zoomIn' type='button' class='btn btn-default'>Zoom In</button>"
+ "<button id='zoomOut' type='button' class='btn btn-default'>Zoom Out</button>"
......
......@@ -366,7 +366,7 @@ public class JobSubmissionServlet extends HttpServlet {
writer.println("<body>");
writer.println(" <div class=\"mainHeading\">");
writer.println(" <h1><img src=\"img/FlinkLogo.png\" width=\"326\" height=\"100\" alt=\"Flink Logo\" align=\"middle\"/>Flink Query Interface</h1>");
writer.println(" <h1><img src=\"img/flink-logo.png\" width=\"100\" height=\"100\" alt=\"Flink Logo\" align=\"middle\"/>Flink Web Submission Client</h1>");
writer.println(" </div>");
writer.println(" <div style=\"margin-top: 50px; text-align: center;\">");
writer.println(" <p class=\"error_text\" style=\"font-size: 18px;\">");
......
......@@ -61,7 +61,12 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Apache Flink</a>
<table>
<tr>
<td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td>
<td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td>
</tr>
</table>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
......
......@@ -53,7 +53,12 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Apache Flink</a>
<table>
<tr>
<td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td>
<td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td>
</tr>
</table>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
......
......@@ -54,7 +54,12 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Apache Flink</a>
<table>
<tr>
<td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td>
<td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td>
</tr>
</table>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
......@@ -83,11 +88,11 @@
<li><a href="index.html"><i class="icon-dashboard"></i> Dashboard</a></li>
<li class="active"><i class="icon-file-alt"></i> Configuration</li>
</ol>
</div>
<div class="col-lg-12"><h3>Global Configuration</h2></div>
<div class="col-lg-12">
<div class="table-responsive" id="confTable">
</div>
</div>
<div class="col-lg-12"><h3>Global Configuration</h2></div>
<div class="col-lg-12">
<div class="table-responsive" id="confTable">
</div>
</div>
</div><!-- /.row -->
......
......@@ -54,7 +54,12 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Apache Flink</a>
<table>
<tr>
<td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td>
<td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td>
</tr>
</table>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
......
......@@ -24,10 +24,10 @@
<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>
<!-- Insert Version -->
<script type="text/javascript">
<script type="text/javascript" src="js/jcanvas.min.js"></script>
<!-- Insert Version -->
<script type="text/javascript">
$(document).ready(function() {
$.ajax({ url : "jobsInfo?get=version", type : "GET", cache: false, success : function(json) {
$("#version").empty();
......@@ -38,7 +38,7 @@
}
}, dataType : "json",
});
});
});
</script>
<!-- Load Menu -->
......@@ -67,7 +67,12 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Apache Flink</a>
<table>
<tr>
<td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td>
<td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td>
</tr>
</table>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
......@@ -182,10 +187,10 @@
<div class="row">
<div class="col-lg-12">
<div class="panel panel-primary">
<div class="panel-heading">
<div class="panel-heading">
<h3 class="panel-title"><i class="fa fa-play"></i> Running Jobs</h3>
</div>
<div class="panel-body">
<div class="panel-body">
<p id="rJpH">There are currently no running jobs, but you can analyze your old jobs in the history.<p>
<div id="jobs" class="contentbox-wrapper"></div>
</div>
......@@ -196,6 +201,6 @@
</div><!-- /#page-wrapper -->
</div><!-- /#wrapper -->
</body>
</body>
</html>
......@@ -54,7 +54,12 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="index.html">Apache Flink</a>
<table>
<tr>
<td><img src="img/flink-logo.png" alt="Flink Logo" style="margin-left:15px; margin-top:5px; width:40px;height:40px";></td>
<td style="vertical-align:top"><a class="navbar-brand" href="index.html">Apache Flink</a></td>
</tr>
</table>
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册