This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new fa38139 [OPENMEETINGS-1996] badge for action is added
fa38139 is described below
commit fa38139e1f3229305b79e3b9d778e3d5aac3dfb1
Author: Maxim Solodovnik <solomax...@gmail.com>
AuthorDate: Wed Feb 13 13:59:43 2019 +0700
[OPENMEETINGS-1996] badge for action is added
---
.../openmeetings/web/room/activities/ActivitiesPanel.html | 6 +++++-
.../apache/openmeetings/web/room/activities/activities.js | 13 ++++++++++++-
openmeetings-web/src/main/webapp/css/raw-activities.css | 1 -
3 files changed, 17 insertions(+), 3 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 ddaed09..4a1ea8c 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
@@ -21,7 +21,11 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:panel>
<div class="ui-widget-header">
- <div onclick="Activities.toggle();" class="clickable control
block ui-widget-header ui-state-active"><div class="ui-icon ui-icon-carat-1-n
sort-icon"></div><div class="label"><wicket:message key="1363"/></div></div>
+ <div onclick="Activities.toggle();" class="clickable control
block ui-widget-header ui-state-active">
+ <div class="ui-icon ui-icon-carat-1-n sort-icon"></div>
+ <span class="badge">42</span>
+ <div class="label"><wicket:message key="1363"/></div>
+ </div>
</div>
<div class="ctrl ui-widget-content">
<div><input type="checkbox" id="activity-auto-clean"/><label
for="activity-auto-clean"><wicket:message
key="activities.autoclean"/></label></div>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
index 77c8503..3e437c3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/activities/activities.js
@@ -84,12 +84,17 @@ var Activities = function() {
}
function _remove(id) {
$('#' + _getId(id)).remove();
+ _updateCount();
}
function _clearItem(id) {
if (aclean.prop('checked')) {
_remove(id);
}
}
+ function _updateCount() {
+ if (!inited) return;
+ $('.control.block .badge',
activities).text(modArea.find('.activity').length);
+ }
return {
init: function() {
@@ -121,6 +126,7 @@ var Activities = function() {
});
_updateClean(_load(), aclean);
inited = true;
+ _updateCount();
}
, toggle: function() {
if (!inited) return;
@@ -155,12 +161,17 @@ var Activities = function() {
} else {
fnd.hide();
}
- a.find('.activity-close').click(function() {
a.remove(); _action('close', obj.id); });
+ a.find('.activity-close').click(function() {
+ a.remove();
+ _updateCount();
+ _action('close', obj.id);
+ });
a.find('.activity-text').text(obj.text);
_hightlight();
if (aclean.prop('checked') && a.hasClass('auto-clean'))
{
setTimeout(_clearItem.bind(null, obj.id),
timeout);
}
+ _updateCount();
}
, remove: _remove
};
diff --git a/openmeetings-web/src/main/webapp/css/raw-activities.css
b/openmeetings-web/src/main/webapp/css/raw-activities.css
index ff9ecac..a53714d 100644
--- a/openmeetings-web/src/main/webapp/css/raw-activities.css
+++ b/openmeetings-web/src/main/webapp/css/raw-activities.css
@@ -31,7 +31,6 @@
}
#activities .control.block .label {
display: inline-block;
- padding-left: 20px;
text-overflow: ellipsis;
white-space: nowrap;
}
