diff options
author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-08-02 20:59:58 +0300 |
---|---|---|
committer | Joas Schilling <coding@schilljs.com> | 2018-08-08 15:17:41 +0300 |
commit | 0ddf0127381df47145f83b44fec8c848f1fb3584 (patch) | |
tree | b56b08a2ee9c32d80b7535de7d745449477d4f56 | |
parent | 31039b8337a22f267fff76f529c90bf3e184da9c (diff) |
Show empty content message when not in a call
The empty content message informs the user when the app is waiting for
the media permissions and then when it is waiting for the sharer to join
the call. Thus it is now shown above the chat view, in the place that
will be occupied by the call container once the call starts.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
-rw-r--r-- | css/publicshareauth.scss | 19 | ||||
-rw-r--r-- | js/publicshareauth.js | 2 |
2 files changed, 12 insertions, 9 deletions
diff --git a/css/publicshareauth.scss b/css/publicshareauth.scss index 09d6dfe15..ef16ef88c 100644 --- a/css/publicshareauth.scss +++ b/css/publicshareauth.scss @@ -76,16 +76,23 @@ input#request-password-button:disabled ~ .icon { border-left-width: 0; } -#talk-sidebar #commentsTabView ~ #emptycontent { - display: none !important; -} - /* Talk sidebar */ #talk-sidebar { display: flex; flex-direction: column; + justify-content: center; +} + +#talk-sidebar #emptycontent { + position: relative; + + margin-top: 10px; +} + +#talk-sidebar.incall #emptycontent { + display: none; } #talk-sidebar:not(.incall) #call-container { @@ -175,10 +182,6 @@ input#request-password-button:disabled ~ .icon { flex-grow: 1; - /* Show chat view below "#videos", even if in the markup it is above it to - * hide the empty content using CSS. */ - order: 1; - /* Distribute available height between call container and chat view. */ height: 50%; } diff --git a/js/publicshareauth.js b/js/publicshareauth.js index 6604fde4f..cb651c5d9 100644 --- a/js/publicshareauth.js +++ b/js/publicshareauth.js @@ -147,7 +147,7 @@ } OCA.SpreedMe.app.signaling.syncRooms().then(function() { - OCA.SpreedMe.app._chatView.$el.prependTo('#talk-sidebar'); + OCA.SpreedMe.app._chatView.$el.appendTo('#talk-sidebar'); OCA.SpreedMe.app._chatView.setTooltipContainer($('body')); var participants = OCA.SpreedMe.app.activeRoom.get('participants'); |