diff options
author | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-07-27 13:23:39 +0300 |
---|---|---|
committer | Daniel Calviño Sánchez <danxuliu@gmail.com> | 2018-07-27 23:26:09 +0300 |
commit | 9bc30ef6ba4d0baa422b7aacf8247afda4ad72ab (patch) | |
tree | 91aef36ba8b59b9a5afb59210f7c0691b68665c4 /templates | |
parent | b97ea0587a4e86b098834cb20a174da60fc23c8c (diff) |
Adjust main layout to changes in server
Main layout elements (navigation, content and sidebar) are no longer
children of the "#app" element in the standard layout in the server, so
those changes are reflected in Talk too.
Note, however, that the "#app" element is still kept as an, in practice,
invisible element, as it is used as a holder for some values (like the
token or the signaling settings) used in scripts.
Besides that, although the layout of the server is mainly mimicked in
Talk, there are also some differences needed for its specific UI.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'templates')
-rw-r--r-- | templates/index.php | 78 |
1 files changed, 40 insertions, 38 deletions
diff --git a/templates/index.php b/templates/index.php index 1b0880cb9..d56c20ff2 100644 --- a/templates/index.php +++ b/templates/index.php @@ -46,53 +46,55 @@ script( <script type="text/json" id="signaling-settings"> <?php echo json_encode($_['signaling-settings']) ?> </script> - <div id="app-navigation" class="icon-loading"> - <form id="oca-spreedme-add-room"> - <input id="select-participants" class="select2-offscreen" type="text" placeholder="<?php p($l->t('New conversation …')) ?>"/> - </form> - <ul id="spreedme-room-list" class="with-icon"> - </ul> - </div> +</div> + +<div id="app-navigation" class="icon-loading"> + <form id="oca-spreedme-add-room"> + <input id="select-participants" class="select2-offscreen" type="text" placeholder="<?php p($l->t('New conversation …')) ?>"/> + </form> + <ul id="spreedme-room-list" class="with-icon"> + </ul> +</div> - <div id="app-content" class="participants-1"> +<div id="app-content" class="participants-1"> - <div id="app-content-wrapper"> + <div id="app-content-wrapper"> <button id="video-fullscreen" class="icon-fullscreen icon-white icon-shadow hidden" data-placement="bottom" data-toggle="tooltip" data-original-title="<?php p($l->t('Fullscreen (f)')) ?>"></button> <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> @@ -102,8 +104,8 @@ script( <input id="shareRoomInput" class="share-room-input hidden" readonly="readonly" type="text"/> <div id="shareRoomClipboardButton" class="shareRoomClipboard icon-clippy hidden" data-clipboard-target="#shareRoomInput"></div> </div> - </div> </div> + </div> </div> |