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

updated select and buttons layout 

git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/share-updates@122094 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2015-12-30 13:19:18 +00:00
parent 34648556c2
commit ca73112dda
4 changed files with 50 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.uibinder.client.UiHandler;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.google.gwt.user.client.ui.Button;
import com.github.gwtbootstrap.client.ui.Button;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.FileUpload;
import com.google.gwt.user.client.ui.HTML;
@ -102,7 +102,7 @@ public class ShareUpdateForm extends Composite {
Button submitButton;
@UiField
HTML attachButton;
Button attachButton;
@UiField
Image avatarImage;
@ -140,9 +140,9 @@ public class ShareUpdateForm extends Composite {
shareTextArea.setText(SHARE_UPDATE_TEXT);
attachButton.getElement().getStyle().setDisplay(Display.INLINE);
attachButton.setHTML("<span style=\"padding: 5px 1px; background: url('"+attach+"') 50% 50% no-repeat;\">&nbsp;&nbsp;&nbsp;&nbsp;</span>");
// attachButton.setHTML("<span style=\"padding: 5px 1px; background: url('"+attach+"') 50% 50% no-repeat;\">&nbsp;&nbsp;&nbsp;&nbsp;</span>");
attachButton.addStyleName("upload-btn-m");
shareupdateService.getUserSettings(new AsyncCallback<UserSettings>() {
public void onFailure(Throwable caught) {
avatarImage.setUrl(avatar_default);
@ -182,6 +182,8 @@ public class ShareUpdateForm extends Composite {
}
else
privacyLevel.setVisible(true);
attachButton.setVisible(true);
submitButton.setVisible(true);
}
});
}
@ -398,7 +400,6 @@ public class ShareUpdateForm extends Composite {
GWT.log("Failed");
uploadProgress.showRegisteringResult(false);
preview.clear();
attachButton.getElement().getStyle().setVisibility(Visibility.VISIBLE); //beacuse otherwise it looses the other properties setting
submitButton.setEnabled(true);
final HorizontalPanel hp = new HorizontalPanel();
final Button close = new Button("Try Again");

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

@ -1,7 +1,7 @@
<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent">
<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder"
xmlns:g="urn:import:com.google.gwt.user.client.ui" xmlns:m="urn:import:org.gcube.portlets.user.shareupdates.client.view"
xmlns:j="urn:import:org.gcube.portlets.widgets.fileupload.client.view">
xmlns:b="urn:import:com.github.gwtbootstrap.client.ui" xmlns:j="urn:import:org.gcube.portlets.widgets.fileupload.client.view">
<g:HTMLPanel ui:field="mainPanel">
<table class="share-updates-table">
<tr>
@ -25,29 +25,27 @@
</table>
<j:UploadProgressPanel ui:field="uploadProgress"></j:UploadProgressPanel>
<m:Placeholder ui:field="preview"></m:Placeholder>
<table class="toolsContainer">
<table class="share-updates-table">
<tr>
<td valign="middle" width="60px;">
</td>
<td valign="middle" width="372px">
<div style="text-align: left; padding-top: 2px; color: #777;">
<g:ListBox styleName="wizardListbox" ui:field="privacyLevel"
visible="false" />
<g:ListBox styleName="wizardListbox" ui:field="notifyListbox"
visible="false" />
</div>
<td class="share-updates-photo-cell">
</td>
<td class="share-updates-cell">
<b:Form>
<b:Fieldset>
<b:ControlGroup>
<g:ListBox styleName="wizardListbox" ui:field="privacyLevel"
visible="false" />
<g:ListBox styleName="wizardListbox" ui:field="notifyListbox"
visible="false" />
<td valign="middle">
<div class="buttonDiv">
<g:HTML ui:field="attachButton" styleName="gwt-Button" />
<g:Button ui:field="submitButton" styleName="shareButton"
width="90px" text="Share" />
</div>
<b:Button ui:field="attachButton" icon="UPLOAD_ALT" visible="false" />
<b:Button ui:field="submitButton" type="INFO" width="60px"
text="Share" visible="false" />
</b:ControlGroup>
</b:Fieldset>
</b:Form>
</td>
</tr>
</table>
</g:HTMLPanel>
</ui:UiBinder>

23
src/main/webapp/ShareUpdates.css
View File

@ -1,8 +1,30 @@
form {
margin-top: 5px !important;
margin-bottom: 0px !important;
}
fieldset {
padding-bottom: 0px !important;
padding-left: 0px !important;
}
fieldset .control-group {
margin-bottom: 0px;
}
fieldset select {
margin-bottom: 0px;
}
.share-updates-table {
border-collapse: collapse;
width: 100%;
}
.upload-btn-m {
margin: 0 13px;
}
.share-updates-table .share-updates-cell {
padding-left: 3px;
}
@ -85,7 +107,6 @@
}
/* DIV trick ends here */
.gwt-Button {
text-shadow: none;
font-weight: normal;

8
src/main/webapp/WEB-INF/liferay-plugin-package.properties
View File

@ -1,9 +1,9 @@
name=ShareUpdates
module-group-id=liferay
module-incremental-version=1
module-incremental-version=2
tags=
short-description=
change-log=
page-url=http://www.liferay.com
author=Liferay, Inc.
licenses=LGPL
page-url=http://www.gcube-system.com
author=Massimiliano Assante
licenses=EUPL