From b64ec9686dac0d04d88b93f304d2b0d12ed2137a Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 28 Apr 2015 13:37:50 +0000 Subject: [PATCH] Integrated gwt-bootstrap and revised css, ported to GWT 2.7.0 git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/questions@114479 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 4 ++-- .settings/org.eclipse.jst.jsp.core.prefs | 3 +++ .settings/org.eclipse.wst.common.component | 4 ++-- ....eclipse.wst.common.project.facet.core.xml | 1 + pom.xml | 23 +++++++++++++++---- .../questions/client/VREManagersPanel.java | 19 +++++++++++---- .../portlets/user/questions/Questions.gwt.xml | 4 ++-- src/main/webapp/Questions.css | 4 ++-- 8 files changed, 44 insertions(+), 18 deletions(-) create mode 100644 .settings/org.eclipse.jst.jsp.core.prefs diff --git a/.classpath b/.classpath index 65677af..b94a91d 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -31,5 +31,5 @@ - + diff --git a/.settings/org.eclipse.jst.jsp.core.prefs b/.settings/org.eclipse.jst.jsp.core.prefs new file mode 100644 index 0000000..3a5c98d --- /dev/null +++ b/.settings/org.eclipse.jst.jsp.core.prefs @@ -0,0 +1,3 @@ +eclipse.preferences.version=1 +validateFragments=false +validation.use-project-settings=true diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index bb22d48..8262461 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -1,10 +1,10 @@ - + - + uses diff --git a/.settings/org.eclipse.wst.common.project.facet.core.xml b/.settings/org.eclipse.wst.common.project.facet.core.xml index 4045d87..b3a52d7 100644 --- a/.settings/org.eclipse.wst.common.project.facet.core.xml +++ b/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -4,4 +4,5 @@ + diff --git a/pom.xml b/pom.xml index 6112d04..f8f0a34 100644 --- a/pom.xml +++ b/pom.xml @@ -13,10 +13,10 @@ org.gcube.portlets.user questions war - 1.0.0-SNAPSHOT + 1.1.0-SNAPSHOT gCube Questions Ask Managers Portlet - VRE Managers + Message VRE Managers scm:svn:http://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/${project.artifactId} @@ -25,7 +25,7 @@ - 2.5.1 + 2.7.0 distro 1.7 1.7 @@ -48,14 +48,27 @@ com.google.gwt - gwt-user + gwt-servlet + ${gwtVersion} provided com.google.gwt - gwt-servlet + gwt-user + ${gwtVersion} provided + + com.google.gwt + gwt-dev + ${gwtVersion} + provided + + + com.github.gwtbootstrap + gwt-bootstrap + 2.3.2.0 + org.gcube.portlets.user gcube-widgets diff --git a/src/main/java/org/gcube/portlets/user/questions/client/VREManagersPanel.java b/src/main/java/org/gcube/portlets/user/questions/client/VREManagersPanel.java index 2f6433b..045e2fc 100644 --- a/src/main/java/org/gcube/portlets/user/questions/client/VREManagersPanel.java +++ b/src/main/java/org/gcube/portlets/user/questions/client/VREManagersPanel.java @@ -8,6 +8,7 @@ import org.gcube.portlets.user.questions.client.resources.Images; import org.gcube.portlets.user.questions.client.ui.DisplayBadge; import org.gcube.portlets.widgets.wsmail.client.forms.MailForm; +import com.github.gwtbootstrap.client.ui.Button; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.RunAsyncCallback; import com.google.gwt.event.dom.client.ClickEvent; @@ -20,6 +21,7 @@ import com.google.gwt.user.client.ui.HasAlignment; import com.google.gwt.user.client.ui.HasVerticalAlignment; import com.google.gwt.user.client.ui.HorizontalPanel; import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.SimplePanel; import com.google.gwt.user.client.ui.VerticalPanel; public class VREManagersPanel extends Composite { @@ -29,6 +31,7 @@ public class VREManagersPanel extends Composite { private Image loadingImage; private Image postToImage; + private Button messageManagers = new Button(); private VerticalPanel mainPanel = new VerticalPanel(); private ArrayList managers; @@ -48,17 +51,15 @@ public class VREManagersPanel extends Composite { mainPanel.clear(); mainPanel.setHorizontalAlignment(HasAlignment.ALIGN_LEFT); mainPanel.setVerticalAlignment(HasVerticalAlignment.ALIGN_TOP); - mainPanel.setStyleName("questions-frame"); + mainPanel.setStyleName("invites-frame"); HTML name = new HTML(DISPLAY_NAME); name.setStyleName("questions-title"); - name.addStyleName("manager-action"); HorizontalPanel hp = new HorizontalPanel(); hp.add(name); - hp.setStyleName("manager-action"); postToImage.setStyleName("manager-post-image"); postToImage.setTitle("Message privately to the Managers"); - hp.add(postToImage); + // hp.add(postToImage); mainPanel.add(hp); if (users == null || users.isEmpty()) { mainPanel.add(new HTML("
Ops, something went wrong. Please reload this page.
")); @@ -66,7 +67,15 @@ public class VREManagersPanel extends Composite { for (int i = 0; i < users.size(); i++) { mainPanel.add(new DisplayBadge(users.get(i))); } + if (users.size() > 1) + messageManagers.setText("Message managers"); + else + messageManagers.setText("Message manager"); } + SimplePanel bPanel = new SimplePanel(); + bPanel.setStyleName("manager-action"); + bPanel.setWidget(messageManagers); + mainPanel.add(bPanel); } @Override @@ -79,7 +88,7 @@ public class VREManagersPanel extends Composite { }); initWidget(mainPanel); - postToImage.addClickHandler(new ClickHandler() { + messageManagers.addClickHandler(new ClickHandler() { @Override public void onClick(ClickEvent event) { final List listToLogin = new ArrayList(); diff --git a/src/main/resources/org/gcube/portlets/user/questions/Questions.gwt.xml b/src/main/resources/org/gcube/portlets/user/questions/Questions.gwt.xml index 7101ba6..537f072 100644 --- a/src/main/resources/org/gcube/portlets/user/questions/Questions.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/questions/Questions.gwt.xml @@ -2,9 +2,9 @@ - + - + diff --git a/src/main/webapp/Questions.css b/src/main/webapp/Questions.css index 83cdfa6..8325c22 100644 --- a/src/main/webapp/Questions.css +++ b/src/main/webapp/Questions.css @@ -7,7 +7,7 @@ font-size: 16px; color: #555; font-weight: 400; - margin-bottom: 10px; + margin-bottom: 5px; } .questions-frame { @@ -37,7 +37,7 @@ } .manager-action { - padding: 5px; + padding: 10px 0px; } .manager-post-image:hover {