Author: solomax
Date: Fri Aug 2 03:09:48 2013
New Revision: 1509520
URL: http://svn.apache.org/r1509520
Log:
[OPENMEETINGS-723] cross button and close-on-escape are disabled for all
dialogs on signin page
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1509520&r1=1509519&r2=1509520&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Fri Aug 2 03:09:48 2013
@@ -45,8 +45,6 @@ import org.apache.openmeetings.web.pages
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import
org.apache.wicket.extensions.validation.validator.RfcCompliantEmailAddressValidator;
-import org.apache.wicket.markup.head.CssContentHeaderItem;
-import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
@@ -61,6 +59,8 @@ import org.apache.wicket.request.mapper.
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
+import com.googlecode.wicket.jquery.core.JQueryBehavior;
+import com.googlecode.wicket.jquery.core.Options;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
@@ -97,22 +97,27 @@ public class RegisterDialog extends Abst
state = WebSession.get().getCountryByBrowserLocale();
tzDropDown.setOutputMarkupId(true);
confirmRegistration = new MessageDialog("confirmRegistration",
WebSession.getString(235), WebSession.getString(674), DialogButtons.OK,
DialogIcon.INFO){
-
private static final long serialVersionUID = 1L;
+ @Override
+ protected void onConfigure(JQueryBehavior behavior) {
+ super.onConfigure(behavior);
+ behavior.setOption("dialogClass",
Options.asString("no-close"));
+ behavior.setOption("closeOnEscape", false);
+ }
+
public void onClose(AjaxRequestTarget target,
DialogButton button) {
s.open(target);
}
-
};
add(confirmRegistration);
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- //to remove upper-right close button
- response.render(new CssContentHeaderItem(".no-close
.ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
+ protected void onConfigure(JQueryBehavior behavior) {
+ super.onConfigure(behavior);
+ behavior.setOption("dialogClass", Options.asString("no-close"));
+ behavior.setOption("closeOnEscape", false);
}
public void setSignInDialog(SignInDialog s) {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1509520&r1=1509519&r2=1509520&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Fri Aug 2 03:09:48 2013
@@ -39,7 +39,6 @@ import org.apache.wicket.ajax.AbstractDe
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.head.CssContentHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -114,13 +113,6 @@ public class SignInDialog extends Abstra
}
@Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- //to remove upper-right close button
- response.render(new CssContentHeaderItem(".no-close
.ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
- }
-
- @Override
protected void onInitialize() {
super.onInitialize();
add(new JQueryBehavior(JQueryWidget.getSelector(this),
"dialog") {
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java?rev=1509520&r1=1509519&r2=1509520&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/auth/SignInPage.java
Fri Aug 2 03:09:48 2013
@@ -25,6 +25,7 @@ import org.apache.openmeetings.data.basi
import org.apache.openmeetings.web.app.WebSession;
import org.apache.openmeetings.web.pages.BaseInitedPage;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.head.CssContentHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
import org.apache.wicket.request.IRequestParameters;
@@ -58,8 +59,9 @@ public class SignInPage extends BaseInit
super.renderHead(response);
//TODO need to be removed if autoOen will be enabled
response.render(OnDomReadyHeaderItem.forScript("$('#" +
d.getMarkupId() + "').dialog('open');"));
+ response.render(new CssContentHeaderItem(".no-close
.ui-dialog-titlebar-close { display: none; }", "dialog-noclose", ""));
}
-
+
@Override
protected void onParameterArrival(IRequestParameters params,
AjaxRequestTarget arg1) {
WebSession.get().setArea(getUrlFragment(params));
