perso/syncthing-arm
Archived
4
0 Fork 0
Code Issues 1 Actions Releases Wiki Activity

Always show local node, and summarize traffic stats (fixes #43)

Browse Source
This commit is contained in:
Jakob Borg committed 2014-02-05 21:30:04 +01:00
1 parent 9bd4fa5008
commit 1aefc50e35
3 files changed
+41 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

auto/gui.files.go
+1 -1
View File
@@ -3,4 +3,4 @@ package auto
import "github.com/cratonica/embed"
var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xec, 0xfd, 0x5b, 0x8c, 0x23, 0x59, 0xb7, 0x20, 0x4, 0xe7, 0x5c, 0xfe, 0x7f, 0xc0, 0x33, 0xdf, 0x9c, 0xa3, 0x19, 0x60, 0xe0, 0x85, 0x71, 0xc6, 0x97, 0xc7, 0x1d, 0x51, 0xde, 0xe9, 0x74, 0x56, 0xf7, 0x77, 0x8b, 0xc8, 0x28, 0x9f, 0xac, 0xac, 0xac, 0x5b, 0x57, 0x66, 0x55, 0x67, 0x66, 0x55, 0x5f, 0x9c, 0xee, 0x9e, 0x1d, 0x17, 0x5f, 0xda, 0x76, 0xd8, 0xe5, 0xb0, 0x33, 0x2b, 0x2b, 0x6d, 0x90, 0x78, 0x2, 0x21, 0xe6, 0x79, 0x74, 0x84, 0x84, 0x78, 0x82, 0x27, 0x84, 0xd0, 0x8, 0x1, 0x3, 0x6f, 0x20, 0x4, 0xcc, 0x3, 0xe2, 0x79, 0xc4, 0x3, 0x2, 0x9, 0xd0, 0x91, 0x6, 0x71, 0x91, 0x10, 0x67, 0x66, 0x60, 0xad, 0xb5, 0xaf, 0x11, 0x76, 0x56, 0x77, 0x9f, 0xf3, 0xcd, 0x79, 0x80, 0xca, 0xee, 0x28, 0x47, 0xec, 0xd8, 0xb1, 0xaf, 0x6b, 0xaf, 0xbd, 0xd6, 0xda, 0xeb, 0xf2, 0x3b, 0x5b, 0x5b, 0x5b, 0x8d, 0x41, 0x96, 0xa4, 0xef, 0x1a, 0xfd, 0xf9, 0x78, 0xd4, 0xc8, 0xaf, 0xa7, 0x5b, 0xbf, 0xbf, 0xb5, 0x15, 0x35, 0xdf, 0x3c, 0x3b, 0xa9, 0xfe, 0xaa, 0xf1, 0x19, 0xbc, 0xde, 0xfa, 0xdd, 0xad, 0xad, 0xe4, 0x5f, 0xf9, 0xfb, 0x67, 0x7f, 0xe1, 0xdf, 0xfd, 0xeb, 0x5b, 0xc9, 0xce, 0xd6, 0xd6, 0xf7, 0xd1, 0xd6, 0x8f, 0xfa, 0xfb, 0x3e, 0x9a, 0xcc, 0x7a, 0xbb, 0xe3, 0x68, 0xfa, 0x3, 0xf9, 0xfe, 0x85, 0xef, 0xa3, 0xbd, 0x7c, 0x16, 0xef, 0xf5, 0x6, 0xf3, 0xfe, 0x22, 0x6a, 0xc4, 0x93, 0xf1, 0x5e, 0xcc, 0x47, 0xe3, 0xfe, 0x5e, 0x7e, 0x93, 0xc5, 0xf3, 0xfe, 0x20, 0xeb, 0xed, 0xf5, 0x16, 0x83, 0x3d, 0xd3, 0xc8, 0xad, 0x8f, 0x7f, 0x1f, 0xff, 0x3e, 0xfe, 0xfd, 0xf6, 0xfe, 0x7e, 0xb6, 0xf5, 0xe9, 0xfd, 0xfd, 0x26, 0xde, 0xfd, 0xdc, 0xd9, 0xae, 0xfe, 0xd5, 0xbf, 0xf2, 0xfa, 0xe3, 0x90, 0x7c, 0xfc, 0xfb, 0xf8, 0xf7, 0xf1, 0xef, 0xe3, 0xdf, 0xc7, 0xbf, 0x8f, 0x7f, 0x1f, 0xff, 0x3e, 0xfe, 0x7d, 0xfc, 0xfb, 0xf8, 0xf7, 0xff, 0xa1, 0xbf, 0xf9, 0xf4, 0xcf, 0x6f, 0xfd, 0x8b, 0xf0, 0xfb, 0x67, 0xe5, 0x73, 0x47, 0xfe, 0xfe, 0x99, 0xd2, 0xef, 0x3f, 0xf8, 0xbf, 0xc5, 0xdf, 0xa1, 0x7c, 0xfe, 0xb6, 0xf4, 0xfe, 0x8f, 0xe4, 0xfb, 0xc7, 0xf2, 0xf9, 0xdf, 0x28, 0xbd, 0xff, 0x73, 0xf2, 0xf7, 0xaf, 0xc8, 0xdf, 0xff, 0xa1, 0xf4, 0xfe, 0xe3, 0xdf, 0xc7, 0xbf, 0x8f, 0x7f, 0x1f, 0xff, 0x3e, 0xfe, 0x7d, 0xfc, 0xfb, 0xf8, 0xf7, 0xf1, 0xef, 0xe3, 0xdf, 0xc7, 0xbf, 0x8f, 0x7f, 0x1f, 0xff, 0x3e, 0xfe, 0x7d, 0xfc, 0xfb, 0xf8, 0xf7, 0x8f, 0xef, 0x8f, 0x27, 0x5b, 0x5b, 0x19, 0xfc, 0xfe, 0x23, 0x64, 0xc4, 0x7f, 0xd7, 0xf0, 0xff, 0xff, 0xcb, 0xef, 0x6c, 0x6d, 0xfd, 0x5d, 0xb8, 0xfe, 0x33, 0xb8, 0xfe, 0x1d, 0xb8, 0xde, 0xc1, 0xb5, 0xf, 0xd7, 0x5f, 0x82, 0xeb, 0xf, 0xff, 0xf2, 0xd6, 0xd6, 0xbf, 0xd, 0xd7, 0xbf, 0x5, 0xd7, 0xdf, 0x84, 0xeb, 0x25, 0x5c, 0xbf, 0x82, 0xeb, 0x1e, 0x5c, 0xff, 0x2c, 0x5c, 0xff, 0xc, 0x5c, 0xbf, 0x3, 0xd7, 0xff, 0xf9, 0xb3, 0xad, 0xad, 0xff, 0xe, 0xae, 0xff, 0x1a, 0xae, 0x7f, 0x1f, 0xae, 0x3f, 0x80, 0xeb, 0x6f, 0xc1, 0xf5, 0x37, 0xe1, 0x5a, 0xc2, 0x35, 0x80, 0xeb, 0x39, 0x5c, 0x4f, 0xe1, 0x7a, 0x2, 0x57, 0x8, 0xd7, 0x5f, 0x83, 0xeb, 0x1f, 0xfe, 0xa5, 0xad, 0xad, 0x3f, 0x82, 0xeb, 0xff, 0x82, 0xeb, 0x7f, 0x84, 0xeb, 0xef, 0xc2, 0xf5, 0x5f, 0xc2, 0xf5, 0x5f, 0xc0, 0xf5, 0x4f, 0xc1, 0xf5, 0x8f, 0xfe, 0xe2, 0xd6, 0xd6, 0x3f, 0x80, 0xeb, 0x8f, 0xe0, 0xfa, 0x5f, 0xe1, 0xfa, 0x9f, 0xe1, 0xfa, 0x9f, 0xe0, 0xfa, 0x4f, 0xe1, 0xfa, 0xdb, 0x70, 0xfd, 0x2d, 0xb8, 0x6e, 0xe1, 0x7a, 0x6, 0x97, 0xf, 0xd7, 0x6f, 0xe0, 0xfa, 0xeb, 0x98, 0xbf, 0x2, 0xe9, 0x70, 0xfd, 0x73, 0x70, 0xfd, 0xe1, 0x3f, 0xb9, 0xb5, 0xf5, 0x9f, 0xc0, 0x15, 0xc0, 0xf5, 0xb7, 0xff, 0x9, 0xa8, 0x1f, 0xae, 0xbf, 0xf7, 0x17, 0xb6, 0xb6, 0xfe, 0x43, 0xb8, 0xfe, 0x0, 0xae, 0xdf, 0x85, 0xeb, 0xff, 0xf8, 0xff, 0x6f, 0x6d, 0xfd, 0xb7, 0x70, 0xfd, 0x57, 0x70, 0xfd, 0xc7, 0x70, 0xfd, 0x1d, 0xb8, 0xfe, 0x4d, 0xb8, 0x56, 0x70, 0x9d, 0xc2, 0xf5, 0xbf, 0xff, 0xff, 0xb6, 0xb6, 0xfe, 0x23, 0xb8, 0xfe, 0x0, 0xae, 0x6, 0x5c, 0x3f, 0x83, 0xeb, 0xef, 0xfc, 0xf9, 0xad, 0xad, 0x2f, 0xe1, 0xda, 0x83, 0xeb, 0x67, 0x70, 0xfd, 0xe1, 0x9f, 0xdb, 0xda, 0xfa, 0xd7, 0xe0, 0x1a, 0xc2, 0xf5, 0x1c, 0xae, 0x7f, 0x1a, 0xae, 0xff, 0xed, 0xcf, 0x6e, 0x6d, 0xfd, 0x37, 0x70, 0xfd, 0xeb, 0x70, 0xbd, 0x87, 0xeb, 0xf1, 0x9f, 0x15, 0xe3, 0xff, 0xf, 0xff, 0xd4, 0x85, 0x21, 0xd5, 0x1f, 0xf8, 0x3b, 0xc8, 0xa7, 0x3c, 0xab, 0x66, 0xbd, 0xdd, 0xbc, 0x3f, 0xb9, 0xe, 0x9d, 0x6c, 0x92, 0xa4, 0x47, 0xdd, 0x5e, 0xe3, 0x14, 0x7e, 0x9f, 0x3d, 0xaa, 0x6e, 0x87, 0xd5, 0xf1, 0xcd, 0xb3, 0x47, 0xce, 0x83, 0xf, 0x96, 0x73, 0x30, 0x4f, 0xaa, 0xf1, 0x88, 0xe7, 0x79, 0xe8, 0xcc, 0xd3, 0x77, 0xf3, 0xdd, 0xd9, 0xa0, 0xd7, 0x9f, 0xff, 0xd0, 0x37, 0x7b, 0xf3, 0xe4, 0xc1, 0xf, 0xb6, 0xee, 0xf6, 0x16, 0x1b, 0x74, 0x98, 0x24, 0x33, 0x57, 0xb6, 0xcc, 0x5b, 0xad, 0x7e, 0xa8, 0x2d, 0xbf, 0xbd, 0x8a, 0xdf, 0xa4, 0x7f, 0xda, 0xf5, 0x8a, 0xe9, 0xb0, 0x7, 0x73, 0x3c, 0xc9, 0x26, 0x90, 0x18, 0xa7, 0xce, 0x3, 0xd1, 0x28, 0x6b, 0x7a, 0x96, 0x55, 0x98, 0xb5, 0xd9, 0x7c, 0xb5, 0x3a, 0xd8, 0xc3, 0xef, 0x1e, 0xfc, 0xa9, 0xb4, 0xf0, 0x47, 0x54, 0xb5, 0xb1, 0x37, 0xbd, 0xd1, 0xcd, 0xb4, 0x3f, 0x88, 0x27, 0x59, 0x55, 0xdf, 0xed, 0x8a, 0x1e, 0x3d, 0x83, 0x5b, 0x6b, 0x9c, 0x9d, 0x7, 0xLine truncated
var Resources embed.PackedResourceMap = embed.PackedResourceMap{0x1f, 0x8b, 0x8, 0x0, 0x0, 0x9, 0x6e, 0x88, 0x2, 0xff, 0xec, 0xbd, 0x9, 0x78, 0x24, 0x5b, 0x56, 0x1e, 0x98, 0xbd, 0x83, 0x9a, 0xa6, 0x1b, 0x1a, 0x1b, 0xb0, 0x8d, 0x9, 0x45, 0x57, 0xab, 0x22, 0x9e, 0x42, 0x29, 0xa9, 0xde, 0xeb, 0x2d, 0x42, 0x51, 0x89, 0x4a, 0xa5, 0xda, 0x5e, 0xa9, 0xaa, 0x9e, 0x54, 0xf5, 0x36, 0x49, 0xef, 0x75, 0x6c, 0xb9, 0x3c, 0x65, 0x46, 0x66, 0x45, 0x64, 0x4a, 0xa5, 0x92, 0x12, 0x8f, 0xfd, 0x8d, 0x3f, 0x30, 0x9f, 0x6d, 0x6, 0xf8, 0xcc, 0x60, 0x96, 0x36, 0x9e, 0xf1, 0x7c, 0xde, 0xf8, 0xb0, 0xf1, 0x30, 0x18, 0xec, 0x19, 0x63, 0x1b, 0x33, 0x33, 0x60, 0x96, 0x66, 0x6c, 0x18, 0x6, 0x30, 0x3, 0xd8, 0x7c, 0x83, 0x6d, 0x98, 0x31, 0x60, 0x1b, 0x2f, 0x18, 0xcf, 0x7f, 0xce, 0xbd, 0x11, 0x71, 0x23, 0x33, 0xa5, 0x52, 0x55, 0xd7, 0x6b, 0xba, 0x71, 0x46, 0xd5, 0x51, 0x46, 0xdc, 0xb8, 0x71, 0xd7, 0x73, 0xcf, 0x3d, 0xe7, 0xdc, 0x73, 0xcf, 0x7d, 0x77, 0xa5, 0x52, 0xa9, 0x7a, 0xbd, 0x5e, 0xf5, 0x8d, 0xb4, 0x9a, 0x1e, 0xf4, 0x2a, 0x1f, 0xaf, 0x54, 0xfc, 0xa5, 0x17, 0xaf, 0x6f, 0x68, 0x1f, 0xa9, 0x3e, 0x87, 0x57, 0x95, 0xf7, 0x55, 0x2a, 0xbf, 0xf3, 0x89, 0xdf, 0xd8, 0x1c, 0x7c, 0xf9, 0x7, 0x2a, 0x97, 0x5e, 0xad, 0x54, 0xde, 0xf0, 0x2b, 0x67, 0xba, 0xde, 0xf0, 0xbb, 0x49, 0x63, 0xa1, 0xe3, 0xf7, 0x1e, 0x11, 0xef, 0x2b, 0xdf, 0xf0, 0x17, 0xd3, 0x24, 0x58, 0x6c, 0xb4, 0xfa, 0xcd, 0x81, 0x5f, 0xd, 0xba, 0x9d, 0xc5, 0xc0, 0x6b, 0x77, 0x9a, 0x8b, 0xe9, 0x61, 0x1c, 0xf4, 0x9b, 0xad, 0xb8, 0xb1, 0xd8, 0x18, 0xb4, 0x16, 0x45, 0x1, 0x2b, 0xd3, 0x6b, 0x7a, 0x4d, 0xaf, 0xa7, 0x76, 0xd, 0xfa, 0xf5, 0x85, 0x8f, 0xbe, 0xa7, 0xf2, 0xec, 0x85, 0xe5, 0x25, 0x7a, 0xfc, 0x80, 0x3e, 0xab, 0xbd, 0xff, 0xb, 0xef, 0x4d, 0xdb, 0x65, 0x7a, 0x4d, 0xaf, 0xe9, 0x35, 0xbd, 0xa6, 0xd7, 0xf4, 0x9a, 0x5e, 0xd3, 0x6b, 0x7a, 0x4d, 0xaf, 0xff, 0x82, 0xae, 0x7e, 0xef, 0xed, 0x95, 0x3f, 0x82, 0xdf, 0xb7, 0xca, 0xe7, 0x3b, 0xf2, 0xf7, 0x2d, 0x23, 0xbf, 0xef, 0x90, 0xbf, 0xef, 0x93, 0xbf, 0x77, 0x47, 0xde, 0xbf, 0x5d, 0xfe, 0xee, 0xc9, 0xdf, 0x8f, 0x8f, 0xbc, 0x7f, 0x9b, 0xfc, 0x7d, 0x5d, 0xfe, 0xfe, 0xcc, 0xc8, 0xfb, 0xe9, 0x35, 0xbd, 0xa6, 0xd7, 0xf4, 0x9a, 0x5e, 0xd3, 0x6b, 0x7a, 0x4d, 0xaf, 0xe9, 0x35, 0xbd, 0xa6, 0xd7, 0xf4, 0x9a, 0x5e, 0xd3, 0x6b, 0x7a, 0xbd, 0x79, 0x97, 0x17, 0x56, 0x2a, 0x3f, 0x6, 0xe1, 0xff, 0x99, 0xb7, 0xb, 0xe1, 0x3e, 0x93, 0xff, 0x7f, 0xfc, 0xbd, 0x8, 0x7, 0xfc, 0x29, 0xc0, 0x1, 0x60, 0x7, 0xb0, 0xd, 0xb8, 0x8, 0x98, 0x3, 0xbc, 0xf, 0xf0, 0xef, 0x3f, 0xbf, 0x52, 0xf9, 0x77, 0x80, 0x4f, 0x2, 0xbe, 0x17, 0x70, 0x17, 0xf0, 0xdb, 0xef, 0xa9, 0x54, 0xbe, 0x5, 0xe0, 0x2, 0xfe, 0xaf, 0xcf, 0xab, 0x54, 0x6, 0x80, 0x2f, 0x0, 0xbc, 0xf, 0xf0, 0x83, 0xef, 0xae, 0x54, 0xfa, 0x80, 0x2f, 0x3, 0xfc, 0x83, 0x99, 0x4a, 0xa5, 0x3, 0xa8, 0x3, 0x22, 0xc0, 0x25, 0xc0, 0x79, 0xc0, 0xbf, 0xff, 0xdc, 0x4a, 0xe5, 0x67, 0x0, 0x9f, 0x4, 0xfc, 0x30, 0xe0, 0x87, 0x0, 0x7f, 0x19, 0xf0, 0xb5, 0x80, 0x4b, 0x0, 0x1d, 0xf0, 0x25, 0x80, 0x2f, 0x4, 0x7c, 0x1, 0xe0, 0xa7, 0x3f, 0xa7, 0x52, 0xf9, 0x3e, 0xc0, 0x77, 0x1, 0xe, 0x1, 0xdb, 0x0, 0x1b, 0xf0, 0x31, 0xc0, 0x7f, 0x7a, 0x57, 0xa5, 0xf2, 0xb3, 0x80, 0x9f, 0x1, 0x7c, 0x1b, 0xe0, 0x3a, 0x40, 0x3, 0xfc, 0xd6, 0x3b, 0xf1, 0x1d, 0xe0, 0x3b, 0x0, 0xdf, 0x6, 0x38, 0x2, 0x74, 0x1, 0xd, 0x40, 0x1d, 0xb0, 0x6, 0x78, 0x17, 0xe0, 0x97, 0xdf, 0x81, 0x3a, 0x0, 0x3e, 0x1, 0x18, 0x2, 0x76, 0x0, 0x2e, 0xe0, 0xcb, 0x1, 0xef, 0x7, 0xfc, 0x1f, 0x68, 0xb3, 0xbf, 0xe, 0xf8, 0x63, 0x80, 0x3a, 0x20, 0x2, 0x5c, 0x7b, 0xbb, 0x68, 0xcb, 0x67, 0x1, 0x5f, 0x4, 0xf8, 0x7f, 0xde, 0x56, 0xa9, 0xfc, 0xef, 0x80, 0x4f, 0x0, 0x7e, 0x11, 0xed, 0xfc, 0x3, 0x80, 0x6f, 0x1, 0x24, 0x80, 0x8f, 0x3, 0x36, 0x1, 0xf3, 0x80, 0x2f, 0x7, 0xfc, 0xf2, 0x5b, 0x2a, 0x95, 0x1f, 0x1, 0x7c, 0xab, 0x54, 0x8a, 0x68, 0xca, 0x55, 0xef, 0x26, 0x9a, 0xd1, 0xd2, 0x5c, 0x6d, 0xc9, 0xd1, 0x5a, 0xda, 0x8a, 0x16, 0x7a, 0x7d, 0xaf, 0xda, 0x8e, 0xe2, 0x46, 0xbf, 0x89, 0x80, 0xf9, 0x79, 0x53, 0x3b, 0x2a, 0xc5, 0xdf, 0xf7, 0x12, 0xad, 0x65, 0x69, 0xb1, 0xd7, 0x89, 0x9c, 0xfc, 0xc5, 0xb9, 0x66, 0xbf, 0xdf, 0xab, 0x36, 0xa2, 0xbe, 0xa1, 0x2f, 0x26, 0x51, 0xda, 0x5f, 0x8c, 0xa3, 0x28, 0xd4, 0xcd, 0x6a, 0x3a, 0x8, 0x82, 0x28, 0x4d, 0x8d, 0xfa, 0x20, 0xe, 0xfa, 0xad, 0x6e, 0xac, 0x19, 0x94, 0xbc, 0x9a, 0xe4, 0xd0, 0x74, 0x4a, 0xc9, 0x9f, 0x4b, 0x83, 0x6e, 0x2f, 0xaa, 0x6, 0xdd, 0x38, 0x8e, 0xf8, 0x93, 0x14, 0x45, 0xa3, 0x8f, 0xca, 0xd1, 0x86, 0xa5, 0xa7, 0xc9, 0x21, 0x74, 0xd1, 0x97, 0xdb, 0xad, 0x70, 0xb7, 0xda, 0x1d, 0xf4, 0xfd, 0x5e, 0xca, 0xd5, 0x3c, 0x3d, 0x62, 0x2b, 0x3e, 0x31, 0xde, 0x50, 0xb, 0xbc, 0x7e, 0xd0, 0xd4, 0x8c, 0x68, 0xb4, 0x51, 0x4e, 0xce, 0x6e, 0xc3, 0xeb, 0x37, 0xab, 0x1d, 0xef, 0x81, 0xb1, 0x64, 0x69, 0x1f, 0xd5, 0x9e, 0x11, 0xd, 0xc0, 0x51, 0x6e, 0xf, 0xfa, 0x97, 0xe, 0xfb, 0x51, 0x7a, 0xb7, 0xdb, 0xf7, 0xda, 0xda, 0xc2, 0x84, 0x9a, 0x8f, 0x47, 0x33, 0xb5, 0x45, 0xad, 0x1f, 0x9a, 0x67, 0xac, 0xc2, 0xc9, 0x79, 0x5f, 0x9f, 0xd0, 0xe4, 0xe5, 0xf2, 0xa0, 0x1, 0xc6, 0x73, 0x90, 0x31, 0x8b, 0xb6, 0xac, 0x3c, 0xc6, 0x6b, 0xbc, 0x9d, 0x1c, 0xf9, 0xb1, 0x92, 0xa0, 0xb7, 0x79, 0x17, 0x95, 0x31, 0xLine truncated
gui/app.js
+5 -19
View File
@@ -51,11 +51,8 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
$scope.config = data;
var nodes = $scope.config.Repositories[0].Nodes;
nodes = nodes.filter(function (x) { return x.NodeID != $scope.myID; });
nodes.sort(function (a, b) {
if (a.NodeID == $scope.myID)
return -1;
if (b.NodeID == $scope.myID)
return 1;
if (a.NodeID < b.NodeID)
return -1;
return a.NodeID > b.NodeID;
@@ -79,6 +76,8 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
var td = (now - prevDate) / 1000;
prevDate = now;
$scope.inbps = 0
$scope.outbps = 0
for (var id in data) {
try {
data[id].inbps = Math.max(0, 8 * (data[id].InBytesTotal - $scope.connections[id].InBytesTotal) / td);
@@ -87,6 +86,8 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
data[id].inbps = 0;
data[id].outbps = 0;
}
$scope.inbps += data[id].outbps;
$scope.outbps += data[id].inbps;
}
$scope.connections = data;
});
@@ -110,10 +111,6 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
};
$scope.nodeIcon = function (nodeCfg) {
if (nodeCfg.NodeID === $scope.myID) {
return "ok";
}
if ($scope.connections[nodeCfg.NodeID]) {
return "ok";
}
@@ -122,10 +119,6 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
};
$scope.nodeClass = function (nodeCfg) {
if (nodeCfg.NodeID === $scope.myID) {
return "default";
}
var conn = $scope.connections[nodeCfg.NodeID];
if (conn) {
return "success";
@@ -135,9 +128,6 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
};
$scope.nodeAddr = function (nodeCfg) {
if (nodeCfg.NodeID === $scope.myID) {
return "this node";
}
var conn = $scope.connections[nodeCfg.NodeID];
if (conn) {
return conn.Address;
@@ -211,10 +201,6 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
}
$scope.nodes.sort(function (a, b) {
if (a.NodeID == $scope.myID)
return -1;
if (b.NodeID == $scope.myID)
return 1;
if (a.NodeID < b.NodeID)
return -1;
return a.NodeID > b.NodeID;
gui/index.html
+35 -12
View File
@@ -74,7 +74,34 @@ html, body {
<div class="panel-heading"><h3 class="panel-title">Cluster</h3></div>
<table class="table table-condensed">
<tbody>
<tr ng-repeat="nodeCfg in nodes" ng-class="{'text-muted': nodeCfg.NodeID == myID}">
<!-- myself -->
<tr class="text-muted">
<td>
<span class="label label-default">
<span class="glyphicon glyphicon-ok"></span>
</span>
</td>
<td>
<span class="text-monospace">{{myID | short}}</span>
</td>
<td>{{version}}</td>
<td>this node</td>
<td class="text-right">
<span ng-show="nodeCfg.NodeID != myID">
{{inbps | metric}}bps
<span class="text-muted glyphicon glyphicon-chevron-down"></span>
</span>
</td>
<td class="text-right">
<span ng-show="nodeCfg.NodeID != myID">
{{outbps | metric}}bps
<span class="text-muted glyphicon glyphicon-chevron-up"></span>
</span>
</td>
<td class="text-right"></td>
</tr>
<!-- all other nodes -->
<tr ng-repeat="nodeCfg in nodes">
<td>
<span class="label label-{{nodeClass(nodeCfg)}}">
<span class="glyphicon glyphicon-{{nodeIcon(nodeCfg)}}"></span>
@@ -90,19 +117,15 @@ html, body {
{{nodeAddr(nodeCfg)}}
</td>
<td class="text-right">
<span ng-show="nodeCfg.NodeID != myID">
<abbr title="{{connections[nodeCfg.NodeID].InBytesTotal | binary}}B">{{connections[nodeCfg.NodeID].inbps | metric}}bps</abbr>
<span class="text-muted glyphicon glyphicon-chevron-down"></span>
</span>
<abbr title="{{connections[nodeCfg.NodeID].InBytesTotal | binary}}B">{{connections[nodeCfg.NodeID].inbps | metric}}bps</abbr>
<span class="text-muted glyphicon glyphicon-chevron-down"></span>
</td>
<td class="text-right">
<span ng-show="nodeCfg.NodeID != myID">
<abbr title="{{connections[nodeCfg.NodeID].OutBytesTotal | binary}}B">{{connections[nodeCfg.NodeID].outbps | metric}}bps</abbr>
<span class="text-muted glyphicon glyphicon-chevron-up"></span>
</span>
<abbr title="{{connections[nodeCfg.NodeID].OutBytesTotal | binary}}B">{{connections[nodeCfg.NodeID].outbps | metric}}bps</abbr>
<span class="text-muted glyphicon glyphicon-chevron-up"></span>
</td>
<td class="text-right">
<button ng-show="nodeCfg.NodeID != myID" type="button" ng-click="editNode(nodeCfg)" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span> Edit</button>
<button type="button" ng-click="editNode(nodeCfg)" class="btn btn-default btn-xs"><span class="glyphicon glyphicon-pencil"></span> Edit</button>
</td>
</tr>
<tr>
@@ -225,8 +248,8 @@ html, body {
</div>
</form>
<div ng-show="!editingExisting">
When adding a new node, keep in mind that <em>this node</em> must be added on the other side too. The Node ID of this node is:
<pre>{{myID}}</pre>
When adding a new node, keep in mind that <em>this node</em> must be added on the other side too. The Node ID of this node is:
<pre>{{myID}}</pre>
</div>
</div>
<div class="modal-footer">