nextcloud
/
spreed
зеркало из https://github.com/nextcloud/spreed.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #1327 from nextcloud/firefox-screensharing-options 

Fix wording and icons for screensharing options
This commit is contained in:
Joas Schilling 2018-12-04 13:55:09 +01:00 коммит произвёл GitHub
Родитель 73fc7f4545 6ed1428e05
Коммит a6d5c6f629
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 64 добавлений и 33 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
css/style.scss
Просмотреть файл

@ -839,6 +839,7 @@ video {
@include icon-black-white('menu-people', 'spreed', 1);
@include icon-black-white('no-password', 'spreed', 1);
@include icon-black-white('share-window', 'spreed', 1);
#app-sidebar .close {
position: absolute;

1
img/share-window.svg Normal file
Просмотреть файл

@ -0,0 +1 @@
<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="none" d="M0 0h24v24H0V0z"/><path d="M19 4H5c-1.1 0-2 .9-2 2v12c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V6c0-1.1-.9-2-2-2zm0 14H5V6h14v12z"/></svg>
Режим "рядом"

После

Ширина:  |  Высота:  |  Размер: 232 B

39
js/app.js
Просмотреть файл

@ -265,12 +265,16 @@
// The parent CSS of the menu list items is using "display:block !important",
// so we need to also hide with "!important".
if (webrtc.getLocalScreen()) {
$('#show-window-entry').attr('style','display:none !important');
$('#share-screen-entry').attr('style','display:none !important');
$('#share-window-entry').attr('style','display:none !important');
$('#show-screen-entry').show();
$('#stop-screen-entry').show();
$('#screensharing-menu').toggleClass('open');
} else {
if (splitShare) {
$('#show-window-entry').show();
$('#share-screen-entry').show();
$('#share-window-entry').show();
$('#show-screen-entry').attr('style','display:none !important');
$('#stop-screen-entry').attr('style','display:none !important');
$('#screensharing-menu').toggleClass('open');
return;
@ -280,27 +284,28 @@
}
}.bind(this));
$("#share-screen-button").on('click', function() {
var webrtc = OCA.SpreedMe.webrtc;
if (!webrtc.getLocalScreen()) {
this.startShareScreen('screen');
}
$('#screensharing-menu').toggleClass('open', false);
}.bind(this));
$("#share-window-button").on('click', function() {
var webrtc = OCA.SpreedMe.webrtc;
if (!webrtc.getLocalScreen()) {
this.startShareScreen('window');
}
$('#screensharing-menu').toggleClass('open', false);
}.bind(this));
$("#show-screen-button").on('click', function() {
var webrtc = OCA.SpreedMe.webrtc;
if (webrtc.getLocalScreen()) {
var currentUser = OCA.SpreedMe.webrtc.connection.getSessionid();
OCA.SpreedMe.sharedScreens.switchScreenToId(currentUser);
} else {
this.startShareScreen('screen');
}
$('#screensharing-menu').toggleClass('open', false);
}.bind(this));
$("#show-window-button").on('click', function() {
var webrtc = OCA.SpreedMe.webrtc;
if (webrtc.getLocalScreen()) {
var currentUser = OCA.SpreedMe.webrtc.connection.getSessionid();
OCA.SpreedMe.sharedScreens.switchScreenToId(currentUser);
} else {
this.startShareScreen('window');
}
$('#screensharing-menu').toggleClass('open', false);
}.bind(this));

16
js/publicshareauth.js
Просмотреть файл

@ -79,13 +79,25 @@
' <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="' + t('spreed', 'Share screen') + '"></button>' +
' <div id="screensharing-menu" class="app-navigation-entry-menu">' +
' <ul>' +
' <li>' +
' <li id="share-screen-entry">' +
' <button id="share-screen-button">' +
' <span class="icon-screen"></span>' +
' <span>' + t('spreed', 'Share whole screen') + '</span>' +
' </button>' +
' </li>' +
' <li id="share-window-entry">' +
' <button id="share-window-button">' +
' <span class="icon-share-window"></span>' +
' <span>' + t('spreed', 'Share a single window') + '</span>' +
' </button>' +
' </li>' +
' <li id="show-screen-entry">' +
' <button id="show-screen-button">' +
' <span class="icon-screen"></span>' +
' <span>' + t('spreed', 'Show your screen') + '</span>' +
' </button>' +
' </li>' +
' <li>' +
' <li id="stop-screen-entry">' +
' <button id="stop-screen-button">' +
' <span class="icon-screen-off"></span>' +
' <span>' + t('spreed', 'Stop screensharing') + '</span>' +

20
templates/index-public.php
Просмотреть файл

@ -72,18 +72,24 @@ script(
<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>
<li id="share-screen-entry">
<button id="share-screen-button">
<span class="icon-screen"></span>
<span><?php p($l->t('Share whole screen'));?></span>
</button>
</li>
<li id="share-window-entry">
<button id="share-window-button">
<span class="icon-share-window"></span>
<span><?php p($l->t('Share a single window'));?></span>
</button>
</li>
<li id="show-screen-entry">
<button id="show-screen-button">
<span class="icon-screen"></span>
<span><?php p($l->t('Show your screen'));?></span>
</button>
</li>
<li id="show-window-entry">
<button id="show-window-button">
<span class="icon-screen"></span>
<span><?php p($l->t('Show a single window'));?></span>
</button>
</li>
<li id="stop-screen-entry">
<button id="stop-screen-button">
<span class="icon-screen-off"></span>

20
templates/index.php
Просмотреть файл

@ -79,18 +79,24 @@ script(
<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>
<li id="share-screen-entry">
<button id="share-screen-button">
<span class="icon-screen"></span>
<span><?php p($l->t('Share whole screen'));?></span>
</button>
</li>
<li id="share-window-entry">
<button id="share-window-button">
<span class="icon-share-window"></span>
<span><?php p($l->t('Share a single window'));?></span>
</button>
</li>
<li id="show-screen-entry">
<button id="show-screen-button">
<span class="icon-screen"></span>
<span><?php p($l->t('Show your screen'));?></span>
</button>
</li>
<li id="show-window-entry">
<button id="show-window-button">
<span class="icon-screen"></span>
<span><?php p($l->t('Show a single window'));?></span>
</button>
</li>
<li id="stop-screen-entry">
<button id="stop-screen-button">
<span class="icon-screen-off"></span>