Archives/ohwgiles_laminar
1
0
Fork 0
mirror of https://github.com/ohwgiles/laminar.git synced 2024-10-27 20:34:20 +00:00
Code Issues Projects Releases Wiki Activity

add favicon, nav logo

Browse Source
This commit is contained in:
Oliver Giles 2015-09-20 19:57:05 +02:00
parent 78a0ef9ed8
commit cf9bee07db
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -57,7 +57,8 @@ add_custom_command(OUTPUT laminar.capnp.c++ laminar.capnp.h
# Zip and compile statically served resources # Zip and compile statically served resources
generate_compressed_bins(${CMAKE_SOURCE_DIR}/src/resources index.html js/app.js generate_compressed_bins(${CMAKE_SOURCE_DIR}/src/resources index.html js/app.js
tpl/home.html tpl/job.html tpl/run.html tpl/log.html tpl/browse.html) tpl/home.html tpl/job.html tpl/run.html tpl/log.html tpl/browse.html
favicon.ico favicon-152.png icon.png)
# Download 3rd-party frontend JS libs... # Download 3rd-party frontend JS libs...
file(DOWNLOAD https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js file(DOWNLOAD https://ajax.googleapis.com/ajax/libs/angularjs/1.3.14/angular.min.js
js/angular.min.js EXPECTED_MD5 b1137641dbb512a60e83d673f7e2d98f) js/angular.min.js EXPECTED_MD5 b1137641dbb512a60e83d673f7e2d98f)

3
src/resources.cpp
View File

@ -28,6 +28,9 @@ Resources::Resources()
{ {
// TODO: Content-type // TODO: Content-type
INIT_RESOURCE("/", index_html); INIT_RESOURCE("/", index_html);
INIT_RESOURCE("/favicon.ico", favicon_ico);
INIT_RESOURCE("/favicon-152.png", favicon_152_png);
INIT_RESOURCE("/icon.png", icon_png);
INIT_RESOURCE("/js/app.js", js_app_js); INIT_RESOURCE("/js/app.js", js_app_js);
INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js); INIT_RESOURCE("/js/Chart.HorizontalBar.js", js_Chart_HorizontalBar_js);
INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js); INIT_RESOURCE("/js/ansi_up.js", js_ansi_up_js);

BIN
src/resources/favicon-152.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.7 KiB

BIN
src/resources/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
src/resources/icon.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

17
src/resources/index.html
View File

@ -5,6 +5,7 @@
<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">
<link rel="apple-touch-icon-precomposed" href="/favicon-152.png">
<title>Laminar</title> <title>Laminar</title>
<script src="/js/angular.min.js"></script> <script src="/js/angular.min.js"></script>
<script src="/js/angular-route.min.js"></script> <script src="/js/angular-route.min.js"></script>
@ -16,9 +17,11 @@
<script src="/js/app.js"></script> <script src="/js/app.js"></script>
<style> <style>
body, html { height: 100%; } body, html { height: 100%; }
.navbar { margin-bottom: 0; } .navbar-brand { margin: 0 -15px; padding: 7px 15px }
.navbar-brand { padding: 13px 15px; font-family: 'Cantarell';} a.navbar-btn { color: #9d9d9d; }
.navbar-inverse { border: 0; } a.navbar-btn.active { color: #fff; }
a.navbar-btn:hover { color: #fff; text-decoration: none; }
a.navbar-btn:focus { color: #fff; }
canvas { canvas {
width: 100% !important; width: 100% !important;
max-width: 800px; max-width: 800px;
@ -33,10 +36,10 @@
<body> <body>
<nav class="navbar navbar-inverse"> <nav class="navbar navbar-inverse">
<div class="container-fluid"> <div class="container-fluid">
<a class="navbar-brand" href="/">laminar</a> <div>
<ul class="nav navbar-nav"> <a class="navbar-brand" href="/"><img src="/icon.png"></a>
<li ng-class="{active:active('/')}"><a href="/jobs">Jobs</a></li> <a class="btn navbar-btn" href="/jobs">Jobs</a>
</ul> </div>
</div> </div>
</nav> </nav>
<div ng-view></div> <div ng-view></div>

3
src/resources/js/app.js
View File

@ -146,9 +146,6 @@ angular.module('laminar',['ngRoute','ngSanitize'])
} }
} }
}); });
$scope.active = function(url) {
return false;
}
$scope.runIcon = Laminar.runIcon; $scope.runIcon = Laminar.runIcon;
timeUpdater = $interval(function() { timeUpdater = $interval(function() {
$scope.jobsRunning.forEach(function(o){ $scope.jobsRunning.forEach(function(o){