modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
| 22 ++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java
| 5 +-
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java
| 8 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
| 20 ++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
| 24 +++++++--
modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
| 2
modules/enterprise/server/ear/pom.xml
| 25 ++--------
7 files changed, 65 insertions(+), 41 deletions(-)
New commits:
commit 8a2e19e9442d84ae9b9fd8d316401c3dfe57971a
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Nov 24 13:03:24 2010 -0500
remove webdav war from ear (
https://bugzilla.redhat.com/show_bug.cgi?id=535493)
diff --git a/modules/enterprise/server/ear/pom.xml
b/modules/enterprise/server/ear/pom.xml
index 0917089..7c919a0 100644
--- a/modules/enterprise/server/ear/pom.xml
+++ b/modules/enterprise/server/ear/pom.xml
@@ -160,28 +160,17 @@
<!-- ** WARs -->
<webModule>
- <groupId>${project.groupId}</groupId>
- <artifactId>rhq-portal</artifactId>
- <bundleFileName>rhq-portal.war</bundleFileName>
- <contextRoot>/</contextRoot>
+ <groupId>org.rhq</groupId>
+ <artifactId>rhq-coregui</artifactId>
+ <bundleFileName>coregui.war</bundleFileName>
+ <contextRoot>/coregui</contextRoot>
</webModule>
-
- <webModule>
- <groupId>org.rhq</groupId>
- <artifactId>rhq-coregui</artifactId>
- <bundleFileName>coregui.war</bundleFileName>
- <contextRoot>/coregui</contextRoot>
- </webModule>
-
-
- <!-- included unless exclude.webdav property is set to true.
-->
<webModule>
<groupId>${project.groupId}</groupId>
- <artifactId>rhq-webdav</artifactId>
- <excluded>${exclude-webdav}</excluded>
- <bundleFileName>rhq-webdav.war</bundleFileName>
- <contextRoot>/webdav</contextRoot>
+ <artifactId>rhq-portal</artifactId>
+ <bundleFileName>rhq-portal.war</bundleFileName>
+ <contextRoot>/</contextRoot>
</webModule>
<!-- used to expose content through http -->
commit f8b9c615da5bff9b1397da83b2db05c7d5011b45
Author: Ian Springer <ian.springer(a)redhat.com>
Date: Wed Nov 24 13:03:18 2010 -0500
make descriptions on default views for top views span the full width of the content
pane
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
index 1b28a58..082d77f 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/AdministrationView.java
@@ -22,13 +22,15 @@ 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 com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.enterprise.gui.coregui.client.admin.agent.install.RemoteAgentInstallView;
import org.rhq.enterprise.gui.coregui.client.admin.roles.RolesView;
import org.rhq.enterprise.gui.coregui.client.admin.templates.ResourceTypeTreeView;
import org.rhq.enterprise.gui.coregui.client.admin.users.UsersView;
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;
@@ -86,11 +88,19 @@ public class AdministrationView extends
AbstractSectionedLeftNavigationView {
return sections;
}
- protected HTMLFlow defaultView() {
- String contents = "<h1>" + MSG.view_admin_administration() +
"</h1>\n" + MSG.view_admin_landing();
- HTMLFlow flow = new HTMLFlow(contents);
- flow.setPadding(20);
- return flow;
+ protected VLayout defaultView() {
+ VLayout vLayout = new VLayout();
+ vLayout.setWidth100();
+
+ // TODO: Admin icon.
+ TitleBar titleBar = new TitleBar(this, MSG.view_admin_administration());
+ vLayout.addMember(titleBar);
+
+ Label label = new Label(MSG.view_admin_landing());
+ label.setPadding(10);
+ vLayout.addMember(label);
+
+ return vLayout;
}
private NavigationSection buildSecuritySection() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java
index 8b5cd62..0dc46b5 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/BundleTopView.java
@@ -18,6 +18,7 @@
*/
package org.rhq.enterprise.gui.coregui.client.bundle;
+import com.allen_sauer.gwt.log.client.Log;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.types.VisibilityMode;
import com.smartgwt.client.widgets.Canvas;
@@ -40,6 +41,7 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableSectionStack
* @author Greg Hinkle
*/
public class BundleTopView extends LocatableHLayout implements BookmarkableView {
+
public static final ViewName VIEW_ID = new ViewName("Bundles",
MSG.view_bundle_bundles());
private BundleTreeView bundleTreeView;
@@ -107,7 +109,7 @@ public class BundleTopView extends LocatableHLayout implements
BookmarkableView
if (viewPath.isEnd()) {
if (currentNextPath == null && bundlesListView != null) {
// refresh
- com.allen_sauer.gwt.log.client.Log.info("Refreshing
BundleTopView");
+ Log.info("Refreshing BundleTopView");
bundlesListView.refresh();
} else {
@@ -127,4 +129,5 @@ public class BundleTopView extends LocatableHLayout implements
BookmarkableView
}
}
}
+
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java
index 36cc9ee..fe6c3b6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/TitleBar.java
@@ -48,11 +48,11 @@ public class TitleBar extends LocatableToolStrip {
super(parent.extendLocatorId("TitleBar"));
setWidth100();
- setHeight(35);
+ setHeight(37);
LocatableVLayout vLayout = new
LocatableVLayout(extendLocatorId("VLayout"));
vLayout.setAlign(VerticalAlignment.CENTER);
- vLayout.setLayoutMargin(5);
+ vLayout.setLayoutMargin(6);
LocatableHLayout hLayout = new
LocatableHLayout(vLayout.extendLocatorId("HLayout"));
vLayout.addMember(hLayout);
@@ -62,7 +62,7 @@ public class TitleBar extends LocatableToolStrip {
this.label.setIcon(icon);
this.label.setIconWidth(24);
this.label.setIconHeight(24);
- this.label.setAutoHeight();
+ this.label.setAutoHeight();
hLayout.addMember(this.label);
setVisible(false);
@@ -98,7 +98,7 @@ public class TitleBar extends LocatableToolStrip {
contents = "<span class='HeaderLabel'>" + title +
"</span>";
windowTitle = "RHQ: " + title;
}
- this.label.setContents(contents);
+ this.label.setContents(contents);
Window.setTitle(windowTitle);
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
index fb4b084..a77c032 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/InventoryView.java
@@ -26,13 +26,15 @@ import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.widgets.Canvas;
-import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.Label;
+import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.core.domain.authz.Permission;
import org.rhq.core.domain.measurement.AvailabilityType;
import org.rhq.core.domain.resource.ResourceCategory;
import org.rhq.core.domain.resource.group.GroupCategory;
import org.rhq.enterprise.gui.coregui.client.CoreGUI;
+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;
@@ -106,10 +108,18 @@ public class InventoryView extends
AbstractSectionedLeftNavigationView {
}
protected Canvas defaultView() {
- String contents = "<h1>" + MSG.common_title_inventory() +
"</h1>\n" + MSG.view_inventory_sectionHelp();
- HTMLFlow flow = new HTMLFlow(contents);
- flow.setPadding(20);
- return flow;
+ VLayout vLayout = new VLayout();
+ vLayout.setWidth100();
+
+ // TODO: Admin icon.
+ TitleBar titleBar = new TitleBar(this, MSG.common_title_inventory());
+ vLayout.addMember(titleBar);
+
+ Label label = new Label(MSG.view_inventory_sectionHelp());
+ label.setPadding(10);
+ vLayout.addMember(label);
+
+ return vLayout;
}
@Override
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
index 275e251..1783a71 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/ReportTopView.java
@@ -26,12 +26,14 @@ 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 com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.enterprise.gui.coregui.client.admin.AdministrationView;
import org.rhq.enterprise.gui.coregui.client.admin.templates.ResourceTypeTreeView;
import org.rhq.enterprise.gui.coregui.client.alert.AlertHistoryView;
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;
@@ -50,6 +52,7 @@ import org.rhq.enterprise.gui.coregui.client.report.tag.TaggedView;
* @author Ian Springer
*/
public class ReportTopView extends AbstractSectionedLeftNavigationView {
+
public static final ViewName VIEW_ID = new ViewName("Reports",
MSG.view_reportsTop_title());
public static final ViewName SECTION_SUBSYSTEMS_VIEW_ID = new
ViewName("Subsystems", MSG.view_reports_subsystems());
@@ -74,11 +77,19 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView
{
}
@Override
- protected HTMLFlow defaultView() {
- String contents = "<h1>" + MSG.view_reportsTop_title() +
"</h1>\n" + MSG.view_reportsTop_description();
- HTMLFlow flow = new HTMLFlow(contents);
- flow.setPadding(20);
- return flow;
+ protected VLayout defaultView() {
+ VLayout vLayout = new VLayout();
+ vLayout.setWidth100();
+
+ // TODO: Admin icon.
+ TitleBar titleBar = new TitleBar(this, MSG.view_reportsTop_title());
+ vLayout.addMember(titleBar);
+
+ Label label = new Label(MSG.view_reportsTop_description());
+ label.setPadding(10);
+ vLayout.addMember(label);
+
+ return vLayout;
}
private NavigationSection buildSubsystemsSection() {
@@ -145,4 +156,5 @@ public class ReportTopView extends AbstractSectionedLeftNavigationView
{
return new NavigationSection(SECTION_INVENTORY_VIEW_ID, inventorySummaryItem,
platformSystemInfoItem);
}
+
}
\ No newline at end of file
diff --git
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
index a99b4ed..913ea3b 100644
---
a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
+++
b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/Messages.properties
@@ -419,7 +419,7 @@ dataSource_resourceErrors_error_fetchFailure = Failed to find Resource
errors fo
#================= Administration ==================
view_admin_administration = Administration~
-view_admin_landing = From this section, the RHQ global settings can be administered. This
includes configuring Security, setting up Plugins, and managing RHQ servers and agents.~
+view_admin_landing = From this section, the RHQ global settings can be administered. This
includes configuring security, setting up plugins, and managing RHQ Servers and Agents.~
view_admin_configuration = Configuration~
view_admin_security = Security~
view_admin_topology = Topology~