diff --git a/static-data/www/board/board.js b/static-data/www/board/board.js index 4c303fd4..516654fd 100755 --- a/static-data/www/board/board.js +++ b/static-data/www/board/board.js @@ -51,7 +51,8 @@ fetch('/flow/version', { document.getElementById('circlesVersion').innerText = data }) -function appendMessages(msg, blockHash, beforeHash){ +function appendMessages(msg, blockHash, beforeHash, channel){ + if (channel !== document.getElementById('feedIDInput').value){return} var humanDate = new Date(0) if (msg.length == 0){ return @@ -161,12 +162,12 @@ function getBlocks(){ continue } requested.push(blockList[i]) - loadMessage(blockList[i], blockList, i) + loadMessage(blockList[i], blockList, i, ch) } } } -function loadMessage(blockHash, blockList, count){ +function loadMessage(blockHash, blockList, count, channel){ fetch('/getblockdata/' + blockHash, { method: 'GET', headers: { @@ -187,7 +188,7 @@ function loadMessage(blockHash, blockList, count){ } } } - setTimeout(function(){appendMessages(data, blockHash, before)}, delay) + setTimeout(function(){appendMessages(data, blockHash, before, channel)}, delay) //appendMessages(data, blockHash, before) }) } diff --git a/static-data/www/private/index.html b/static-data/www/private/index.html index b632a108..8978fc1f 100755 --- a/static-data/www/private/index.html +++ b/static-data/www/private/index.html @@ -3,7 +3,6 @@ - Onionr @@ -108,7 +107,6 @@ </div> </div> </div> - </div> </section> <br> @@ -204,25 +202,20 @@ </div> </div> </div> - </div> - </div> - </div> - <!--Configuration Card--> - <div class="card"> - <header class="card-header" id="configToggle"> - <p class="card-header-title"> - <a class="button is-white">Edit Configuration</a> - </p> - </header> - <div class="card-content" id="configContent"> + <a class="button is-white" id="configToggle">Edit Configuration</a> + + <div id="configContent"> <div class="content"> <p><em>Warning: </em><b>Some values can be dangerous to change. Use caution.</b></p> <textarea class="textarea configEditor" rows="20"></textarea> + <br> <a class="button is-primary saveConfig">Save Config</a> </div> </div> </div> + </div> + </div> </div> <br> <div class="modal aboutModal"> diff --git a/static-data/www/private/main.css b/static-data/www/private/main.css index c90b2ae5..50253ffa 100755 --- a/static-data/www/private/main.css +++ b/static-data/www/private/main.css @@ -16,4 +16,10 @@ #connectedNodes{ overflow-y: auto; -} \ No newline at end of file +} + +#configToggle, #configContent{ + margin-left: 1em; + margin-right: 1em; + margin-bottom: 1em; +}