Author: solomax
Date: Fri Sep 21 03:46:28 2012
New Revision: 1388315
URL: http://svn.apache.org/viewvc?rev=1388315&view=rev
Log:
Wicket:
Confirmations are added to the admin (need to be generalized)
General method for component re-initialized is added
Favicon is added
code cleanup;
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/ConfirmableAjaxLink.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/ConfirmableAjaxLink.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/ConfirmableAjaxLink.java?rev=1388315&r1=1388314&r2=1388315&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/ConfirmableAjaxLink.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/ConfirmableAjaxLink.java
Fri Sep 21 03:46:28 2012
@@ -18,7 +18,6 @@
*/
package org.apache.openmeetings.web.components;
-import org.apache.wicket.Component;
import org.apache.wicket.ajax.attributes.AjaxCallListener;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -36,13 +35,6 @@ public abstract class ConfirmableAjaxLin
@Override
protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new AjaxCallListener() {
- private static final long serialVersionUID =
485123450543463471L;
-
- @Override
- public CharSequence getPrecondition(Component
component) {
- return "if (!confirm('" + confirmText + "'))
{hideBusyIndicator(); return false;}";
- }
- });
+ attributes.getAjaxCallListeners().add(new
AjaxCallListener().onPrecondition("if (!confirm('" + confirmText + "'))
{hideBusyIndicator(); return false;}"));
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java?rev=1388315&r1=1388314&r2=1388315&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
Fri Sep 21 03:46:28 2012
@@ -140,7 +140,7 @@ public class MenuPanel extends BasePanel
target.add(contents.replace(new ServersPanel("child")));
break;
}
-
target.appendJavaScript("location.hash = '" +
JavaScriptUtils.escapeQuotes(hash) + "';");
+
target.appendJavaScript("location.hash = '" +
JavaScriptUtils.escapeQuotes(hash) + "'; if (typeof window.omComponentInit ==
'function'){ omComponentInit(); window.omComponentInit = null; };");
};
}.add(AttributeModifier.replace("href", hash)));
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java?rev=1388315&r1=1388314&r2=1388315&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/AdminBaseFormPanel.java
Fri Sep 21 03:46:28 2012
@@ -20,6 +20,8 @@ package org.apache.openmeetings.web.comp
import org.apache.openmeetings.web.app.WebSession;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxCallListener;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
@@ -102,6 +104,13 @@ public abstract class AdminBaseFormPanel
private static final long serialVersionUID =
839803820502260006L;
@Override
+ protected void
updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ //FIXME need to be generalized
+ attributes.getAjaxCallListeners().add(new
AjaxCallListener().onBefore("if (!confirm('" + WebSession.getString(833L) +
"')) {return false;}"));
+ }
+
+ @Override
protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
// repaint the feedback panel so that it is
hidden
target.add(feedback);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java?rev=1388315&r1=1388314&r2=1388315&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
Fri Sep 21 03:46:28 2012
@@ -34,6 +34,8 @@ import org.apache.openmeetings.web.data.
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxCallListener;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -88,6 +90,7 @@ public class LangPanel extends AdminPane
//FIXME reload
}
+ //FIXME confirmation
@Override
protected void onDeleteSubmit(AjaxRequestTarget target,
Form<?> form) {
Application.getBean(FieldLanguagesValuesDAO.class).delete(getModelObject());
@@ -124,7 +127,7 @@ public class LangPanel extends AdminPane
target.add(form);
}
});
- item.add(AttributeModifier.replace("class",
(item.getIndex() % 2 == 1) ? "even" : "odd"));
+ item.add(AttributeModifier.append("class",
"clickable " + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
}
};
@@ -161,6 +164,13 @@ public class LangPanel extends AdminPane
private static final long serialVersionUID =
-1650946343073068686L;
@Override
+ protected void
updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ //FIXME need to be generalized
+ attributes.getAjaxCallListeners().add(new
AjaxCallListener().onBefore("if (!confirm('" + WebSession.getString(833L) +
"')) {return false;}"));
+ }
+
+ @Override
protected void onEvent(AjaxRequestTarget target) {
language.setDeleted(true);
FieldLanguageDaoImpl langDao =
Application.getBean(FieldLanguageDaoImpl.class);
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html?rev=1388315&r1=1388314&r2=1388315&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/calendar/CalendarPanel.html
Fri Sep 21 03:46:28 2012
@@ -23,16 +23,12 @@
<wicket:head>
<link media="screen" type="text/css" rel="stylesheet"
href='css/fullcalendar.css' />
<!-- link media="print" type="text/css" rel="stylesheet"
href='css/fullcalendar.print.css' /--> <!-- FIXME incorrectly rendered -->
- </wicket:head>
- <wicket:panel>
- <script type="text/javascript"
src="js/fullcalendar.min.js"></script>
- <div wicket:id="calendar"></div>
- <!-- bottom section -->
<script type="text/javascript">
function getCalendarHeight() {
return $(window).height() -
$('#calendar').position().top - 20; //FIXME HACK
}
- $(function() {
+
+ function omComponentInit() {
$('#calendar').fullCalendar({
header: {
left: 'prev,next today',
@@ -79,8 +75,13 @@
, autoOpen: false
, modal: true
});
- });
+ }
</script>
+ </wicket:head>
+ <wicket:panel>
+ <script type="text/javascript"
src="js/fullcalendar.min.js"></script>
+ <div wicket:id="calendar"></div>
+ <!-- bottom section -->
<div id="appointment" wicket:ommessage="title:815">
<form wicket:id="appointment">
<table>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html?rev=1388315&r1=1388314&r2=1388315&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/pages/BasePage.html
Fri Sep 21 03:46:28 2012
@@ -22,6 +22,7 @@
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
<head>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>
+ <link rel="shortcut icon" href="favicon.ico"
type="image/x-icon"/>
<title wicket:id="pageTitle">[title]</title>
<link rel="stylesheet" type="text/css"
href="css/openmeetings-forms.css"/>
</head>
