gCubeSystem
/
share-updates
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed "Edit your profile picture" tooltip on user's avatar 

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/share-updates@122285 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Costantino Perciante 2016-01-18 13:46:58 +00:00
parent a27851dbc6
commit 308f70092d
4 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/gcube/portlets/user/shareupdates/client/view/AttachmentPreviewer.ui.xml
View File

@ -4,16 +4,14 @@
<ui:style> <ui:style>
.image-preview { .image-preview {
align: left; align: left;
margin-right: 5px; margin: 5px;
margin-left: 2px;
display: inline; display: inline;
margin-top: 5px;
margin-bottom: 5px;
height: 40px; height: 40px;
width: auto; width: auto;
} }
.attach-result { .attach-result {
margin-top: 5px;
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
font-size: 10px; font-size: 10px;

1
src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.java
View File

@ -6,7 +6,6 @@ import java.util.List;
import net.eliasbalasis.tibcopagebus4gwt.client.PageBusAdapter; import net.eliasbalasis.tibcopagebus4gwt.client.PageBusAdapter;
import net.eliasbalasis.tibcopagebus4gwt.client.PageBusAdapterException; import net.eliasbalasis.tibcopagebus4gwt.client.PageBusAdapterException;
import org.gcube.portal.databook.shared.ClientFeed; import org.gcube.portal.databook.shared.ClientFeed;
import org.gcube.portal.databook.shared.ClientFeed.ClientFeedJsonizer; import org.gcube.portal.databook.shared.ClientFeed.ClientFeedJsonizer;
import org.gcube.portal.databook.shared.FeedType; import org.gcube.portal.databook.shared.FeedType;

2
src/main/java/org/gcube/portlets/user/shareupdates/client/view/ShareUpdateForm.ui.xml
View File

@ -6,7 +6,7 @@
<table class="share-updates-table"> <table class="share-updates-table">
<tr> <tr>
<td class="share-updates-photo-cell"> <td class="share-updates-photo-cell">
<g:Image title="Edit Profile Picture" styleName="share-updates-member-photo" <g:Image styleName="share-updates-member-photo"
url="" ui:field="avatarImage" /> url="" ui:field="avatarImage" />
</td> </td>
<td class="share-updates-cell"> <td class="share-updates-cell">

36
src/main/java/org/gcube/portlets/user/shareupdates/server/ShareUpdateServiceImpl.java
View File

@ -124,7 +124,7 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar
} }
public String getDevelopmentUser() { public String getDevelopmentUser() {
String user = TEST_USER; String user = TEST_USER;
// user = "costantino.perciante"; user = "costantino.perciante";
return user; return user;
} }
/** /**
@ -334,24 +334,26 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar
firstAttachmentDescription = firstAttachment.getDescription(); firstAttachmentDescription = firstAttachment.getDescription();
firstAttachmentFormat = firstAttachment.getFormat(); firstAttachmentFormat = firstAttachment.getFormat();
firstAttachmentDownloadUrl = firstAttachment.getDownloadUrl(); firstAttachmentDownloadUrl = firstAttachment.getDownloadUrl();
firstAttachmenturlThumbnail = firstAttachment.getThumbnailUrl() != null ? firstAttachment.getThumbnailUrl() : "null"; firstAttachmenturlThumbnail =
firstAttachment.getThumbnailUrl() != null ?
firstAttachment.getThumbnailUrl() : firstAttachmenturlThumbnail;
if(uploadedFiles.size() > 1){ if(uploadedFiles.size() > 1){
attachments = new ArrayList<>(); attachments = new ArrayList<>();
// check if there are more files // check if there are more files
for (UploadedFile file : uploadedFiles) { for (UploadedFile file : uploadedFiles) {
attachments.add(new Attachment( attachments.add(new Attachment(
UUID.randomUUID().toString(), UUID.randomUUID().toString(),
file.getDownloadUrl(), file.getDownloadUrl(),
file.getFileName(), file.getFileName(),
file.getDescription(), file.getDescription(),
file.getThumbnailUrl(), file.getThumbnailUrl(),
file.getFormat()) file.getFormat())
); );
} }
} }
} }
@ -432,8 +434,6 @@ public class ShareUpdateServiceImpl extends RemoteServiceServlet implements Shar
} }
if (!result) return null; if (!result) return null;
_log.debug("Saved feed text is " + toShare.getDescription());
//everything went fine //everything went fine
ClientFeed cf = new ClientFeed(toShare.getKey(), toShare.getType().toString(), username, feedDate, toShare.getUri(), ClientFeed cf = new ClientFeed(toShare.getKey(), toShare.getType().toString(), username, feedDate, toShare.getUri(),
TextTransfromUtils.replaceAmpersand(toShare.getDescription()), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(), TextTransfromUtils.replaceAmpersand(toShare.getDescription()), fullName, email, thumbnailAvatarURL, toShare.getLinkTitle(), toShare.getLinkDescription(),