You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/10/25 20:02:23 UTC
svn commit: r1402240 - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/openmeetings/css/theme.css
src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html
src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java
Author: sebawagner
Date: Thu Oct 25 18:02:23 2012
New Revision: 1402240
URL: http://svn.apache.org/viewvc?rev=1402240&view=rev
Log:
OPENMEETINGS-428 BackupPanel styling fixed
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
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/WebContent/openmeetings/css/theme.css
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1402240&r1=1402239&r2=1402240&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Thu Oct 25 18:02:23 2012
@@ -321,6 +321,12 @@ div.tableWrapper {
margin: 4px 2px 2px;
}
+.adminBackupForm div.formelement {
+ display: block;
+ clear: both;
+ max-width: 1240px;
+}
+
.formelementradiobox {
margin-left: 100px;
}
Modified: 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=1402240&r1=1402239&r2=1402240&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.html Thu Oct 25 18:02:23 2012
@@ -25,30 +25,35 @@
<span wicket:id="uploadFeedback"/>
</div>
<!-- wicket:id="form" -->
- <form wicket:id="backupUpload" class="adminForm">
+ <form wicket:id="backupUpload" class="adminForm adminBackupForm">
<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" wicket:id="includeFilesInBackup" />
- <br/>
- <input wicket:id="fileInput" type="file"/>
- <br/>
- <span wicket:id="progress">[[upload progressbar]]</span>
- <br/>
- <!-- Perform Download -->
- <input type="submit" value="System Import" wicket:id="upload" />
- <!-- Perform Upload -->
- <input type="submit" wicket:ommessage="value:1066" wicket:id="download" />
- <br/>
- <!-- Max upload size -->
- <wicket:ommessage key="1491" />
- <br/>
- <!-- Backup CLI import information -->
- <wicket:ommessage key="1505" style="white-space: pre;"/>
- <br/>
-
+ <div class="formelement">
+ <div class="info-icon" /><span style="font-style: italic;"><wicket:ommessage key="1065" /></span>
+ </div>
+ <div class="formelement">
+ <label>Include uploaded files and recordings in backup</label> <input type="checkbox" wicket:id="includeFilesInBackup" />
+ </div>
+ <div class="formelement">
+ <input class="uploadFileField" wicket:id="fileInput" type="file"/>
+ </div>
+ <div class="formelement">
+ <span wicket:id="progress">[[upload progressbar]]</span>
+ </div>
+ <div class="formelement">
+ <!-- Perform Download -->
+ <input type="submit" value="System Import" wicket:id="upload" />
+ <!-- Perform Upload -->
+ <input type="submit" wicket:ommessage="value:1066" wicket:id="download" />
+ </div>
+ <div class="formelement">
+ <!-- Max upload size -->
+ <wicket:ommessage key="1491" /> <span wicket:id="MaxUploadSize" /><span>MB</span>
+ </div>
+ <div class="formelement">
+ <!-- Backup CLI import information -->
+ <div class="info-icon" /><span style="font-style: italic;"><wicket:ommessage key="1505" /></span>
+ </div>
</fieldset>
</form>
</wicket:panel>
Modified: 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=1402240&r1=1402239&r2=1402240&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/backup/BackupPanel.java Thu Oct 25 18:02:23 2012
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.comp
import java.io.File;
import java.io.IOException;
+import java.text.DecimalFormat;
import java.util.Date;
import org.apache.openmeetings.OpenmeetingsVariables;
@@ -35,6 +36,7 @@ import org.apache.openmeetings.web.util.
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.upload.FileUpload;
@@ -81,6 +83,13 @@ public class BackupPanel extends AdminPa
// set this form to multipart mode (allways needed for uploads!)
setMultiPart(true);
+ // set max upload size in form as info text
+ Long maxBytes = ImportHelper.getMaxUploadSize(Application
+ .getBean(ConfigurationDaoImpl.class));
+ double megaBytes = maxBytes.doubleValue() / 1024 / 1024;
+ DecimalFormat formatter = new DecimalFormat("#,###.00");
+ add(new Label("MaxUploadSize", formatter.format(megaBytes)));
+
// Add one file input field
fileUploadField = new FileUploadField("fileInput");
add(fileUploadField);
@@ -119,7 +128,8 @@ public class BackupPanel extends AdminPa
.booleanValue());
download.setFileName(backupFile.getName());
- download.setResourceStream(new FileResourceStream(backupFile));
+ download.setResourceStream(new FileResourceStream(
+ backupFile));
download.initiate(target);
} catch (Exception e) {
log.error("Exception on panel backup download ", e);