Author: sebawagner
Date: Sat Oct 13 17:41:32 2012
New Revision: 1397912
URL: http://svn.apache.org/viewvc?rev=1397912&view=rev
Log:
Add Backup Panel HTML Markup. Remove ":" in Server's Form
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/MenuPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
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=1397912&r1=1397911&r2=1397912&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
Sat Oct 13 17:41:32 2012
@@ -23,6 +23,7 @@ import org.apache.openmeetings.persisten
import org.apache.openmeetings.persistence.beans.basic.Navimain;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.app.WebSession;
+import org.apache.openmeetings.web.components.admin.backup.BackupPanel;
import
org.apache.openmeetings.web.components.admin.configurations.ConfigsPanel;
import org.apache.openmeetings.web.components.admin.groups.GroupsPanel;
import org.apache.openmeetings.web.components.admin.labels.LangPanel;
@@ -143,6 +144,7 @@ public class MenuPanel extends BasePanel
target.add(contents.replace(new LdapsPanel("child")));
break;
case
adminModuleBackup:
+
target.add(contents.replace(new BackupPanel("child")));
break;
case
adminModuleServers:
target.add(contents.replace(new ServersPanel("child")));
@@ -225,6 +227,7 @@ public class MenuPanel extends BasePanel
hash = "#admin/ldaps";
break;
case adminModuleBackup:
+ hash = "#admin/backup";
break;
case adminModuleServers:
hash = "#admin/servers";
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html?rev=1397912&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
Sat Oct 13 17:41:32 2012
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<html xmlns="http://www.w3.org/1999/xhtml";
+
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.5-strict.dtd";
lang="en">
+ <wicket:panel>
+ <!-- wicket:id="form" -->
+ <form class="adminForm">
+ <fieldset>
+ <legend><wicket:ommessage key="1066" /></legend>
+ <wicket:ommessage key="1065" />
+ <br/>
+ <!-- _includeFileOption -->
+ <span>Include uploaded files and recordings in
backup</span> <input type="checkbox"/>
+ <br/>
+ <div>
+ <input type="submit" value="System
Import" />
+ </div>
+ <div>
+ <input type="submit" value="System
Backup" />
+ </div>
+ <br/>
+ <!-- Max upload size -->
+ <wicket:ommessage key="1491" />
+ <br/>
+ <!-- Backup CLI import information -->
+ <wicket:ommessage key="1505" />
+ <br/>
+
+ </fieldset>
+ </form>
+ </wicket:panel>
+</html>
Added:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java?rev=1397912&view=auto
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
(added)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
Sat Oct 13 17:41:32 2012
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.openmeetings.web.components.admin.backup;
+
+import org.apache.openmeetings.web.components.admin.AdminPanel;
+
+/**
+ * Panel component to manage Backup Import/Export
+ *
+ * @author swagner
+ *
+ */
+public class BackupPanel extends AdminPanel {
+
+ private static final long serialVersionUID = -1L;
+
+ public BackupPanel(String id) {
+ super(id);
+
+
+ }
+}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html?rev=1397912&r1=1397911&r2=1397912&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.html
Sat Oct 13 17:41:32 2012
@@ -51,19 +51,19 @@
<div wicket:id="buttons"></div>
<fieldset>
<legend><wicket:ommessage key="1502" /></legend>
- <wicket:ommessage
key="1500" />: <input type="text" wicket:id="name"/>
+ <wicket:ommessage
key="1500" /><input type="text" wicket:id="name"/>
<br/>
- <wicket:ommessage key="1501" />:
<input type="text" wicket:id="address"/>
+ <wicket:ommessage key="1501"
/><input type="text" wicket:id="address"/>
<br/>
- <wicket:ommessage
key="1110" />: <span wicket:id="inserted"/>
+ <wicket:ommessage
key="1110" /><span wicket:id="inserted"/>
<br/>
- <wicket:ommessage key="1111" />:
<span wicket:id="insertedby.login"/>
+ <wicket:ommessage key="1111"
/><span wicket:id="insertedby.login"/>
<br/>
- <wicket:ommessage key="1112" />:
<span wicket:id="updated"/>
+ <wicket:ommessage key="1112"
/><span wicket:id="updated"/>
<br/>
- <wicket:ommessage key="1113" />:
<span wicket:id="updatedby.login"/>
+ <wicket:ommessage key="1113"
/><span wicket:id="updatedby.login"/>
<br/>
- <wicket:ommessage key="270" />:
<textarea wicket:id="comment"/>
+ <wicket:ommessage key="270"
/><textarea wicket:id="comment"/>
<br/>
</fieldset>
</form>
