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 5191b38 [OPENMEETINGS-2165] access-denied is converted
5191b38 is described below
commit 5191b38cff75bdc9a82fe66bb29908adcf2ac85a
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Mar 17 13:04:59 2020 +0700
[OPENMEETINGS-2165] access-denied is converted
---
.../web/room/ExpiredMessageDialog.java | 35 ++++++++--------------
.../openmeetings/web/room/IconTextModal.html | 2 +-
2 files changed, 14 insertions(+), 23 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java
index c921ba1..40f9da1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java
@@ -18,43 +18,34 @@
*/
package org.apache.openmeetings.web.room;
+import org.apache.openmeetings.web.common.OmModalCloseButton;
import org.apache.openmeetings.web.room.menu.RoomMenuPanel;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.model.ResourceModel;
-import com.googlecode.wicket.jquery.core.JQueryBehavior;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
-import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
-import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
-
-public class ExpiredMessageDialog extends MessageDialog {
+public class ExpiredMessageDialog extends IconTextModal {
private static final long serialVersionUID = 1L;
private final RoomMenuPanel menu;
public ExpiredMessageDialog(String id, String message, RoomMenuPanel
menu) {
- super(id, "", message, DialogButtons.OK, DialogIcon.ERROR);
+ super(id);
+ withLabel(message);
this.menu = menu;
}
@Override
protected void onInitialize() {
- getTitle().setObject(getString("204"));
super.onInitialize();
+ withErrorIcon();
+ header(new ResourceModel("204"));
+ setBackdrop(Backdrop.TRUE);
+ show(true);
+ setUseCloseHandler(true);
+ addButton(OmModalCloseButton.of("54"));
}
@Override
- public boolean isModal() {
- return true;
- }
-
- @Override
- public void onConfigure(JQueryBehavior behavior) {
- super.onConfigure(behavior);
- behavior.setOption("autoOpen", true);
- }
-
- @Override
- public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
- menu.exit(handler);
+ protected void onClose(IPartialPageRequestHandler target) {
+ menu.exit(target);
}
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.html
index 1a5d0a4..64816bd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/IconTextModal.html
@@ -21,6 +21,6 @@
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:extend>
- <i wicket:id="icon"></i><span wicket:id="label"></span>
+ <i wicket:id="icon"></i> <span wicket:id="label"></span>
</wicket:extend>
</html>
