modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java
| 24 +++++++---
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
| 20 ++++++--
2 files changed, 33 insertions(+), 11 deletions(-)
New commits:
commit 5a40add5ff601db923a576b918a181b730a84eb4
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Apr 6 17:46:42 2011 -0400
pretty up header and desc of Help and Test top views
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java
index 47865a8..1488e5d 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/help/HelpView.java
@@ -28,19 +28,21 @@ import java.util.MissingResourceException;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.Label;
import org.rhq.core.domain.common.ProductInfo;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
import org.rhq.enterprise.gui.coregui.client.MessageConstants;
import org.rhq.enterprise.gui.coregui.client.components.AboutModalWindow;
import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane;
+import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import
org.rhq.enterprise.gui.coregui.client.components.view.AbstractSectionedLeftNavigationView;
import org.rhq.enterprise.gui.coregui.client.components.view.NavigationItem;
import org.rhq.enterprise.gui.coregui.client.components.view.NavigationSection;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewFactory;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
* The Help top-level view.
@@ -48,6 +50,7 @@ import org.rhq.enterprise.gui.coregui.client.gwt.GWTServiceLookup;
* @author Jay Shaughnessy
*/
public class HelpView extends AbstractSectionedLeftNavigationView {
+
public static final ViewName VIEW_ID = new ViewName("Help",
MSG.common_title_help());
private static final ViewName SECTION_PRODUCT_VIEW_ID = new
ViewName("Product", MSG.view_help_section_product());
@@ -72,11 +75,19 @@ public class HelpView extends AbstractSectionedLeftNavigationView {
}
@Override
- protected HTMLFlow defaultView() {
- String contents = "<h1>" + MSG.common_title_help() +
"</h1>\n" + MSG.view_helpTop_description();
- HTMLFlow flow = new HTMLFlow(contents);
- flow.setPadding(20);
- return flow;
+ protected LocatableVLayout defaultView() {
+ LocatableVLayout vLayout = new
LocatableVLayout(this.extendLocatorId("Default"));
+ vLayout.setWidth100();
+
+ // TODO: Help icon.
+ TitleBar titleBar = new TitleBar(this, MSG.common_title_help());
+ vLayout.addMember(titleBar);
+
+ Label label = new Label(MSG.view_helpTop_description());
+ label.setPadding(10);
+ vLayout.addMember(label);
+
+ return vLayout;
}
private NavigationSection buildProductSection() {
@@ -140,4 +151,5 @@ public class HelpView extends AbstractSectionedLeftNavigationView {
sections.add(section);
}
}
+
}
\ No newline at end of file
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
index 8aae428..11e4f9e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/test/TestTopView.java
@@ -22,8 +22,9 @@ import java.util.ArrayList;
import java.util.List;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.Label;
+import org.rhq.enterprise.gui.coregui.client.components.TitleBar;
import
org.rhq.enterprise.gui.coregui.client.components.view.AbstractSectionedLeftNavigationView;
import org.rhq.enterprise.gui.coregui.client.components.view.NavigationItem;
import org.rhq.enterprise.gui.coregui.client.components.view.NavigationSection;
@@ -38,6 +39,7 @@ import
org.rhq.enterprise.gui.coregui.client.test.configuration.TestReadOnlyGrou
import org.rhq.enterprise.gui.coregui.client.test.i18n.TestPluralizationView;
import org.rhq.enterprise.gui.coregui.client.test.i18n.TestRemoteServiceStatisticsView;
import org.rhq.enterprise.gui.coregui.client.test.inventory.TestSearchBarView;
+import org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
/**
* The Test top-level view. This view is "hidden", i.e. there are no links to
it, so the user must go to the URL
@@ -73,10 +75,18 @@ public class TestTopView extends AbstractSectionedLeftNavigationView
{
}
protected Canvas defaultView() {
- String contents = "<h1>" + MSG.view_testTop_title() +
"</h1>\n" + MSG.view_testTop_description();
- HTMLFlow flow = new HTMLFlow(contents);
- flow.setPadding(20);
- return flow;
+ LocatableVLayout vLayout = new
LocatableVLayout(this.extendLocatorId("Default"));
+ vLayout.setWidth100();
+
+ // TODO: Help icon.
+ TitleBar titleBar = new TitleBar(this, MSG.view_testTop_title());
+ vLayout.addMember(titleBar);
+
+ Label label = new Label(MSG.view_testTop_description());
+ label.setPadding(10);
+ vLayout.addMember(label);
+
+ return vLayout;
}
@Override
Show replies by date