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 9a12228 [OPENMEETINGS-2438] A&A buttons are more visible
9a12228 is described below
commit 9a1222865477637325850ffd07a64e3a8e080caf
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Tue Sep 15 21:05:53 2020 +0700
[OPENMEETINGS-2438] A&A buttons are more visible
---
.../web/room/activities/ActivitiesPanel.html | 26 ++++++++++++----------
.../apache/openmeetings/web/room/raw-activities.js | 7 +++---
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
index 8fccb7c..b859396 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/ActivitiesPanel.html
@@ -36,18 +36,20 @@
</div>
<div class="d-none">
<div id="activity-stub" class="activity item clearfix">
- <button class="activity-close btn btn-outline-secondary
btn-small" wicket:message="title:85">
- <i class="fas fa-times"></i>
- </button>
- <button class="activity-accept btn
btn-outline-secondary btn-small" wicket:message="title:1360">
- <i class="fas fa-check"></i>
- </button>
- <button class="activity-decline btn
btn-outline-secondary btn-small" wicket:message="title:1361">
- <i class="fas fa-ban"></i>
- </button>
- <button class="activity-find btn btn-outline-secondary
btn-small" wicket:message="title:find.user">
- <i class="fas fa-crosshairs"></i>
- </button>
+ <div class="btn-group align-right bg-white rounded"
role="group">
+ <button class="activity-close btn
btn-outline-secondary btn-small align-right" wicket:message="title:85">
+ <i class="fas fa-times"></i>
+ </button>
+ <button class="activity-accept btn
btn-outline-secondary btn-small align-right" wicket:message="title:1360">
+ <i class="fas fa-check"></i>
+ </button>
+ <button class="activity-decline btn
btn-outline-secondary btn-small align-right" wicket:message="title:1361">
+ <i class="fas fa-ban"></i>
+ </button>
+ <button class="activity-find btn
btn-outline-secondary btn-small align-right" wicket:message="title:find.user">
+ <i class="fas fa-crosshairs"></i>
+ </button>
+ </div>
<div class="activity-text"></div>
</div>
</div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-activities.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-activities.js
index 6ac0b1e..d38a7b8 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-activities.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-activities.js
@@ -154,24 +154,23 @@ var Activities = function() {
const _id = _getId(obj.id);
(obj.action ? modArea :
area).append(OmUtil.tmpl('#activity-stub', _id).data(obj));
const a = $('#' + _id).addClass(obj.cssClass);
-
a.find('.activity-close,.activity-accept,.activity-decline,.activity-find').addClass('align-right');
const acpt = a.find('.activity-accept');
if (obj.accept) {
acpt.click(function() { _action('accept',
obj.id); });
} else {
- acpt.hide();
+ acpt.remove();
}
const dcln = a.find('.activity-decline');
if (obj.decline) {
dcln.click(function() { _action('decline',
obj.id); });
} else {
- dcln.hide();
+ dcln.remove();
}
const fnd = a.find('.activity-find');
if (obj.find) {
fnd.click(function() { _findUser(obj.uid); });
} else {
- fnd.hide();
+ fnd.remove();
}
a.find('.activity-close').click(function() {
_action('close', obj.id);
