modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/ClusterConfigurationEditor.java | 23 ++++++---- modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties | 4 + modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ko.properties | 14 ------ modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties | 1 modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties | 1 modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java | 18 ++++--- 8 files changed, 32 insertions(+), 31 deletions(-)
New commits: commit 687fb22a9a85c2f77937ed2b0cb14adfb94fbe6e Author: Jirka Kremser jkremser@redhat.com Date: Wed Aug 21 15:11:29 2013 +0200
Modifying the description for predefined storage node alert templates. Also adding a new item to the RHQ help page.
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties index 1e3fbe3..cbe3b2d 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants.properties @@ -30,7 +30,7 @@ view_help_section_count = 2
view_help_section_1_title = Documentation -view_help_section_1_item_count = 3 +view_help_section_1_item_count = 4
view_help_section_1_propTitle_1 = Frequently Asked Questions (FAQ) view_help_section_1_propUrl_1 = https://docs.jboss.org/author/display/RHQ/FAQ @@ -38,6 +38,8 @@ view_help_section_1_propTitle_2 = Documentation Set view_help_section_1_propUrl_2 = https://docs.jboss.org/author/display/RHQ/User+Documentation view_help_section_1_propTitle_3 = API Javadoc view_help_section_1_propUrl_3 = https://docs.jboss.org/author/display/RHQ/API+Documentation +view_help_section_1_propTitle_4 = Deploying Storage Nodes +view_help_section_1_propUrl_4 = https://docs.jboss.org/author/display/RHQ/Deploying+Storage+Nodes
view_help_section_2_title = Tutorial view_help_section_2_item_count = 4 diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties index 6b17551..136083f 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_de.properties @@ -15,6 +15,7 @@ view_help_section_1_title = Dokumentation view_help_section_1_propTitle_1 = Frequently Asked Questions (FAQ) view_help_section_1_propTitle_2 = Dokumentation view_help_section_1_propTitle_3 = API Javadoc +##view_help_section_1_propTitle_4 = Deploying Storage Nodes
view_help_section_2_title = Tutorium
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties index c3b1487..359eedf 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ja.properties @@ -15,6 +15,7 @@ view_help_section_1_title = ドキュメンテーション view_help_section_1_propTitle_1 = よくある質問 (FAQ) view_help_section_1_propTitle_2 = ドキュメンテーションセット view_help_section_1_propTitle_3 = API Javadoc +##view_help_section_1_propTitle_4 = Deploying Storage Nodes
view_help_section_2_title = チュートリアル
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ko.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ko.properties index 159d9af..3a1b570 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ko.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_ko.properties @@ -27,28 +27,16 @@ # view_help_section_N_propIcon_M = icon path (optional, defaults to document icon) # view_help_section_N_propUrl_M = url for the help (required) # -view_help_section_count = 2 - view_help_section_1_title = 문서 -view_help_section_1_item_count = 3
view_help_section_1_propTitle_1 = 자주 묻는 질문 (FAQ) -view_help_section_1_propUrl_1 = https://docs.jboss.org/author/display/RHQ/FAQ view_help_section_1_propTitle_2 = 문서 세트 -view_help_section_1_propUrl_2 = https://docs.jboss.org/author/display/RHQ/Home view_help_section_1_propTitle_3 = API Javadoc -view_help_section_1_propUrl_3 = https://docs.jboss.org/author/display/RHQ/API+Documentation +##view_help_section_1_propTitle_4 = Deploying Storage Nodes
view_help_section_2_title = 자습서 -view_help_section_2_item_count = 4
view_help_section_2_propTitle_1 = 데모: 모든 데모 -view_help_section_2_propUrl_1 = https://docs.jboss.org/author/display/RHQ/Demos view_help_section_2_propTitle_2 = 데모: 번들 제공 -view_help_section_2_propUrl_2 = http://management-platform.blogspot.com/2011/01/bundle-provisioning-via-rhq.... view_help_section_2_propTitle_3 = 그룹 환경 정의의 구축 방법 -view_help_section_2_propIcon_3 = [SKIN]/../actions/help.png -view_help_section_2_propUrl_3 = http://docs.redhat.com/docs/en-US/JBoss_Operations_Network/2.4/html/Basic_Ad... view_help_section_2_propTitle_4 = 검색창 사용 방법 -view_help_section_2_propIcon_4 = [SKIN]/../actions/help.png -view_help_section_2_propUrl_4 = https://docs.jboss.org/author/display/RHQ/Search diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties index 434c06b..c25c4aa 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_pt.properties @@ -15,6 +15,7 @@ view_help_section_1_title = Documentação view_help_section_1_propTitle_1 = Perguntas & Respostas (FAQ) view_help_section_1_propTitle_2 = Conjunto de Documentos view_help_section_1_propTitle_3 = API Javadoc +##view_help_section_1_propTitle_4 = Deploying Storage Nodes
view_help_section_2_title = Tutorial
diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties index 545263e..fac53bc 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/client/MessageConstants_zh.properties @@ -15,6 +15,7 @@ view_help_section_1_title = \u6587\u6863 view_help_section_1_propTitle_1 = \u7591\u96be\u89e3\u7b54 (FAQ) view_help_section_1_propTitle_2 = \u6587\u6863\u96c6 view_help_section_1_propTitle_3 = API Javadoc +##view_help_section_1_propTitle_4 = Deploying Storage Nodes
view_help_section_2_title = \u6559\u7a0b
diff --git a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java index 1bf9683..5a2c8a2 100644 --- a/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java +++ b/modules/enterprise/server/plugins/alertdef-rhq/src/main/java/org/rhq/enterprise/server/plugins/alertdef/AlertDefinitionServerPluginComponent.java @@ -80,26 +80,28 @@ public class AlertDefinitionServerPluginComponent implements ServerPluginCompone storageNodeHighHeapTemplate = new InjectedTemplate( "RHQStorage", // "VM Memory System", // - "StorageNodeHighHeapTemplate", // - "An alert template to notify users of excessive heap use by an RHQ Storage Node. When fired please see documentation for the proper corrective action."); + "StorageNodeHighHeap", // + "Increase the storage node heap. If you cannot increase the heap or if you continue receiving alerts, then" + + " deploy another storage node. Consult <a href='.#Help/Section1/Section1Item4'>wiki</a> for more info.");
storageNodeHighDiskUsageTemplate = new InjectedTemplate( "RHQStorage", // "StorageService", // - "StorageNodeHighDiskUsageTemplate", // - "An alert template to notify users of excessive heap use by an RHQ Storage Node. When fired please see documentation for the proper corrective action."); + "StorageNodeHighDiskUsage", // + "Increase the storage node disk size. If you cannot increase the disk size or if you continue receiving " + + "alerts, then deploy another storage node. Consult <a href='.#Help/Section1/Section1Item4'>wiki</a> for more info.");
storageNodeSnapshotFailureTemplate = new InjectedTemplate( "RHQStorage", // "StorageService", // - "StorageNodeSnapshotFailureTemplate", // - "An alert template to notify users when a snapshot operations fails for an RHQ Storage Node. When fired please see documentation for the proper corrective action."); + "StorageNodeSnapshotFailure", // + "Snapshot operation failed for an RHQ Storage Node. When fired please see documentation for the proper corrective action.");
storageNodeMaintenanceOperationsFailureTemplate = new InjectedTemplate( "RHQStorage", // "RHQ Storage Node", // - "StorageNodeMaintenanceOperationsFailureTemplate", // - "An alert template to notify users when a maintenance operation fails for an RHQ Storage Node. When fired please see documentation for the proper corrective action."); + "StorageNodeMaintenanceOperationsFailure", // + "Maintenance operation failed for an RHQ Storage Node. When fired please see documentation for the proper corrective action.");
injectedTemplates = new ArrayList<InjectedTemplate>(); injectedTemplates.add(storageNodeHighHeapTemplate);
commit 58a9c77213cf41c5b87ce07ffdadd8030723d7c5 Author: Jirka Kremser jkremser@redhat.com Date: Wed Aug 21 15:09:43 2013 +0200
Replacing the check box form item with the radio button. Because the radio buttons are commonly used for boolean properties in RHQ.
diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/ClusterConfigurationEditor.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/ClusterConfigurationEditor.java index ec948a3..279a54a 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/ClusterConfigurationEditor.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/storage/ClusterConfigurationEditor.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.gui.coregui.client.admin.storage;
import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List;
import com.google.gwt.user.client.rpc.AsyncCallback; @@ -30,6 +31,7 @@ import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.ClickHandler; import com.smartgwt.client.widgets.form.fields.CheckboxItem; import com.smartgwt.client.widgets.form.fields.FormItem; +import com.smartgwt.client.widgets.form.fields.RadioGroupItem; import com.smartgwt.client.widgets.form.fields.StaticTextItem; import com.smartgwt.client.widgets.form.fields.TextItem; import com.smartgwt.client.widgets.form.validator.IsIntegerValidator; @@ -193,16 +195,19 @@ public class ClusterConfigurationEditor extends EnhancedVLayout implements Refre Boolean.toString(settings.getAutomaticDeployment()), "If this is set, the newly installed storage nodes will be automatically deployed to the storage cluster.", false, null); - CheckboxItem autoDeployCheckbox = new CheckboxItem(FIELD_AUTOMATIC_DEPLOYMENT); - autoDeployCheckbox.setValue(settings.getAutomaticDeployment()); - autoDeployCheckbox.setValidateOnChange(true); - autoDeployCheckbox.setAlign(Alignment.CENTER); - autoDeployCheckbox.setShowTitle(false); - autoDeployCheckbox.setShowLabel(false); - autoDeployCheckbox.setRequired(true); - autoDeployCheckbox.setCellStyle(!oddRow ? "OddRow" : "EvenRow"); + RadioGroupItem autoDeployRadio = new RadioGroupItem(FIELD_AUTOMATIC_DEPLOYMENT); + autoDeployRadio.setVertical(false); + LinkedHashMap<String, String> values = new LinkedHashMap<String, String>(2); + values.put("true", "On"); + values.put("false", "Off"); + autoDeployRadio.setValueMap(values); + autoDeployRadio.setValue(settings.getAutomaticDeployment()); + autoDeployRadio.setAlign(Alignment.CENTER); + autoDeployRadio.setShowTitle(false); + autoDeployRadio.setRequired(true); + autoDeployRadio.setCellStyle(!oddRow ? "OddRow" : "EvenRow"); oddRow = !oddRow; - automaticDeploymentItems.set(1, autoDeployCheckbox); + automaticDeploymentItems.set(1, autoDeployRadio); items.addAll(automaticDeploymentItems); form.setFields(items.toArray(new FormItem[items.size()])); form.setWidth100();
rhq-commits@lists.fedorahosted.org