Fixed GWT wonkiness

web/src/main/java/org/eurekastreams/web/client/ui/pages/discover/DiscoverListItemPanel.java

@@ -85,6 +85,18 @@ public enum ListItemType
      */
     interface LocalStyle extends CssResource
     {
+        /** @return Button style. */
+        @ClassName("locked-button")
+        String lockedButton();
+
+        /** @return Button style. */
+        @ClassName("request-button")
+        String requestButton();
+
+        /** @return Button style. */
+        @ClassName("pending-button")
+        String pendingButton();
+
         /** @return Apply to the follow panel to allow custom styling. */
         @ClassName("follow-controls-panel")
         String followControlsPanel();
@@ -101,18 +113,6 @@ interface LocalStyle extends CssResource
         @ClassName("block-button")
         String blockButton();
 
-        /** @return Button style. */
-        @ClassName("request-access-button-small")
-        String requestAccessButtonSmall();
-
-        // /** @return Button style. */
-        // @ClassName("pending-access-button-small")
-        // String requestAccessButtonPendingSmall();
-        //
-        // /** @return Button style. */
-        // @ClassName("private-group-lock-small")
-        // String privateGroupLockSmall();
-
         /** @return When multiple controls are in the follower controls panel. */
         String multi();
     }
@@ -135,7 +135,7 @@ interface LocalStyle extends CssResource
 
     /**
      * Constructor.
-     *
+     * 
      * @param inStreamDTO
      *            the streamDTO to represent
      * @param inListItemType
@@ -148,7 +148,7 @@ public DiscoverListItemPanel(final StreamDTO inStreamDTO, final ListItemType inL
 
     /**
      * Constructor.
-     *
+     * 
      * @param inStreamDTO
      *            the streamDTO to represent
      * @param inListItemType
@@ -219,19 +219,19 @@ public DiscoverListItemPanel(final StreamDTO inStreamDTO, final ListItemType inL
 
             if (showBlockSuggestion)
             {
-                followPanel = new FollowPanel(inStreamDTO, style.followButton(), style.unfollowButton(), coreCss
-                        .buttonLabel(), true, new ClickHandler()
-                {
-                    public void onClick(final ClickEvent event)
-                    {
-                        removeFromParent();
-                    }
-                });
+                followPanel = new FollowPanel(inStreamDTO, style.followButton(), style.unfollowButton(),
+                        coreCss.buttonLabel(), true, new ClickHandler()
+                        {
+                            public void onClick(final ClickEvent event)
+                            {
+                                removeFromParent();
+                            }
+                        });
             }
             else
             {
-                followPanel = new FollowPanel(inStreamDTO, style.followButton(), style.unfollowButton(), coreCss
-                        .buttonLabel(), true);
+                followPanel = new FollowPanel(inStreamDTO, style.followButton(), style.unfollowButton(),
+                        coreCss.buttonLabel(), true);
             }
 
             // Panel p1 = new FlowPanel();

web/src/main/java/org/eurekastreams/web/client/ui/pages/discover/DiscoverListItemPanel.ui.xml

@@ -9,14 +9,23 @@
 	<ui:image field="followingImage" src="style/images/followingSmall.png" />
 	<ui:image field="unfollowImage" src="style/images/unfollowSmall.png" />
 
-	<ui:image field="requestAccessBtnSmall" src="style/images/requestAccessBtnSmall.png" />
-	<ui:image field="requestAccessBtnPendingSmall" src="style/images/requestAccessBtnPendingSmall.png" />
-	<ui:image field="privateGroupLockSmall" src="style/images/privateGroupLockSmall.png" />
-
+	<ui:image field="lockedButton" src="style/images/privateGroupLockSmall.png" />
+	<ui:image field="requestButton" src="style/images/requestAccessBtnSmall.png" />
+	<ui:image field="pendingButton" src="style/images/requestPendingSmall.png" />
+	
 	<ui:with field="coreCss"
 		type="org.eurekastreams.web.client.ui.pages.master.CoreCss" />
 
 	<ui:style type="org.eurekastreams.web.client.ui.pages.discover.DiscoverListItemPanel.LocalStyle">
+	@sprite .locked-button{
+		gwt-image:"lockedButton";
+	}
+	@sprite .request-button{
+		gwt-image:"requestButton";
+	}
+	@sprite .pending-button{
+		gwt-image:"pendingButton";
+	}
 		.main {
 			position: relative;
 			padding-left: 10px;
@@ -67,18 +76,6 @@
 	gwt-image: "removeHoverImage";
 	}
 
-	@sprite .request-access-button-small {
-		gwt-image: "requestAccessBtnSmall";
-	}
-
-	@sprite .pending-access-button-small {
-		gwt-image: "requestAccessBtnPendingSmall";
-	}
-
-	@sprite .private-group-lock-small {
-		gwt-image: "privateGroupLockSmall";
-	}
-
 	</ui:style>
 
 	<g:HTMLPanel addStyleNames="{coreCss.connectionItem} {coreCss.listItem} {coreCss.person} {style.main}">