diff --git a/YACOSWeb/WebContent/javascripts/yacos/admin.js b/YACOSWeb/WebContent/javascripts/yacos/admin.js
index 23b7343..121295b 100644
--- a/YACOSWeb/WebContent/javascripts/yacos/admin.js
+++ b/YACOSWeb/WebContent/javascripts/yacos/admin.js
@@ -1,8 +1,9 @@
var AdminManager = Class.create({
initialize: function(){
this.input = $('userFilterInput');
- this.input.observe('keyPress',this.userInputKeyHandler.bind(this));
- this.fillUserList();
+ this.input.observe('keypress',this.userInputKeyHandler.bindAsEventListener(this));
+ $('sendNotificationsButton').observe('click',this.sendNotifications.bind(this));
+ this.filterTimeout = window.setTimeout(this.fillUserList.bind(this),0);
},
addConferenceCreationToken: function(event,user_object){
AdminController.addConferenceCreationToken(user_object.login,
@@ -11,6 +12,7 @@ var AdminManager = Class.create({
updated_number);
}
);
+ $('sendNotificationsButton').appear({duration:0.5});
event.stop();
},
removeConferenceCreationToken: function(event,user_object){
@@ -22,7 +24,16 @@ var AdminManager = Class.create({
);
event.stop();
},
- userInputKeyHandler: function(){
+ sendNotifications: function(){
+ AdminController.sendNotifications(function(){
+ alert("The users have been notified of their new rights.");
+ });
+ },
+ userInputKeyHandler: function(event){
+ window.clearTimeout(this.filterTimeout);
+ this.filterTimeout = window.setTimeout(
+ this.fillUserList.bind(this),1000);
+ this.input.pulsate({duration:1.0,from:0.7,pulses:3});
switch(event.keyCode){
case Event.KEY_RETURN:
this.addRemote();
@@ -31,12 +42,19 @@ var AdminManager = Class.create({
}
},
fillUserList: function(){
- AdminController.getUsersList(function(people){
+ var filter = this.input.value;
+ AdminController.getUsersList(filter,function(people){
+ $$('#userDynamicList .dynamicListItem').invoke("remove");
var content;
var elemName;
var contentValue;
var id;
var person;
+ if(people.length > 0){
+ $$(".dynamicListPlaceholder").invoke("fade");
+ } else {
+ $$(".dynamicListPlaceholder").invoke("appear");
+ }
for (var i = 0; i < people.length; i++) {
person = people[i];
id = "_"+person.id;
@@ -46,6 +64,9 @@ var AdminManager = Class.create({
dwr.util.setValue("person_name" + id, person.firstName + " " + person.lastName);
dwr.util.setValue("person_num_tokens"+id,person.numTokens);
+ $(elemName).removeClassName("dynamicListItemPattern");
+ $(elemName).addClassName("dynamicListItem");
+
$("person_add_token"+id).observe('click',
this.addConferenceCreationToken.bindAsEventListener(this,person));
$("person_remove_token"+id).observe('click',
diff --git a/YACOSWeb/WebContent/stylesheets/base.css b/YACOSWeb/WebContent/stylesheets/base.css
index 22609e4..a57a8ec 100644
--- a/YACOSWeb/WebContent/stylesheets/base.css
+++ b/YACOSWeb/WebContent/stylesheets/base.css
@@ -799,6 +799,12 @@ div.user_new {
.button .down {
background-image: url(../images/button-box-down.png);
}
+.button .hover div {
+ background-image: url(../images/button-box-hover.png);
+}
+.button .down div {
+ background-image: url(../images/button-box-down.png);
+}
.to-right {
float: right;
diff --git a/YACOSWeb/src/org/yacos/web/admin/AdminController.java b/YACOSWeb/src/org/yacos/web/admin/AdminController.java
index 5a750ac..5456cb6 100644
--- a/YACOSWeb/src/org/yacos/web/admin/AdminController.java
+++ b/YACOSWeb/src/org/yacos/web/admin/AdminController.java
@@ -3,7 +3,6 @@ package org.yacos.web.admin;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
-
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.springframework.web.servlet.ModelAndView;
@@ -14,7 +13,6 @@ import org.yacos.core.exceptions.NoConferenceCreationTokenLeftException;
import org.yacos.core.users.IUserManager;
import org.yacos.core.users.User;
import org.yacos.web.system.controller.MailSenderService;
-import org.yacos.web.system.session.SessionService;
import org.yacos.web.system.session.YACOSUtils;
public class AdminController extends MultiActionController {
@@ -79,25 +77,33 @@ public class AdminController extends MultiActionController {
User user;
for(String login : addedConferenceCreationTokens){
user = userManager.getUser(login);
- MailSenderService.getInstance().sendEMail(user.getEmail(),
+ // We can't be sure of what happened on the client side, so we avoid sending mails for nothing
+ if(user.getConferenceCreationTokens() > 0 ){
+ MailSenderService.getInstance().sendEMail(user.getEmail(),
"YACOS : "+user.getFirstName()+" "+user.getLastName()+" you have been granted a conference creation token",
"You receive this email because the YACOS admin allowed you to create a new conference in the system.\n"
+ "Your current conference creation token count is "+user.getConferenceCreationTokens()+"\n"
+ YACOSUtils.fullURL("addConference.htm"));
+ }
}
}
- public List