Show node name in title/header (fixes #221)

This commit is contained in:
Jakob Borg 2014-05-16 18:42:22 +02:00
parent 958c39ef5f
commit b60251b960
3 changed files with 18 additions and 6 deletions

File diff suppressed because one or more lines are too long

View File

@ -230,6 +230,18 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
return nodeCfg.NodeID.substr(0, 6); return nodeCfg.NodeID.substr(0, 6);
}; };
$scope.thisNodeName = function () {
var nodes = $scope.thisNode();
if (typeof nodes === 'undefined' || nodes.length != 1) {
return "(unknown node)";
}
var nodeCfg = nodes[0];
if (nodeCfg.Name) {
return nodeCfg.Name;
}
return nodeCfg.NodeID.substr(0, 6);
};
$scope.editSettings = function () { $scope.editSettings = function () {
$('#settings').modal({backdrop: 'static', keyboard: true}); $('#settings').modal({backdrop: 'static', keyboard: true});
} }

View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" ng-app="syncthing"> <html lang="en" ng-app="syncthing" ng-controller="SyncthingCtrl" class="ng-cloak">
<head> <head>
<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">
@ -8,7 +8,7 @@
<meta name="author" content=""> <meta name="author" content="">
<link rel="shortcut icon" href="favicon.png"> <link rel="shortcut icon" href="favicon.png">
<title>syncthing</title> <title>Syncthing | {{thisNodeName()}}</title>
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet"> <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet">
<style type="text/css"> <style type="text/css">
body { body {
@ -91,13 +91,13 @@
</style> </style>
</head> </head>
<body ng-controller="SyncthingCtrl" class="ng-cloak"> <body>
<!-- Top bar --> <!-- Top bar -->
<nav class="navbar navbar-top navbar-default" role="navigation"> <nav class="navbar navbar-top navbar-default" role="navigation">
<div class="container"> <div class="container">
<span class="navbar-brand"><img class="logo" src="st-logo-128.png" width="32" height="32"> Syncthing</span> <span class="navbar-brand"><img class="logo" src="st-logo-128.png" width="32" height="32" /> Syncthing<small> | {{thisNodeName()}}</small></span>
<button type="button" class="btn btn-default btn-sm pull-right navbar-btn" ng-click="editSettings()"><span class="glyphicon glyphicon-cog"></span> Settings</button> <button type="button" class="btn btn-default btn-sm pull-right navbar-btn" ng-click="editSettings()"><span class="glyphicon glyphicon-cog"></span> Settings</button>
</div> </div>
</nav> </nav>