svn commit: r1553544 - in /openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common: UploadableProfileImagePanel.html UploadableProfileImagePanel.java

[solomax]

Author: solomax
Date: Thu Dec 26 18:30:11 2013
New Revision: 1553544

URL: http://svn.apache.org/r1553544
Log:
[OPENMEETINGS-865] Picture upload

Modified:
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
    
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html?rev=1553544&r1=1553543&r2=1553544&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.html
 Thu Dec 26 18:30:11 2013
@@ -21,7 +21,8 @@
 <html xmlns:wicket="http://wicket.apache.org";>
        <wicket:extend>
                <form wicket:id="form"><div 
-                       class="uploadtext"><wicket:ommessage 
key="379"/></div><div class="upload"><input type="file" 
-                       wicket:id="image"/><span 
wicket:id="progress">[progressbar]</span></div></form>
+                       class="fileupload fileupload-new" 
data-provides="fileupload" style="margin: 0;"><span 
+                       class="btn btn-file" style="width: 
120px;"><wicket:ommessage key="379"/><input type="file" accept="image/*" 
+                       wicket:id="image"/></span></div><span 
wicket:id="progress">[progressbar]</span></form>
        </wicket:extend>
 </html>
\ No newline at end of file

Modified: 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
URL: 
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1553544&r1=1553543&r2=1553544&view=diff
==============================================================================
--- 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
 (original)
+++ 
openmeetings/trunk/singlewebapp/src/web/java/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
 Thu Dec 26 18:30:11 2013
@@ -30,10 +30,11 @@ import org.apache.wicket.ajax.form.AjaxF
 import 
org.apache.wicket.extensions.ajax.markup.html.form.upload.UploadProgressBar;
 import org.apache.wicket.markup.html.form.Form;
 import org.apache.wicket.markup.html.form.upload.FileUpload;
-import org.apache.wicket.markup.html.form.upload.FileUploadField;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.util.lang.Bytes;
 
+import de.agilecoders.wicket.extensions.javascript.jasny.FileUploadField;
+
 public class UploadableProfileImagePanel extends ProfileImagePanel {
        private static final long serialVersionUID = -6681473769070950510L;
        private FileUploadField fileUploadField;