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 2015/10/06 18:12:21 UTC
svn commit: r1707082 [2/2] - in /openmeetings: branches/3.0.x/
branches/3.0.x/src/main/webapp/WEB-INF/classes/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/auth/
branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/ br...
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java?rev=1707082&r1=1707081&r2=1707082&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizard.java Tue Oct 6 16:12:20 2015
@@ -43,20 +43,16 @@ import org.apache.openmeetings.db.dao.la
import org.apache.openmeetings.installation.ImportInitvalues;
import org.apache.openmeetings.installation.InstallationConfig;
import org.apache.openmeetings.util.ConnectionProperties;
-import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.util.ConnectionProperties.DbType;
+import org.apache.openmeetings.util.OmFileHelper;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.common.ErrorMessagePanel;
import org.apache.openmeetings.web.common.OmLabel;
-import org.apache.wicket.Component;
import org.apache.wicket.ajax.AbstractAjaxTimerBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
-import org.apache.wicket.extensions.wizard.IWizardStep;
-import org.apache.wicket.extensions.wizard.Wizard;
import org.apache.wicket.extensions.wizard.dynamic.DynamicWizardModel;
import org.apache.wicket.extensions.wizard.dynamic.DynamicWizardStep;
import org.apache.wicket.extensions.wizard.dynamic.IDynamicWizardStep;
@@ -68,12 +64,10 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
-import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
@@ -82,17 +76,17 @@ import org.springframework.beans.factory
import org.springframework.orm.jpa.LocalEntityManagerFactoryBean;
import org.springframework.web.context.support.XmlWebApplicationContext;
+import com.googlecode.wicket.jquery.core.JQueryBehavior;
import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.progressbar.ProgressBar;
+import com.googlecode.wicket.jquery.ui.widget.wizard.AbstractWizard;
import com.googlecode.wicket.kendo.ui.form.button.IndicatingAjaxButton;
import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
-//TODO maybe JQ wizard should be used
-public class InstallWizard extends Wizard {
+public class InstallWizard extends AbstractWizard<InstallationConfig> {
private static final long serialVersionUID = 1L;
private static final Logger log = Red5LoggerFactory.getLogger(InstallWizard.class, webAppRootKey);
- private InstallationConfig cfg;
- private CompoundPropertyModel<InstallWizard> model;
private final static List<SelectOption> yesNoList = Arrays.asList(SelectOption.NO, SelectOption.YES);
private final static List<SelectOption> yesNoTextList = Arrays.asList(SelectOption.NO_TEXT, SelectOption.YES_TEXT);
private final static List<String> allFonts = Arrays.asList("TimesNewRoman", "Verdana", "Arial");
@@ -104,25 +98,21 @@ public class InstallWizard extends Wizar
private final IDynamicWizardStep paramsStep4;
private final InstallStep installStep;
private Throwable th = null;
- private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
public void initTzDropDown() {
paramsStep1.tzDropDown.setOption();
}
//onInit, applyState
- public InstallWizard(String id) {
- super(id);
- //TODO enable install after first params
- cfg = new InstallationConfig();
- setDefaultModel(model = new CompoundPropertyModel<InstallWizard>(this));
+ public InstallWizard(String id, String title) {
+ super(id, title, new CompoundPropertyModel<InstallationConfig>(new InstallationConfig()), true);
+ setTitle(Model.of(getModelObject().appName));
welcomeStep = new WelcomeStep();
dbStep = new DbStep();
paramsStep1 = new ParamsStep1();
paramsStep2 = new ParamsStep2();
paramsStep3 = new ParamsStep3();
paramsStep4 = new ParamsStep4();
- //TODO add install/progress step
installStep = new InstallStep();
DynamicWizardModel wmodel = new DynamicWizardModel(welcomeStep);
@@ -132,33 +122,28 @@ public class InstallWizard extends Wizar
}
@Override
- protected Component newButtonBar(String id) {
- final Panel bBar = (Panel)super.newButtonBar(id);
- AjaxButton finish = new AjaxButton("finish", new ResourceModel("org.apache.wicket.extensions.wizard.finish")) {
- private static final long serialVersionUID = 1L;
+ public void onConfigure(JQueryBehavior behavior) {
+ super.onConfigure(behavior);
+ behavior.setOption("closeOnEscape", false);
+ behavior.setOption("dialogClass", Options.asString("no-close"));
+ behavior.setOption("resizable", false);
+ }
- public boolean isEnabled() {
- IWizardStep activeStep = getWizardModel().getActiveStep();
- return ((activeStep != null) && getWizardModel().isLastStep(activeStep));
- }
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- installStep.startInstallation(target);
- target.add(bBar.setEnabled(false));
- }
- };
- return bBar.replace(finish).setOutputMarkupId(true);
+ @Override
+ protected WebMarkupContainer newFeedbackPanel(String id) {
+ KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
+ feedback.setEscapeModelStrings(false);
+ return feedback;
}
- protected Component newFeedbackPanel(final String id) {
- return feedback.setEscapeModelStrings(false);
+ @Override
+ public int getWidth() {
+ return 1000;
}
@Override
- protected void onDetach() {
- model.detach();
- super.onDetach();
+ protected boolean closeOnFinish() {
+ return false;
}
private abstract class BaseStep extends DynamicWizardStep {
@@ -166,7 +151,7 @@ public class InstallWizard extends Wizar
public BaseStep(IDynamicWizardStep prev) {
super(prev);
- setTitleModel(Model.of(cfg.appName + " - " + getString("install.wizard.install.header")));
+ InstallWizard.this.setTitle(Model.of(getModelObject().appName + " - " + getString("install.wizard.install.header")));
setSummaryModel(Model.of(""));
}
}
@@ -176,14 +161,15 @@ public class InstallWizard extends Wizar
public WelcomeStep() {
super(null);
- //TODO localize
- add(new Label("step", getString("install.wizard.welcome.panel")).setEscapeModelStrings(false));
+ add(new Label("step", getString("install.wizard.welcome.panel")).setEscapeModelStrings(false));
}
+ @Override
public boolean isLastStep() {
return false;
}
+ @Override
public IDynamicWizardStep next() {
return dbStep;
}
@@ -220,7 +206,7 @@ public class InstallWizard extends Wizar
@Override
protected void onUpdate(AjaxRequestTarget target) {
- target.add(feedback);
+ target.add(getFeedbackPanel());
initForm(true, target);
}
}));
@@ -229,16 +215,19 @@ public class InstallWizard extends Wizar
add(new IndicatingAjaxButton("check") {
private static final long serialVersionUID = 1L;
+ @Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- target.add(feedback);
+ target.add(getFeedbackPanel());
}
+ @Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
- target.add(feedback);
+ target.add(getFeedbackPanel());
}
});
}
+ @Override
protected void onValidateModelObjects() {
ConnectionProperties props = getModelObject();
try {
@@ -247,12 +236,10 @@ public class InstallWizard extends Wizar
form.error(new StringResourceModel("install.wizard.db.step.nodriver", InstallWizard.this).setParameters(getString("install.wizard.db.step.instructions." + props.getDbType().name())).getObject());
return;
}
- Connection conn = null;
boolean valid = true;
- try {
- ConnectionPropertiesPatcher.updateUrl(props, host.getModelObject(), "" + port.getModelObject(), dbname.getModelObject());
- DriverManager.setLoginTimeout(3);
- conn = DriverManager.getConnection(props.getURL(), props.getLogin(), props.getPassword());
+ ConnectionPropertiesPatcher.updateUrl(props, host.getModelObject(), "" + port.getModelObject(), dbname.getModelObject());
+ DriverManager.setLoginTimeout(3);
+ try (Connection conn = DriverManager.getConnection(props.getURL(), props.getLogin(), props.getPassword())) {
valid = conn.isValid(0); //no timeout
String sql = null;
switch (props.getDbType()) {
@@ -277,20 +264,13 @@ public class InstallWizard extends Wizar
form.error(e.getMessage() + "<br/>" + getString("install.wizard.db.step.instructions." + props.getDbType().name()));
log.error("error while testing DB", e);
valid = false;
- } finally {
- if (conn != null) {
- try {
- conn.close();
- } catch (Exception e) {
- //no-op
- }
- }
}
if (valid) {
form.success(getString("install.wizard.db.step.valid"));
}
}
+ @Override
protected void onSubmit() {
try {
ConnectionPropertiesPatcher.patch(getModelObject());
@@ -365,18 +345,20 @@ public class InstallWizard extends Wizar
public DbStep() {
super(welcomeStep);
//TODO localize
- add(new OmLabel("note", "install.wizard.db.step.note", cfg.appName, getString("install.wizard.db.step.instructions.derby")
- , getString("install.wizard.db.step.instructions.mysql"), getString("install.wizard.db.step.instructions.postgresql")
- , getString("install.wizard.db.step.instructions.db2"), getString("install.wizard.db.step.instructions.mssql")
- , getString("install.wizard.db.step.instructions.oracle")).setEscapeModelStrings(false));
- add(form.setOutputMarkupId(true));
- initForm(false, null);
+ add(new OmLabel("note", "install.wizard.db.step.note", getModelObject().appName, getString("install.wizard.db.step.instructions.derby")
+ , getString("install.wizard.db.step.instructions.mysql"), getString("install.wizard.db.step.instructions.postgresql")
+ , getString("install.wizard.db.step.instructions.db2"), getString("install.wizard.db.step.instructions.mssql")
+ , getString("install.wizard.db.step.instructions.oracle")).setEscapeModelStrings(false));
+ add(form.setOutputMarkupId(true));
+ initForm(false, null);
}
+ @Override
public boolean isLastStep() {
return false;
}
+ @Override
public IDynamicWizardStep next() {
return paramsStep1;
}
@@ -388,18 +370,19 @@ public class InstallWizard extends Wizar
public ParamsStep1() {
super(dbStep);
- //TODO localize
- add(new RequiredTextField<String>("cfg.username").add(minimumLength(USER_LOGIN_MINIMUM_LENGTH)));
- add(new PasswordTextField("cfg.password").add(minimumLength(USER_PASSWORD_MINIMUM_LENGTH)));
- add(new RequiredTextField<String>("cfg.email").add(RfcCompliantEmailAddressValidator.getInstance()));
+ add(new RequiredTextField<String>("username").setLabel(Model.of(getString("install.wizard.params.step1.username"))).add(minimumLength(USER_LOGIN_MINIMUM_LENGTH)));
+ add(new PasswordTextField("password").setLabel(Model.of(getString("install.wizard.params.step1.password"))).add(minimumLength(USER_PASSWORD_MINIMUM_LENGTH)));
+ add(new RequiredTextField<String>("email").setLabel(Model.of(getString("install.wizard.params.step1.email"))).add(RfcCompliantEmailAddressValidator.getInstance()));
add(tzDropDown = new TzDropDown("ical_timeZone"));
- add(new RequiredTextField<String>("cfg.group"));
+ add(new RequiredTextField<String>("group").setLabel(Model.of(getString("install.wizard.params.step1.group"))));
}
+ @Override
public boolean isLastStep() {
return false;
}
+ @Override
public IDynamicWizardStep next() {
return paramsStep2;
}
@@ -426,22 +409,24 @@ public class InstallWizard extends Wizar
add(new YesNoDropDown("sendEmailAtRegister"));
add(new YesNoDropDown("sendEmailWithVerficationCode"));
add(new YesNoDropDown("createDefaultRooms"));
- add(new TextField<String>("cfg.mailReferer"));
- add(new TextField<String>("cfg.smtpServer"));
- add(new TextField<Integer>("cfg.smtpPort").setRequired(true));
- add(new TextField<String>("cfg.mailAuthName"));
- add(new PasswordTextField("cfg.mailAuthPass").setRequired(false));
+ add(new TextField<String>("mailReferer"));
+ add(new TextField<String>("smtpServer"));
+ add(new TextField<Integer>("smtpPort").setRequired(true));
+ add(new TextField<String>("mailAuthName"));
+ add(new PasswordTextField("mailAuthPass").setRequired(false));
add(new YesNoDropDown("mailUseTls"));
//TODO check mail server
add(new YesNoDropDown("replyToOrganizer"));
add(new LangDropDown("defaultLangId"));
- add(new DropDownChoice<String>("cfg.defaultExportFont", allFonts));
+ add(new DropDownChoice<String>("defaultExportFont", allFonts));
}
+ @Override
public boolean isLastStep() {
return false;
}
+ @Override
public IDynamicWizardStep next() {
return paramsStep3;
}
@@ -463,20 +448,22 @@ public class InstallWizard extends Wizar
public ParamsStep3() {
super(paramsStep2);
- add(new TextField<Integer>("cfg.swfZoom").setRequired(true).add(range(50, 600)));
- add(new TextField<Integer>("cfg.swfJpegQuality").setRequired(true).add(range(1, 100)));
- add(new TextField<String>("cfg.swfPath"));
- add(new TextField<String>("cfg.imageMagicPath"));
- add(new TextField<String>("cfg.ffmpegPath"));
- add(new TextField<String>("cfg.soxPath"));
- add(new TextField<String>("cfg.jodPath"));
- add(new TextField<String>("cfg.officePath"));
+ add(new TextField<Integer>("swfZoom").setRequired(true).add(range(50, 600)));
+ add(new TextField<Integer>("swfJpegQuality").setRequired(true).add(range(1, 100)));
+ add(new TextField<String>("swfPath"));
+ add(new TextField<String>("imageMagicPath"));
+ add(new TextField<String>("ffmpegPath"));
+ add(new TextField<String>("soxPath"));
+ add(new TextField<String>("jodPath"));
+ add(new TextField<String>("officePath"));
}
+ @Override
public boolean isLastStep() {
return false;
}
+ @Override
public IDynamicWizardStep next() {
return paramsStep4;
}
@@ -497,18 +484,20 @@ public class InstallWizard extends Wizar
public ParamsStep4() {
super(paramsStep3);
- add(new RequiredTextField<String>("cfg.cryptClassName")); //Validate class
+ add(new RequiredTextField<String>("cryptClassName")); //Validate class
- //TODO add check for red5sip connection
- add(new YesNoTextDropDown("red5SipEnable"));
- add(new TextField<String>("cfg.red5SipRoomPrefix"));
- add(new TextField<String>("cfg.red5SipExtenContext"));
+ //TODO add check for red5sip connection
+ add(new YesNoTextDropDown("red5SipEnable"));
+ add(new TextField<String>("red5SipRoomPrefix"));
+ add(new TextField<String>("red5SipExtenContext"));
}
+ @Override
public boolean isLastStep() {
return false;
}
+ @Override
public IDynamicWizardStep next() {
return installStep;
}
@@ -593,10 +582,12 @@ public class InstallWizard extends Wizar
add(container.setOutputMarkupId(true));
}
+ @Override
public boolean isLastStep() {
return true;
}
+ @Override
public IDynamicWizardStep next() {
return null;
}
@@ -612,7 +603,7 @@ public class InstallWizard extends Wizar
public void run() {
try {
- installer.loadAll(cfg, true);
+ installer.loadAll(getModelObject(), true);
} catch (Exception e) {
th = e;
}
@@ -642,7 +633,7 @@ public class InstallWizard extends Wizar
WizardDropDown(String id) {
super(id);
- propModel = InstallWizard.this.model.bind("cfg." + id);
+ propModel = ((CompoundPropertyModel<InstallationConfig>)InstallWizard.this.getModel()).bind(id);
setModel(new PropertyModel<T>(this, "option"));
}
@@ -737,11 +728,19 @@ public class InstallWizard extends Wizar
option = op;
}
list.add(op);
- if (option == null && me.getKey().toString().equals(cfg.defaultLangId)) {
+ if (option == null && me.getKey().toString().equals(InstallWizard.this.getModelObject().defaultLangId)) {
option = op;
}
}
setChoices(list);
}
}
+
+ @Override
+ protected void onFinish(AjaxRequestTarget target) {
+ for (DialogButton b : getButtons()) {
+ b.setEnabled(false, target);
+ }
+ installStep.startInstallation(target);
+ }
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html?rev=1707082&r1=1707081&r2=1707082&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.html Tue Oct 6 16:12:20 2015
@@ -20,123 +20,29 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
- <script type="text/javascript" src="js/openmeetings_functions.js" >
- </script>
+ <script type="text/javascript" src="js/openmeetings_functions.js" ></script>
<style type="text/css">
- form,fieldset {
- margin: 0;
- padding: 0;
- }
- fieldset {
- border: 1px solid #000;
- }
- legend {
- padding: 0;
- color: #000;
- }
- input:focus,textarea:focus {
- color: #000;
- background: #fff;
- outline: 1px solid black;
- }
- input,textarea,select {
- margin: 0;
- padding: 1px;
- position: absolute;
- left: 700px;
- background: #ddd;
- font-size: 100%;
- font-family: inherit;
- width: 300px;
- }
- select {
- padding: 0;
- }
- form.wicketExtensionsWizardForm {
- width: 1024px;
- font-size: 1.1em;
- color: #333;
- }
- form.wicketExtensionsWizardForm legend {
- padding-left: 0;
- }
- form.wicketExtensionsWizardForm legend,form.wicketExtensionsWizardForm label {
- color: #333;
- }
- form.wicketExtensionsWizardForm fieldset {
- border: none;
- border-top: 1px solid #C9DCA6;
- }
- form.wicketExtensionsWizardForm fieldset fieldset {
- background: none;
- }
- form.wicketExtensionsWizardForm fieldset li {
- padding: 5px 10px 7px;
- }
- form.wicketExtensionsWizardForm fieldset {
- margin-bottom: 10px;
- }
- form.wicketExtensionsWizardForm legend {
- padding: 0 2px;
- font-weight: bold;
+ .abstractWizard .adminForm div.formelement {
+ max-width: 600px;
}
- form.wicketExtensionsWizardForm label {
- display: inline-block;
- line-height: 1.8;
- vertical-align: top;
- }
- form.wicketExtensionsWizardForm fieldset ol {
- margin: 0;
- padding: 0;
- }
- form.wicketExtensionsWizardForm fieldset li {
- list-style: none;
- margin: 0;
- }
- form.wicketExtensionsWizardForm fieldset fieldset {
- border: none;
- margin: 3px 0 0;
- }
- form.wicketExtensionsWizardForm fieldset fieldset legend {
- padding: 0 0 5px;
- font-weight: normal;
+ .abstractWizard .adminForm label {
+ width: 240px;
}
- form.wicketExtensionsWizardForm fieldset fieldset label {
- display: block;
- width: auto;
+ .abstractWizard ul.paramList {
+ list-style-type: none;
}
- form.wicketExtensionsWizardForm em {
- font-weight: bold;
- font-style: normal;
- color: #f00;
- }
- form.wicketExtensionsWizardForm label {
- width: 420px;
- }
- form.wicketExtensionsWizardForm fieldset fieldset label {
- margin-left: 123px;
- }
- .wicketExtensionsWizard {
- padding-right: 100px;
- padding-left: 100px;
- width: 850px;
- }
- .wicketExtensionsWizardHeader {
- font-size: 2em;
- padding: 10px;
+ .abstractWizard ul.paramList li {
+ padding-top: 5px;
}
- .wicketExtensionsWizardViewInner {
- padding: 5px;
+ .abstractWizard ul.paramList label {
+ width: 350px;
+ display: inline-block;
}
- .wicketExtensionsWizardInnerTable, .wicketExtensionsWizardOuterTable {
- width: 100%;
+ .abstractWizard input, .abstractWizard select {
+ width: 280px;
}
- .wicketExtensionsWizardButtonBar input {
- position: static;
+ .abstractWizard input[type=checkbox], .abstractWizard input[type=radio] {
width: auto;
- padding-right: 15px;
- padding-left: 15px;
- margin: 5px;
}
</style>
</wicket:head>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java?rev=1707082&r1=1707081&r2=1707082&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/install/InstallWizardPage.java Tue Oct 6 16:12:20 2015
@@ -23,17 +23,19 @@ import org.apache.openmeetings.web.pages
import org.apache.wicket.RestartResponseException;
import org.apache.wicket.ajax.AjaxClientInfoBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.head.CssContentHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.protocol.http.request.WebClientInfo;
public class InstallWizardPage extends BaseNotInitedPage {
private static final long serialVersionUID = 1L;
- private InstallWizard wizard = null;
+ private final InstallWizard wizard;
public InstallWizardPage() {
if (Application.isInstalled()) {
throw new RestartResponseException(Application.get().getHomePage());
}
- add(wizard = new InstallWizard("wizard"));
+ add(wizard = new InstallWizard("wizard", getString("install.wizard.install.header")));
// This code is required to detect time zone offset
add(new AjaxClientInfoBehavior() {
private static final long serialVersionUID = 1L;
@@ -42,7 +44,14 @@ public class InstallWizardPage extends B
protected void onClientInfo(AjaxRequestTarget target, WebClientInfo clientInfo) {
super.onClientInfo(target, clientInfo);
wizard.initTzDropDown();
+ wizard.open(target);
}
});
}
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(new CssContentHeaderItem(".no-close .ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
+ }
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml?rev=1707082&r1=1707081&r2=1707082&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/WEB-INF/classes/logback-config.xml Tue Oct 6 16:12:20 2015
@@ -60,6 +60,7 @@
<logger name="httpclient.wire.header" level="ERROR" />
<logger name="org.apache.directory" level="INFO" />
<logger name="org.apache.mina.filter.ssl.SslFilter" level="ERROR" />
+ <logger name="org.apache.wicket" level="WARN" />
<root level="DEBUG">
<appender-ref ref="FLOG2" />
<appender-ref ref="CONSOLE2" />
Modified: openmeetings/trunk/singlewebapp/pom.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/pom.xml?rev=1707082&r1=1707081&r2=1707082&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/pom.xml (original)
+++ openmeetings/trunk/singlewebapp/pom.xml Tue Oct 6 16:12:20 2015
@@ -42,7 +42,7 @@
<maven.surefire.version>2.18.1</maven.surefire.version>
<maven-site.version>3.4</maven-site.version>
<wicket.version>7.0.0</wicket.version>
- <wicketju.version>7.0.1</wicketju.version>
+ <wicketju.version>7.0.2-SNAPSHOT</wicketju.version>
<wickets.version>7.0.0</wickets.version>
<red5-server.version>1.0.7-SNAPSHOT</red5-server.version>
<red5-client.version>1.0.6-RELEASE</red5-client.version>