-- Leo's gemini proxy
-- Connecting to git.thebackupbox.net:1965...
-- Connected
-- Sending request
-- Meta line: 20 text/gemini
repo: janusweb action: commit revision: path_from: revision_from: 158930980eadc2724ac08fddb1d8ed3c7beb0d6f: path_to: revision_to:
commit 158930980eadc2724ac08fddb1d8ed3c7beb0d6f Author: James Baicoianu <james_github@baicoianu.com> Date: Wed Mar 28 00:10:43 2018 -0700 Updated Web UI diff --git a/media/assets/webui/apps/appdrawer/appdrawer.json b/media/assets/webui/apps/appdrawer/appdrawer.json
--- a/media/assets/webui/apps/appdrawer/appdrawer.json +++ b/media/assets/webui/apps/appdrawer/appdrawer.json @@ -2,7 +2,7 @@ "templates": { }, "scripts": ["./appdrawer.js"], - "css": ["./appdrawer.css"] + "css": [] } diff --git a/media/assets/webui/apps/buttons/buttons.html b/media/assets/webui/apps/buttons/buttons.html new file mode 100644 index 0000000000000000000000000000000000000000..26ad72a79fcba8b90a371367bcb26fc8b53c6f06 --- /dev/null +++ b/media/assets/webui/apps/buttons/buttons.html @@ -0,0 +1,7 @@ + <ui-buttonbar> + <ui-button onclick="janus.engine.client.shareScreenshot()">Share</ui-button> + <ui-button onclick="janus.engine.client.toggleFullscreen()">Expand</ui-button> + <ui-button onclick="janus.engine.client.toggleVR()">WebVR</ui-button> + <ui-button onclick="janus.engine.client.configureOptions()">Config</ui-button> + </ui-buttonbar> + diff --git a/media/assets/webui/apps/buttons/buttons.js b/media/assets/webui/apps/buttons/buttons.js
--- a/media/assets/webui/apps/buttons/buttons.js +++ b/media/assets/webui/apps/buttons/buttons.js @@ -1,3 +1,9 @@ +elation.elements.define('janus.ui.buttons', class extends elation.elements.base { + create() { + this.innerHTML = elation.template.get('janus.ui.buttons'); +alert('new buttons' + this.innerHTML); + } +}); elation.elements.define('janus-buttons-display', class extends elation.elements.ui.dropdownbutton { init() { super.init(); @@ -13,7 +19,6 @@ elation.elements.define('janus-buttons-display', class extends elation.elements. }; } - supportsFullscreen() { } supportsWebVR() { diff --git a/media/assets/webui/apps/buttons/buttons.json b/media/assets/webui/apps/buttons/buttons.json
--- a/media/assets/webui/apps/buttons/buttons.json +++ b/media/assets/webui/apps/buttons/buttons.json @@ -1,8 +1,8 @@ { "templates": { + "janus.ui.buttons": "./buttons.html" }, "css": [ - "./buttons.css" ], "scripts": [ "./buttons.js" diff --git a/media/assets/webui/apps/navigation/navigation.js b/media/assets/webui/apps/navigation/navigation.js
--- a/media/assets/webui/apps/navigation/navigation.js +++ b/media/assets/webui/apps/navigation/navigation.js @@ -43,6 +43,7 @@ elation.elements.define('janus.ui.statusindicator', class extends elation.elemen this.tooltip = elation.elements.create('ui-tooltip', { append: this, }); + setTimeout(() => { this.tooltip.hide(); }, 1000); this.canvas = document.createElement('canvas'); this.inner.appendChild(this.canvas); @@ -84,7 +85,7 @@ elation.elements.define('janus.ui.statusindicator', class extends elation.elemen room = this.janusweb.currentroom; } if (this.room !== room) { -console.log('room changed!', this.room, room); +//console.log('room changed!', this.room, room); elation.events.add(room, 'room_load_queued', elation.bind(this, this.updateStatus, 'queued')); elation.events.add(room, 'room_load_start', elation.bind(this, this.updateStatus, 'downloading')); @@ -174,7 +175,7 @@ console.log('room changed!', this.room, room); total += this.loading[k].total; } var percent = loaded / total; - console.log('room had some progress', count + ' files, ' + loaded + ' / ' + total + ' bytes, ' + (percent * 100).toFixed(2) + '%', url); + //console.log('room had some progress', count + ' files, ' + loaded + ' / ' + total + ' bytes, ' + (percent * 100).toFixed(2) + '%', url); this.percent = percent; @@ -198,6 +199,7 @@ console.log('room changed!', this.room, room); this.tooltip.hide(); } updateTooltip() { +return; var summary = this.getSummary(); this.tooltip.setcontent(summary); this.tooltip.show(); diff --git a/media/assets/webui/apps/partymode/partymode.json b/media/assets/webui/apps/partymode/partymode.json
--- a/media/assets/webui/apps/partymode/partymode.json +++ b/media/assets/webui/apps/partymode/partymode.json @@ -4,7 +4,6 @@ "janus.ui.partymode.user": "./user.html" }, "css": [ - "./partymode.css" ], "scripts": [ "./partymode.js" diff --git a/media/assets/webui/default.html b/media/assets/webui/default.html
--- a/media/assets/webui/default.html +++ b/media/assets/webui/default.html @@ -8,16 +8,11 @@ <janus-ui-chat></janus-ui-chat> </ui-window> <ui-panel bottom="1" right="1"> - <ui-buttonbar> - <ui-button>Share</ui-button> - <ui-button>Expand</ui-button> - <ui-button>WebVR</ui-button> - <ui-button>Config</ui-button> - </ui-buttonbar> + <janus-ui-buttons></janus-ui-buttons> </ui-panel> <janus-ui-splash></janus-ui-splash> -<ui-panel bottom="1" left="1"> +<!-- ui-panel bottom="1" left="1"> <janus-controls-gamepad></janus-controls-gamepad> -</ui-panel> +</ui-panel -->> diff --git a/media/assets/webui/default.json b/media/assets/webui/default.json
--- a/media/assets/webui/default.json +++ b/media/assets/webui/default.json @@ -1,6 +1,5 @@ { "includes": [ - "./apps/splash/splash.json", "./apps/popular/popular.json", "./apps/partymode/partymode.json", "./apps/bookmarks/bookmarks.json", diff --git a/media/assets/webui/themes/default.css b/media/assets/webui/themes/default.css
--- a/media/assets/webui/themes/default.css +++ b/media/assets/webui/themes/default.css @@ -69,7 +69,15 @@ ui-checklist>ui-checklistitem[hover] { } ui-list>ui-item.state_selected, ui-checklist>ui-checklistitem.state_selected { - background: #eef; + background: rgba(128,128,255,.5); +} +ui-list[selectable] { + cursor: text; + user-select: text; +} +ui-list>[selectable] { + cursor: text; + user-select: text; } /* <ui-grid> */ @@ -92,8 +100,6 @@ ui-grid[scrollable-y] { } ui-grid>ui-item { display: inline-block; - width: 10em; - height: 6em; border-radius: .5em; border: 1px solid #111; background: rgba(0,0,0,.1); @@ -103,6 +109,36 @@ ui-grid>ui-item { ui-grid>ui-item[hover] { background-color: rgba(128,128,255,.2); } +ui-grid.twocolumn>ui-item { + width: 50%; +} +ui-grid.threecolumn>ui-item { + width: calc(33% - .8em - 2px); +} +ui-grid.fourcolumn>ui-item { + width: 25%; +} +ui-grid.fivecolumn>ui-item { + width: 20%; +} +ui-grid.sixcolumn>ui-item { + width: 16%; +} +ui-grid.sevencolumn>ui-item { + width: 14%; +} +ui-grid.eightcolumn>ui-item { + width: 12.5%; +} +ui-grid.ninecolumn>ui-item { + width: 11%; +} +ui-grid.tencolumn>ui-item { + width: 10%; +} +ui-grid.fivecolumn>ui-item { + width: 20%; +} /* <ui-tabs> */ ui-tabs {
-----END OF PAGE-----
-- Response ended
-- Page fetched on Sun Jun 2 14:47:45 2024