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 2020/04/22 13:53:47 UTC
[openmeetings] branch master updated: [OPENMEETINGS-2255] close
button is on the right
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 4dc5180 [OPENMEETINGS-2255] close button is on the right
4dc5180 is described below
commit 4dc5180e27e19f2cae8fe19b46e3f84590db0e7a
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Wed Apr 22 20:53:31 2020 +0700
[OPENMEETINGS-2255] close button is on the right
---
.../java/org/apache/openmeetings/web/common/InvitationDialog.java | 8 ++++----
.../main/java/org/apache/openmeetings/web/common/NameDialog.java | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
index ee07f5c..44e756d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
@@ -41,7 +41,7 @@ public class InvitationDialog extends Modal<Invitation> {
protected void onInitialize() {
header(new ResourceModel("213"));
- addButton(generate = new BootstrapAjaxButton("button", new ResourceModel("1526"), form, Buttons.Type.Outline_Primary) {
+ addButton(send = new BootstrapAjaxButton("button", new ResourceModel("218"), form, Buttons.Type.Outline_Primary) {
private static final long serialVersionUID = 1L;
@Override
@@ -51,10 +51,10 @@ public class InvitationDialog extends Modal<Invitation> {
@Override
protected void onSubmit(AjaxRequestTarget target) {
- InvitationDialog.this.onClick(target, InvitationForm.Action.GENERATE);
+ InvitationDialog.this.onClick(target, InvitationForm.Action.SEND);
}
});
- addButton(send = new BootstrapAjaxButton("button", new ResourceModel("218"), form, Buttons.Type.Outline_Primary) {
+ addButton(generate = new BootstrapAjaxButton("button", new ResourceModel("1526"), form, Buttons.Type.Outline_Primary) {
private static final long serialVersionUID = 1L;
@Override
@@ -64,7 +64,7 @@ public class InvitationDialog extends Modal<Invitation> {
@Override
protected void onSubmit(AjaxRequestTarget target) {
- InvitationDialog.this.onClick(target, InvitationForm.Action.SEND);
+ InvitationDialog.this.onClick(target, InvitationForm.Action.GENERATE);
}
});
addButton(OmModalCloseButton.of());
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
index 8edfa86..004ed72 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
@@ -54,7 +54,6 @@ public abstract class NameDialog extends Modal<String> {
protected void onInitialize() {
header(getTitle());
- addButton(OmModalCloseButton.of());
addButton(new BootstrapAjaxButton("button", getAddBtnLabel(), form, Buttons.Type.Outline_Primary) {
private static final long serialVersionUID = 1L;
@@ -68,6 +67,7 @@ public abstract class NameDialog extends Modal<String> {
NameDialog.this.onError(target);
}
}); // add
+ addButton(OmModalCloseButton.of());
form.add(new Label("label", getLabel())
, title = new RequiredTextField<>("title", getModel())
, feedback.setOutputMarkupId(true)