Added logo and external link indication
diff --git a/asterix-app/src/main/resources/webui/querytemplate.html b/asterix-app/src/main/resources/webui/querytemplate.html
index 2b205bf..f9f1f7c 100644
--- a/asterix-app/src/main/resources/webui/querytemplate.html
+++ b/asterix-app/src/main/resources/webui/querytemplate.html
@@ -6,6 +6,9 @@
<link href='http://fonts.googleapis.com/css?family=Bitter|PT+Sans+Caption|Open+Sans' rel='stylesheet' type='text/css'>
<script src="/webui/static/js/jquery.min.js"></script>
+<link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap-combined.no-icons.min.css" rel="stylesheet">
+<link href="//netdna.bootstrapcdn.com/font-awesome/3.1.1/css/font-awesome.css" rel="stylesheet">
+
<link href="/webui/static/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<link href="/webui/static/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css" />
@@ -30,7 +33,7 @@
</head>
<body>
- <div class="navbar navbar-inverse navbar-fixed-top">
+ <div class="navbar navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
<a class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
@@ -38,12 +41,16 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</a>
- <a class="brand" href="#">AsterixDB</a>
+
+ <!-- Temporary logo placeholder -->
+ <!--<a class="brand" href="#"><img src="../sdk/static/img/finalasterixlogo.jpg"></a>-->
+ <a class="brand" href="#"><img src="http://db.tt/J1MTCdKs"></a>
+
<div class="nav-collapse collapse">
<ul class="nav">
- <li><a href="http://code.google.com/p/asterixdb/source/browse/">Open source</a></li>
- <li><a href="http://code.google.com/p/asterixdb/issues/list">File issues</a></li>
- <li><a href="https://groups.google.com/forum/?fromgroups#!forum/asterixdb-userst">Contact</a></li>
+ <li><a href="http://code.google.com/p/asterixdb/source/browse/">Open source<i class="icon-external-link"></i></a></li>
+ <li><a href="http://code.google.com/p/asterixdb/issues/list">File issues<i class="icon-external-link"></i></a></li>
+ <li><a href="https://groups.google.com/forum/?fromgroups#!forum/asterixdb-userst">Contact<i class="icon-external-link"></i></a></li>
</ul>
</div><!--/.nav-collapse -->
</div>
@@ -84,7 +91,7 @@
</div>
</div>
</div>
- </div>
+</div>
<div class="footer">
<section class="line"><hr></section>
<section class="content">
diff --git a/asterix-app/src/main/resources/webui/static/css/style.css b/asterix-app/src/main/resources/webui/static/css/style.css
index b8688db..39c00b2 100644
--- a/asterix-app/src/main/resources/webui/static/css/style.css
+++ b/asterix-app/src/main/resources/webui/static/css/style.css
@@ -5,10 +5,11 @@
font-size: 14px;
line-height: 17px;
width: 100%;
+ padding: 24px;
}
.content {
- margin-top: 70px;
+ margin-top: 36px;
}
label.query, label.result {
@@ -137,3 +138,15 @@
padding-right: 20px;
float: right;
}
+
+.navbar .brand {
+ width: 160px;
+ height: 40px;
+ overflow: visible;
+ padding-top: 0;
+ padding-bottom: 0;
+}
+
+i {
+ margin-left: 4px;
+}
diff --git a/asterix-app/src/main/resources/webui/static/img/finalasterixlogo.jpg b/asterix-app/src/main/resources/webui/static/img/finalasterixlogo.jpg
new file mode 100644
index 0000000..0ab3727
--- /dev/null
+++ b/asterix-app/src/main/resources/webui/static/img/finalasterixlogo.jpg
Binary files differ
diff --git a/asterix-app/src/main/resources/webui/static/img/finalasterixlogo.png b/asterix-app/src/main/resources/webui/static/img/finalasterixlogo.png
new file mode 100644
index 0000000..10ce431
--- /dev/null
+++ b/asterix-app/src/main/resources/webui/static/img/finalasterixlogo.png
Binary files differ
