From 573f82c84f7c79047acae1f24c4cabdee41f3767 Mon Sep 17 00:00:00 2001 From: "massimiliano.assante" Date: Thu, 10 Jan 2013 11:20:33 +0000 Subject: [PATCH] fixed styles git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/notifications@67415 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 2 +- pom.xml | 5 ++++ .../templates/SingleNotificationView.java | 8 ++----- .../templates/SingleNotificationView.ui.xml | 17 +++++++------- .../client/view/templates/Span.java | 23 +++++++++++++++++++ src/main/webapp/Notifications.css | 4 +--- 6 files changed, 41 insertions(+), 18 deletions(-) create mode 100644 src/main/java/org/gcube/portlets/user/notifications/client/view/templates/Span.java diff --git a/.classpath b/.classpath index 8cf07ed..7af9f72 100644 --- a/.classpath +++ b/.classpath @@ -20,7 +20,7 @@ - + diff --git a/pom.xml b/pom.xml index 0cf7078..21a9423 100644 --- a/pom.xml +++ b/pom.xml @@ -62,6 +62,11 @@ 1.2.0-SNAPSHOT provided + + org.gcube.applicationsupportlayer + aslcore + 3.2.0-2.12.0 + com.liferay.portal portal-service diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java index fe3098b..0a973fe 100644 --- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java +++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.java @@ -1,8 +1,5 @@ package org.gcube.portlets.user.notifications.client.view.templates; -import java.util.Date; - -import com.google.gwt.user.datepicker.client.CalendarUtil; import org.gcube.portal.databook.client.GCubeSocialNetworking; import org.gcube.portal.databook.shared.Notification; import org.gcube.portal.databook.shared.NotificationType; @@ -14,7 +11,6 @@ import com.google.gwt.resources.client.ImageResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; -import com.google.gwt.user.client.ui.HTML; import com.google.gwt.user.client.ui.HTMLPanel; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.Widget; @@ -35,8 +31,8 @@ public class SingleNotificationView extends Composite { @UiField Image notificationImage; @UiField HTMLPanel mainPanel; - @UiField HTML notificationText; - @UiField HTML timeArea; + @UiField Span notificationText; + @UiField Span timeArea; public SingleNotificationView(Notification toShow) { initWidget(uiBinder.createAndBindUi(this)); diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.ui.xml b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.ui.xml index 1c0b693..dd8824c 100644 --- a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/SingleNotificationView.ui.xml @@ -1,19 +1,20 @@ + xmlns:g="urn:import:com.google.gwt.user.client.ui" + xmlns:c="urn:import:org.gcube.portlets.user.notifications.client.view.templates"> - - -
- + + - + + - + +
diff --git a/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/Span.java b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/Span.java new file mode 100644 index 0000000..8a999dc --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/notifications/client/view/templates/Span.java @@ -0,0 +1,23 @@ +package org.gcube.portlets.user.notifications.client.view.templates; + +import com.google.gwt.user.client.DOM; +import com.google.gwt.user.client.ui.HTML; +import com.google.gwt.user.client.ui.HasText; + +/** + * + * @author Massimiliano Assante, ISTI-CNR + * @version 0.1 Sep 2012 + * + */ +public class Span extends HTML implements HasText { + + public Span() { + super(DOM.createElement("span")); + } + + public Span(String text) { + this(); + setText(text); + } +} diff --git a/src/main/webapp/Notifications.css b/src/main/webapp/Notifications.css index 8194dbe..930d133 100644 --- a/src/main/webapp/Notifications.css +++ b/src/main/webapp/Notifications.css @@ -61,7 +61,7 @@ a.link:hover { font-family: 'Lucida Grande', Verdana, 'Bitstream Vera Sans', Arial, sans-serif; font-size: 12px; - padding-left: 10px; + padding: 1px 10px; white-space: nowrap; } @@ -74,6 +74,4 @@ a.link:hover { border-color: #999; border-width: 1px; letter-spacing: normal; - white-space: nowrap; - padding-left: 10px; } \ No newline at end of file