modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadcrumbTrailPane.java | 7 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java | 6 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java | 1 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java | 4 modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java | 84 +++++++++- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java | 19 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java | 2 modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 25 +- modules/enterprise/gui/coregui/src/main/webapp/images/header/breadcrumb_space.png |binary 9 files changed, 116 insertions(+), 32 deletions(-)
New commits: commit c579592cf1c89e6b146560de773bb5495439e380 Author: Greg Hinkle ghinkle@redhat.com Date: Thu May 27 15:15:47 2010 -0400
Fix font overriding by gwt themes (we're back to tahoma) Improve breadcrumb layout resource icons displayed
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadcrumbTrailPane.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadcrumbTrailPane.java index 8916c0a..76e104c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadcrumbTrailPane.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/BreadcrumbTrailPane.java @@ -40,7 +40,8 @@ public class BreadcrumbTrailPane extends HTMLPane { setBackgroundColor("#E6E3E3"); setBackgroundImage("[skin]images/SectionHeader/header_opened_stretch.png"); //ToolStrip/background.png"); setBackgroundRepeat(BkgndRepeat.REPEAT_X); - setPadding(5); +// setPadding(5); + setOverflow(Overflow.CLIP_V); }
@@ -58,7 +59,7 @@ public class BreadcrumbTrailPane extends HTMLPane { if (!viewId.getBreadcrumbs().isEmpty()) { if (!first) { path.append("/"); - content.append(" > "); + content.append("<img src="images/header/breadcrumb_space.png" style="vertical-align: middle;" width="28" height="28"/>"); } else { first = false; } @@ -81,7 +82,7 @@ public class BreadcrumbTrailPane extends HTMLPane { content.append("<a href="#"); // NOTE: We have to call toString() below, because GWT chokes if you try to append a StringBuilder. content.append(path.toString() + breadcrumb.getName()); - content.append("">"); + content.append("" style="padding: 0 10px;">"); content.append(breadcrumb.getDisplayName()); content.append("</a>"); } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java index ab30742..4dbb543 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java @@ -76,7 +76,11 @@ public class LinkManager { }
public static String getDashboardLink() { - return "/Dashboard.do"; + if (GWT) { + return "#Dashboard"; + } else { + return "/Dashboard.do"; + } }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java index 4c5ad03..74b7b2b 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/destination/BundleDestinationView.java @@ -154,6 +154,7 @@ public class BundleDestinationView extends VLayout implements BookmarkableView {
private Canvas getActionLayout() { VLayout actionLayout = new VLayout(); + actionLayout.setMembersMargin(10); IButton deployButton = new IButton("Deploy"); deployButton.setIcon("subsystems/bundle/BundleAction_Deploy_16.png"); deployButton.addClickHandler(new ClickHandler() { diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java index e6cfcd6..bdc854c 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/bundle/list/BundlesListView.java @@ -53,13 +53,15 @@ public class BundlesListView extends Table {
public BundlesListView(Criteria criteria) { super("Bundles", criteria); - setHeaderIcon("subsystems/bundle/Bundle_24.png"); }
@Override protected void onInit() { super.onInit();
+ setHeaderIcon("subsystems/bundle/Bundle_24.png"); + + setDataSource(new BundlesWithLatestVersionDataSource());
getListGrid().getField("id").setWidth("60"); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java index b2a7f14..8852dfc 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/InventoryView.java @@ -33,14 +33,22 @@ import com.smartgwt.client.widgets.tree.TreeGrid; import com.smartgwt.client.widgets.tree.TreeNode;
import org.rhq.core.domain.resource.Resource; +import org.rhq.enterprise.gui.coregui.client.BookmarkableView; import org.rhq.enterprise.gui.coregui.client.CoreGUI; +import org.rhq.enterprise.gui.coregui.client.ViewId; +import org.rhq.enterprise.gui.coregui.client.ViewPath; +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.users.UsersView; +import org.rhq.enterprise.gui.coregui.client.components.FullHTMLPane; import org.rhq.enterprise.gui.coregui.client.inventory.groups.ResourceGroupListView; import org.rhq.enterprise.gui.coregui.client.inventory.groups.definitions.GroupDefinitionListView; +import org.rhq.enterprise.gui.coregui.client.inventory.resource.discovery.ResourceAutodiscoveryView;
/** * @author Greg Hinkle */ -public class InventoryView extends HLayout { +public class InventoryView extends HLayout implements BookmarkableView {
public static final String VIEW_PATH = "Inventory";
@@ -179,4 +187,78 @@ public class InventoryView extends HLayout { contentCanvas.addChild(newContent); contentCanvas.markForRedraw(); } + + + + private void renderContentView(ViewPath viewPath) { + + ViewId currentSectionViewId = viewPath.getCurrent(); + ViewId currentPageViewId = viewPath.getNext(); + + String section = currentSectionViewId.getPath(); + String page = currentPageViewId.getPath(); + + + Canvas content = null; + if ("Reports".equals(section)) { + + if ("Inventory Summary".equals(page)) { + content = new FullHTMLPane("/rhq/admin/report/resourceInstallReport-body.xhtml"); + } + + + } else if ("Security".equals(section)) { + + if ("Manage Users".equals(page)) { + content = new UsersView(); + } else if ("Manage Roles".equals(page)) { + content = new RolesView(); + } else if ("Auto Discovery Queue".equals(page)) { + content = new ResourceAutodiscoveryView(); + } else if ("Remote Agent Install".equals(page)) { + content = new RemoteAgentInstallView(); + } + } + + + /* for (String name : treeGrids.keySet()) { + + TreeGrid treeGrid = treeGrids.get(name); + if (name.equals(section)) { + treeGrid.setSelectedPaths(page); + } else { + treeGrid.deselectAllRecords(); + } + }*/ + + + + setContent(content); + + + if (content instanceof BookmarkableView) { + ((BookmarkableView) content).renderView(viewPath.next().next()); + } + + + } + + + public void renderView(ViewPath viewPath) { + +/* + if (!viewPath.isCurrent(currentSectionViewId) || !viewPath.isNext(currentPageViewId)) { + + if (viewPath.isEnd()) { + // Display default view + setContent(defaultView()); + } else { + renderContentView(viewPath); + } + } +*/ + + + + } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java index 91627d2..c08c42f 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/ResourceSearchView.java @@ -80,15 +80,15 @@ public class ResourceSearchView extends Table { setWidth100(); setHeight100();
- DynamicForm searchPanel = new DynamicForm(); - final TextItem searchBox = new TextItem("query", "Search Resources"); - searchBox.setValue(""); - searchPanel.setWrapItemTitles(false); - searchPanel.setFields(searchBox); +// DynamicForm searchPanel = new DynamicForm(); +// final TextItem searchBox = new TextItem("query", "Search Resources"); +// searchBox.setValue(""); +// searchPanel.setWrapItemTitles(false); +// searchPanel.setFields(searchBox);
final ResourceDatasource datasource = new ResourceDatasource(); - setTitleComponent(searchPanel); +// setTitleComponent(searchPanel); setDataSource(datasource);
getListGrid().setSelectionType(SelectionStyle.SIMPLE); @@ -97,6 +97,7 @@ public class ResourceSearchView extends Table {
ListGridField idField = new ListGridField("id", "Id", 55); idField.setType(ListGridFieldType.INTEGER); + ListGridField iconField = new ListGridField("icon","", 40); ListGridField nameField = new ListGridField("name", "Name", 250); nameField.setCellFormatter(new CellFormatter() { public String format(Object o, ListGridRecord listGridRecord, int i, int i1) { @@ -111,7 +112,7 @@ public class ResourceSearchView extends Table {
ListGridField availabilityField = new ListGridField("currentAvailability", "Availability", 55); availabilityField.setAlign(Alignment.CENTER); - getListGrid().setFields(idField, nameField, descriptionField, typeNameField, pluginNameField, + getListGrid().setFields(idField, iconField, nameField, descriptionField, typeNameField, pluginNameField, categoryField, availabilityField);
addTableAction("Uninventory", Table.SelectionEnablement.ANY, @@ -122,7 +123,7 @@ public class ResourceSearchView extends Table { });
- searchBox.addKeyPressHandler(new KeyPressHandler() { + /*searchBox.addKeyPressHandler(new KeyPressHandler() { public void onKeyPress(KeyPressEvent event) { if ((event.getCharacterValue() != null) && (event.getCharacterValue() == KeyCodes.KEY_ENTER)) { datasource.setQuery((String) searchBox.getValue()); @@ -139,7 +140,7 @@ public class ResourceSearchView extends Table { System.out.println("Loaded in: " + (System.currentTimeMillis() - start)); } } - }); + });*/ }
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java index b69eb0e..3c4e3a6 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/report/tag/TaggedView.java @@ -89,7 +89,7 @@ public class TaggedView extends VLayout implements BookmarkableView {
tileLayout = new TileLayout(); tileLayout.setWidth100(); - tileLayout.setTileHeight(250); + tileLayout.setTileHeight(220); tileLayout.setTileWidth(getWidth() / 2 - 20); addMember(tileLayout);
diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css index 05997e8..40274c1 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css +++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css @@ -8,8 +8,8 @@
body, p, td, th, option, input, textarea, select { color: #000000; - font-family: tahoma, verdana, sans-serif; - font-size: 11px; + font-family: tahoma, verdana, sans-serif !important; + font-size: 11px !important; }
img { @@ -27,22 +27,15 @@ hr { width: 100%; }
-a:link { - color: #4A5D75; - font-weight: bold; - text-decoration: none; -} +a, a:link, a:visited, a:hover { + color: #4A5D75 !important; + font-weight: bold !important; + text-decoration: none !important;
-a:visited { - color: #4A5D75; - font-weight: bold; - text-decoration: none; }
a:hover { - color: #4A5D75; - font-weight: bold; - text-decoration: underline; + text-decoration: underline !important; }
@@ -214,7 +207,7 @@ a:hover { .SubTabButtonSelectedFocusedOver, .SubTabButtonDisabled, .SubTabButtonSelectedDisabled { - font-family: Arial, Verdana, Bitstream Vera Sans, sans-serif; + font-family: tahoma, verdona, sans-serif; font-size: 11px; padding: 2px; } @@ -297,7 +290,7 @@ a:hover { .SimpleButtonSelectedOver, .SimpleButtonSelectedFocusedOver, .SimpleButtonSelectedDisabled{ - font-family: Arial, Verdana, Bitstream Vera Sans, sans-serif; + font-family: tahoma, verdana, sans-serif; font-size: 11px; padding: 2px; font-weight: bold; diff --git a/modules/enterprise/gui/coregui/src/main/webapp/images/header/breadcrumb_space.png b/modules/enterprise/gui/coregui/src/main/webapp/images/header/breadcrumb_space.png new file mode 100644 index 0000000..e25b082 Binary files /dev/null and b/modules/enterprise/gui/coregui/src/main/webapp/images/header/breadcrumb_space.png differ
rhq-commits@lists.fedorahosted.org