You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2018/07/25 16:33:55 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1142] recording
button is restyled
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new a51fb23 [OPENMEETINGS-1142] recording button is restyled
a51fb23 is described below
commit a51fb23feaa744fd33baf0ef0627f9699925ca8a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Jul 25 23:33:23 2018 +0700
[OPENMEETINGS-1142] recording button is restyled
---
.../java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html | 2 +-
.../main/java/org/apache/openmeetings/web/room/wb/interview-area.js | 6 +++---
openmeetings-web/src/main/webapp/css/room.css | 4 +++-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
index 8194818..3139b33 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/InterviewWbPanel.html
@@ -23,7 +23,7 @@
<div class="pod-area" style="width: 1000px;height: 600px;">
<div class="pod-big"></div>
</div>
- <div class="rec-btn" wicket:message="data-title-start:913,data-title-stop:914">
+ <div class="rec-btn ui-state-error" wicket:message="data-title-start:913,data-title-stop:914">
</div>
</wicket:panel>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js
index 73bbf4d..b5241c9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js
@@ -14,7 +14,7 @@ var InterviewWbArea = function() {
rec.button({
disabled: true
, showLabel: false
- , icon: 'ui-icon-play'
+ , icon: 'ui-icon-bullet'
}).click(function() {
wbAction($(this).data('mode') === 'rec' ? 'startRecording' : 'stopRecording', '');
});
@@ -65,13 +65,13 @@ var InterviewWbArea = function() {
}
function _setRecEnabled(en) {
if (!_inited) return;
- rec.data('mode', 'rec').button('option', {disabled: !en, icon: 'ui-icon-play'});
+ rec.data('mode', 'rec').button('option', {disabled: !en, icon: 'ui-icon-bullet'});
}
function _setRecStarted(started) {
if (!_inited) return;
rec.data('mode', started ? 'stop' : 'rec')
.attr('title', rec.data(started ? 'title-stop' : 'title-start'))
- .button('option', {icon: started ? 'ui-icon-stop' : 'ui-icon-play'});
+ .button('option', {icon: started ? 'ui-icon-stop' : 'ui-icon-bullet'});
}
function _updateAreaClass() {
const count = pArea.find('.pod:not(.ui-helper,.ui-sortable-placeholder)').length
diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/room.css
index e82b6c8..0c2c4e1 100644
--- a/openmeetings-web/src/main/webapp/css/room.css
+++ b/openmeetings-web/src/main/webapp/css/room.css
@@ -546,10 +546,12 @@ ul.settings-menu {
}
.room.box.interview .room.wb.area .wb-area .rec-btn {
z-index: 100;
- border-radius: 20px;
+ border-radius: 30px;
position: absolute;
right: 200px;
bottom: 30px;
+ width: 50px;
+ height: 50px;
}
#quick-vote {
position: absolute;