Author: solomax
Date: Thu Apr 7 15:40:22 2016
New Revision: 1738143
URL: http://svn.apache.org/viewvc?rev=1738143&view=rev
Log:
[OPENMEETINGS-853] cleanup button is added
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
Thu Apr 7 15:40:22 2016
@@ -1905,4 +1905,6 @@
<entry key="dashboard.widget.admin.cleanup.files">files:</entry>
<entry key="dashboard.widget.admin.cleanup.streams">Streams
folder:</entry>
<entry key="dashboard.widget.admin.cleanup.final">final:</entry>
+ <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry>
+ <entry key="dashboard.widget.admin.cleanup.error">Unexpected error
while performing cleanup</entry>
</properties>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
Thu Apr 7 15:40:22 2016
@@ -41,7 +41,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.Radio;
import org.apache.wicket.markup.html.form.RadioGroup;
import org.apache.wicket.markup.html.form.RequiredTextField;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -56,19 +55,20 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ForgetPasswordDialog extends AbstractFormDialog<String> {
private static final Logger log =
Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey);
private static final long serialVersionUID = 1L;
private DialogButton send = new DialogButton("send",
Application.getString(317));
private DialogButton cancel = new DialogButton("cancel",
Application.getString(122));
- private FeedbackPanel feedback = new FeedbackPanel("feedback");
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private RequiredTextField<String> nameField;
private Form<String> form;
private SignInDialog s;
private String name;
private Type type = Type.email;
- final MessageDialog confirmDialog;
+ final MessageDialog confirmDialog;
enum Type {
email
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Thu Apr 7 15:40:22 2016
@@ -50,7 +50,6 @@ 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.StatelessForm;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -65,13 +64,14 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class RegisterDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log =
Red5LoggerFactory.getLogger(RegisterDialog.class, webAppRootKey);
private DialogButton cancelBtn = new DialogButton("cancel",
Application.getString(122));
private DialogButton registerBtn = new DialogButton("register",
Application.getString(121));
- private FeedbackPanel feedback = new FeedbackPanel("feedback");
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private final IModel<String> tzModel =
Model.of(WebSession.get().getClientTZCode());
private final DropDownChoice<String> tzDropDown = new
DropDownChoice<String>("tz", tzModel, AVAILABLE_TIMEZONES);
private RegisterForm form;
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
Thu Apr 7 15:40:22 2016
@@ -35,7 +35,6 @@ import org.apache.wicket.core.request.ha
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.Model;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
@@ -45,15 +44,16 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ResetPasswordDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private DialogButton resetBtn = new DialogButton("reset",
Application.getString(327));
private Form<String> form;
- private FeedbackPanel feedback = new FeedbackPanel("feedback");
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private PasswordTextField password;
private final User user;
- final MessageDialog confirmReset;
+ final MessageDialog confirmReset;
public ResetPasswordDialog(String id, final User user) {
super(id, Application.getString(325));
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Thu Apr 7 15:40:22 2016
@@ -61,7 +61,6 @@ import org.apache.wicket.markup.html.ima
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -74,20 +73,21 @@ import com.googlecode.wicket.jquery.ui.e
import com.googlecode.wicket.jquery.ui.form.button.Button;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class SignInDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private Form<String> form;
private DialogButton loginBtn = new DialogButton("login",
Application.getString(112));
private DialogButton registerBtn = new DialogButton("register",
Application.getString(123));
- private String password;
- private String login;
- private boolean rememberMe = false;
- private RegisterDialog r;
- private ForgetPasswordDialog f;
- private LdapConfig domain;
- private FeedbackPanel feedback = new FeedbackPanel("feedback");
-
+ private String password;
+ private String login;
+ private boolean rememberMe = false;
+ private RegisterDialog r;
+ private ForgetPasswordDialog f;
+ private LdapConfig domain;
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
+
public SignInDialog(String id) {
super(id, Application.getString(108));
add(form = new SignInForm("signin"));
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
Thu Apr 7 15:40:22 2016
@@ -22,6 +22,7 @@
<wicket:panel>
<div class="ui-widget">
<div class="ui-widget-content ui-corner-all">
+ <div wicket:id="feedback"></div>
<ul wicket:id="container">
<li><div wicket:id="temp"></div></li>
<li><span><wicket:message
key="dashboard.widget.admin.cleanup.upload"/></span> <span
wicket:id="upload-size"></span>
@@ -38,6 +39,7 @@
</ul>
</li>
</ul>
+ <form wicket:id="form"><button
wicket:id="cleanup"><wicket:message
key="dashboard.widget.admin.cleanup.cleanup"/></button></form>
</div>
</div>
</wicket:panel>
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
Thu Apr 7 15:40:22 2016
@@ -38,10 +38,14 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.Model;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class AdminCleanupInfoDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1L;
@@ -54,6 +58,7 @@ public class AdminCleanupInfoDialog exte
private final Label streamsSize;
private final CleanupEntityUnitPanel fin;
private final WebMarkupContainer container = new
WebMarkupContainer("container");
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
public AdminCleanupInfoDialog(String id) {
super(id, "");
@@ -65,8 +70,16 @@ public class AdminCleanupInfoDialog exte
files = new CleanupEntityUnitPanel("files",
"dashboard.widget.admin.cleanup.files", new CleanupEntityUnit());
streamsSize = new Label("streams-size", "");
fin = new CleanupEntityUnitPanel("final",
"dashboard.widget.admin.cleanup.final", new CleanupEntityUnit());
-
+
+ add(feedback);
add(container.add(temp, uploadSize, profile, imp, backup,
files, streamsSize, fin).setOutputMarkupId(true));
+ add(new Form<Void>("form").add(new
IndicatingAjaxButton("cleanup") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ }
+ }));
}
@Override
@@ -77,10 +90,9 @@ public class AdminCleanupInfoDialog exte
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
- // TODO Auto-generated method stub
}
- public void show(AjaxRequestTarget target) {
+ private void update(AjaxRequestTarget target) {
temp.setDefaultModelObject(getTempUnit());
uploadSize.setDefaultModelObject(getHumanSize(getUploadDir()));
profile.setDefaultModelObject(getProfileUnit(getBean(UserDao.class)));
@@ -90,6 +102,24 @@ public class AdminCleanupInfoDialog exte
streamsSize.setDefaultModelObject(getHumanSize(getStreamsDir()));
fin.setDefaultModelObject(getRecUnit(getBean(RecordingDao.class)));
target.add(container);
+ }
+
+ public void show(AjaxRequestTarget target) {
+ update(target);
open(target);
}
+
+ public void cleanup(AjaxRequestTarget target) {
+ try {
+ ((CleanupUnit)temp.getDefaultModelObject()).cleanup();
+
((CleanupEntityUnit)profile.getDefaultModelObject()).cleanup();
+ ((CleanupUnit)imp.getDefaultModelObject()).cleanup();;
+ ((CleanupUnit)backup.getDefaultModelObject()).cleanup();
+
((CleanupEntityUnit)files.getDefaultModelObject()).cleanup();;
+
((CleanupEntityUnit)fin.getDefaultModelObject()).cleanup();
+ update(target);
+ } catch (Exception e) {
+
error(getString("dashboard.widget.admin.cleanup.error"));
+ }
+ }
}
Modified:
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
(original)
+++
openmeetings/application/branches/3.1.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
Thu Apr 7 15:40:22 2016
@@ -41,7 +41,7 @@ public class AdminWidgetView extends Wid
@Override
protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
- cleanupDialog.show(target);
+ cleanupDialog.cleanup(target);
}
});
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
Thu Apr 7 15:40:22 2016
@@ -1905,4 +1905,6 @@
<entry key="dashboard.widget.admin.cleanup.files">files:</entry>
<entry key="dashboard.widget.admin.cleanup.streams">Streams
folder:</entry>
<entry key="dashboard.widget.admin.cleanup.final">final:</entry>
+ <entry key="dashboard.widget.admin.cleanup.cleanup">Cleanup</entry>
+ <entry key="dashboard.widget.admin.cleanup.error">Unexpected error
while performing cleanup</entry>
</properties>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.java
Thu Apr 7 15:40:22 2016
@@ -41,7 +41,6 @@ import org.apache.wicket.markup.html.for
import org.apache.wicket.markup.html.form.Radio;
import org.apache.wicket.markup.html.form.RadioGroup;
import org.apache.wicket.markup.html.form.RequiredTextField;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -56,19 +55,20 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ForgetPasswordDialog extends AbstractFormDialog<String> {
private static final Logger log =
Red5LoggerFactory.getLogger(ForgetPasswordDialog.class, webAppRootKey);
private static final long serialVersionUID = 1L;
private DialogButton send = new DialogButton("send",
Application.getString(317));
private DialogButton cancel = new DialogButton("cancel",
Application.getString(122));
- private FeedbackPanel feedback = new FeedbackPanel("feedback");
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private RequiredTextField<String> nameField;
private Form<String> form;
private SignInDialog s;
private String name;
private Type type = Type.email;
- final MessageDialog confirmDialog;
+ final MessageDialog confirmDialog;
enum Type {
email
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/RegisterDialog.java
Thu Apr 7 15:40:22 2016
@@ -50,7 +50,6 @@ 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.StatelessForm;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -65,13 +64,14 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class RegisterDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private static final Logger log =
Red5LoggerFactory.getLogger(RegisterDialog.class, webAppRootKey);
private DialogButton cancelBtn = new DialogButton("cancel",
Application.getString(122));
private DialogButton registerBtn = new DialogButton("register",
Application.getString(121));
- private FeedbackPanel feedback = new FeedbackPanel("feedback");
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private final IModel<String> tzModel =
Model.of(WebSession.get().getClientTZCode());
private final DropDownChoice<String> tzDropDown = new
DropDownChoice<String>("tz", tzModel, AVAILABLE_TIMEZONES);
private RegisterForm form;
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.java
Thu Apr 7 15:40:22 2016
@@ -35,7 +35,6 @@ import org.apache.wicket.core.request.ha
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.TextField;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.Model;
import com.googlecode.wicket.jquery.core.JQueryBehavior;
@@ -45,15 +44,16 @@ import com.googlecode.wicket.jquery.ui.w
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButtons;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogIcon;
import com.googlecode.wicket.jquery.ui.widget.dialog.MessageDialog;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class ResetPasswordDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private DialogButton resetBtn = new DialogButton("reset",
Application.getString(327));
private Form<String> form;
- private FeedbackPanel feedback = new FeedbackPanel("feedback");
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
private PasswordTextField password;
private final User user;
- final MessageDialog confirmReset;
+ final MessageDialog confirmReset;
public ResetPasswordDialog(String id, final User user) {
super(id, Application.getString(325));
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
Thu Apr 7 15:40:22 2016
@@ -61,7 +61,6 @@ import org.apache.wicket.markup.html.ima
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.FeedbackPanel;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
@@ -74,20 +73,21 @@ import com.googlecode.wicket.jquery.ui.e
import com.googlecode.wicket.jquery.ui.form.button.Button;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class SignInDialog extends AbstractFormDialog<String> {
private static final long serialVersionUID = 1L;
private Form<String> form;
private DialogButton loginBtn = new DialogButton("login",
Application.getString(112));
private DialogButton registerBtn = new DialogButton("register",
Application.getString(123));
- private String password;
- private String login;
- private boolean rememberMe = false;
- private RegisterDialog r;
- private ForgetPasswordDialog f;
- private LdapConfig domain;
- private FeedbackPanel feedback = new FeedbackPanel("feedback");
-
+ private String password;
+ private String login;
+ private boolean rememberMe = false;
+ private RegisterDialog r;
+ private ForgetPasswordDialog f;
+ private LdapConfig domain;
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
+
public SignInDialog(String id) {
super(id, Application.getString(108));
add(form = new SignInForm("signin"));
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
Thu Apr 7 15:40:22 2016
@@ -22,6 +22,7 @@
<wicket:panel>
<div class="ui-widget">
<div class="ui-widget-content ui-corner-all">
+ <div wicket:id="feedback"></div>
<ul wicket:id="container">
<li><div wicket:id="temp"></div></li>
<li><span><wicket:message
key="dashboard.widget.admin.cleanup.upload"/></span> <span
wicket:id="upload-size"></span>
@@ -38,6 +39,7 @@
</ul>
</li>
</ul>
+ <form wicket:id="form"><button
wicket:id="cleanup"><wicket:message
key="dashboard.widget.admin.cleanup.cleanup"/></button></form>
</div>
</div>
</wicket:panel>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.java
Thu Apr 7 15:40:22 2016
@@ -38,10 +38,14 @@ import org.apache.wicket.ajax.AjaxReques
import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.Model;
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.form.button.IndicatingAjaxButton;
import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractDialog;
import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
public class AdminCleanupInfoDialog extends AbstractDialog<String> {
private static final long serialVersionUID = 1L;
@@ -54,6 +58,7 @@ public class AdminCleanupInfoDialog exte
private final Label streamsSize;
private final CleanupEntityUnitPanel fin;
private final WebMarkupContainer container = new
WebMarkupContainer("container");
+ private final KendoFeedbackPanel feedback = new
KendoFeedbackPanel("feedback", new Options("button", true));
public AdminCleanupInfoDialog(String id) {
super(id, "");
@@ -66,7 +71,15 @@ public class AdminCleanupInfoDialog exte
streamsSize = new Label("streams-size", "");
fin = new CleanupEntityUnitPanel("final",
"dashboard.widget.admin.cleanup.final", new CleanupEntityUnit());
+ add(feedback);
add(container.add(temp, uploadSize, profile, imp, backup,
files, streamsSize, fin).setOutputMarkupId(true));
+ add(new Form<Void>("form").add(new
IndicatingAjaxButton("cleanup") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
+ }
+ }));
}
@Override
@@ -77,10 +90,9 @@ public class AdminCleanupInfoDialog exte
@Override
public void onClose(IPartialPageRequestHandler handler, DialogButton
button) {
- // TODO Auto-generated method stub
}
- public void show(AjaxRequestTarget target) {
+ private void update(AjaxRequestTarget target) {
temp.setDefaultModelObject(getTempUnit());
uploadSize.setDefaultModelObject(getHumanSize(getUploadDir()));
profile.setDefaultModelObject(getProfileUnit(getBean(UserDao.class)));
@@ -90,6 +102,24 @@ public class AdminCleanupInfoDialog exte
streamsSize.setDefaultModelObject(getHumanSize(getStreamsDir()));
fin.setDefaultModelObject(getRecUnit(getBean(RecordingDao.class)));
target.add(container);
+ }
+
+ public void show(AjaxRequestTarget target) {
+ update(target);
open(target);
}
+
+ public void cleanup(AjaxRequestTarget target) {
+ try {
+ ((CleanupUnit)temp.getDefaultModelObject()).cleanup();
+
((CleanupEntityUnit)profile.getDefaultModelObject()).cleanup();
+ ((CleanupUnit)imp.getDefaultModelObject()).cleanup();;
+ ((CleanupUnit)backup.getDefaultModelObject()).cleanup();
+
((CleanupEntityUnit)files.getDefaultModelObject()).cleanup();;
+
((CleanupEntityUnit)fin.getDefaultModelObject()).cleanup();
+ update(target);
+ } catch (Exception e) {
+
error(getString("dashboard.widget.admin.cleanup.error"));
+ }
+ }
}
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java?rev=1738143&r1=1738142&r2=1738143&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.java
Thu Apr 7 15:40:22 2016
@@ -41,7 +41,7 @@ public class AdminWidgetView extends Wid
@Override
protected void onSubmit(AjaxRequestTarget target,
Form<?> form) {
- cleanupDialog.show(target);
+ cleanupDialog.cleanup(target);
}
});
}
