git ssb - move progress notifier to top bar (over Patchwork logo)

Matt McKegg committed on 6/28/2017, 2:39:42 AM
Parent: f8bdee2684f2d8c6b83777a938fbac68a863bbf3

main-window.js	changed
modules/app/html/progress-notifier.js	changed
styles/loading.mcss	changed
styles/main-window.mcss	changed

main-window.jsView
		@@ -86,9 +86,12 @@
86	86	tab('Public', '/public'),
87	87	tab('Private', '/private'),
88	88	tab('Gatherings', '/gatherings')
89	89	]),
90		- h('span.appTitle', ['Patchwork']),
	90	+ h('span.appTitle', [
	91	+ h('span.title', 'Patchwork'),
	92	+ api.app.html.progressNotifier()
	93	+ ]),
91	94	h('span', [ api.app.html.search(api.app.navigate) ]),
92	95	h('span.nav', [
93	96	tab('Profile', id),
94	97	tab('Mentions', '/mentions')
		@@ -101,9 +104,8 @@
101	104	h('a.ignore', {'ev-click': latestUpdate.ignore}, 'X')
102	105	])
103	106	])
104	107	),
105		- api.app.html.progressNotifier(),
106	108	views.html
107	109	])
108	110
109	111	catchLinks(container, (href, external) => {

modules/app/html/progress-notifier.jsView
		@@ -43,13 +43,13 @@
43	43	return h('div.info', { hidden }, [
44	44	h('div.status', [
45	45	when(displaying, h('Loading -small', [
46	46	when(pendingMigration,
47		- ['Upgrading database', h('progress', { style: {'margin-left': '10px'}, min: 0, max: 1, value: migrationProgress })],
	47	+ [h('span.info', 'Upgrading database'), h('progress', { style: {'margin-left': '10px'}, min: 0, max: 1, value: migrationProgress })],
48	48	when(computed(replicateProgress.incompleteFeeds, (v) => v > 5),
49		- ['Downloading new messages', h('progress', { style: {'margin-left': '10px'}, min: 0, max: 1, value: downloadProgress })],
	49	+ [h('span.info', 'Downloading new messages'), h('progress', { style: {'margin-left': '10px'}, min: 0, max: 1, value: downloadProgress })],
50	50	when(pending, [
51		- ['Indexing database', h('progress', { style: {'margin-left': '10px'}, min: 0, max: 1, value: indexProgress })]
	51	+ [h('span.info', 'Indexing database'), h('progress', { style: {'margin-left': '10px'}, min: 0, max: 1, value: indexProgress })]
52	52	], 'Scuttling...')
53	53	)
54	54	)
55	55	]))

Matt McKegg / patchwork