From e941506d7ba76bd5620f94a43c36c4226c871618 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 14 Jan 2014 18:02:43 +0000 Subject: [PATCH] share update button style modified, attach button added in the UI git-svn-id: https://svn.research-infrastructures.eu/d4science/gcube/trunk/portlets/user/share-updates@90116 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 10 +++---- .settings/org.eclipse.jdt.core.prefs | 7 ++--- ....eclipse.wst.common.project.facet.core.xml | 2 +- pom.xml | 19 +++++++----- .../client/form/ShareUpdateForm.java | 7 +++++ .../client/form/ShareUpdateForm.ui.xml | 3 +- .../user/shareupdates/ShareUpdates.gwt.xml | 2 +- src/main/webapp/ShareUpdates.css | 30 +++++++++++++++++++ 8 files changed, 60 insertions(+), 20 deletions(-) diff --git a/.classpath b/.classpath index b73d87d..51ca97e 100644 --- a/.classpath +++ b/.classpath @@ -20,16 +20,16 @@ - - - - - + + + + + diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index d4ee883..443e085 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,8 @@ -#Tue Apr 09 17:02:22 CEST 2013 eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7 +org.eclipse.jdt.core.compiler.compliance=1.7 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.source=1.7 diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index fefc63a..c24712e 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -2,6 +2,6 @@ - + diff --git a/pom.xml b/pom.xml index 0eecb0d..763a23b 100644 --- a/pom.xml +++ b/pom.xml @@ -28,9 +28,9 @@ 2.5.1 distro - - 1.6 - 1.6 + + 1.7 + 1.7 ${project.build.directory}/${project.build.finalName} UTF-8 @@ -54,7 +54,6 @@ xerces xercesImpl 2.9.1 - provided com.google.gwt @@ -87,6 +86,11 @@ gcube-widgets provided + + org.gcube.core + common-scope-maps + [1.0.0-SNAPSHOT, 2.0.0-SNAPSHOT) + org.gcube.portlets.widgets pickuser-widget @@ -141,7 +145,6 @@ commons-validator commons-validator 1.4.0 - provided com.liferay.portal @@ -161,7 +164,7 @@ org.slf4j slf4j-api - + @@ -210,8 +213,8 @@ maven-compiler-plugin 2.3.2 - 1.6 - 1.6 + 1.7 + 1.7 diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/client/form/ShareUpdateForm.java b/src/main/java/org/gcube/portlets/user/shareupdates/client/form/ShareUpdateForm.java index 439a28c..6e0ae2d 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/client/form/ShareUpdateForm.java +++ b/src/main/java/org/gcube/portlets/user/shareupdates/client/form/ShareUpdateForm.java @@ -18,6 +18,9 @@ import org.jsonmaker.gwt.client.Jsonizer; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Document; +import com.google.gwt.dom.client.Style.FontStyle; +import com.google.gwt.dom.client.Style.FontWeight; +import com.google.gwt.dom.client.Style.TextDecoration; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; @@ -72,6 +75,9 @@ public class ShareUpdateForm extends Composite { @UiField Button submitButton; + + @UiField + Button attachButton; @UiField Image avatarImage; @@ -88,6 +94,7 @@ public class ShareUpdateForm extends Composite { avatarImage.setUrl(loading); shareTextArea.setText(SHARE_UPDATE_TEXT); + shareupdateService.getUserSettings(new AsyncCallback() { public void onFailure(Throwable caught) { avatarImage.setSize("60px", "60px"); diff --git a/src/main/java/org/gcube/portlets/user/shareupdates/client/form/ShareUpdateForm.ui.xml b/src/main/java/org/gcube/portlets/user/shareupdates/client/form/ShareUpdateForm.ui.xml index 101bb8b..10d786a 100644 --- a/src/main/java/org/gcube/portlets/user/shareupdates/client/form/ShareUpdateForm.ui.xml +++ b/src/main/java/org/gcube/portlets/user/shareupdates/client/form/ShareUpdateForm.ui.xml @@ -40,7 +40,8 @@
- + +
diff --git a/src/main/resources/org/gcube/portlets/user/shareupdates/ShareUpdates.gwt.xml b/src/main/resources/org/gcube/portlets/user/shareupdates/ShareUpdates.gwt.xml index 12d45bf..f86d639 100644 --- a/src/main/resources/org/gcube/portlets/user/shareupdates/ShareUpdates.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/shareupdates/ShareUpdates.gwt.xml @@ -13,7 +13,7 @@ name="net.eliasbalasis.tibcopagebus4gwt.testsubscriber.TestSubscriber" /> - + diff --git a/src/main/webapp/ShareUpdates.css b/src/main/webapp/ShareUpdates.css index 2628a13..066e4c0 100644 --- a/src/main/webapp/ShareUpdates.css +++ b/src/main/webapp/ShareUpdates.css @@ -66,6 +66,10 @@ /* DIV trick ends here */ +.gwt-Button { + text-shadow: none; + font-weight: normal; +} .darker-color { color: #333; @@ -75,6 +79,32 @@ -webkit-transition: background .25s ease-in-out; } +.shareButton { + background-color: #0271BE; + background-image: linear-gradient(#6ab4eb, #0271BE); + border: 1px solid #01497C; + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + border-radius: 4px; + color: #FFF; + font-weight: normal; + font-size: 12px; + text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.25); + cursor: pointer; + padding: 3px 15px; +} + +.shareButton:hover, .shareButton:focus { + background-color: #019AD3; + background-image: linear-gradient(#33BCEF, #019AD3); + border-color: #057ED0; +} + +.shareButton:active { + background: #e3e8f3; +} + + .framed { margin: 0 0 10px; padding: 10px;