diff options
| -rw-r--r-- | css/style.scss | 32 | ||||
| -rw-r--r-- | lib/Controller/PageController.php | 4 | ||||
| -rw-r--r-- | templates/index-public.php | 89 |
3 files changed, 44 insertions, 81 deletions
diff --git a/css/style.scss b/css/style.scss index f040b6460..9e64f00fa 100644 --- a/css/style.scss +++ b/css/style.scss @@ -4,12 +4,14 @@ * overridden with a full set of flex containers to cascade parent element * height to the main view to limit the vertical scroll bar only to it (same * thing done for the sidebar and the chat view). */ -#body-user { +#body-user, +#body-public { display: flex; flex-direction: column; } -#body-user #header { +#body-user #header, +#body-public #header { /* Override fixed position from server to include it in the flex layout */ position: static; flex-shrink: 0; @@ -55,14 +57,6 @@ flex-grow: 1; } -#body-public { - height: 100%; -} - -#body-public #app-content { - overflow: hidden; -} - .app-spreed #app-navigation { padding-top: 45px; padding-bottom: 0; @@ -809,29 +803,11 @@ video { } } -/* The header element contains the header div; as the header div uses a fixed - position the header element has no height, and as #app-content-wrapper uses a - "100%" height its contents must be padded to prevent them from overlapping - with the header element */ -#body-public #app-content-wrapper { - padding-top: 45px; -} - /* make blue header bar transparent in shared room */ #body-public #app-content:not(.participants-1) #header.spreed-public { background: transparent; } -/* Correctly position icons below header in public chat. */ -#body-public { - #app-sidebar-trigger { - top: 45px; - } - #video-fullscreen { - top: 89px; - } -} - /* As the header is hidden (except for the logo), move the fullscreen button and * sidebar to the top during calls */ #body-public #app-content:not(.participants-1) #app-sidebar, diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index 2cf3bf8db..f97672908 100644 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -36,6 +36,7 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\TemplateResponse; +use OCP\AppFramework\Http\Template\PublicTemplateResponse; use OCP\ILogger; use OCP\IRequest; use OCP\IURLGenerator; @@ -220,7 +221,8 @@ class PageController extends Controller { 'token' => $token, 'signaling-settings' => $this->config->getSettings($this->userId), ]; - $response = new TemplateResponse($this->appName, 'index-public', $params, 'base'); + $response = new PublicTemplateResponse($this->appName, 'index-public', $params); + $response->setFooterVisible(false); $csp = new ContentSecurityPolicy(); $csp->addAllowedConnectDomain('*'); $csp->addAllowedMediaDomain('blob:'); diff --git a/templates/index-public.php b/templates/index-public.php index b77cd315f..82454e53d 100644 --- a/templates/index-public.php +++ b/templates/index-public.php @@ -46,67 +46,52 @@ script( <script type="text/json" id="signaling-settings"> <?php echo json_encode($_['signaling-settings']) ?> </script> - <div id="app-content" class="participants-1"> +</div> - <header> - <div id="header" class="spreed-public"> - <div id="header-left"> - <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="nextcloud" target="_blank"> - <div class="logo logo-icon svg"> - <h1 class="hidden-visually"> - <?php p($theme->getName() . ' ' . $l->t('Talk')); ?> - </h1> - </div> - </a> - </div> - <div id="header-right"> - </div> - </div> - </header> +<div id="app-content" class="participants-1"> - <div id="app-content-wrapper"> - <button id="video-fullscreen" class="icon-fullscreen icon-white icon-shadow public" data-placement="bottom" data-toggle="tooltip" data-original-title="<?php p($l->t('Fullscreen (f)')) ?>"></button> + <div id="app-content-wrapper"> + <button id="video-fullscreen" class="icon-fullscreen icon-white icon-shadow public" data-placement="bottom" data-toggle="tooltip" data-original-title="<?php p($l->t('Fullscreen (f)')) ?>"></button> - <div id="video-speaking"> + <div id="video-speaking"> - </div> - <div id="videos"> - <div class="videoView videoContainer hidden" id="localVideoContainer"> - <video id="localVideo"></video> - <div class="avatar-container hidden"> - <div class="avatar"></div> - </div> - <div class="nameIndicator"> - <button id="mute" class="icon-audio icon-white icon-shadow" data-placement="top" data-toggle="tooltip" data-original-title="<?php p($l->t('Mute audio (m)')) ?>"></button> - <button id="hideVideo" class="icon-video icon-white icon-shadow" data-placement="top" data-toggle="tooltip" data-original-title="<?php p($l->t('Disable video (v)')) ?>"></button> - <button id="screensharing-button" class="app-navigation-entry-utils-menu-button icon-screen-off icon-white icon-shadow screensharing-disabled" data-placement="top" data-toggle="tooltip" data-original-title="<?php p($l->t('Share screen')) ?>"></button> - <div id="screensharing-menu" class="app-navigation-entry-menu"> - <ul> - <li> - <button id="show-screen-button"> - <span class="icon-screen"></span> - <span><?php p($l->t('Show your screen'));?></span> - </button> - </li> - <li> - <button id="stop-screen-button"> - <span class="icon-screen-off"></span> - <span><?php p($l->t('Stop screensharing'));?></span> - </button> - </li> - </ul> - </div> + </div> + <div id="videos"> + <div class="videoView videoContainer hidden" id="localVideoContainer"> + <video id="localVideo"></video> + <div class="avatar-container hidden"> + <div class="avatar"></div> + </div> + <div class="nameIndicator"> + <button id="mute" class="icon-audio icon-white icon-shadow" data-placement="top" data-toggle="tooltip" data-original-title="<?php p($l->t('Mute audio (m)')) ?>"></button> + <button id="hideVideo" class="icon-video icon-white icon-shadow" data-placement="top" data-toggle="tooltip" data-original-title="<?php p($l->t('Disable video (v)')) ?>"></button> + <button id="screensharing-button" class="app-navigation-entry-utils-menu-button icon-screen-off icon-white icon-shadow screensharing-disabled" data-placement="top" data-toggle="tooltip" data-original-title="<?php p($l->t('Share screen')) ?>"></button> + <div id="screensharing-menu" class="app-navigation-entry-menu"> + <ul> + <li> + <button id="show-screen-button"> + <span class="icon-screen"></span> + <span><?php p($l->t('Show your screen'));?></span> + </button> + </li> + <li> + <button id="stop-screen-button"> + <span class="icon-screen-off"></span> + <span><?php p($l->t('Stop screensharing'));?></span> + </button> + </li> + </ul> </div> </div> </div> + </div> - <div id="screens"></div> + <div id="screens"></div> - <div id="emptycontent"> - <div id="emptycontent-icon" class="icon-video"></div> - <h2><?php p($l->t('Join a conversation or start a new one')) ?></h2> - <p class="uploadmessage"></p> - </div> + <div id="emptycontent"> + <div id="emptycontent-icon" class="icon-video"></div> + <h2><?php p($l->t('Join a conversation or start a new one')) ?></h2> + <p class="uploadmessage"></p> </div> </div> </div> |