Version bump & GUI enhancements

d243ebbb · Nigel Kukard · 73149523 · 73149523 · d243ebbb · d243ebbb
Commit d243ebbb authored 11 years ago by Nigel Kukard
--- a/opentrafficshaper/plugins/webserver/pages/static/favicon.ico
+++ b/opentrafficshaper/plugins/webserver/pages/static/favicon.ico
--- a/opentrafficshaper/plugins/webserver/pages/static/logo-inverted-short.png
+++ b/opentrafficshaper/plugins/webserver/pages/static/logo-inverted-short.png
--- a/opentrafficshaper/plugins/webserver/pages/static/logo-inverted.png
+++ b/opentrafficshaper/plugins/webserver/pages/static/logo-inverted.png
--- a/opentrafficshaper/plugins/webserver/pages/static/logo.png
+++ b/opentrafficshaper/plugins/webserver/pages/static/logo.png
--- a/opentrafficshaper/plugins/webserver/webserver.pm
+++ b/opentrafficshaper/plugins/webserver/webserver.pm
@@ -51,7 +51,7 @@ our (@ISA,@EXPORT,@EXPORT_OK);
 );

 use constant {
-	VERSION => '0.0.1'
+	VERSION => '0.0.2'
 };


@@ -141,7 +141,6 @@ sub plugin_init
 		Stopped => \&server_session_stop,
 	);

-
 	# Load statistics pages if the statistics module is enabled
 	if (isPluginLoaded('statistics')) {
 		# Check if we can actually load the pages
@@ -413,6 +412,7 @@ $styleStr

 	<body>
 		<div class="navbar navbar-inverse navbar-fixed-top">
+			<a class="navbar-brand" href="/"><img src="/static/logo-inverted-short.png" alt="Open Traffic Shaper" width="100%" height="auto" /></a>
 			<div class="container">
 				<div class="navbar-header">
 					<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -420,7 +420,6 @@ $styleStr
 						<span class="icon-bar"></span>
 						<span class="icon-bar"></span>
 					</button>
-   					<a class="navbar-brand" href="/">OpenTrafficShaper</a>
 				</div>
 				<div class="collapse navbar-collapse">
 					<ul class="nav navbar-nav">

--- a/opentrafficshaper/version.pm
+++ b/opentrafficshaper/version.pm
@@ -30,7 +30,7 @@ our (@ISA,@EXPORT,@EXPORT_OK);


 use constant {
-	VERSION		=> "1.0.0",
+	VERSION		=> "1.1.0",
 };