modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java | 9 ++++----- modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/MessageConstants.properties | 4 +--- 2 files changed, 5 insertions(+), 8 deletions(-)
New commits: commit 0ba38a7e2532c04e7f6f196ad0e19946fbfd1f82 Author: John Mazzitelli mazz@redhat.com Date: Mon Oct 28 19:27:50 2013 -0400
BZ 1014603 - this really isn't necessary for this BZ but it does clean up the help icons that are associated with the help links. we now use the new help icon
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java index 42bc376..e571e17 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/help/HelpView.java @@ -79,7 +79,6 @@ public class HelpView extends AbstractSectionedLeftNavigationView { EnhancedVLayout vLayout = new EnhancedVLayout(); vLayout.setWidth100();
- // TODO: Help icon. TitleBar titleBar = new TitleBar(MSG.common_title_help(), VIEW_ID.getIcon().getIcon24x24Path()); vLayout.addMember(titleBar);
@@ -92,8 +91,8 @@ public class HelpView extends AbstractSectionedLeftNavigationView {
private NavigationSection buildProductSection() {
- NavigationItem aboutItem = new NavigationItem(new ViewName("AboutBox", MSG.view_help_section_product_about()), - "[SKIN]/../actions/help.png", new ViewFactory() { + NavigationItem aboutItem = new NavigationItem(new ViewName("AboutBox", MSG.view_help_section_product_about(), + IconEnum.HELP), new ViewFactory() { public Canvas createView() { final AboutModalWindow aboutModalWindow = new AboutModalWindow(productInfo); aboutModalWindow.show(); @@ -122,10 +121,10 @@ public class HelpView extends AbstractSectionedLeftNavigationView { try { icon = this.getContent("view_help_section_" + i + "_propIcon_" + j); if (icon == null) { - icon = "[SKIN]/../headerIcons/document.png"; + icon = IconEnum.HELP.getIcon16x16Path(); } } catch (MissingResourceException e) { - icon = "[SKIN]/../headerIcons/document.png"; + icon = IconEnum.HELP.getIcon16x16Path(); }
final String itemName = "Section" + i + "Item" + j; diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/MessageConstants.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/MessageConstants.properties index 6295970..65298be 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/MessageConstants.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/MessageConstants.properties @@ -24,7 +24,7 @@ # M = 1..numSectionItems # # view_help_section_N_propTitle_M = localized title for the help (required) -# view_help_section_N_propIcon_M = icon path (optional, defaults to document icon) +# view_help_section_N_propIcon_M = icon path (optional, defaults to help icon) # view_help_section_N_propUrl_M = url for the help (required) # view_help_section_count = 2 @@ -49,8 +49,6 @@ view_help_section_2_propUrl_1 = https://docs.jboss.org/author/display/RHQ/Demo view_help_section_2_propTitle_2 = Demo: Bundle Provisioning view_help_section_2_propUrl_2 = http://management-platform.blogspot.com/2011/01/bundle-provisioning-via-rhq.... view_help_section_2_propTitle_3 = How to build Group Definitions -view_help_section_2_propIcon_3 = [SKIN]/../actions/help.png view_help_section_2_propUrl_3 = https://docs.jboss.org/author/display/RHQ/Group+Definitions view_help_section_2_propTitle_4 = How to use the Search Bar -view_help_section_2_propIcon_4 = [SKIN]/../actions/help.png view_help_section_2_propUrl_4 = https://docs.jboss.org/author/display/RHQ/Search
rhq-commits@lists.fedorahosted.org