Author: solomax
Date: Tue May 21 08:09:48 2013
New Revision: 1484686
URL: http://svn.apache.org/r1484686
Log:
Profile image upload should work better
Modified:
openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/StoredFile.java
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
Modified: openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1484686&r1=1484685&r2=1484686&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
(original)
+++ openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css Tue
May 21 08:09:48 2013
@@ -583,6 +583,10 @@ div.tableWrapper {
width: 100%;
padding: 5px;
z-index: 50;
+ font-size: 14px;
+ font-family: Arial;
+ font-weight: bold;
+ color: blue;
}
.profile .upload {
z-index: 100;
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/StoredFile.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/StoredFile.java?rev=1484686&r1=1484685&r2=1484686&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/StoredFile.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/utils/StoredFile.java
Tue May 21 08:09:48 2013
@@ -59,12 +59,12 @@ public class StoredFile {
public StoredFile(String fullname) {
int idx = fullname.lastIndexOf('.');
name = idx < 0 ? fullname : fullname.substring(0, idx);
- ext = idx < 0 ? "" : fullname.substring(idx + 1);
+ ext = idx < 0 ? "" : fullname.substring(idx + 1).toLowerCase();
}
public StoredFile(String name, String ext) {
this.name = name;
- this.ext = ext;
+ this.ext = ext != null ? ext.toLowerCase() : "";
}
public static String[] getExtensions(){
Modified:
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
URL:
http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java?rev=1484686&r1=1484685&r2=1484686&view=diff
==============================================================================
---
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
(original)
+++
openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/common/UploadableProfileImagePanel.java
Tue May 21 08:09:48 2013
@@ -41,7 +41,7 @@ public class UploadableProfileImagePanel
public UploadableProfileImagePanel(String id, final long userId) {
super(id, userId);
- Form<Void> form = new Form<Void>("form");
+ final Form<Void> form = new Form<Void>("form");
form.setMultiPart(true);
form.setMaxSize(Bytes.bytes(getMaxUploadSize(getBean(ConfigurationDao.class))));
form.add(fileUploadField = new FileUploadField("image", new
IModel<List<FileUpload>>() {
@@ -73,7 +73,6 @@ public class UploadableProfileImagePanel
//FIXME need to work
with InputStream !!!
getBean(GenerateImage.class)
.convertImageUserProfile(fu.writeToTempFile(), userId, asIs);
- target.add(profile);
} catch (Exception e) {
// TODO display error
e.printStackTrace();
@@ -82,8 +81,9 @@ public class UploadableProfileImagePanel
//TODO display error
}
}
+ target.add(profile, form);
}
});
- add(form);
+ add(form.setOutputMarkupId(true));
}
}
