This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch csp
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/csp by this push:
new 6097ea2 [OPENMEETINGS-2165] avatars n chat, initial work on calendar
6097ea2 is described below
commit 6097ea2021206fc49a18982b085dab12fea49de5
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Fri Feb 14 09:43:26 2020 +0700
[OPENMEETINGS-2165] avatars n chat, initial work on calendar
---
.../openmeetings/web/admin/users/UsersPanel.java | 4 +-
.../apache/openmeetings/web/pages/HashPage.java | 5 +-
.../apache/openmeetings/web/pages/ResetPage.java | 4 +-
.../openmeetings/web/pages/auth/SignInPage.java | 8 +-
.../web/user/calendar/CalendarDialog.html | 47 ++---
.../web/user/calendar/CalendarDialog.java | 226 ++++++++-------------
.../web/user/calendar/CalendarPanel.java | 8 +-
.../apache/openmeetings/web/user/chat/raw-chat.js | 3 +-
.../dashboard/admin/AdminCleanupInfoDialog.java | 3 +-
.../src/main/webapp/css/raw-calendar.css | 6 -
10 files changed, 133 insertions(+), 181 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
index c8e7be5..c83bcb3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
@@ -41,7 +41,9 @@ import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.ModalCloseButton;
import
de.agilecoders.wicket.core.markup.html.bootstrap.utilities.ColorBehavior;
@AuthorizeInstantiation({"Admin", "GroupAdmin"})
@@ -107,7 +109,7 @@ public class UsersPanel extends AdminBasePanel {
.withLabel(new ResourceModel("warn.nogroup"))
.withErrorIcon(ColorBehavior.Color.Warning)
.header(new ResourceModel("797"))
- .addCloseButton(new ResourceModel("54"));
+ .addButton(new ModalCloseButton(new
ResourceModel("54")).type(Buttons.Type.Outline_Secondary));
form = new UserForm("form", listContainer,
getNewUserInstance(userDao.get(getUserId())), warning);
form.setNewVisible(true);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
index c1ce91a..f25f015 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.java
@@ -57,6 +57,9 @@ import
org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.util.string.StringValue;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.ModalCloseButton;
+
public class HashPage extends BaseInitedPage implements IUpdatable {
private static final long serialVersionUID = 1L;
public static final String APP = "app";
@@ -206,7 +209,7 @@ public class HashPage extends BaseInitedPage implements
IUpdatable {
add(new IconTextModal("access-denied")
.withLabel(errorMsg)
.withErrorIcon()
- .addCloseButton(new ResourceModel("54"))
+ .addButton(new ModalCloseButton(new
ResourceModel("54")).type(Buttons.Type.Outline_Secondary))
.header(new ResourceModel("invalid.hash"))
.show(error)
);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
index a497cbd..1aa0e58 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.java
@@ -27,8 +27,10 @@ import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.spring.injection.annot.SpringBean;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal.Backdrop;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.ModalCloseButton;
import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.TextContentModal;
public class ResetPage extends BaseNotInitedPage {
@@ -52,7 +54,7 @@ public class ResetPage extends BaseNotInitedPage {
if (user != null) {
add(new ResetPasswordDialog("resetPassword",
user, resetInfo));
add(resetInfo.header(new ResourceModel("325"))
- .addCloseButton(new
ResourceModel("54"))
+ .addButton(new
ModalCloseButton(new ResourceModel("54")).type(Buttons.Type.Outline_Secondary))
.setUseCloseHandler(true)
.setBackdrop(Backdrop.STATIC));
return;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
index 2207b39..a99fa6b 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.java
@@ -73,8 +73,10 @@ import org.slf4j.LoggerFactory;
import com.github.openjson.JSONException;
import com.github.openjson.JSONObject;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal.Backdrop;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.ModalCloseButton;
import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.TextContentModal;
public class SignInPage extends BaseInitedPage {
@@ -89,7 +91,7 @@ public class SignInPage extends BaseInitedPage {
setCloseOnEscapeKey(false);
show(true);
setUseCloseHandler(true);
- addCloseButton(new ResourceModel("54"));
+ addButton(new ModalCloseButton(new
ResourceModel("54")).type(Buttons.Type.Outline_Secondary));
}
@Override
@@ -199,13 +201,13 @@ public class SignInPage extends BaseInitedPage {
r.setVisible(allowRegister()), forget,
kick.setVisible(WebSession.get().isKickedByAdmin()));
add(forgetInfoDialog
.header(new ResourceModel("312"))
- .addCloseButton(new ResourceModel("54"))
+ .addButton(new ModalCloseButton(new
ResourceModel("54")).type(Buttons.Type.Outline_Secondary))
.setUseCloseHandler(true)
.setBackdrop(Backdrop.STATIC)
);
add(registerInfoDialog
.header(new ResourceModel("235"))
- .addCloseButton(new ResourceModel("54"))
+ .addButton(new ModalCloseButton(new
ResourceModel("54")).type(Buttons.Type.Outline_Secondary))
.setUseCloseHandler(true)
.setBackdrop(Backdrop.STATIC)
);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
index ec9dc2b..1f089f1 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.html
@@ -20,34 +20,31 @@
-->
<!DOCTYPE html>
<html xmlns:wicket="http://wicket.apache.org";>
-<wicket:panel>
+<wicket:extend>
<form wicket:id="calform" class="appointmentPopUp">
<span wicket:id="feedback"></span>
<div id="tabs">
- <table>
- <tr>
- <td><wicket:message key="572"/></td>
- <td><input type="text"
wicket:id="title"/></td>
- </tr>
- <tr>
- <td wicket:id="urlLabel"></td>
- <td><input type="url" wicket:id="url"
/></td>
- </tr>
- <tr>
- <td wicket:id="userLabel"></td>
- <td><input type="text"
wicket:id="login"/></td>
- </tr>
- <tr>
- <td wicket:id="passLabel"></td>
- <td><input type="password"
wicket:id="password"/></td>
- </tr>
- <tr>
- <td><wicket:message
key="calendar.gcal"/></td>
- <td><input type="checkbox"
wicket:id="gcal"/></td>
- </tr>
- </table>
+ <div>
+ <label class="col-3"
wicket:for="title"><wicket:message key="572"/></label>
+ <input class="col-8" type="text"
wicket:id="title"/>
+ </div>
+ <div>
+ <label class="col-3" wicket:for="url"><span
wicket:id="urlLabel"/></label>
+ <input class="col-8" type="url"
wicket:id="url"/>
+ </div>
+ <div>
+ <label class="col-3" wicket:for="login"><span
wicket:id="userLabel"/></label>
+ <input class="col-8" type="text"
wicket:id="login"/>
+ </div>
+ <div>
+ <label class="col-3"
wicket:for="password"><span wicket:id="passLabel"/></label>
+ <input class="col-8" type="password"
wicket:id="password"/>
+ </div>
+ <div>
+ <label class="col-3"
wicket:for="gcal"><wicket:message key="calendar.gcal"/></label>
+ <input type="checkbox" wicket:id="gcal"/>
+ </div>
</div>
</form>
- <div wicket:id="confirmDelete"></div>
-</wicket:panel>
+</wicket:extend>
</html>
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
index 330e465..65d695c 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
@@ -19,8 +19,8 @@
package org.apache.openmeetings.web.user.calendar;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
+import static
org.apache.openmeetings.web.util.CallbackFunctionHelper.newOkCancelDangerConfirm;
-import java.util.Arrays;
import java.util.List;
import org.apache.http.auth.UsernamePasswordCredentials;
@@ -41,38 +41,36 @@ import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.markup.html.form.UrlTextField;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.validator.UrlValidator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
-import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
-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;
-
+import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxButton;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.button.BootstrapAjaxLink;
+import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.ModalCloseButton;
/**
* Multipurpose Calendar Dialog form. This provides the ability to ask for a
user prompt,
* for Creating, and Syncing of Calendars. Along with that also,
* during the Creation and Deletion of Appointments.
*/
-public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
+public class CalendarDialog extends Modal<OmCalendar> {
private static final long serialVersionUID = 1L;
private static final Logger log =
LoggerFactory.getLogger(CalendarDialog.class);
private CalendarPanel calendarPanel;
private final NotificationPanel feedback = new
NotificationPanel("feedback");
- private DialogButton save;
- private DialogButton cancel;
- private DialogButton delete;
+ private BootstrapAjaxButton save;
+ private BootstrapAjaxLink<String> delete;
private UserCalendarForm form;
- private MessageDialog confirmDelete;
private List<OmCalendar> cals; //List of calendars for syncing
private int calIndex = 0;
@SpringBean
@@ -92,31 +90,84 @@ public class CalendarDialog extends
AbstractFormDialog<OmCalendar> {
private Appointment appointment = null;
public CalendarDialog(String id, final CalendarPanel calendarPanel,
CompoundPropertyModel<OmCalendar> model) {
- super(id, "", true);
+ super(id, model);
this.calendarPanel = calendarPanel;
- form = new UserCalendarForm("calform", model);
- add(form);
}
@Override
protected void onInitialize() {
- getTitle().setObject(getString("calendar.dialogTitle"));
- save = new DialogButton("save", getString("144"));
- cancel = new DialogButton("cancel", getString("lbl.cancel"));
- delete = new DialogButton("delete", getString("80"));
- confirmDelete = new MessageDialog("confirmDelete",
getString("80"), getString("833"), DialogButtons.OK_CANCEL, DialogIcon.WARN) {
+ header(new ResourceModel("calendar.dialogTitle"));
+ setBackdrop(Backdrop.STATIC);
+
+ form = new UserCalendarForm("calform", getModel());
+ add(form);
+
+ addButton(save = new BootstrapAjaxButton("button", new
ResourceModel("144"), form, Buttons.Type.Outline_Primary) {
private static final long serialVersionUID = 1L;
@Override
- public void onClose(IPartialPageRequestHandler handler,
DialogButton button) {
- if (button != null &&
button.match(AbstractDialog.OK)) {
-
apptManager.deleteCalendar(form.getModelObject());
- calendarPanel.refresh(handler);
- calendarPanel.refreshCalendars(handler);
+ protected void onSubmit(AjaxRequestTarget target) {
+ switch (type) {
+ case UPDATE_CALENDAR:
+ OmCalendar c =
form.getModelObject();
+
c.setHref(form.url.getModelObject());
+ HttpClient client =
calendarPanel.getHttpClient();
+ HttpClientContext context =
calendarPanel.getHttpClientContext();
+
+ if (form.gcal.getModelObject())
{
+
c.setSyncType(OmCalendar.SyncType.GOOGLE_CALENDAR);
+
c.setToken(form.username.getModelObject());
+ if (c.getId() == null) {
+
calendarPanel.populateGoogleCalendar(c, target);
+ }
+ } else if (c.getId() == null &&
form.username.getModelObject() != null) {
+
apptManager.provideCredentials(context, c, new
UsernamePasswordCredentials(form.username.getModelObject(),
+
form.pass.getModelObject()));
+ }
+
+
apptManager.createCalendar(client, context, c);
+
calendarPanel.refreshCalendars(target);
+ calendarPanel.refresh(target);
+ break;
+ case SYNC_CALENDAR:
+
syncCalendar(form.getModelObject(), target);
+ if (setFormModelObject()) {
+ setButtons(target);
+
target.add(show(target));
+ }
+ break;
+ case UPDATE_APPOINTMENT:
+ updateAppointment(appointment);
+ calendarPanel.refresh(target);
+ break;
+ case DELETE_APPOINTMENT:
+ deleteAppointment(appointment);
+ calendarPanel.refresh(target);
+ break;
}
+ clearFormModel(target);
+ target.add(feedback);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target) {
+ target.add(feedback);
+ }
+ });
+
save.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
+ delete = new BootstrapAjaxLink<>("button", null,
Buttons.Type.Outline_Danger, new ResourceModel("80")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget handler) {
+
apptManager.deleteCalendar(form.getModelObject());
+ calendarPanel.refresh(handler);
+ calendarPanel.refreshCalendars(handler);
}
};
- add(confirmDelete);
+
delete.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true);
+ add(delete.add(newOkCancelDangerConfirm(this,
getString("833"))));
+ addButton(new ModalCloseButton(new
ResourceModel("lbl.cancel")).type(Buttons.Type.Outline_Secondary));
super.onInitialize();
}
@@ -127,13 +178,12 @@ public class CalendarDialog extends
AbstractFormDialog<OmCalendar> {
* @param type - the {@link DIALOG_TYPE} being opened
* @param a - the {@link Appointment}
*/
- public void open(IPartialPageRequestHandler handler, DIALOG_TYPE type,
Appointment a) {
+ public void show(IPartialPageRequestHandler handler, DIALOG_TYPE type,
Appointment a) {
this.type = type;
appointment = a;
if (isOwner(a)) {
if (setFormModelObject(a, handler)) {
- this.open(handler);
- handler.add(this);
+ handler.add(show(handler));
} else {
switch (type) {
case UPDATE_APPOINTMENT:
@@ -163,17 +213,17 @@ public class CalendarDialog extends
AbstractFormDialog<OmCalendar> {
* @param type - the {@link DIALOG_TYPE} being opened
* @param c - the {@link OmCalendar}
*/
- public void open(IPartialPageRequestHandler handler, DIALOG_TYPE type,
OmCalendar c) {
+ public void show(IPartialPageRequestHandler handler, DIALOG_TYPE type,
OmCalendar c) {
this.type = type;
switch (type) {
case UPDATE_CALENDAR:
setFormModelObject(c);
setButtons(handler);
- this.open(handler);
+ show(handler);
break;
case SYNC_CALENDAR:
if (setCalendarList(handler)) {
- this.open(handler);
+ show(handler);
handler.add(this);
} else {
calendarPanel.refresh(handler);
@@ -188,71 +238,6 @@ public class CalendarDialog extends
AbstractFormDialog<OmCalendar> {
}
}
- @Override
- public int getWidth() {
- return 650;
- }
-
- @Override
- public DialogButton getSubmitButton() {
- return save;
- }
-
- @Override
- protected List<DialogButton> getButtons() {
- return Arrays.asList(save, cancel, delete);
- }
-
- @Override
- public Form<?> getForm() {
- return form;
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, DialogButton btn) {
- switch (type) {
- case UPDATE_CALENDAR:
- OmCalendar c = form.getModelObject();
- c.setHref(form.url.getModelObject());
- HttpClient client =
calendarPanel.getHttpClient();
- HttpClientContext context =
calendarPanel.getHttpClientContext();
-
- if (form.gcal.getModelObject()) {
-
c.setSyncType(OmCalendar.SyncType.GOOGLE_CALENDAR);
-
c.setToken(form.username.getModelObject());
- if (c.getId() == null) {
-
calendarPanel.populateGoogleCalendar(c, target);
- }
- } else if (c.getId() == null &&
form.username.getModelObject() != null) {
- apptManager.provideCredentials(context,
c, new UsernamePasswordCredentials(form.username.getModelObject(),
-
form.pass.getModelObject()));
- }
-
- apptManager.createCalendar(client, context, c);
- calendarPanel.refreshCalendars(target);
- calendarPanel.refresh(target);
- break;
- case SYNC_CALENDAR:
- syncCalendar(form.getModelObject(), target);
- if (setFormModelObject()) {
- setButtons(target);
- this.open(target);
- target.add(this);
- }
- break;
- case UPDATE_APPOINTMENT:
- updateAppointment(appointment);
- calendarPanel.refresh(target);
- break;
- case DELETE_APPOINTMENT:
- deleteAppointment(appointment);
- calendarPanel.refresh(target);
- break;
- }
- clearFormModel(target);
- target.add(feedback);
- }
-
/**
* Performs syncing of the Calendar.
*
@@ -366,54 +351,19 @@ public class CalendarDialog extends
AbstractFormDialog<OmCalendar> {
case UPDATE_APPOINTMENT:
case DELETE_APPOINTMENT:
case SYNC_CALENDAR:
- delete.setVisible(false, target);
- save.setVisible(true, target);
+ target.add(delete.setVisible(false),
save.setVisible(true));
break;
case UPDATE_CALENDAR:
OmCalendar c = form.getModelObject();
if (c.getId() == null) {
- delete.setVisible(false, target);
+ target.add(delete.setVisible(false));
} else {
- delete.setVisible(isOwner(c), target);
+
target.add(delete.setVisible(isOwner(c)));
}
- save.setVisible(isOwner(c), target);
+ target.add(save.setVisible(isOwner(c)));
}
}
- @Override
- public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
- switch (type) {
- case UPDATE_CALENDAR:
- if (delete.equals(button)) {
- confirmDelete.open(handler);
- }
- break;
- case UPDATE_APPOINTMENT:
- //If the Appointment to put on the server was a
new one, but the user cancelled it.
- // Then remove the calendar from the Appointment
- if (cancel.equals(button) &&
appointment.getHref() == null) {
- appointment.setCalendar(null);
- apptDao.update(appointment,
getUserId());
- calendarPanel.refresh(handler);
- }
- break;
- case DELETE_APPOINTMENT:
- appointment = null;
- break;
- case SYNC_CALENDAR:
- //If the user cancels the syncing then remove
- // all the calendars and stop the syncing.
- cals = null;
- break;
- }
- clearFormModel(handler);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, DialogButton btn) {
- target.add(feedback);
- }
-
private void clearFormModel(IPartialPageRequestHandler handler) {
form.clearInput();
form.username.setModelObject(null);
@@ -453,7 +403,7 @@ public class CalendarDialog extends
AbstractFormDialog<OmCalendar> {
}
};
- public UserCalendarForm(String id,
CompoundPropertyModel<OmCalendar> model) {
+ public UserCalendarForm(String id, IModel<OmCalendar> model) {
super(id, model);
setOutputMarkupId(true);
}
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index bb988ef..ad2473f 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -284,7 +284,7 @@ public class CalendarPanel extends UserBasePanel {
@Override
protected void
onEvent(AjaxRequestTarget target) {
- calendarDialog.open(target,
CalendarDialog.DIALOG_TYPE.UPDATE_CALENDAR, cal);
+ calendarDialog.show(target,
CalendarDialog.DIALOG_TYPE.UPDATE_CALENDAR, cal);
target.add(calendarDialog);
}
});
@@ -305,7 +305,7 @@ public class CalendarPanel extends UserBasePanel {
@Override
protected void onEvent(AjaxRequestTarget target) {
- calendarDialog.open(target,
CalendarDialog.DIALOG_TYPE.UPDATE_CALENDAR, getDefaultCalendar());
+ calendarDialog.show(target,
CalendarDialog.DIALOG_TYPE.UPDATE_CALENDAR, getDefaultCalendar());
target.add(calendarDialog);
}
}));
@@ -390,12 +390,12 @@ public class CalendarPanel extends UserBasePanel {
//Function which delegates the syncing of the Calendar to CalendarDialog
public void syncCalendar(AjaxRequestTarget target) {
- calendarDialog.open(target,
CalendarDialog.DIALOG_TYPE.SYNC_CALENDAR, (OmCalendar) null);
+ calendarDialog.show(target,
CalendarDialog.DIALOG_TYPE.SYNC_CALENDAR, (OmCalendar) null);
}
//Function which delegates the update / deletion of appointment on the
Calendar to CalendarDialog
public void updatedeleteAppointment(IPartialPageRequestHandler target,
CalendarDialog.DIALOG_TYPE type, Appointment a) {
- calendarDialog.open(target, type, a);
+ calendarDialog.show(target, type, a);
}
private Appointment getDefault() {
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
index 3b208e7..3d95fbf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
@@ -255,7 +255,6 @@ var Chat = function() {
msg.find('.user-row')
.data('userId', cm.from.id)
.data('actions', cm.actions)
- //.css('background-image', 'url(' +
(!!cm.from.img ? cm.from.img : './profile/' + cm.from.id + '?anticache=' +
Date.now()) + ')')
.mouseenter(function() {
__hideActions();
__getActions($(this))
@@ -283,6 +282,8 @@ var Chat = function() {
area.data('lastDate', cm.date);
}
area.append(msg);
+ msg.find('.user-row')[0].style.backgroundImage
= 'url(' + (!!cm.from.img ? cm.from.img : './profile/' + cm.from.id +
'?anticache=' + Date.now()) + ')';
+
msg.find('.msg').addClass(align).html(emoticon.emoticonize(!!cm.message ?
cm.message : ""));
if (btm) {
_scrollDown(area);
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
index d84ccf9..86824a3 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
@@ -44,6 +44,7 @@ import org.apache.wicket.spring.injection.annot.SpringBean;
import de.agilecoders.wicket.core.markup.html.bootstrap.button.Buttons;
import
de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
+import
de.agilecoders.wicket.core.markup.html.bootstrap.dialog.ModalCloseButton;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.spinner.SpinnerAjaxButton;
public class AdminCleanupInfoDialog extends Modal<String> {
@@ -74,7 +75,7 @@ public class AdminCleanupInfoDialog extends Modal<String> {
header(new
ResourceModel("dashboard.widget.admin.cleanup.title"));
setCloseOnEscapeKey(true);
setBackdrop(Backdrop.STATIC);
- addCloseButton(new ResourceModel("54"));
+ addButton(new ModalCloseButton(new
ResourceModel("54")).type(Buttons.Type.Outline_Secondary));
uploadSize = new Label("upload-size", "");
profile = new CleanupEntityUnitPanel("profile",
"dashboard.widget.admin.cleanup.profiles", new CleanupEntityUnit());
diff --git a/openmeetings-web/src/main/webapp/css/raw-calendar.css
b/openmeetings-web/src/main/webapp/css/raw-calendar.css
index ce022cd..2466cdd 100644
--- a/openmeetings-web/src/main/webapp/css/raw-calendar.css
+++ b/openmeetings-web/src/main/webapp/css/raw-calendar.css
@@ -1,10 +1,4 @@
/* Licensed under the Apache License, Version 2.0 (the "License")
http://www.apache.org/licenses/LICENSE-2.0 */
-.appointmentPopUp input[type="text"], .appointmentPopUp input[type="url"] {
- width: 420px;
-}
-.appointmentPopUp input[type="password"] {
- width: 420px;
-}
.appointmentPopUp textarea {
width: 424px;
height: 80px;
