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 2017/12/21 10:41:45 UTC
[1/3] openmeetings git commit: [OPENMEETINGS-1790] getString should
be used were it is possible instead of Application.getString
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x dd125aead -> 0297c55c1
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
----------------------------------------------------------------------
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 020b92d..1a8093b 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
@@ -30,7 +30,6 @@ import org.apache.openmeetings.db.dao.calendar.AppointmentDao;
import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.OmCalendar;
import org.apache.openmeetings.service.calendar.caldav.AppointmentManager;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
@@ -68,9 +67,9 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
private CalendarPanel calendarPanel;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private DialogButton save = new DialogButton("save", Application.getString("144"));
- private DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
- private DialogButton delete = new DialogButton("delete", Application.getString("80"));
+ private DialogButton save;
+ private DialogButton cancel;
+ private DialogButton delete;
private UserCalendarForm form;
private MessageDialog confirmDelete;
private List<OmCalendar> cals; //List of calendars for syncing
@@ -87,12 +86,20 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
private DIALOG_TYPE type = DIALOG_TYPE.UPDATE_CALENDAR;
private Appointment appointment = null;
- public CalendarDialog(String id, String title, final CalendarPanel calendarPanel, CompoundPropertyModel<OmCalendar> model) {
- super(id, title, true);
+ public CalendarDialog(String id, final CalendarPanel calendarPanel, CompoundPropertyModel<OmCalendar> model) {
+ super(id, "", true);
this.calendarPanel = calendarPanel;
form = new UserCalendarForm("calform", model);
add(form);
- confirmDelete = new MessageDialog("confirmDelete", Application.getString("80"), Application.getString("833"), DialogButtons.OK_CANCEL, DialogIcon.WARN) {
+ }
+
+ @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) {
private static final long serialVersionUID = 1L;
@Override
@@ -105,6 +112,7 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
}
};
add(confirmDelete);
+ super.onInitialize();
}
/**
@@ -409,9 +417,9 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
RequiredTextField<String> title = new RequiredTextField<>("title");
// Fields required for adding Google Calendar
- Label urlLabel = new Label("urlLabel", Application.getString("calendar.url")),
- userLabel = new Label("userLabel", Application.getString("114")),
- passLabel = new Label("passLabel", Application.getString("110"));
+ private Label urlLabel;
+ private Label userLabel;
+ private Label passLabel;
AjaxCheckBox gcal; // Checkbox for Google Calendar
UrlTextField url = new UrlTextField("url", Model.of(""), new UrlValidator() {
@@ -438,6 +446,13 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
public UserCalendarForm(String id, CompoundPropertyModel<OmCalendar> model) {
super(id, model);
setOutputMarkupId(true);
+ }
+
+ @Override
+ protected void onInitialize() {
+ urlLabel = new Label("urlLabel", getString("calendar.url"));
+ userLabel = new Label("userLabel", getString("114"));
+ passLabel = new Label("passLabel", getString("110"));
add(title);
add(feedback.setOutputMarkupId(true));
@@ -463,6 +478,7 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
};
add(gcal);
+ super.onInitialize();
}
@Override
@@ -510,23 +526,23 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
passLabel.setVisible(false);
//Google Calendar ID
- urlLabel.setDefaultModelObject(Application.getString("calendar.googleID"));
+ urlLabel.setDefaultModelObject(getString("calendar.googleID"));
url.setEnabled(true);
- url.setLabel(Model.<String>of(Application.getString("calendar.googleID")));
+ url.setLabel(Model.<String>of(getString("calendar.googleID")));
//Google API Key
- userLabel.setDefaultModelObject(Application.getString("calendar.googleKey"));
+ userLabel.setDefaultModelObject(getString("calendar.googleKey"));
username.setEnabled(true);
} else {
gcal.setModelObject(false);
pass.setVisible(true);
passLabel.setVisible(true);
- userLabel.setDefaultModelObject(Application.getString("114"));
+ userLabel.setDefaultModelObject(getString("114"));
username.setModelObject(null);
- urlLabel.setDefaultModelObject(Application.getString("calendar.url"));
- url.setLabel(Model.of(Application.getString("calendar.url")));
+ urlLabel.setDefaultModelObject(getString("calendar.url"));
+ url.setLabel(Model.of(getString("calendar.url")));
}
//Add new AttributeModifier to change the type of URLTextField, to text for
@@ -565,7 +581,7 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
log.error("Error executing the TestConnection");
}
- error(Application.getString("calendar.error"));
+ error(getString("calendar.error"));
break;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
----------------------------------------------------------------------
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 55b8c26..8cebbd8 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
@@ -41,7 +41,6 @@ import org.apache.openmeetings.db.entity.calendar.Appointment;
import org.apache.openmeetings.db.entity.calendar.Appointment.Reminder;
import org.apache.openmeetings.db.entity.calendar.OmCalendar;
import org.apache.openmeetings.service.calendar.caldav.AppointmentManager;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
@@ -92,19 +91,21 @@ public class CalendarPanel extends UserBasePanel {
}
};
private Calendar calendar;
- private final CalendarDialog calendarDialog;
+ private CalendarDialog calendarDialog;
private AppointmentDialog dialog;
- private final WebMarkupContainer calendarListContainer;
+ private final WebMarkupContainer calendarListContainer = new WebMarkupContainer("calendarListContainer");
private transient HttpClient client = null; // Non-Serializable HttpClient.
public CalendarPanel(String id) {
super(id);
+ }
+ @Override
+ protected void onInitialize() {
final Form<Date> form = new Form<>("form");
add(form);
- dialog = new AppointmentDialog("appointment", Application.getString("815")
- , this, new CompoundPropertyModel<>(getDefault()));
+ dialog = new AppointmentDialog("appointment", this, new CompoundPropertyModel<>(getDefault()));
add(dialog);
boolean isRtl = isRtl();
@@ -118,24 +119,24 @@ public class CalendarPanel extends UserBasePanel {
options.set("timeFormat", Options.asString("H(:mm)"));
options.set("buttonText", new JSONObject()
- .put("month", Application.getString("801"))
- .put("week", Application.getString("800"))
- .put("day", Application.getString("799"))
- .put("today", Application.getString("1555")).toString());
+ .put("month", getString("801"))
+ .put("week", getString("800"))
+ .put("day", getString("799"))
+ .put("today", getString("1555")).toString());
JSONArray monthes = new JSONArray();
JSONArray shortMonthes = new JSONArray();
JSONArray days = new JSONArray();
JSONArray shortDays = new JSONArray();
// first week day must be Sunday
- days.put(0, Application.getString("466"));
- shortDays.put(0, Application.getString("459"));
+ days.put(0, getString("466"));
+ shortDays.put(0, getString("459"));
for (int i = 0; i < 12; i++) {
- monthes.put(i, Application.getString(String.valueOf(469 + i)));
- shortMonthes.put(i, Application.getString(String.valueOf(1556 + i)));
+ monthes.put(i, getString(String.valueOf(469 + i)));
+ shortMonthes.put(i, getString(String.valueOf(1556 + i)));
if (i + 1 < 7) {
- days.put(i + 1, Application.getString(String.valueOf(460 + i)));
- shortDays.put(i + 1, Application.getString(String.valueOf(453 + i)));
+ days.put(i + 1, getString(String.valueOf(460 + i)));
+ shortDays.put(i + 1, getString(String.valueOf(453 + i)));
}
}
options.set("monthNames", monthes.toString());
@@ -254,12 +255,10 @@ public class CalendarPanel extends UserBasePanel {
add(refreshTimer);
add(syncTimer);
- calendarDialog = new CalendarDialog("calendarDialog", Application.getString("calendar.dialogTitle"),
- this, new CompoundPropertyModel<>(getDefaultCalendar()));
+ calendarDialog = new CalendarDialog("calendarDialog", this, new CompoundPropertyModel<>(getDefaultCalendar()));
add(calendarDialog);
- calendarListContainer = new WebMarkupContainer("calendarListContainer");
calendarListContainer.setOutputMarkupId(true);
calendarListContainer.add(new ListView<OmCalendar>("items", new LoadableDetachableModel<List<OmCalendar>>() {
private static final long serialVersionUID = 1L;
@@ -310,6 +309,8 @@ public class CalendarPanel extends UserBasePanel {
}));
add(calendarListContainer);
+
+ super.onInitialize();
}
@Override
@@ -379,11 +380,11 @@ public class CalendarPanel extends UserBasePanel {
}
}
- private static OmCalendar getDefaultCalendar() {
+ private OmCalendar getDefaultCalendar() {
OmCalendar calendar = new OmCalendar();
calendar.setDeleted(false);
calendar.setOwner(getBean(UserDao.class).get(getUserId()));
- calendar.setTitle(Application.getString("calendar.defaultTitle"));
+ calendar.setTitle(getString("calendar.defaultTitle"));
return calendar;
}
@@ -397,11 +398,11 @@ public class CalendarPanel extends UserBasePanel {
calendarDialog.open(target, type, a);
}
- private static Appointment getDefault() {
+ private Appointment getDefault() {
Appointment a = new Appointment();
a.setReminder(Reminder.ical);
a.setOwner(getBean(UserDao.class).get(getUserId()));
- a.setTitle(Application.getString("1444"));
+ a.setTitle(getString("1444"));
log.debug(" -- getDefault -- Current model " + a);
return a;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
index b962940..38107de 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/Chat.java
@@ -45,7 +45,6 @@ import org.apache.openmeetings.db.entity.basic.ChatMessage;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.MainPanel;
import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -107,9 +106,13 @@ public class Chat extends Panel {
super(id);
setOutputMarkupPlaceholderTag(true);
setMarkupId(id);
+ }
+ @Override
+ protected void onInitialize() {
add(chatActivity);
add(new ChatForm("sendForm"));
+ super.onInitialize();
}
private Client getClient() {
@@ -126,16 +129,16 @@ public class Chat extends Panel {
return WebSocketHelper.getMessage(curUser, list, (o, u) -> o.put("img", getUrl(RequestCycle.get(), u)));
}
- public static CharSequence getReinit() {
+ public CharSequence getReinit() {
StringBuilder sb = new StringBuilder("Chat.reinit(");
- sb.append('\'').append(Application.getString("1494")).append('\'')
- .append(',').append('\'').append(Application.getString("406")).append('\'');
+ sb.append('\'').append(getString("1494")).append('\'')
+ .append(',').append('\'').append(getString("406")).append('\'');
return sb.append("); ");
}
public CharSequence addRoom(Room r) {
StringBuilder sb = new StringBuilder();
- sb.append(String.format("Chat.addTab('%1$s%2$d', '%3$s %2$d');", ID_ROOM_PREFIX, r.getId(), Application.getString("406")));
+ sb.append(String.format("Chat.addTab('%1$s%2$d', '%3$s %2$d');", ID_ROOM_PREFIX, r.getId(), getString("406")));
List<ChatMessage> list = getBean(ChatDao.class).getRoom(r.getId(), 0, 30, !r.isChatModerated() || isModerator(getUserId(), r.getId()));
if (!list.isEmpty()) {
sb.append("Chat.addMessage(").append(getMessage(list).toString()).append(");");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
index 9505de7..cbccd80 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/ChatPanel.java
@@ -19,7 +19,6 @@
package org.apache.openmeetings.web.user.chat;
import static org.apache.openmeetings.core.util.WebSocketHelper.ID_ROOM_PREFIX;
-import static org.apache.openmeetings.web.user.chat.Chat.getReinit;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
@@ -78,7 +77,7 @@ public class ChatPanel extends Panel {
if (handler != null) {
handler.add(this);
if (visible) {
- handler.appendJavaScript(getReinit());
+ handler.appendJavaScript(chat.getReinit());
}
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
index a06b574..5d801de 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/StartWidgetView.java
@@ -22,7 +22,6 @@ import static org.apache.openmeetings.web.common.BasePanel.EVT_CLICK;
import static org.apache.openmeetings.web.util.OmUrlFragment.CALENDAR;
import static org.apache.openmeetings.web.util.OmUrlFragment.ROOMS_PUBLIC;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.pages.MainPage;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -39,11 +38,15 @@ public class StartWidgetView extends WidgetView {
public StartWidgetView(String id, Model<Widget> model) {
super(id, model);
+ }
+
+ @Override
+ protected void onInitialize() {
add(new WebMarkupContainer("step1").add(new PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step2").add(new PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step3").add(new PublicRoomsEventBehavior()));
add(new WebMarkupContainer("step4").add(new PublicRoomsEventBehavior()));
- add(new Label("123msg", Application.getString("widget.start.desc")).setEscapeModelStrings(false));
+ add(new Label("123msg", getString("widget.start.desc")).setEscapeModelStrings(false));
add(new Button("start").add(new PublicRoomsEventBehavior()));
add(new Button("calendar").add(new AjaxEventBehavior(EVT_CLICK) {
private static final long serialVersionUID = 1L;
@@ -53,6 +56,7 @@ public class StartWidgetView extends WidgetView {
((MainPage)getPage()).updateContents(CALENDAR, target);
}
}));
+ super.onInitialize();
}
private class PublicRoomsEventBehavior extends AjaxEventBehavior {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
index a1a186f..95c27a8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
@@ -29,7 +29,6 @@ import java.util.List;
import org.apache.openmeetings.core.util.StrongPasswordValidator;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
@@ -46,15 +45,8 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ChangePasswordDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(ChangePasswordDialog.class, getWebAppRootKey());
- private final DialogButton update = new DialogButton("update", Model.of(Application.getString("327"))) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isIndicating() {
- return true;
- }
- };
- private final DialogButton cancel = new DialogButton("cancel", Model.of(Application.getString("lbl.cancel")));
+ private DialogButton update;
+ private DialogButton cancel;
private final PasswordTextField current = new PasswordTextField("current", Model.of((String)null));
private final PasswordTextField pass = new PasswordTextField("pass", Model.of((String)null));
private final PasswordTextField pass2 = new PasswordTextField("pass2", Model.of((String)null));
@@ -76,7 +68,7 @@ public class ChangePasswordDialog extends AbstractFormDialog<String> {
}
String p1 = pass.getConvertedInput();
if (!Strings.isEmpty(p1) && !p1.equals(pass2.getConvertedInput())) {
- error(Application.getString("232"));
+ error(getString("232"));
}
super.onValidate();
}
@@ -84,12 +76,21 @@ public class ChangePasswordDialog extends AbstractFormDialog<String> {
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
public ChangePasswordDialog(String id) {
- super(id, Model.of(Application.getString("327")));
+ super(id, "");
}
@Override
protected void onInitialize() {
- super.onInitialize();
+ getTitle().setObject(getString("327"));
+ update = new DialogButton("update", Model.of(getString("327"))) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isIndicating() {
+ return true;
+ }
+ };
+ cancel = new DialogButton("cancel", Model.of(getString("lbl.cancel")));
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
passValidator = new StrongPasswordValidator(getMinPasswdLength(cfgDao), getBean(UserDao.class).get(getUserId()));
add(form.add(
@@ -98,6 +99,7 @@ public class ChangePasswordDialog extends AbstractFormDialog<String> {
, pass2.setLabel(Model.of(getString("116")))
, feedback.setOutputMarkupId(true)
));
+ super.onInitialize();
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
index 19f3a6c..cae7118 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.openmeetings.db.dao.user.UserDao;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.markup.html.tabs.AbstractTab;
@@ -44,12 +43,17 @@ public class SettingsPanel extends UserBasePanel {
public static final int EDIT_PROFILE_TAB_ID = 2;
public static final int SEARCH_TAB_ID = 3;
public static final int DASHBOARD_TAB_ID = 4;
+ public final int active;
public SettingsPanel(String id, int active) {
super(id);
+ this.active = active;
+ }
+ @Override
+ protected void onInitialize() {
List<ITab> tabs = new ArrayList<>();
- tabs.add(new AjaxTab(Model.of(Application.getString("1170"))) {
+ tabs.add(new AjaxTab(Model.of(getString("1170"))) {
private static final long serialVersionUID = 1L;
UserProfilePanel profilePanel = null;
@@ -71,7 +75,7 @@ public class SettingsPanel extends UserBasePanel {
return super.load(target);
}
});
- tabs.add(new AjaxTab(Model.of(Application.getString("1188"))) {
+ tabs.add(new AjaxTab(Model.of(getString("1188"))) {
private static final long serialVersionUID = 1L;
@Override
@@ -79,7 +83,7 @@ public class SettingsPanel extends UserBasePanel {
return new MessagesContactsPanel(panelId);
}
});
- tabs.add(new AbstractTab(Model.of(Application.getString("1171"))) {
+ tabs.add(new AbstractTab(Model.of(getString("1171"))) {
private static final long serialVersionUID = 1L;
@Override
@@ -87,7 +91,7 @@ public class SettingsPanel extends UserBasePanel {
return new ProfilePanel(panelId);
}
});
- tabs.add(new AbstractTab(Model.of(Application.getString("1172"))) {
+ tabs.add(new AbstractTab(Model.of(getString("1172"))) {
private static final long serialVersionUID = 1L;
@Override
@@ -95,7 +99,7 @@ public class SettingsPanel extends UserBasePanel {
return new UserSearchPanel(panelId);
}
});
- tabs.add(new AbstractTab(Model.of(Application.getString("1548"))) {
+ tabs.add(new AbstractTab(Model.of(getString("1548"))) {
private static final long serialVersionUID = 1L;
@Override
@@ -104,5 +108,7 @@ public class SettingsPanel extends UserBasePanel {
}
});
add(new TabbedPanel("tabs", tabs, new Options("active", active)).setActiveTab(active));
+
+ super.onInitialize();
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
index c1d4ab4..70bb9b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.java
@@ -25,7 +25,6 @@ import static org.apache.openmeetings.web.app.WebSession.getUserId;
import org.apache.openmeetings.db.dao.user.UserContactDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ProfileImagePanel;
import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -45,15 +44,21 @@ public class UserProfilePanel extends UserBasePanel {
public UserProfilePanel(String id, CompoundPropertyModel<User> model) {
super(id, model);
- add(new ProfileImagePanel("img", model.getObject().getId()));
+ }
+
+ @Override
+ protected void onInitialize() {
+ User u = (User)getDefaultModelObject();
+
+ add(new ProfileImagePanel("img", u.getId()));
add(new Label("firstname"));
add(new Label("lastname"));
add(new Label("timeZoneId"));
add(new Label("regdate"));
add(new TextArea<String>("userOffers").setEnabled(false));
add(new TextArea<String>("userSearchs").setEnabled(false));
- if (getUserId().equals(model.getObject().getId()) || model.getObject().isShowContactData()
- || (model.getObject().isShowContactDataToContacts() && getBean(UserContactDao.class).isContact(model.getObject().getId(), getUserId())))
+ if (getUserId().equals(u.getId()) || u.isShowContactData()
+ || (u.isShowContactDataToContacts() && getBean(UserContactDao.class).isContact(u.getId(), getUserId())))
{
addressDenied.setVisible(false);
address.add(new Label("address.phone"));
@@ -61,13 +66,15 @@ public class UserProfilePanel extends UserBasePanel {
address.add(new Label("address.additionalname"));
address.add(new Label("address.zip"));
address.add(new Label("address.town"));
- address.add(new Label("country", getCountryName(model.getObject().getAddress().getCountry(), getLocale())));
+ address.add(new Label("country", getCountryName(u.getAddress().getCountry(), getLocale())));
address.add(new Label("address.comment"));
} else {
address.setVisible(false);
- addressDenied.setDefaultModelObject(Application.getString(model.getObject().isShowContactDataToContacts() ? "1269" : "1268"));
+ addressDenied.setDefaultModelObject(getString(u.isShowContactDataToContacts() ? "1269" : "1268"));
}
- add(address.setDefaultModel(model));
+ add(address.setDefaultModel(getDefaultModel()));
add(addressDenied);
+
+ super.onInitialize();
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
index 7488532..9a7f18b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingsPanel.java
@@ -25,7 +25,6 @@ import static org.apache.openmeetings.web.app.WebSession.getUserId;
import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.db.dto.record.RecordingContainerData;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.NameDialog;
import org.apache.openmeetings.web.common.UserBasePanel;
import org.apache.openmeetings.web.common.tree.FileTreePanel;
@@ -35,18 +34,22 @@ public class RecordingsPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
private final VideoPlayer video = new VideoPlayer("video");
private final VideoInfo info = new VideoInfo("info");
- private final NameDialog addFolder = new NameDialog("addFolder", Application.getString("712")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- fileTree.createFolder(target, getModelObject());
- }
- };
- private final FileTreePanel fileTree;
+ private FileTreePanel fileTree;
public RecordingsPanel(String id) {
super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
+ final NameDialog addFolder = new NameDialog("addFolder", getString("712")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ fileTree.createFolder(target, getModelObject());
+ }
+ };
add(fileTree = new FileTreePanel("tree", null, addFolder, null) {
private static final long serialVersionUID = 1L;
@@ -66,5 +69,7 @@ public class RecordingsPanel extends UserBasePanel {
}
});
add(video, info, addFolder);
+
+ super.onInitialize();
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
index 4921ded..671719b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.java
@@ -51,30 +51,12 @@ public class RoomsPanel extends UserPanel {
private final Label roomNameLbl = new Label("roomName", Model.of((String)null));
private final Label roomCommentLbl = new Label("roomComment", Model.of((String)null));
private List<Client> clientsInRoom = null;
+ private final List<Room> rooms;
private Long roomId = 0L;
public RoomsPanel(String id, List<Room> rooms) {
super(id);
- add(new RoomListPanel("list", rooms, Application.getString("131")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onContainerClick(AjaxRequestTarget target, Room r) {
- roomId = r.getId();
- updateRoomDetails(target);
- }
-
- @Override
- public void onRefreshClick(AjaxRequestTarget target, Room r) {
- super.onRefreshClick(target, r);
- roomId = r.getId();
- updateRoomDetails(target);
- }
- });
-
- // Users in this Room
- add(details.setOutputMarkupId(true).setVisible(!rooms.isEmpty()));
- details.add(roomIdLbl, roomNameLbl, roomCommentLbl);
+ this.rooms = rooms;
clients = new ListView<Client>("clients", clientsInRoom){
private static final long serialVersionUID = 1L;
@@ -111,7 +93,33 @@ public class RoomsPanel extends UserPanel {
item.add(new Label("from", client.getConnectedSince()));
}
};
+ }
+
+ @Override
+ protected void onInitialize() {
+ add(new RoomListPanel("list", rooms, getString("131")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onContainerClick(AjaxRequestTarget target, Room r) {
+ roomId = r.getId();
+ updateRoomDetails(target);
+ }
+
+ @Override
+ public void onRefreshClick(AjaxRequestTarget target, Room r) {
+ super.onRefreshClick(target, r);
+ roomId = r.getId();
+ updateRoomDetails(target);
+ }
+ });
+
+ // Users in this Room
+ add(details.setOutputMarkupId(true).setVisible(!rooms.isEmpty()));
+ details.add(roomIdLbl, roomNameLbl, roomCommentLbl);
details.add(clientsContainer.add(clients.setOutputMarkupId(true)).setOutputMarkupId(true));
+
+ super.onInitialize();
}
void updateRoomDetails(AjaxRequestTarget target) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
index cd55012..71e810b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.java
@@ -28,11 +28,12 @@ import org.apache.wicket.markup.html.basic.Label;
public class RoomsSelectorPanel extends UserBasePanel {
private static final long serialVersionUID = 1L;
+ private String title;
+ private String desc;
public RoomsSelectorPanel(String id, MenuParams param) {
super(id);
- String title, desc;
RoomDao roomDao = Application.getBean(RoomDao.class);
switch (param) {
case myTabButton:
@@ -52,7 +53,12 @@ public class RoomsSelectorPanel extends UserBasePanel {
add(new RoomsPanel("rooms", roomDao.getPublicRooms()));
break;
}
- add(new Label("title", Application.getString(title)));
- add(new Label("desc", Application.getString(desc)));
+ }
+
+ @Override
+ protected void onInitialize() {
+ add(new Label("title", getString(title)));
+ add(new Label("desc", getString(desc)));
+ super.onInitialize();
}
}
[3/3] openmeetings git commit: [OPENMEETINGS-1790] getString should
be used were it is possible instead of Application.getString
Posted by so...@apache.org.
[OPENMEETINGS-1790] getString should be used were it is possible instead of Application.getString
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/0297c55c
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/0297c55c
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/0297c55c
Branch: refs/heads/4.0.x
Commit: 0297c55c13bf075ac65935434db45eff4ad5f41d
Parents: dd125ae
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Thu Dec 21 17:41:30 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Thu Dec 21 17:41:30 2017 +0700
----------------------------------------------------------------------
.../openmeetings/web/admin/AdminSavePanel.java | 11 +-
.../web/admin/backup/BackupPanel.java | 8 +-
.../web/admin/configurations/ConfigForm.java | 83 +++---
.../web/admin/configurations/ConfigsPanel.java | 6 +-
.../web/admin/labels/AddLanguageDialog.java | 12 +-
.../web/admin/labels/LangPanel.java | 14 +-
.../openmeetings/web/admin/ldaps/LdapForm.java | 10 +-
.../web/admin/ldaps/LdapsPanel.java | 8 +-
.../openmeetings/web/admin/oauth/OAuthForm.java | 31 ++-
.../web/admin/oauth/OAuthPanel.java | 5 +
.../openmeetings/web/admin/rooms/RoomForm.java | 7 +-
.../openmeetings/web/admin/users/UserForm.java | 3 +-
.../web/admin/users/UsersPanel.java | 22 +-
.../web/app/Application.properties.xml | 12 +
.../web/app/Application_ar.properties.xml | 14 +-
.../web/app/Application_bg.properties.xml | 12 +
.../web/app/Application_ca.properties.xml | 12 +
.../web/app/Application_cs.properties.xml | 12 +
.../web/app/Application_da.properties.xml | 12 +
.../web/app/Application_de.properties.xml | 12 +
.../web/app/Application_el.properties.xml | 12 +
.../web/app/Application_es.properties.xml | 12 +
.../web/app/Application_fa.properties.xml | 12 +
.../web/app/Application_fi.properties.xml | 12 +
.../web/app/Application_fr.properties.xml | 12 +
.../web/app/Application_gl.properties.xml | 12 +
.../web/app/Application_he.properties.xml | 12 +
.../web/app/Application_hu.properties.xml | 12 +
.../web/app/Application_id.properties.xml | 12 +
.../web/app/Application_it.properties.xml | 12 +
.../web/app/Application_ja.properties.xml | 12 +
.../web/app/Application_ko.properties.xml | 12 +
.../web/app/Application_nl.properties.xml | 12 +
.../web/app/Application_pl.properties.xml | 12 +
.../web/app/Application_pt.properties.xml | 12 +
.../web/app/Application_pt_BR.properties.xml | 12 +
.../web/app/Application_ru.properties.xml | 12 +
.../web/app/Application_sk.properties.xml | 12 +
.../web/app/Application_sv.properties.xml | 12 +
.../web/app/Application_th.properties.xml | 12 +
.../web/app/Application_tr.properties.xml | 12 +
.../web/app/Application_uk.properties.xml | 12 +
.../web/app/Application_zh_CN.properties.xml | 12 +
.../web/app/Application_zh_TW.properties.xml | 12 +
.../web/common/GeneralUserForm.java | 5 +-
.../web/common/InvitationDialog.java | 18 +-
.../openmeetings/web/common/InvitationForm.java | 15 +-
.../openmeetings/web/common/MainPanel.java | 17 +-
.../openmeetings/web/common/NameDialog.java | 12 +-
.../web/common/tree/ConvertingErrorsDialog.java | 11 +-
.../web/pages/InvitationPasswordDialog.java | 17 +-
.../web/pages/auth/ForgetPasswordDialog.java | 9 +-
.../web/pages/auth/RegisterDialog.java | 32 ++-
.../web/pages/auth/ResetPasswordDialog.java | 9 +-
.../web/pages/auth/SignInDialog.java | 37 ++-
.../web/room/ExpiredMessageDialog.java | 9 +-
.../openmeetings/web/room/NicknameDialog.java | 17 +-
.../web/room/RedirectMessageDialog.java | 5 +-
.../apache/openmeetings/web/room/SwfPanel.java | 5 +-
.../web/room/menu/RoomInvitationForm.java | 9 +-
.../web/room/menu/RoomMenuPanel.java | 251 ++++++++++---------
.../web/room/menu/SipDialerDialog.java | 9 +-
.../web/room/menu/StartSharingButton.java | 8 +-
.../web/room/poll/CreatePollDialog.java | 24 +-
.../web/room/poll/PollResultsDialog.java | 76 +++---
.../openmeetings/web/room/poll/VoteDialog.java | 25 +-
.../web/room/sidebar/RoomSidebar.java | 17 +-
.../web/room/sidebar/UploadDialog.java | 31 ++-
.../openmeetings/web/room/wb/WbPanel.java | 3 +-
.../openmeetings/web/user/AboutDialog.java | 9 +-
.../web/user/InviteUserMessageDialog.java | 15 +-
.../web/user/InviteUserToRoomDialog.java | 20 +-
.../openmeetings/web/user/MessageDialog.java | 15 +-
.../openmeetings/web/user/UserInfoDialog.java | 20 +-
.../web/user/calendar/AppointmentDialog.java | 41 +--
.../web/user/calendar/CalendarDialog.java | 50 ++--
.../web/user/calendar/CalendarPanel.java | 45 ++--
.../apache/openmeetings/web/user/chat/Chat.java | 13 +-
.../openmeetings/web/user/chat/ChatPanel.java | 3 +-
.../web/user/dashboard/StartWidgetView.java | 8 +-
.../web/user/profile/ChangePasswordDialog.java | 28 ++-
.../web/user/profile/SettingsPanel.java | 18 +-
.../web/user/profile/UserProfilePanel.java | 21 +-
.../web/user/record/RecordingsPanel.java | 25 +-
.../openmeetings/web/user/rooms/RoomsPanel.java | 48 ++--
.../web/user/rooms/RoomsSelectorPanel.java | 12 +-
86 files changed, 1134 insertions(+), 522 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
index 63ee8ec..8f0dc95 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminSavePanel.java
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.web.admin;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.common.FormSaveRefreshPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -29,20 +28,19 @@ import org.apache.wicket.model.Model;
public abstract class AdminSavePanel<T> extends FormSaveRefreshPanel<T> {
private static final long serialVersionUID = 1L;
- private final Label newRecord;
+ private final Label newRecord = new Label("newRecord", Model.of(""));
private final Form<T> form;
public AdminSavePanel(String id, final Form<T> form) {
super(id, form);
this.form = form;
-
- newRecord = new Label("newRecord", Model.of(Application.getString("155")));
- add(newRecord.setVisible(false).setOutputMarkupId(true));
}
@Override
protected void onInitialize() {
- super.onInitialize();
+ newRecord.setDefaultModelObject(getString("155"));
+ add(newRecord.setVisible(false).setOutputMarkupId(true));
+
final AjaxButton newBtn = new AjaxButton("ajax-new-button", form) {
private static final long serialVersionUID = 1L;
@@ -83,6 +81,7 @@ public abstract class AdminSavePanel<T> extends FormSaveRefreshPanel<T> {
}
};
add(newBtn.setVisible(isNewBtnVisible()), delBtn.setVisible(isDelBtnVisible()));
+ super.onInitialize();
}
/**
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
index 2c99c42..b23a47e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.java
@@ -34,7 +34,6 @@ import org.apache.openmeetings.backup.ProgressHolder;
import org.apache.openmeetings.util.CalendarPatterns;
import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.admin.AdminBasePanel;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.util.upload.BootstrapFileUploadBehavior;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -210,7 +209,12 @@ public class BackupPanel extends AdminBasePanel {
target.add(feedback);
}
}));
- add(new Label("cmdLineDesc", Application.getString("1505")).setEscapeModelStrings(false));
+ }
+
+ @Override
+ protected void onInitialize() {
+ add(new Label("cmdLineDesc", getString("1505")).setEscapeModelStrings(false));
+ super.onInitialize();
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
index 0458819..f091a53 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigForm.java
@@ -27,7 +27,6 @@ import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.entity.basic.Configuration;
import org.apache.openmeetings.db.entity.basic.Configuration.Type;
import org.apache.openmeetings.web.admin.AdminBaseForm;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.DateLabel;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -67,47 +66,6 @@ public class ConfigForm extends AdminBaseForm<Configuration> {
super(id, new CompoundPropertyModel<>(configuration));
setOutputMarkupId(true);
this.listContainer = listContainer;
- add(new DropDownChoice<>("type", Arrays.asList(Type.values()), new IChoiceRenderer<Type>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getIdValue(Type rt, int index) {
- return rt.name();
- }
-
- @Override
- public Object getDisplayValue(Type rt) {
- return rt.name();
- }
-
- @Override
- public Type getObject(String id, IModel<? extends List<? extends Type>> choices) {
- for (Type rt : choices.getObject()) {
- if (rt.name().equals(id)) {
- return rt;
- }
- }
- return null;
- }
- }).setLabel(Model.of(Application.getString("45"))).add(new AjaxFormComponentUpdatingBehavior("change") {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- update(target);
- }
- }));
- add(new RequiredTextField<String>("key").setLabel(Model.of(Application.getString("265"))).add(new IValidator<String>(){
- private static final long serialVersionUID = 1L;
-
- @Override
- public void validate(IValidatable<String> validatable) {
- Configuration c = getBean(ConfigurationDao.class).forceGet(validatable.getValue());
- if (c != null && !c.isDeleted() && !c.getId().equals(ConfigForm.this.getModelObject().getId())) {
- validatable.error(new ValidationError(Application.getString("error.cfg.exist")));
- }
- }
- }));
valueS = new TextField<>("valueS");
valueN = new TextField<Long>("valueN") {
private static final long serialVersionUID = 1L;
@@ -152,6 +110,47 @@ public class ConfigForm extends AdminBaseForm<Configuration> {
@Override
protected void onInitialize() {
super.onInitialize();
+ add(new DropDownChoice<>("type", Arrays.asList(Type.values()), new IChoiceRenderer<Type>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getIdValue(Type rt, int index) {
+ return rt.name();
+ }
+
+ @Override
+ public Object getDisplayValue(Type rt) {
+ return rt.name();
+ }
+
+ @Override
+ public Type getObject(String id, IModel<? extends List<? extends Type>> choices) {
+ for (Type rt : choices.getObject()) {
+ if (rt.name().equals(id)) {
+ return rt;
+ }
+ }
+ return null;
+ }
+ }).setLabel(Model.of(getString("45"))).add(new AjaxFormComponentUpdatingBehavior("change") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ update(target);
+ }
+ }));
+ add(new RequiredTextField<String>("key").setLabel(Model.of(getString("265"))).add(new IValidator<String>(){
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void validate(IValidatable<String> validatable) {
+ Configuration c = getBean(ConfigurationDao.class).forceGet(validatable.getValue());
+ if (c != null && !c.isDeleted() && !c.getId().equals(ConfigForm.this.getModelObject().getId())) {
+ validatable.error(new ValidationError(getString("error.cfg.exist")));
+ }
+ }
+ }));
add(valueS.setLabel(Model.of(getString("271"))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
add(valueN.setLabel(Model.of(getString("271"))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
add(valueB.setLabel(Model.of(getString("271"))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
index 36b4b4c..21f23c8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
@@ -48,9 +48,12 @@ public class ConfigsPanel extends AdminBasePanel {
public ConfigsPanel(String id) {
super(id);
+ }
+ @Override
+ protected void onInitialize() {
SearchableDataView<Configuration> dataView = new SearchableDataView<Configuration>("configList"
- , new SearchableDataProvider<>(ConfigurationDao.class)) {
+ , new SearchableDataProvider<>(ConfigurationDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -92,5 +95,6 @@ public class ConfigsPanel extends AdminBasePanel {
form = new ConfigForm("form", listContainer, new Configuration());
form.showNewRecord();
add(form);
+ super.onInitialize();
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
index b992f53..69fed3d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/AddLanguageDialog.java
@@ -25,7 +25,6 @@ import java.util.Locale;
import java.util.Map;
import org.apache.openmeetings.db.dao.label.LabelDao;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.form.Form;
@@ -43,13 +42,13 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class AddLanguageDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final DialogButton add = new DialogButton("add", Application.getString("366"));
+ private DialogButton add;
private final Form<Void> form = new Form<>("addLangForm");
private final RequiredTextField<String> iso = new RequiredTextField<>("iso", Model.of(""));
private final LangPanel langPanel;
public AddLanguageDialog(String id, final LangPanel langPanel) {
- super(id, Application.getString("362"));
+ super(id, "");
this.langPanel = langPanel;
add(form.add(feedback, iso.setOutputMarkupId(true)));
iso.add(new IValidator<String>() {
@@ -75,6 +74,13 @@ public class AddLanguageDialog extends AbstractFormDialog<String> {
}
@Override
+ protected void onInitialize() {
+ add = new DialogButton("add", getString("366"));
+ getTitle().setObject(getString("362"));
+ super.onInitialize();
+ }
+
+ @Override
public Form<?> getForm() {
return form;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
index b1fadae..677e656 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
@@ -75,15 +75,18 @@ public class LangPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(LangPanel.class, getWebAppRootKey());
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final LangForm langForm;
- private FileUploadField fileUploadField;
+ private LangForm langForm;
+ private final FileUploadField fileUploadField = new FileUploadField("fileInput");
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
Map.Entry<Long, Locale> language;
public LangPanel(String id) {
super(id);
+ }
+ @Override
+ protected void onInitialize() {
// Create feedback panels
add(feedback.setOutputMarkupId(true));
language = new AbstractMap.SimpleEntry<>(1L, Locale.ENGLISH);
@@ -146,7 +149,6 @@ public class LangPanel extends AdminBasePanel {
add(container.getLinks());
add(navigator);
langForm = new LangForm("langForm", listContainer, this);
- fileUploadField = new FileUploadField("fileInput");
langForm.add(fileUploadField);
langForm.add(new UploadProgressBar("progress", langForm, fileUploadField));
fileUploadField.add(new AjaxFormSubmitBehavior(langForm, "change") {
@@ -240,11 +242,6 @@ public class LangPanel extends AdminBasePanel {
}
});
add(BootstrapFileUploadBehavior.INSTANCE);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
add(new ConfirmableAjaxBorder("deleteLangBtn", getString("80"), getString("833")) {
private static final long serialVersionUID = 1L;
@@ -257,6 +254,7 @@ public class LangPanel extends AdminBasePanel {
target.add(listContainer);
}
});
+ super.onInitialize();
}
public LangForm getLangForm() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
index e4c0ec9..c1276b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapForm.java
@@ -23,7 +23,6 @@ import static org.apache.openmeetings.web.app.Application.getBean;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.entity.server.LdapConfig;
import org.apache.openmeetings.web.admin.AdminBaseForm;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.DateLabel;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -54,13 +53,11 @@ public class LdapForm extends AdminBaseForm<LdapConfig> {
setOutputMarkupId(true);
this.listContainer = listContainer;
- add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString("165"))));
add(new CheckBox("active"));
add(new DateLabel("inserted"));
add(new Label("insertedby.login"));
add(new DateLabel("updated"));
add(new Label("updatedby.login"));
- add(new RequiredTextField<String>("configFileName").setLabel(Model.of(Application.getString("1115"))));
add(new CheckBox("addDomainToUserName"));
add(new TextField<String>("domain"));
add(new TextArea<String>("comment"));
@@ -71,6 +68,13 @@ public class LdapForm extends AdminBaseForm<LdapConfig> {
}
@Override
+ protected void onInitialize() {
+ add(new RequiredTextField<String>("name").setLabel(Model.of(getString("165"))));
+ add(new RequiredTextField<String>("configFileName").setLabel(Model.of(getString("1115"))));
+ super.onInitialize();
+ }
+
+ @Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
setModelObject(getBean(LdapConfigDao.class).update(getModelObject(), WebSession.getUserId()));
hideNewRecord();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
index 770c8cc..4819948 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
@@ -48,8 +48,12 @@ public class LdapsPanel extends AdminBasePanel {
public LdapsPanel(String id) {
super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
SearchableDataView<LdapConfig> dataView = new SearchableDataView<LdapConfig>("ldapList"
- , new SearchableDataProvider<>(LdapConfigDao.class)) {
+ , new SearchableDataProvider<>(LdapConfigDao.class)) {
private static final long serialVersionUID = 1L;
@Override
@@ -91,5 +95,7 @@ public class LdapsPanel extends AdminBasePanel {
form = new LdapForm("form", listContainer, new LdapConfig());
form.showNewRecord();
add(form);
+
+ super.onInitialize();
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
index 91b05c6..4a4608e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthForm.java
@@ -52,20 +52,7 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
setOutputMarkupId(true);
add(new CheckBox("isEnabled"));
- add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString("165"))));
- add(new TextField<String>("iconUrl").setLabel(Model.of(Application.getString("1575"))));
- add(new RequiredTextField<String>("clientId").setLabel(Model.of(Application.getString("1576"))));
- add(new RequiredTextField<String>("clientSecret").setLabel(Model.of(Application.getString("1577"))));
- add(redirectUriText = (TextField<String>) new TextField<>("redirectUri", Model.of("")).setLabel(Model.of(Application.getString("1587"))));
- add(new RequiredTextField<String>("requestKeyUrl").setLabel(Model.of(Application.getString("1578"))));
- add(new RequiredTextField<String>("requestTokenUrl").setLabel(Model.of(Application.getString("1579"))));
- add(new RequiredTextField<String>("requestTokenAttributes").setLabel(Model.of(Application.getString("1586"))));
- add(new RequiredTextField<String>("requestInfoUrl").setLabel(Model.of(Application.getString("1580"))));
add(new DropDownChoice<>("requestTokenMethod", Arrays.asList(RequestMethod.values()), new ChoiceRenderer<RequestMethod>("name", "name")));
- add(new RequiredTextField<String>("loginParamName").setLabel(Model.of(Application.getString("1582"))));
- add(new RequiredTextField<String>("emailParamName").setLabel(Model.of(Application.getString("1583"))));
- add(new TextField<String>("firstnameParamName").setLabel(Model.of(Application.getString("1584"))));
- add(new TextField<String>("lastnameParamName").setLabel(Model.of(Application.getString("1585"))));
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
@@ -73,6 +60,24 @@ public class OAuthForm extends AdminBaseForm<OAuthServer> {
}
@Override
+ protected void onInitialize() {
+ add(new RequiredTextField<String>("name").setLabel(Model.of(getString("165"))));
+ add(new TextField<String>("iconUrl").setLabel(Model.of(getString("1575"))));
+ add(new RequiredTextField<String>("clientId").setLabel(Model.of(getString("1576"))));
+ add(new RequiredTextField<String>("clientSecret").setLabel(Model.of(getString("1577"))));
+ add(redirectUriText = (TextField<String>) new TextField<>("redirectUri", Model.of("")).setLabel(Model.of(getString("1587"))));
+ add(new RequiredTextField<String>("requestKeyUrl").setLabel(Model.of(getString("1578"))));
+ add(new RequiredTextField<String>("requestTokenUrl").setLabel(Model.of(getString("1579"))));
+ add(new RequiredTextField<String>("requestTokenAttributes").setLabel(Model.of(getString("1586"))));
+ add(new RequiredTextField<String>("requestInfoUrl").setLabel(Model.of(getString("1580"))));
+ add(new RequiredTextField<String>("loginParamName").setLabel(Model.of(getString("1582"))));
+ add(new RequiredTextField<String>("emailParamName").setLabel(Model.of(getString("1583"))));
+ add(new TextField<String>("firstnameParamName").setLabel(Model.of(getString("1584"))));
+ add(new TextField<String>("lastnameParamName").setLabel(Model.of(getString("1585"))));
+ super.onInitialize();
+ }
+
+ @Override
protected void onModelChanged() {
super.onModelChanged();
redirectUriText.setModelObject(getRedirectUri(getModelObject()));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
index d3549e8..b2e675a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
@@ -42,6 +42,10 @@ public class OAuthPanel extends AdminBasePanel {
public OAuthPanel(String id) {
super(id);
+ }
+
+ @Override
+ protected void onInitialize() {
SearchableDataView<OAuthServer> dataView = new SearchableDataView<OAuthServer>("oauthServersList",
new SearchableDataProvider<>(OAuth2Dao.class))
{
@@ -86,5 +90,6 @@ public class OAuthPanel extends AdminBasePanel {
form = new OAuthForm("form", listContainer, new OAuthServer());
form.showNewRecord();
add(form);
+ super.onInitialize();
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
index 3f81565..6cb680c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java
@@ -50,7 +50,6 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.service.user.UserManager;
import org.apache.openmeetings.web.admin.AdminBaseForm;
import org.apache.openmeetings.web.admin.AdminUserChoiceProvider;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.util.RestrictiveChoiceProvider;
import org.apache.openmeetings.web.util.RoomTypeDropDown;
@@ -128,7 +127,7 @@ public class RoomForm extends AdminBaseForm<Room> {
protected void onInitialize() {
super.onInitialize();
RequiredTextField<String> name = new RequiredTextField<>("name");
- name.setLabel(new Model<>(Application.getString("165")));
+ name.setLabel(new Model<>(getString("165")));
add(name);
add(new DropDownChoice<>("capacity", //
@@ -145,7 +144,7 @@ public class RoomForm extends AdminBaseForm<Room> {
}
}));
- add(new RoomTypeDropDown("type").setRequired(true).setLabel(Model.of(Application.getString("45"))));
+ add(new RoomTypeDropDown("type").setRequired(true).setLabel(Model.of(getString("45"))));
add(new TextArea<String>("comment"));
@@ -197,7 +196,7 @@ public class RoomForm extends AdminBaseForm<Room> {
add(new CheckBox("isDemoRoom"));
TextField<Integer> demoTime = new TextField<>("demoTime");
- demoTime.setLabel(new Model<>(Application.getString("637")));
+ demoTime.setLabel(new Model<>(getString("637")));
add(demoTime);
add(new CheckBox("allowUserQuestions"));
add(new CheckBox("audioOnly"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index 91e3068..9ae0c46 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -47,7 +47,6 @@ import org.apache.openmeetings.db.entity.user.User.Right;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.service.mail.EmailManager;
import org.apache.openmeetings.web.admin.AdminBaseForm;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.ComunityUserForm;
import org.apache.openmeetings.web.common.GeneralUserForm;
import org.apache.openmeetings.web.util.DateLabel;
@@ -108,7 +107,7 @@ public class UserForm extends AdminBaseForm<User> {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
add(password.setResetPassword(false).setLabel(Model.of(getString("110"))).setRequired(false)
.add(passValidator = new StrongPasswordValidator(getMinPasswdLength(cfgDao), getModelObject())));
- login.setLabel(Model.of(Application.getString("108")));
+ login.setLabel(Model.of(getString("108")));
add(login.add(minimumLength(getMinLoginLength(cfgDao))));
add(new DropDownChoice<>("type", Arrays.asList(Type.values())).add(new OnChangeAjaxBehavior() {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
----------------------------------------------------------------------
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 f1afc7d..fbe680b 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
@@ -26,7 +26,6 @@ import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.admin.AdminBasePanel;
import org.apache.openmeetings.web.admin.SearchableDataView;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.PagedEntityListPanel;
import org.apache.openmeetings.web.data.DataViewContainer;
import org.apache.openmeetings.web.data.OmOrderByBorder;
@@ -49,14 +48,6 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
public class UsersPanel extends AdminBasePanel {
private static final long serialVersionUID = 1L;
final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
- private final MessageDialog warning = new MessageDialog("warning", Application.getString("797"), Application.getString("warn.nogroup"), DialogButtons.OK, DialogIcon.WARN) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
- //no-op
- }
- };
private UserForm form;
public UsersPanel(String id) {
@@ -102,10 +93,23 @@ public class UsersPanel extends AdminBasePanel {
.addLink(new OmOrderByBorder<>("orderByLastName", "lastname", container));
add(container.getLinks());
add(navigator);
+ }
+
+ @Override
+ protected void onInitialize() {
+ final MessageDialog warning = new MessageDialog("warning", getString("797"), getString("warn.nogroup"), DialogButtons.OK, DialogIcon.WARN) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClose(IPartialPageRequestHandler handler, DialogButton button) {
+ //no-op
+ }
+ };
UserDao userDao = getBean(UserDao.class);
form = new UserForm("form", listContainer, userDao.getNewUserInstance(userDao.get(getUserId())), warning);
form.showNewRecord();
add(form, warning);
+ super.onInitialize();
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 15e6fa3..de4bd72 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 721658d..96c5de8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -153,7 +153,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="308"><![CDATA[خروج]]></entry>
<entry key="309"><![CDATA[عودة الى غرف]]></entry>
<entry key="310"><![CDATA[خروج]]></entry>
- <entry key="311"><![CDATA[Desktop Viewer]]></entry>
+ <entry key="311"><![CDATA[Forgotten your password?]]></entry>
<entry key="312"><![CDATA[start Desktop Viewer]]></entry>
<entry key="313"><![CDATA[صوت و صورة]]></entry>
<entry key="314"><![CDATA[دردشة]]></entry>
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index b233d99..3a2f8fe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index f42d64a..6b4bc94 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 74eaea3..654e060 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 2883503..8e6067d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index 7447c35..111436e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Builddate]]></entry>
<entry key="1555"><![CDATA[heute]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mär</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">Mai</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Okt</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dez</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[OAuth2 Konfigurationen]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index bfc0ec5..afbcee6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index 4067d20..b219140 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revisión]]></entry>
<entry key="1553"><![CDATA[Fecha de construcción]]></entry>
<entry key="1555"><![CDATA[hoy]]></entry>
+ <entry key="1556">Ene</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Abr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Ago</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dic</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Administrar configuraciones de OAuth2]]></entry>
<entry key="1575"><![CDATA[Icono URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 1b729fd..75bb438 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 8df49ae..6caabb0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 1bd4b38..5e4510d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Révision]]></entry>
<entry key="1553"><![CDATA[Date de compilation]]></entry>
<entry key="1555"><![CDATA[aujourd'hui]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Fév</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Avr</entry>
+ <entry key="1560">Mai</entry>
+ <entry key="1561">Jui</entry>
+ <entry key="1562">Juil</entry>
+ <entry key="1563">Aou</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Déc</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Gérer les configurations OAuth2 ]]></entry>
<entry key="1575"><![CDATA[URL de l'icône]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 876b7dd..27a9246 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index 15e6fa3..de4bd72 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index d240af1..7ee0dff 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[ma]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index d3277a7..acdadad 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index ed227cc..09944a8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revisione]]></entry>
<entry key="1553"><![CDATA[Data Build]]></entry>
<entry key="1555"><![CDATA[oggi]]></entry>
+ <entry key="1556">Gen</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">Mag</entry>
+ <entry key="1561">Giu</entry>
+ <entry key="1562">Lug</entry>
+ <entry key="1563">Ago</entry>
+ <entry key="1564">Set</entry>
+ <entry key="1565">Ott</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dic</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Gestisci le configurazioni OAuth2]]></entry>
<entry key="1575"><![CDATA[URL Icona]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index aa30d12..8e2a6a8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[リビジョン]]></entry>
<entry key="1553"><![CDATA[ビルド日時]]></entry>
<entry key="1555"><![CDATA[今日]]></entry>
+ <entry key="1556">1月</entry>
+ <entry key="1557">2月</entry>
+ <entry key="1558">3月</entry>
+ <entry key="1559">4月</entry>
+ <entry key="1560">5月</entry>
+ <entry key="1561">6月</entry>
+ <entry key="1562">7月</entry>
+ <entry key="1563">8月</entry>
+ <entry key="1564">9月</entry>
+ <entry key="1565">10月</entry>
+ <entry key="1566">11月</entry>
+ <entry key="1567">12月</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[OAuth2設定]]></entry>
<entry key="1575"><![CDATA[アイコンURL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 26fe9fc..d48511e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 2972494..73dd85f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 73edd80..f6e4763 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index 47f1c1e..d420650 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index 13beec5..bd4f7dd 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index 1d7ba21..8b01e98 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Ревизия]]></entry>
<entry key="1553"><![CDATA[Дата билда]]></entry>
<entry key="1555"><![CDATA[сегодня]]></entry>
+ <entry key="1556">Янв</entry>
+ <entry key="1557">Фев</entry>
+ <entry key="1558">Март</entry>
+ <entry key="1559">Апр</entry>
+ <entry key="1560">Май</entry>
+ <entry key="1561">Июнь</entry>
+ <entry key="1562">Июль</entry>
+ <entry key="1563">Авг</entry>
+ <entry key="1564">Сен</entry>
+ <entry key="1565">Окт</entry>
+ <entry key="1566">Ноя</entry>
+ <entry key="1567">Дек</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Конфигурировать OAuth2]]></entry>
<entry key="1575"><![CDATA[URL значка]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index 9f3c51e..2310752 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index f39c382..c2c0adb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 3926592..da01e2b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 107d9af..ba11910 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index f57f266..7529638 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Ревізія]]></entry>
<entry key="1553"><![CDATA[Дата білду]]></entry>
<entry key="1555"><![CDATA[сьогодні]]></entry>
+ <entry key="1556">Січ.</entry>
+ <entry key="1557">Лют.</entry>
+ <entry key="1558">Бер.</entry>
+ <entry key="1559">Квіт</entry>
+ <entry key="1560">Трав.</entry>
+ <entry key="1561">Черв.</entry>
+ <entry key="1562">Лип.</entry>
+ <entry key="1563">Серп.</entry>
+ <entry key="1564">Вер.</entry>
+ <entry key="1565">Жовт.</entry>
+ <entry key="1566">Лист.</entry>
+ <entry key="1567">Груд.</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Конфігурувати OAuth2]]></entry>
<entry key="1575"><![CDATA[URL значка]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 9d84306..310408a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[修改版本]]></entry>
<entry key="1553"><![CDATA[Build日期]]></entry>
<entry key="1555"><![CDATA[今天]]></entry>
+ <entry key="1556">一月</entry>
+ <entry key="1557">二月</entry>
+ <entry key="1558">三月</entry>
+ <entry key="1559">四月</entry>
+ <entry key="1560">五月</entry>
+ <entry key="1561">六月</entry>
+ <entry key="1562">七月</entry>
+ <entry key="1563">八月</entry>
+ <entry key="1564">九月</entry>
+ <entry key="1565">十月</entry>
+ <entry key="1566">十一月</entry>
+ <entry key="1567">十二月</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[oauth2配置管理]]></entry>
<entry key="1575"><![CDATA[链接图标]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 68c54ad..bb94962 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -609,6 +609,18 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="1552"><![CDATA[Revision]]></entry>
<entry key="1553"><![CDATA[Build date]]></entry>
<entry key="1555"><![CDATA[today]]></entry>
+ <entry key="1556">Jan</entry>
+ <entry key="1557">Feb</entry>
+ <entry key="1558">Mar</entry>
+ <entry key="1559">Apr</entry>
+ <entry key="1560">May</entry>
+ <entry key="1561">Jun</entry>
+ <entry key="1562">Jul</entry>
+ <entry key="1563">Aug</entry>
+ <entry key="1564">Sep</entry>
+ <entry key="1565">Oct</entry>
+ <entry key="1566">Nov</entry>
+ <entry key="1567">Dec</entry>
<entry key="1571"><![CDATA[OAuth2]]></entry>
<entry key="1572"><![CDATA[Manage OAuth2 configurations]]></entry>
<entry key="1575"><![CDATA[Icon URL]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index fa1e521..4c6eaed 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -36,7 +36,6 @@ import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Salutation;
import org.apache.openmeetings.util.CalendarHelper;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.CountryDropDown;
import org.apache.openmeetings.web.util.RestrictiveChoiceProvider;
@@ -79,7 +78,7 @@ public class GeneralUserForm extends Form<User> {
protected void onInitialize() {
super.onInitialize();
add(email);
- email.setLabel(Model.of(Application.getString("119")));
+ email.setLabel(Model.of(getString("119")));
email.add(RfcCompliantEmailAddressValidator.getInstance());
add(new DropDownChoice<>("salutation"
, Arrays.asList(Salutation.values())
@@ -174,7 +173,7 @@ public class GeneralUserForm extends Form<User> {
protected void onValidate() {
User u = getModelObject();
if(!getBean(UserDao.class).checkEmail(email.getConvertedInput(), u.getType(), u.getDomainId(), u.getId())) {
- error(Application.getString("error.email.inuse"));
+ error(getString("error.email.inuse"));
}
super.onValidate();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.java
----------------------------------------------------------------------
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 eb0f146..dd2fa01 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
@@ -22,7 +22,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.openmeetings.db.entity.room.Invitation;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.Form;
@@ -31,17 +30,26 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class InvitationDialog extends AbstractFormDialog<Invitation> {
private static final long serialVersionUID = 1L;
- public final DialogButton generate = new DialogButton("generate", Application.getString("1526"));
- public final DialogButton send = new DialogButton("send", Application.getString("218"));
- public final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
+ public DialogButton generate;
+ public DialogButton send;
+ public DialogButton cancel;
private final InvitationForm form;
public InvitationDialog(String id, final InvitationForm _form) {
- super(id, Application.getString("213"),_form.getModel());
+ super(id, "",_form.getModel());
add(form = _form);
}
@Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("213"));
+ generate = new DialogButton("generate", getString("1526"));
+ send = new DialogButton("send", getString("218"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ super.onInitialize();
+ }
+
+ @Override
public int getWidth() {
return 500;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
index 3bf83fd..5b3af5b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationForm.java
@@ -39,7 +39,6 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.entity.user.User.Type;
import org.apache.openmeetings.service.room.InvitationManager;
import org.apache.openmeetings.util.crypt.CryptProvider;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.util.UserMultiChoice;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -70,7 +69,7 @@ public abstract class InvitationForm extends Form<Invitation> {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(InvitationForm.class, getWebAppRootKey());
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final PasswordTextField passwd;
+ private final PasswordTextField passwd = new PasswordTextField("password");
private final DropDownChoice<String> timeZoneId = new DropDownChoice<>("timeZoneId", Model.of((String)null), AVAILABLE_TIMEZONES);
private final OmDateTimePicker from = new OmDateTimePicker("from", Model.of(LocalDateTime.now()));
private final OmDateTimePicker to = new OmDateTimePicker("to", Model.of(LocalDateTime.now()));
@@ -84,9 +83,12 @@ public abstract class InvitationForm extends Form<Invitation> {
public InvitationForm(String id) {
super(id, new CompoundPropertyModel<>(new Invitation()));
setOutputMarkupId(true);
+ }
+ @Override
+ protected void onInitialize() {
add(subject, message);
- recipients.setLabel(Model.of(Application.getString("216"))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") {
+ recipients.setLabel(Model.of(getString("216"))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@Override
@@ -118,9 +120,9 @@ public abstract class InvitationForm extends Form<Invitation> {
add(valid.add(new Radio<>("one", Model.of(Valid.OneTime))
, new Radio<>("period", Model.of(Valid.Period))
, new Radio<>("endless", Model.of(Valid.Endless))));
- add(passwd = new PasswordTextField("password"));
+ add(passwd);
Invitation i = getModelObject();
- passwd.setLabel(Model.of(Application.getString("110"))).setOutputMarkupId(true).setEnabled(i.isPasswordProtected());
+ passwd.setLabel(Model.of(getString("110"))).setOutputMarkupId(true).setEnabled(i.isPasswordProtected());
add(from, to, timeZoneId);
from.setEnabled(i.getValid() == Valid.Period).setOutputMarkupId(true);
to.setEnabled(i.getValid() == Valid.Period).setOutputMarkupId(true);
@@ -135,6 +137,7 @@ public abstract class InvitationForm extends Form<Invitation> {
});
add(url.setOutputMarkupId(true));
add(lang, feedback);
+ super.onInitialize();
}
protected void updateButtons(AjaxRequestTarget target) {
@@ -146,7 +149,7 @@ public abstract class InvitationForm extends Form<Invitation> {
@Override
protected void onValidate() {
if (from.getConvertedInput() != null && to.getConvertedInput() != null && from.getConvertedInput().isAfter(to.getConvertedInput())) {
- error(Application.getString("1592"));
+ error(getString("1592"));
}
}
[2/3] openmeetings git commit: [OPENMEETINGS-1790] getString should
be used were it is possible instead of Application.getString
Posted by so...@apache.org.
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
index 28c175f..611bd6e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/MainPanel.java
@@ -100,10 +100,10 @@ public class MainPanel extends Panel {
private static final String DELIMITER = " ";
private final WebMarkupContainer EMPTY = new WebMarkupContainer(CHILD_ID);
private String uid = null;
- private final MenuPanel menu;
+ private MenuPanel menu;
private final WebMarkupContainer topControls = new WebMarkupContainer("topControls");
private final WebMarkupContainer topLinks = new WebMarkupContainer("topLinks");
- private final MarkupContainer contents;
+ private final MarkupContainer contents = new WebMarkupContainer("contents");
private ChatPanel chat;
private MessageDialog newMessage;
private UserInfoDialog userInfo;
@@ -129,8 +129,6 @@ public class MainPanel extends Panel {
setAuto(true);
setOutputMarkupId(true);
setOutputMarkupPlaceholderTag(true);
- menu = new MenuPanel("menu", getMainMenu());
- contents = new WebMarkupContainer("contents");
pingTimer.stop(null);
add(pingTimer, new WebSocketBehavior() {
private static final long serialVersionUID = 1L;
@@ -187,7 +185,7 @@ public class MainPanel extends Panel {
@Override
protected void onInitialize() {
- super.onInitialize();
+ menu = new MenuPanel("menu", getMainMenu());
add(topControls.setOutputMarkupPlaceholderTag(true).setMarkupId("topControls"));
add(contents.add(getClient() == null || panel == null ? EMPTY : panel).setOutputMarkupId(true).setMarkupId("contents"));
topControls.add(menu.setVisible(false), topLinks.setVisible(false).setOutputMarkupPlaceholderTag(true).setMarkupId("topLinks"));
@@ -301,6 +299,7 @@ public class MainPanel extends Panel {
setResponsePage(Application.get().getSignInPageClass());
}
});
+ super.onInitialize();
}
private IMenuItem getSubItem(String lbl, String title, MenuActions action, MenuParams param) {
@@ -321,7 +320,7 @@ public class MainPanel extends Panel {
List<IMenuItem> l = new ArrayList<>();
l.add(getSubItem("290", "1450", MenuActions.dashboardModuleStartScreen, null));
l.add(getSubItem("291", "1451", MenuActions.dashboardModuleCalendar, null));
- mmenu.add(new OmMenuItem(Application.getString("124"), l));
+ mmenu.add(new OmMenuItem(getString("124"), l));
}
{
// Conference Menu Points
@@ -346,13 +345,13 @@ public class MainPanel extends Panel {
}
});
}
- mmenu.add(new OmMenuItem(Application.getString("792"), l));
+ mmenu.add(new OmMenuItem(getString("792"), l));
}
{
// Recording Menu Points
List<IMenuItem> l = new ArrayList<>();
l.add(getSubItem("395", "1452", MenuActions.recordModule, null));
- mmenu.add(new OmMenuItem(Application.getString("395"), l));
+ mmenu.add(new OmMenuItem(getString("395"), l));
}
Set<Right> r = WebSession.getRights();
boolean isAdmin = hasAdminLevel(r);
@@ -373,7 +372,7 @@ public class MainPanel extends Panel {
l.add(getSubItem("367", "1461", MenuActions.adminModuleBackup, null));
l.add(getSubItem("main.menu.admin.email", "main.menu.admin.email.desc", MenuActions.adminModuleEmail, null));
}
- mmenu.add(new OmMenuItem(Application.getString("6"), l));
+ mmenu.add(new OmMenuItem(getString("6"), l));
}
return mmenu;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/NameDialog.java
----------------------------------------------------------------------
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 10c1ad8..97396df 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
@@ -21,7 +21,6 @@ package org.apache.openmeetings.web.common;
import java.util.Arrays;
import java.util.List;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -37,8 +36,8 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public abstract class NameDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
- private final DialogButton add;
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
+ private DialogButton add;
+ private DialogButton cancel;
private final Form<String> form;
protected final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final String name;
@@ -51,14 +50,14 @@ public abstract class NameDialog extends AbstractFormDialog<String> {
public NameDialog(String id, String name) {
super(id, "", Model.of(name));
this.name = name;
- add = new DialogButton("add", getAddStr());
form = new Form<>("form", getModel());
}
@Override
protected void onInitialize() {
- super.onInitialize();
setTitle(Model.of(getTitleStr()));
+ add = new DialogButton("add", getAddStr());
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
form.add(new Label("label", getLabelStr())
, title = new RequiredTextField<>("title", getModel())
, feedback.setOutputMarkupId(true)
@@ -77,6 +76,7 @@ public abstract class NameDialog extends AbstractFormDialog<String> {
});
title.setLabel(Model.of(getLabelStr()));
add(form.setOutputMarkupId(true));
+ super.onInitialize();
}
@Override
@@ -120,6 +120,6 @@ public abstract class NameDialog extends AbstractFormDialog<String> {
}
protected String getAddStr() {
- return Application.getString("1261");
+ return getString("1261");
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
index 0c49b65..45629f9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/tree/ConvertingErrorsDialog.java
@@ -27,7 +27,6 @@ import java.util.List;
import org.apache.openmeetings.db.dao.file.FileItemLogDao;
import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.FileItemLog;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -59,11 +58,17 @@ public class ConvertingErrorsDialog extends AbstractDialog<BaseFileItem> {
};
public ConvertingErrorsDialog(String id, IModel<BaseFileItem> model) {
- super(id, Application.getString("887"), model);
+ super(id, "", model);
add(container.add(message.setVisible(false), logView.setVisible(false)).setOutputMarkupId(true));
}
@Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("887"));
+ super.onInitialize();
+ }
+
+ @Override
public int getWidth() {
return 600;
}
@@ -85,7 +90,7 @@ public class ConvertingErrorsDialog extends AbstractDialog<BaseFileItem> {
List<FileItemLog> logs = getBean(FileItemLogDao.class).get(f);
if (f.getHash() == null) {
message.setVisible(true);
- message.setDefaultModelObject(Application.getString("888"));
+ message.setDefaultModelObject(getString("888"));
} else if (!f.exists()) {
message.setVisible(true);
message.setDefaultModelObject(getString(f.getType() == BaseFileItem.Type.Recording ? "1595" : "convert.errors.file.missing"));
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
index ab410aa..55a687b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/InvitationPasswordDialog.java
@@ -23,7 +23,6 @@ import java.util.List;
import org.apache.openmeetings.db.entity.room.Invitation;
import org.apache.openmeetings.util.crypt.CryptProvider;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.IUpdatable;
import org.apache.openmeetings.web.util.NonClosableDialog;
@@ -45,21 +44,21 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class InvitationPasswordDialog extends NonClosableDialog<Invitation> {
private static final long serialVersionUID = 1L;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final DialogButton check = new DialogButton("check", Application.getString("537"));
+ private DialogButton check;
private final Form<Void> form = new Form<>("form");
private final PasswordTextField password = new PasswordTextField("password", Model.of((String)null));
private final IUpdatable comp;
public InvitationPasswordDialog(String id, IUpdatable comp) {
- super(id, Application.getString("230"));
+ super(id, "");
this.comp = comp;
- password.setLabel(Model.of(Application.getString("110"))).add(new IValidator<String>(){
+ password.add(new IValidator<String>(){
private static final long serialVersionUID = 1L;
@Override
public void validate(IValidatable<String> validatable) {
if (!CryptProvider.get().verify(validatable.getValue(), WebSession.get().getInvitation().getPassword())) {
- validatable.error(new ValidationError(Application.getString("error.bad.password")));
+ validatable.error(new ValidationError(getString("error.bad.password")));
}
}
});
@@ -83,6 +82,14 @@ public class InvitationPasswordDialog extends NonClosableDialog<Invitation> {
}
@Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("230"));
+ password.setLabel(Model.of(getString("110")));
+ check = new DialogButton("check", getString("537"));
+ super.onInitialize();
+ }
+
+ @Override
public void onConfigure(JQueryBehavior behavior) {
super.onConfigure(behavior);
Invitation i = WebSession.get().getInvitation();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
index 20b7107..b2d45e9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
@@ -35,7 +35,6 @@ import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.UserHelper;
import org.apache.openmeetings.service.mail.template.ResetPasswordTemplate;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.Captcha;
import org.apache.openmeetings.web.pages.ResetPage;
import org.apache.openmeetings.web.util.NonClosableMessageDialog;
@@ -66,8 +65,8 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ForgetPasswordDialog extends AbstractFormDialog<String> {
private static final Logger log = Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, getWebAppRootKey());
private static final long serialVersionUID = 1L;
- private final DialogButton send = new DialogButton("send", Application.getString("317"));
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
+ private DialogButton send;
+ private DialogButton cancel;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final IValidator<String> emailValidator = RfcCompliantEmailAddressValidator.getInstance();
private final RequiredTextField<String> name = new RequiredTextField<>("name", Model.of((String)null));
@@ -143,8 +142,9 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> {
@Override
protected void onInitialize() {
- super.onInitialize();
setTitle(Model.of(getString("312")));
+ send = new DialogButton("send", getString("317"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
add(form);
confirmDialog = new NonClosableMessageDialog("confirmDialog", getString("312"), getString("321")) {
private static final long serialVersionUID = 1L;
@@ -155,6 +155,7 @@ public class ForgetPasswordDialog extends AbstractFormDialog<String> {
}
};
add(confirmDialog);
+ super.onInitialize();
}
private void updateLabel(IPartialPageRequestHandler handler) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
index f5c38d3..a37a18e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
@@ -39,7 +39,6 @@ import org.apache.openmeetings.db.dao.user.IUserManager;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.Address;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.Captcha;
import org.apache.openmeetings.web.util.NonClosableDialog;
@@ -68,15 +67,8 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class RegisterDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(RegisterDialog.class, getWebAppRootKey());
- private DialogButton cancelBtn = new DialogButton("cancel", Application.getString("lbl.cancel"));
- private DialogButton registerBtn = new DialogButton("register", Application.getString("121")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isIndicating() {
- return true;
- }
- };
+ private DialogButton cancelBtn;
+ private DialogButton registerBtn;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final IModel<String> tzModel = Model.of(WebSession.get().getClientTZCode());
private RegisterForm form;
@@ -90,16 +82,29 @@ public class RegisterDialog extends NonClosableDialog<String> {
private String country;
private Long lang;
- final MessageDialog confirmRegistration;
+ MessageDialog confirmRegistration;
private boolean sendConfirmation = false;
private boolean sendEmailAtRegister = false;
public RegisterDialog(String id) {
- super(id, Application.getString("113"));
+ super(id, "");
add(form = new RegisterForm("form"));
form.setOutputMarkupId(true);
+ }
- confirmRegistration = new NonClosableMessageDialog("confirmRegistration", Application.getString("235"), Application.getString("warn.notverified")) {
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("113"));
+ cancelBtn = new DialogButton("cancel", getString("lbl.cancel"));
+ registerBtn = new DialogButton("register", getString("121")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isIndicating() {
+ return true;
+ }
+ };
+ confirmRegistration = new NonClosableMessageDialog("confirmRegistration", getString("235"), getString("warn.notverified")) {
private static final long serialVersionUID = 1L;
@Override
@@ -109,6 +114,7 @@ public class RegisterDialog extends NonClosableDialog<String> {
};
add(confirmRegistration);
reset(null);
+ super.onInitialize();
}
public void setSignInDialog(SignInDialog s) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
index 2cf393b..210f8ba 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
@@ -47,7 +47,7 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ResetPasswordDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
- private DialogButton resetBtn = new DialogButton("reset", Application.getString("327"));
+ private DialogButton resetBtn;
private Form<String> form = new ResetForm("form");
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private PasswordTextField password;
@@ -55,13 +55,14 @@ public class ResetPasswordDialog extends NonClosableDialog<String> {
MessageDialog confirmReset;
public ResetPasswordDialog(String id, final User user) {
- super(id, Application.getString("325"));
+ super(id, "");
this.user = user;
}
@Override
protected void onInitialize() {
- super.onInitialize();
+ getTitle().setObject(getString("325"));
+ resetBtn = new DialogButton("reset", getString("327"));
add(form);
confirmReset = new NonClosableMessageDialog("confirmReset", getString("325"), getString("332")) {
private static final long serialVersionUID = 1L;
@@ -72,6 +73,8 @@ public class ResetPasswordDialog extends NonClosableDialog<String> {
}
};
add(confirmReset);
+
+ super.onInitialize();
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index 55e3a35..e512e77 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -81,15 +81,8 @@ public class SignInDialog extends NonClosableDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(SignInDialog.class, getWebAppRootKey());
private Form<String> form;
- private DialogButton loginBtn = new DialogButton("login", Application.getString("112")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isIndicating() {
- return true;
- }
- };
- private DialogButton registerBtn = new DialogButton("register", Application.getString("123"));
+ private DialogButton loginBtn;
+ private DialogButton registerBtn;
private String password;
private String login;
private boolean rememberMe = false;
@@ -99,11 +92,26 @@ public class SignInDialog extends NonClosableDialog<String> {
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
public SignInDialog(String id) {
- super(id, Application.getString("108"));
+ super(id, "");
add(form = new SignInForm("signin"));
add(new OmAjaxClientInfoBehavior());
}
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("108"));
+ loginBtn = new DialogButton("login", getString("112")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isIndicating() {
+ return true;
+ }
+ };
+ registerBtn = new DialogButton("register", getString("123"));
+ super.onInitialize();
+ }
+
public void setRegisterDialog(RegisterDialog r) {
this.r = r;
}
@@ -224,9 +232,7 @@ public class SignInDialog extends NonClosableDialog<String> {
}
add(feedback.setOutputMarkupId(true));
add(loginField = new RequiredTextField<>("login", new PropertyModel<String>(SignInDialog.this, "login")));
- loginField.setLabel(Model.of(Application.getString("114")));
add(passField = new PasswordTextField("pass", new PropertyModel<String>(SignInDialog.this, "password")).setResetPassword(true));
- passField.setLabel(Model.of(Application.getString("110")));
List<LdapConfig> ldaps = getBean(LdapConfigDao.class).get();
int selectedLdap = getBean(ConfigurationDao.class).getInt(CONFIG_DEFAULT_LDAP_ID, 0);
domain = ldaps.get(selectedLdap < ldaps.size() && selectedLdap > 0 ? selectedLdap : 0);
@@ -291,6 +297,13 @@ public class SignInDialog extends NonClosableDialog<String> {
}).setVisible(allowOAuthLogin()));
}
+ @Override
+ protected void onInitialize() {
+ loginField.setLabel(Model.of(getString("114")));
+ passField.setLabel(Model.of(getString("110")));
+ super.onInitialize();
+ }
+
private void alreadyLoggedIn() {
// logon successful. Continue to the original destination
continueToOriginalDestination();
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/ExpiredMessageDialog.java
----------------------------------------------------------------------
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 2e51e1b..c921ba1 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,7 +18,6 @@
*/
package org.apache.openmeetings.web.room;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.room.menu.RoomMenuPanel;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -33,11 +32,17 @@ public class ExpiredMessageDialog extends MessageDialog {
private final RoomMenuPanel menu;
public ExpiredMessageDialog(String id, String message, RoomMenuPanel menu) {
- super(id, Application.getString("204"), message, DialogButtons.OK, DialogIcon.ERROR);
+ super(id, "", message, DialogButtons.OK, DialogIcon.ERROR);
this.menu = menu;
}
@Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("204"));
+ super.onInitialize();
+ }
+
+ @Override
public boolean isModal() {
return true;
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
index 60d0712..518cc46 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/NicknameDialog.java
@@ -28,7 +28,6 @@ import java.util.List;
import org.apache.commons.lang3.time.FastDateFormat;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.util.NonClosableDialog;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
@@ -47,23 +46,25 @@ public class NicknameDialog extends NonClosableDialog<User> {
private static final long serialVersionUID = 1L;
private static final FastDateFormat TIME_DF = FastDateFormat.getInstance("HH:mm:ss");
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final DialogButton ok = new DialogButton("ok", Application.getString("54"));
+ private DialogButton ok;
private final RoomPanel room;
private final Form<User> form;
public NicknameDialog(String id, final RoomPanel room) {
- super(id, Application.getString("1287"));
+ super(id, "");
this.room = room;
add(form = new Form<>("form", new CompoundPropertyModel<>(room.getClient().getUser())));
}
@Override
protected void onInitialize() {
- super.onInitialize();
+ getTitle().setObject(getString("1287"));
+ ok = new DialogButton("ok", getString("54"));
form.add(feedback);
- form.add(new RequiredTextField<String>("firstname").setLabel(Model.of(Application.getString("135"))).add(minimumLength(4)));
- form.add(new RequiredTextField<String>("lastname").setLabel(Model.of(Application.getString("136"))).add(minimumLength(4)));
- form.add(new RequiredTextField<String>("address.email").setLabel(Model.of(Application.getString("119"))).add(RfcCompliantEmailAddressValidator.getInstance()));
+ form.add(new RequiredTextField<String>("firstname").setLabel(Model.of(getString("135"))).add(minimumLength(4)));
+ form.add(new RequiredTextField<String>("lastname").setLabel(Model.of(getString("136"))).add(minimumLength(4)));
+ form.add(new RequiredTextField<String>("address.email").setLabel(Model.of(getString("119"))).add(RfcCompliantEmailAddressValidator.getInstance()));
+ super.onInitialize();
}
private static boolean isVisible(User u) {
@@ -77,7 +78,7 @@ public class NicknameDialog extends NonClosableDialog<User> {
User u = form.getModelObject();
boolean visible = isVisible(u);
if (visible) {
- u.setFirstname(Application.getString("433"));
+ u.setFirstname(getString("433"));
u.setLastname(String.format("%s %s", u.getFirstname(), TIME_DF.format(new Date())));
}
behavior.setOption("autoOpen", visible);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
index 10b9aaa..d0dd17f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/RedirectMessageDialog.java
@@ -43,7 +43,7 @@ public class RedirectMessageDialog extends NonClosableMessageDialog {
private Component label;
public RedirectMessageDialog(String id, String labelId, boolean autoOpen, String url) {
- super(id, Application.getString("204"), "", new ArrayList<DialogButton>(), DialogIcon.ERROR);
+ super(id, "", "", new ArrayList<DialogButton>(), DialogIcon.ERROR);
this.labelId = labelId;
this.url = url;
this.autoOpen = autoOpen;
@@ -51,10 +51,11 @@ public class RedirectMessageDialog extends NonClosableMessageDialog {
@Override
protected void onInitialize() {
- super.onInitialize();
+ getTitle().setObject(getString("204"));
if (autoOpen) {
startTimer(null);
}
+ super.onInitialize();
}
private void startTimer(IPartialPageRequestHandler handler) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
index a33eaa1..5c7a353 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/SwfPanel.java
@@ -27,7 +27,6 @@ import static org.apache.openmeetings.util.OpenmeetingsVariables.getWebAppRootKe
import java.net.URL;
import org.apache.openmeetings.util.OpenmeetingsVariables;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.BasePanel;
import org.apache.openmeetings.web.common.OmAjaxClientInfoBehavior;
import org.apache.openmeetings.web.util.ExtendedClientProperties;
@@ -143,10 +142,10 @@ public class SwfPanel extends BasePanel {
return SWF_TYPE_NETWORK.equals(type.toString()) ? "networktest.swf" : "";
}
- public static String getStringLabels(String... ids) {
+ public String getStringLabels(String... ids) {
JSONArray arr = new JSONArray();
for (String id : ids) {
- arr.put(new JSONObject().put("id", id).put("value", Application.getString(id)));
+ arr.put(new JSONObject().put("id", id).put("value", getString(id)));
}
return arr.toString();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
index 26a110e..efa3ab1 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomInvitationForm.java
@@ -33,7 +33,6 @@ import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.GroupUser;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.service.room.InvitationManager;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.GroupChoiceProvider;
import org.apache.openmeetings.web.common.InvitationForm;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -83,7 +82,7 @@ public class RoomInvitationForm extends InvitationForm {
}
}));
groupContainer.add(
- groups.setLabel(Model.of(Application.getString("126"))).setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") {
+ groups.setRequired(true).add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@Override
@@ -101,6 +100,12 @@ public class RoomInvitationForm extends InvitationForm {
}
@Override
+ protected void onInitialize() {
+ groups.setLabel(Model.of(getString("126")));
+ super.onInitialize();
+ }
+
+ @Override
protected void updateButtons(AjaxRequestTarget target) {
if (rdi.getModelObject() == InviteeType.user) {
super.updateButtons(target);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
index feaa09b..239ffca 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.java
@@ -48,7 +48,6 @@ import org.apache.openmeetings.db.entity.user.Group;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.ws.RoomMessage.Type;
import org.apache.openmeetings.db.util.ws.TextRoomMessage;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ImagePanel;
import org.apache.openmeetings.web.common.InvitationDialog;
@@ -78,7 +77,7 @@ public class RoomMenuPanel extends Panel {
private final VoteDialog vote;
private final PollResultsDialog pollResults;
private final SipDialerDialog sipDialer;
- private final MenuPanel menuPanel;
+ private MenuPanel menuPanel;
private final StartSharingButton shareBtn;
private final Label roomName;
private static final FastDateFormat df = FastDateFormat.getInstance("dd.MM.yyyy HH:mm");
@@ -99,119 +98,21 @@ public class RoomMenuPanel extends Panel {
}
};
private final RoomPanel room;
- private final RoomMenuItem exitMenuItem = new RoomMenuItem(Application.getString("308"), Application.getString("309"), "room menu exit") {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- exit(target);
- }
- };
- private final RoomMenuItem filesMenu = new RoomMenuItem(Application.getString("245"), null, false);
- private final RoomMenuItem actionsMenu = new RoomMenuItem(Application.getString("635"), null, false);
- private final RoomMenuItem inviteMenuItem = new RoomMenuItem(Application.getString("213"), Application.getString("1489"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- invite.updateModel(target);
- invite.open(target);
- }
- };
- private final RoomMenuItem shareMenuItem = new RoomMenuItem(Application.getString("239"), Application.getString("1480"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- shareBtn.onClick(target);
- }
- };
- private final RoomMenuItem applyModerMenuItem = new RoomMenuItem(Application.getString("784"), Application.getString("1481"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- room.requestRight(Room.Right.moderator, target);
- }
- };
- private final RoomMenuItem applyWbMenuItem = new RoomMenuItem(Application.getString("785"), Application.getString("1492"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- room.requestRight(Room.Right.whiteBoard, target);
- }
- };
- private final RoomMenuItem applyAvMenuItem = new RoomMenuItem(Application.getString("786"), Application.getString("1482"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- room.requestRight(Room.Right.video, target);
- }
- };
- private final RoomMenuItem pollCreateMenuItem = new RoomMenuItem(Application.getString("24"), Application.getString("1483"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- createPoll.updateModel(target);
- createPoll.open(target);
- }
- };
- private final RoomMenuItem pollVoteMenuItem = new RoomMenuItem(Application.getString("32"), Application.getString("1485"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- RoomPoll rp = getBean(PollDao.class).getByRoom(room.getRoom().getId());
- if (rp != null) {
- vote.updateModel(target, rp);
- vote.open(target);
- }
- }
- };
- private final RoomMenuItem pollResultMenuItem = new RoomMenuItem(Application.getString("37"), Application.getString("1484"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- pollResults.updateModel(target, room.getClient().hasRight(Room.Right.moderator));
- pollResults.open(target);
- }
- };
- private final RoomMenuItem sipDialerMenuItem = new RoomMenuItem(Application.getString("1447"), Application.getString("1488"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- sipDialer.open(target);
- }
- };
- private final RoomMenuItem downloadPngMenuItem = new RoomMenuItem(Application.getString("download.png"), Application.getString("download.png")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- download(target, EXTENSION_PNG);
- }
- };
- private final RoomMenuItem downloadJpgMenuItem = new RoomMenuItem(Application.getString("download.jpg"), Application.getString("download.jpg")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- download(target, EXTENSION_JPG);
- }
- };
- private final RoomMenuItem downloadPdfMenuItem = new RoomMenuItem(Application.getString("download.pdf"), Application.getString("download.pdf")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- download(target, EXTENSION_PDF);
- }
- };
+ private RoomMenuItem exitMenuItem;
+ private RoomMenuItem filesMenu;
+ private RoomMenuItem actionsMenu;
+ private RoomMenuItem inviteMenuItem;
+ private RoomMenuItem shareMenuItem;
+ private RoomMenuItem applyModerMenuItem;
+ private RoomMenuItem applyWbMenuItem;
+ private RoomMenuItem applyAvMenuItem;
+ private RoomMenuItem pollCreateMenuItem;
+ private RoomMenuItem pollVoteMenuItem;
+ private RoomMenuItem pollResultMenuItem;
+ private RoomMenuItem sipDialerMenuItem;
+ private RoomMenuItem downloadPngMenuItem;
+ private RoomMenuItem downloadJpgMenuItem;
+ private RoomMenuItem downloadPdfMenuItem;
private final ImagePanel logo = new ImagePanel("logo") {
private static final long serialVersionUID = 1L;
@@ -227,7 +128,6 @@ public class RoomMenuPanel extends Panel {
this.room = room;
Room r = room.getRoom();
setVisible(!r.isHidden(RoomElement.TopBar));
- add((menuPanel = new MenuPanel("menu", getMenu())).setVisible(isVisible()));
add((roomName = new Label("roomName", r.getName())).setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
String tag = getGroup().getTag();
add(logo, new Label("tag", tag).setVisible(!Strings.isEmpty(tag)));
@@ -251,7 +151,121 @@ public class RoomMenuPanel extends Panel {
@Override
protected void onInitialize() {
- super.onInitialize();
+ exitMenuItem = new RoomMenuItem(getString("308"), getString("309"), "room menu exit") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ exit(target);
+ }
+ };
+ filesMenu = new RoomMenuItem(getString("245"), null, false);
+ actionsMenu = new RoomMenuItem(getString("635"), null, false);
+ inviteMenuItem = new RoomMenuItem(getString("213"), getString("1489"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ invite.updateModel(target);
+ invite.open(target);
+ }
+ };
+ shareMenuItem = new RoomMenuItem(getString("239"), getString("1480"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ shareBtn.onClick(target);
+ }
+ };
+ applyModerMenuItem = new RoomMenuItem(getString("784"), getString("1481"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ room.requestRight(Room.Right.moderator, target);
+ }
+ };
+ applyWbMenuItem = new RoomMenuItem(getString("785"), getString("1492"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ room.requestRight(Room.Right.whiteBoard, target);
+ }
+ };
+ applyAvMenuItem = new RoomMenuItem(getString("786"), getString("1482"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ room.requestRight(Room.Right.video, target);
+ }
+ };
+ pollCreateMenuItem = new RoomMenuItem(getString("24"), getString("1483"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ createPoll.updateModel(target);
+ createPoll.open(target);
+ }
+ };
+ pollVoteMenuItem = new RoomMenuItem(getString("32"), getString("1485"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ RoomPoll rp = getBean(PollDao.class).getByRoom(room.getRoom().getId());
+ if (rp != null) {
+ vote.updateModel(target, rp);
+ vote.open(target);
+ }
+ }
+ };
+ pollResultMenuItem = new RoomMenuItem(getString("37"), getString("1484"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ pollResults.updateModel(target, room.getClient().hasRight(Room.Right.moderator));
+ pollResults.open(target);
+ }
+ };
+ sipDialerMenuItem = new RoomMenuItem(getString("1447"), getString("1488"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ sipDialer.open(target);
+ }
+ };
+ downloadPngMenuItem = new RoomMenuItem(getString("download.png"), getString("download.png")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ download(target, EXTENSION_PNG);
+ }
+ };
+ downloadJpgMenuItem = new RoomMenuItem(getString("download.jpg"), getString("download.jpg")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ download(target, EXTENSION_JPG);
+ }
+ };
+ downloadPdfMenuItem = new RoomMenuItem(getString("download.pdf"), getString("download.pdf")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ download(target, EXTENSION_PDF);
+ }
+ };
+ add((menuPanel = new MenuPanel("menu", getMenu())).setVisible(isVisible()));
+
add(askBtn.add(AttributeModifier.replace(ATTR_TITLE, getString("84"))));
Label demo = new Label("demo", Model.of(""));
Room r = room.getRoom();
@@ -271,6 +285,7 @@ public class RoomMenuPanel extends Panel {
}
});
}
+ super.onInitialize();
}
private List<IMenuItem> getMenu() {
@@ -278,7 +293,7 @@ public class RoomMenuPanel extends Panel {
exitMenuItem.setEnabled(false);
menu.add(exitMenuItem.setTop(true));
- filesMenu.getItems().add(new RoomMenuItem(Application.getString("15"), Application.getString("1479")) {
+ filesMenu.getItems().add(new RoomMenuItem(getString("15"), getString("1479")) {
private static final long serialVersionUID = 1L;
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
index d62da64..80fc131 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.java
@@ -24,7 +24,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.openmeetings.db.dao.room.SipDao;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
@@ -40,8 +39,8 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class SipDialerDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- private final DialogButton call = new DialogButton("call", Application.getString("1448"));
- private final DialogButton close = new DialogButton("close", Application.getString("85"));
+ private DialogButton call;
+ private DialogButton close;
private final Form<String> form = new Form<>("form", Model.of(""));
private final TextField<String> number = new TextField<>("number", Model.of(""));
private final RoomPanel room;
@@ -68,8 +67,10 @@ public class SipDialerDialog extends AbstractFormDialog<String> {
@Override
protected void onInitialize() {
- super.onInitialize();
setTitle(Model.of(getString("1003")));
+ call = new DialogButton("call", getString("1448"));
+ close = new DialogButton("close", getString("85"));
+ super.onInitialize();
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
index 2886e83..eddb908 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/StartSharingButton.java
@@ -41,7 +41,6 @@ import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.server.ISessionManager;
import org.apache.openmeetings.db.entity.basic.Client;
import org.apache.openmeetings.db.entity.room.Room;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.OmButton;
import org.apache.openmeetings.web.room.VideoSettings;
@@ -70,7 +69,6 @@ public class StartSharingButton extends OmButton {
this.uid = uid;
setOutputMarkupPlaceholderTag(true);
setVisible(false);
- add(AttributeModifier.replace(ATTR_TITLE, Application.getString("1480")));
add(download = new AjaxDownloadBehavior(new ResourceStreamResource() {
private static final long serialVersionUID = 1L;
@@ -89,6 +87,12 @@ public class StartSharingButton extends OmButton {
}
@Override
+ protected void onInitialize() {
+ add(AttributeModifier.replace(ATTR_TITLE, getString("1480")));
+ super.onInitialize();
+ }
+
+ @Override
public void onClick(AjaxRequestTarget target) {
try (InputStream jnlp = getClass().getClassLoader().getResourceAsStream("APPLICATION.jnlp")) {
ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
index e318d56..19f233a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.java
@@ -31,7 +31,6 @@ import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.ws.RoomMessage;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.MainPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
@@ -50,18 +49,26 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class CreatePollDialog extends AbstractFormDialog<RoomPoll> {
private static final long serialVersionUID = 1L;
- private final DialogButton create = new DialogButton("create", Application.getString("22"));
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
+ private DialogButton create;
+ private DialogButton cancel;
private final Long roomId;
private final PollForm form;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
public CreatePollDialog(String id, Long roomId) {
- super(id, Application.getString("18"), new CompoundPropertyModel<>(new RoomPoll()));
+ super(id, "", new CompoundPropertyModel<>(new RoomPoll()));
this.roomId = roomId;
add(form = new PollForm("form", getModel()));
}
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("18"));
+ create = new DialogButton("create", getString("22"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ super.onInitialize();
+ }
+
public void updateModel(AjaxRequestTarget target) {
RoomPoll p = new RoomPoll();
User u = getBean(UserDao.class).get(getUserId());
@@ -105,7 +112,11 @@ public class CreatePollDialog extends AbstractFormDialog<RoomPoll> {
public PollForm(String id, IModel<RoomPoll> model) {
super(id, model);
- add(new RequiredTextField<String>("name").setLabel(Model.of(Application.getString("1410"))));
+ }
+
+ @Override
+ protected void onInitialize() {
+ add(new RequiredTextField<String>("name").setLabel(Model.of(getString("1410"))));
add(new TextArea<String>("question"));
add(new DropDownChoice<>("type", Arrays.asList(RoomPoll.Type.values())
, new ChoiceRenderer<RoomPoll.Type>() {
@@ -121,8 +132,9 @@ public class CreatePollDialog extends AbstractFormDialog<RoomPoll> {
return pt.name();
}
})
- .setRequired(true).setLabel(Model.of(Application.getString("21"))));
+ .setRequired(true).setLabel(Model.of(getString("21"))));
add(feedback);
+ super.onInitialize();
}
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
index 9d6cbca..a621fbe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.java
@@ -29,7 +29,6 @@ import org.apache.openmeetings.db.dao.room.PollDao;
import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
import org.apache.openmeetings.db.util.ws.RoomMessage;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.MainPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
@@ -42,7 +41,6 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
import org.wicketstuff.jqplot.behavior.JqPlotBehavior;
@@ -75,20 +73,28 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
private final Long roomId;
private final PollSelectForm selForm;
private final PollResultsForm dispForm;
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
- private final DialogButton close = new DialogButton("close", Application.getString("1418"));
- private final DialogButton delete = new DialogButton("delete", Application.getString("1420"));
+ private DialogButton cancel;
+ private DialogButton close;
+ private DialogButton delete;
private boolean moderator = false;
- private final MessageDialog closeConfirm;
- private final MessageDialog deleteConfirm;
+ private MessageDialog closeConfirm;
+ private MessageDialog deleteConfirm;
private boolean opened = false;
public PollResultsDialog(String id, Long _roomId) {
- super(id, Application.getString("37"));
+ super(id, "");
this.roomId = _roomId;
add(selForm = new PollSelectForm("selForm"));
add(dispForm = new PollResultsForm("dispForm"));
- add(closeConfirm = new MessageDialog("closeConfirm", Application.getString("1418"), Application.getString("1419"), DialogButtons.YES_NO, DialogIcon.WARN) {
+ }
+
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("37"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ close = new DialogButton("close", getString("1418"));
+ delete = new DialogButton("delete", getString("1420"));
+ add(closeConfirm = new MessageDialog("closeConfirm", getString("1418"), getString("1419"), DialogButtons.YES_NO, DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
@Override
@@ -105,7 +111,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
}
}
});
- add(deleteConfirm = new MessageDialog("deleteConfirm", Application.getString("1420"), Application.getString("1421"), DialogButtons.YES_NO, DialogIcon.WARN) {
+ add(deleteConfirm = new MessageDialog("deleteConfirm", getString("1420"), getString("1421"), DialogButtons.YES_NO, DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
@Override
@@ -118,6 +124,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
}
}
});
+ super.onInitialize();
}
@Override
@@ -207,10 +214,10 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
return opened;
}
- private static String[] getTicks(RoomPoll p) {
+ private String[] getTicks(RoomPoll p) {
return p != null && RoomPoll.Type.numeric == p.getType()
? new String[] {"1", "2", "3", "4", "5", "6", "7", "8", "9", "10"}
- : new String[] {Application.getString("34"), Application.getString("35")};
+ : new String[] {getString("34"), getString("35")};
}
private static Integer[] initValues(int size) {
@@ -235,7 +242,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
return values;
}
- private static BarChart<Integer> barChart(RoomPoll p) {
+ private BarChart<Integer> barChart(RoomPoll p) {
String[] ticks = getTicks(p);
BarChart<Integer> barChart = new BarChart<>(null);
barChart.addValue(Arrays.asList(getValues(p)));
@@ -269,7 +276,7 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
@Override
public Object getDisplayValue(RoomPoll object) {
- return object == null ? "" : String.format("%s%s", object.getName(), object.isArchived() ? "" : String.format(" (%s)", Application.getString("1413")));
+ return object == null ? "" : String.format("%s%s", object.getName(), object.isArchived() ? "" : String.format(" (%s)", getString("1413")));
}
@Override
@@ -304,19 +311,25 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
private class PollResultsForm extends Form<RoomPoll> {
private static final long serialVersionUID = 1L;
- private final String SIMPLE_CHART = Application.getString("1414");
- private final String PIE_CHART = Application.getString("1415");
- private final IModel<String> name = Model.of((String)null);
- private final IModel<String> question = Model.of((String)null);
- private final IModel<Integer> count = Model.of(0);
- private final DropDownChoice<String> chartType = new DropDownChoice<>("chartType", Model.of(SIMPLE_CHART), Arrays.asList(SIMPLE_CHART, PIE_CHART));
+ private String chartSimple;
+ private String chartPie;
+ private final Label name = new Label("name", Model.of((String)null));
+ private final Label question = new Label("question", Model.of((String)null));
+ private final Label count = new Label("count", Model.of(0));
+ private DropDownChoice<String> chartType;
PollResultsForm(String id) {
super(id, Model.of((RoomPoll)null));
setOutputMarkupId(true);
- add(new Label("name", name));
- add(new Label("question", question));
- add(new Label("count", count));
+ add(chartDiv.setOutputMarkupId(true));
+ }
+
+ @Override
+ protected void onInitialize() {
+ chartSimple = getString("1414");
+ chartPie = getString("1415");
+ add(name, question, count);
+ chartType = new DropDownChoice<>("chartType", Model.of(chartSimple), Arrays.asList(chartSimple, chartPie));
add(chartType.add(new AjaxFormComponentUpdatingBehavior("change") {
private static final long serialVersionUID = 1L;
@@ -325,14 +338,14 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
redraw(target);
}
}));
- add(chartDiv.setOutputMarkupId(true));
+ super.onInitialize();
}
public void updateModel(RoomPoll poll, boolean redraw, IPartialPageRequestHandler handler) {
setModelObject(poll);
- name.setObject(poll == null ? "" : VoteDialog.getName(poll.getCreator()));
- question.setObject(poll == null ? "" : poll.getQuestion());
- count.setObject(poll == null ? 0 : poll.getAnswers().size());
+ name.setDefaultModelObject(poll == null ? "" : VoteDialog.getName(this, poll.getCreator()));
+ question.setDefaultModelObject(poll == null ? "" : poll.getQuestion());
+ count.setDefaultModelObject(poll == null ? 0 : poll.getAnswers().size());
handler.add(this);
close.setVisible(moderator && (poll != null && !poll.isArchived()), handler);
delete.setVisible(moderator, handler);
@@ -343,17 +356,10 @@ public class PollResultsDialog extends AbstractDialog<RoomPoll> {
private void redraw(IPartialPageRequestHandler handler) {
RoomPoll poll = getModelObject();
- Chart<?> chart = SIMPLE_CHART.equals(chartType.getModelObject()) ? barChart(poll) : pieChart(poll);
+ Chart<?> chart = chartSimple.equals(chartType.getModelObject()) ? barChart(poll) : pieChart(poll);
handler.appendJavaScript(getScript(chart));
}
- @Override
- protected void onDetach() {
- name.detach();
- count.detach();
- super.onDetach();
- }
-
private PieChart<Integer> pieChart(RoomPoll p) {
PieChart<Integer> pieChart = new PieChart<>(null);
String[] ticks = getTicks(p);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
index d6fc278..a5d805b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.java
@@ -32,8 +32,8 @@ import org.apache.openmeetings.db.entity.room.RoomPoll;
import org.apache.openmeetings.db.entity.room.RoomPollAnswer;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.ws.RoomMessage;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.MainPanel;
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -58,19 +58,27 @@ import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> {
private static final long serialVersionUID = 1L;
private static final List<Integer> answers = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
- private final PollAnswerForm form;
- private final DialogButton vote = new DialogButton("vote", Application.getString("32"));
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
+ private PollAnswerForm form;
+ private DialogButton vote;
+ private DialogButton cancel;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final IModel<String> user = Model.of((String)null);
public VoteDialog(String id) {
- super(id, Application.getString("18"));
+ super(id, "");
+ }
+
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("18"));
add(form = new PollAnswerForm("form", new CompoundPropertyModel<>(new RoomPollAnswer())));
+ vote = new DialogButton("vote", getString("32"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ super.onInitialize();
}
- static String getName(User u) {
- return u == null ? "" : (getUserId().equals(u.getId()) ? Application.getString("1411") : u.getFirstname() + " " + u.getLastname());
+ static String getName(Component c, User u) {
+ return u == null ? "" : (getUserId().equals(u.getId()) ? c.getString("1411") : u.getFirstname() + " " + u.getLastname());
}
public void updateModel(IPartialPageRequestHandler target, RoomPoll rp) {
@@ -78,7 +86,7 @@ public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> {
a.setRoomPoll(rp);
User u = getBean(UserDao.class).get(getUserId());
a.setVotedUser(u);
- user.setObject(getName(a.getRoomPoll().getCreator()));
+ user.setObject(getName(this, a.getRoomPoll().getCreator()));
form.setModelObject(a);
boolean typeNum = a.getRoomPoll() != null && RoomPoll.Type.numeric == a.getRoomPoll().getType();
form.typeBool.setVisible(!typeNum);
@@ -136,6 +144,7 @@ public class VoteDialog extends AbstractFormDialog<RoomPollAnswer> {
user.detach();
super.onDetach();
}
+
private class PollAnswerForm extends Form<RoomPollAnswer> {
private static final long serialVersionUID = 1L;
private final WebMarkupContainer typeBool = new WebMarkupContainer("typeBool");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
index e014bd1..f5e6b46 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/RoomSidebar.java
@@ -36,7 +36,6 @@ import org.apache.openmeetings.db.entity.room.Room.Right;
import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.util.ws.RoomMessage;
import org.apache.openmeetings.db.util.ws.TextRoomMessage;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder;
import org.apache.openmeetings.web.common.ConfirmableAjaxBorder.ConfirmableBorderDialog;
@@ -95,14 +94,6 @@ public class RoomSidebar extends Panel {
item.add(new RoomClientPanel("user", item, room));
}
};
- private final NameDialog addFolder = new NameDialog("addFolder", Application.getString("712")) {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onSubmit(AjaxRequestTarget target) {
- roomFiles.createFolder(target, getModelObject());
- }
- };
private final AbstractDefaultAjaxBehavior roomAction = new AbstractDefaultAjaxBehavior() {
private static final long serialVersionUID = 1L;
@@ -242,6 +233,14 @@ public class RoomSidebar extends Panel {
@Override
protected void onInitialize() {
super.onInitialize();
+ final NameDialog addFolder = new NameDialog("addFolder", getString("712")) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ roomFiles.createFolder(target, getModelObject());
+ }
+ };
final Form<?> form = new Form<>("form");
ConfirmableBorderDialog confirmTrash = new ConfirmableBorderDialog("confirm-trash", getString("80"), getString("713"), form);
roomFiles = new RoomFilePanel("tree", room, addFolder, confirmTrash);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
index ae1884a..3d54349 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/sidebar/UploadDialog.java
@@ -32,7 +32,6 @@ import org.apache.openmeetings.db.entity.file.BaseFileItem;
import org.apache.openmeetings.db.entity.file.FileItem;
import org.apache.openmeetings.util.process.ProcessResult;
import org.apache.openmeetings.util.process.ProcessResultList;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.openmeetings.web.util.upload.BootstrapFileUploadBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -64,8 +63,8 @@ public class UploadDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
private final Form<String> form;
- private final DialogButton upload;
- private final DialogButton cancel;
+ private DialogButton upload;
+ private DialogButton cancel;
private final FileUploadField uploadField;
private final HiddenField<String> fileName;
private final CheckBox toWb = new CheckBox("to-wb", Model.of(false));
@@ -75,19 +74,10 @@ public class UploadDialog extends AbstractFormDialog<String> {
private final RoomPanel room;
public UploadDialog(String id, RoomPanel room, RoomFilePanel roomFiles) {
- super(id, Application.getString("304"));
+ super(id, "");
this.roomFiles = roomFiles;
this.room = room;
add(form = new Form<>("form"));
- upload = new DialogButton("upload", Application.getString("593"), false) {
- private static final long serialVersionUID = 1L;
-
- @Override
- public boolean isIndicating() {
- return true;
- }
- };
- cancel = new DialogButton("close", Application.getString("85"));
toWb.add(new OnChangeAjaxBehavior() {
private static final long serialVersionUID = 1L;
@@ -134,6 +124,21 @@ public class UploadDialog extends AbstractFormDialog<String> {
}
@Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("304"));
+ upload = new DialogButton("upload", getString("593"), false) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isIndicating() {
+ return true;
+ }
+ };
+ cancel = new DialogButton("close", getString("85"));
+ super.onInitialize();
+ }
+
+ @Override
public void onClick(AjaxRequestTarget target, DialogButton button) {
if (button == null || button.match("close")) {
super.onClick(target, button);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index 3c87934..ac69890 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -70,7 +70,6 @@ import org.apache.openmeetings.db.entity.room.Room.RoomElement;
import org.apache.openmeetings.db.entity.room.RoomFile;
import org.apache.openmeetings.util.NullStringer;
import org.apache.openmeetings.util.OmFileHelper;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.common.NameDialog;
import org.apache.openmeetings.web.room.RoomPanel;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -130,7 +129,7 @@ public class WbPanel extends AbstractWbPanel {
@Override
protected String getAddStr() {
- return Application.getString("144");
+ return getString("144");
}
};
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
index 42219d4..d45e55d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.java
@@ -26,7 +26,6 @@ import static org.apache.openmeetings.util.Version.getVersion;
import java.util.ArrayList;
import java.util.List;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.basic.Label;
@@ -37,7 +36,7 @@ public class AboutDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1L;
public AboutDialog(String id) {
- super(id, Application.getString("1549"));
+ super(id, "");
add(new Label("name", getApplicationName()));
add(new Label("version", getVersion()));
@@ -46,6 +45,12 @@ public class AboutDialog extends AbstractDialog<String> {
}
@Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("1549"));
+ super.onInitialize();
+ }
+
+ @Override
protected List<DialogButton> getButtons() {
return new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
index 4551a49..74b79c0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.java
@@ -27,7 +27,6 @@ import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.app.Application;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.form.CheckBox;
@@ -40,17 +39,25 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class InviteUserMessageDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
- private final DialogButton send = new DialogButton("send", Application.getString("213"));
- private final DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
+ private DialogButton send;
+ private DialogButton cancel;
private final Form<Void> form = new Form<>("form");
private final TextArea<String> message = new TextArea<>("message", Model.of(""));
private final CheckBox enterRoom = new CheckBox("enterRoom", Model.of(false));
public InviteUserMessageDialog(String id) {
- super(id, Application.getString("1138"));
+ super(id, "");
add(form.add(message.setRequired(true), enterRoom.setOutputMarkupId(true)).setOutputMarkupId(true));
}
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("1138"));
+ send = new DialogButton("send", getString("213"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ super.onInitialize();
+ }
+
public void open(IPartialPageRequestHandler handler, Long roomId, Long userId) {
Room r = getBean(RoomDao.class).get(roomId);
User u = getBean(UserDao.class).get(userId);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
index 9107a95..4e7043a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.java
@@ -29,7 +29,6 @@ import org.apache.openmeetings.db.dao.room.RoomDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.room.Room;
import org.apache.openmeetings.db.entity.user.GroupUser;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.user.rooms.RoomListPanel;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -39,9 +38,9 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class InviteUserToRoomDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1L;
- private DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
- private final RoomListPanel publicRooms;
- private final RoomListPanel privateRooms;
+ private DialogButton cancel;
+ private RoomListPanel publicRooms;
+ private RoomListPanel privateRooms;
private final InviteUserMessageDialog inviteMsg = new InviteUserMessageDialog("inviteMsg");
private Long userId;
@@ -59,10 +58,17 @@ public class InviteUserToRoomDialog extends AbstractDialog<String> {
}
public InviteUserToRoomDialog(String id) {
- super(id, Application.getString("1131"));
- add(publicRooms = new InviteRoomListPanel("publicRooms", new ArrayList<Room>(), Application.getString("1135")));
- add(privateRooms = new InviteRoomListPanel("privateRooms", new ArrayList<Room>(), Application.getString("1135")));
+ super(id, "");
+ }
+
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("1131"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ add(publicRooms = new InviteRoomListPanel("publicRooms", new ArrayList<Room>(), getString("1135")));
+ add(privateRooms = new InviteRoomListPanel("privateRooms", new ArrayList<Room>(), getString("1135")));
add(inviteMsg);
+ super.onInitialize();
}
private static List<Room> getPrivateRooms(Long userId1, Long userId2, RoomDao roomDao) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
index 55bea25..cbf7b4b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.java
@@ -84,8 +84,8 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> {
private static final long serialVersionUID = 1L;
private final Form<PrivateMessage> form;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- protected DialogButton send = new DialogButton("send", Application.getString("218"));
- private DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
+ protected DialogButton send;
+ private DialogButton cancel;
private final WebMarkupContainer roomParamsBlock = new WebMarkupContainer("roomParamsBlock");
private final WebMarkupContainer roomParams = new WebMarkupContainer("roomParams");
private final DateTimePicker start = new OmDateTimePicker("start", Model.of(LocalDateTime.now()));
@@ -94,8 +94,15 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> {
private final IModel<Collection<User>> modelTo = new CollectionModel<>(new ArrayList<User>());
public MessageDialog(String id, CompoundPropertyModel<PrivateMessage> model) {
- super(id, Application.getString("1209"), model);
+ super(id, "", model);
form = new Form<>("form", getModel());
+ }
+
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("1209"));
+ send = new DialogButton("send", getString("218"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
form.add(feedback.setOutputMarkupId(true));
form.add(new UserMultiChoice("to", modelTo).setRequired(true));
@@ -122,6 +129,8 @@ public class MessageDialog extends AbstractFormDialog<PrivateMessage> {
roomParams.add(start);
roomParams.add(end);
add(form.setOutputMarkupId(true));
+
+ super.onInitialize();
}
public MessageDialog reset(boolean isPrivate) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java
index 0719b4a..29db16f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.java
@@ -25,7 +25,6 @@ import java.util.Arrays;
import java.util.List;
import org.apache.openmeetings.db.dao.user.UserContactDao;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.user.profile.UserProfilePanel;
import org.apache.openmeetings.web.util.ContactsHelper;
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
@@ -37,18 +36,27 @@ import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
public class UserInfoDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1L;
private WebMarkupContainer container = new WebMarkupContainer("container");
- private DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
- private DialogButton message = new DialogButton("message", Application.getString("1253"));
- private DialogButton contacts = new DialogButton("contacts", Application.getString("1186"));
+ private DialogButton cancel;
+ private DialogButton message;
+ private DialogButton contacts;
private MessageDialog newMessage;
private long userId;
public UserInfoDialog(String id, MessageDialog newMessage) {
- super(id, Application.getString("1235"));
- add(container.add(new WebMarkupContainer("body")).setOutputMarkupId(true));
+ super(id, "");
this.newMessage = newMessage;
}
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("1235"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ message = new DialogButton("message", getString("1253"));
+ contacts = new DialogButton("contacts", getString("1186"));
+ add(container.add(new WebMarkupContainer("body")).setOutputMarkupId(true));
+ super.onInitialize();
+ }
+
public void open(IPartialPageRequestHandler handler, long userId) {
this.userId = userId;
contacts.setVisible(userId != getUserId() && getBean(UserContactDao.class).get(userId, getUserId()) == null, handler);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/0297c55c/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
index b3b7c68..51a69e8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/AppointmentDialog.java
@@ -51,7 +51,6 @@ import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.db.util.AuthLevelUtil;
import org.apache.openmeetings.db.util.FormatHelper;
import org.apache.openmeetings.service.calendar.caldav.AppointmentManager;
-import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.GroupChoiceProvider;
import org.apache.openmeetings.web.common.OmDateTimePicker;
@@ -105,13 +104,13 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
private static final Logger log = Red5LoggerFactory.getLogger(AppointmentDialog.class, getWebAppRootKey());
private AppointmentForm form;
- private DialogButton save = new DialogButton("save", Application.getString("144"));
- private DialogButton cancel = new DialogButton("cancel", Application.getString("lbl.cancel"));
- private DialogButton delete = new DialogButton("delete", Application.getString("80"));
- private DialogButton enterRoom = new DialogButton("enterRoom", Application.getString("1282"));
+ private DialogButton save;
+ private DialogButton cancel;
+ private DialogButton delete;
+ private DialogButton enterRoom;
private final CalendarPanel calendarPanel;
private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
- final MessageDialog confirmDelete;
+ MessageDialog confirmDelete;
private final WebMarkupContainer sipContainer = new WebMarkupContainer("sip-container");
private final RadioGroup<InviteeType> rdi = new RadioGroup<>("inviteeType", Model.of(InviteeType.user));
private final Select2MultiChoice<Group> groups = new Select2MultiChoice<>("groups"
@@ -123,14 +122,23 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
, group
}
- public AppointmentDialog(String id, String title, CalendarPanel calendarPanel, CompoundPropertyModel<Appointment> model) {
- super(id, title, model, true);
+ public AppointmentDialog(String id, CalendarPanel calendarPanel, CompoundPropertyModel<Appointment> model) {
+ super(id, "", model, true);
log.debug(" -- AppointmentDialog -- Current model " + getModel().getObject());
this.calendarPanel = calendarPanel;
setOutputMarkupId(true);
form = new AppointmentForm("appForm", model);
add(form);
- confirmDelete = new MessageDialog("confirmDelete", Application.getString("80"), Application.getString("833"), DialogButtons.OK_CANCEL, DialogIcon.WARN){
+ }
+
+ @Override
+ protected void onInitialize() {
+ getTitle().setObject(getString("815"));
+ save = new DialogButton("save", getString("144"));
+ cancel = new DialogButton("cancel", getString("lbl.cancel"));
+ delete = new DialogButton("delete", getString("80"));
+ enterRoom = new DialogButton("enterRoom", getString("1282"));
+ confirmDelete = new MessageDialog("confirmDelete", getString("80"), getString("833"), DialogButtons.OK_CANCEL, DialogIcon.WARN){
private static final long serialVersionUID = 1L;
@Override
@@ -141,6 +149,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
}
};
add(confirmDelete);
+ super.onInitialize();
}
@Override
@@ -326,7 +335,6 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
createRoom = myRoomsAllowed;
add(feedback.setOutputMarkupId(true));
//General
- add(new RequiredTextField<String>("title").setLabel(Model.of(Application.getString("572"))));
add(ownerPanel.add(owner));
boolean showGroups = AuthLevelUtil.hasAdminLevel(getRights());
add(rdi.add(new AjaxFormChoiceComponentUpdatingBehavior() {
@@ -339,7 +347,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
}
}));
groupContainer.add(
- groups.setLabel(Model.of(Application.getString("126"))).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true)
+ groups.setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true)
, new Radio<>("group", Model.of(InviteeType.group))
);
if (showGroups) {
@@ -380,7 +388,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
}
}.setVisible(myRoomsAllowed));
add(createRoomBlock.add(roomType, new CheckBox("moderated")).setEnabled(createRoom).setVisible(myRoomsAllowed).setOutputMarkupId(true));
- add(groom.setRequired(true).setLabel(Model.of(Application.getString("406"))).setEnabled(!createRoom).setOutputMarkupId(true));
+ groom.setRequired(true).setEnabled(!createRoom).setOutputMarkupId(true);
add(sipContainer.setOutputMarkupPlaceholderTag(true).setOutputMarkupId(true));
sipContainer.add(new Label("room.confno", "")).setVisible(false);
@@ -477,9 +485,12 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
@Override
protected void onInitialize() {
- super.onInitialize();
+ groups.setLabel(Model.of(getString("126")));
+ add(new RequiredTextField<String>("title").setLabel(Model.of(getString("572"))));
add(start.setLabel(Model.of(getString("570"))).setRequired(true)
- , end.setLabel(Model.of(getString("571"))).setRequired(true));
+ , end.setLabel(Model.of(getString("571"))).setRequired(true)
+ , groom.setLabel(Model.of(getString("406"))));
+ super.onInitialize();
}
private List<Room> getRoomList() {
@@ -498,7 +509,7 @@ public class AppointmentDialog extends AbstractFormDialog<Appointment> {
@Override
protected void onValidate() {
if (null != start.getConvertedInput() && null != end.getConvertedInput() && end.getConvertedInput().isBefore(start.getConvertedInput())) {
- error(Application.getString("1592"));
+ error(getString("1592"));
}
}
}