modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
| 20 ++++++++--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/CurrentGroupPluginConfigurationView.java
| 7 +--
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java
| 6 ---
3 files changed, 20 insertions(+), 13 deletions(-)
New commits:
commit 08f7e2e988fdd857e37a70a9f13fe29820f0d4b8
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Feb 24 10:32:20 2011 -0500
remove the ugly labels, use the new config editor title
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/CurrentGroupPluginConfigurationView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/CurrentGroupPluginConfigurationView.java
index 87c4179..e33773c 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/CurrentGroupPluginConfigurationView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/CurrentGroupPluginConfigurationView.java
@@ -27,7 +27,6 @@ import java.util.Set;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.IButton;
-import com.smartgwt.client.widgets.Label;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
@@ -126,14 +125,12 @@ public class CurrentGroupPluginConfigurationView extends
LocatableVLayout implem
private void initEditor() {
if (this.configurationDefinition != null && this.memberConfigurations !=
null) {
- Label title = new
Label(MSG.view_group_pluginConfig_edit_currentGroupProperties());
- addMember(title);
-
this.editor = new
GroupConfigurationEditor(this.extendLocatorId("Editor"),
this.configurationDefinition,
this.memberConfigurations);
+
this.editor.setEditorTitle(MSG.view_group_pluginConfig_edit_currentGroupProperties());
this.editor.setOverflow(Overflow.AUTO);
this.editor.addPropertyValueChangeListener(this);
- this.editor.setReadOnly(!this.resourcePermission.isConfigureWrite());
+ this.editor.setReadOnly(!this.resourcePermission.isConfigureWrite());
addMember(this.editor);
}
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java
index 22aa7be..fed4f63 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/inventory/HistoryGroupPluginConfigurationSettings.java
@@ -25,7 +25,6 @@ import java.util.Map;
import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
-import com.smartgwt.client.widgets.Label;
import org.rhq.core.domain.configuration.Configuration;
import org.rhq.core.domain.configuration.composite.ResourceConfigurationComposite;
@@ -87,12 +86,9 @@ public class HistoryGroupPluginConfigurationSettings extends
LocatableVLayout {
private void initEditor() {
if (this.configurationDefinition != null && this.memberConfigurations !=
null) {
- Label title = new Label(MSG.view_group_pluginConfig_view_groupProperties() +
" - "
- + this.groupUpdateId);
- addMember(title);
-
this.editor = new
GroupConfigurationEditor(this.extendLocatorId("Editor"),
this.configurationDefinition,
this.memberConfigurations);
+ this.editor.setEditorTitle(MSG.view_group_pluginConfig_view_groupProperties()
+ " - " + this.groupUpdateId);
this.editor.setOverflow(Overflow.AUTO);
this.editor.setReadOnly(true);
addMember(this.editor);
commit 762027f422b393fbe239a4a046c815f36dd7797f
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Thu Feb 24 10:24:10 2011 -0500
now that we no longer have tabs, we lost the ability to give a title to the config
this adds the new "editor title" attribute which becomes a label in the top
toolstip, to the left of the jump menu
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
index ff33cc7..894aeb3 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/configuration/ConfigurationEditor.java
@@ -161,6 +161,7 @@ public class ConfigurationEditor extends LocatableVLayout {
private int resourceTypeId;
private ConfigType configType;
+ private String editorTitle = null;
private boolean readOnly = false;
private Set<String> invalidPropertyNames = new HashSet<String>();
private Set<PropertyValueChangeListener> propertyValueChangeListeners = new
HashSet<PropertyValueChangeListener>();
@@ -204,6 +205,14 @@ public class ConfigurationEditor extends LocatableVLayout {
this.readOnly = readOnly;
}
+ public String getEditorTitle() {
+ return editorTitle;
+ }
+
+ public void setEditorTitle(String title) {
+ this.editorTitle = title;
+ }
+
public void showError(Throwable failure) {
addMember(new Label(failure.getMessage()));
}
@@ -366,6 +375,14 @@ public class ConfigurationEditor extends LocatableVLayout {
LocatableToolStrip toolStrip = new
LocatableToolStrip(layout.extendLocatorId("Tools"));
toolStrip.setBackgroundImage(null);
toolStrip.setWidth100();
+ toolStrip.setMembersMargin(3);
+ toolStrip.setPadding(3);
+
+ if (getEditorTitle() != null) {
+ Label titleLabel = new Label(getEditorTitle());
+ titleLabel.setWrap(false);
+ toolStrip.addMember(titleLabel);
+ }
Menu menu = new LocatableMenu(toolStrip.extendLocatorId("JumpMenu"));
for (SectionStackSection section : sectionStack.getSections()) {
@@ -391,9 +408,6 @@ public class ConfigurationEditor extends LocatableVLayout {
});
menu.addItem(hideAllItem);
- // TODO GH: Save button as saveListener() or remove the buttons from this form
and have
- // the container provide them?
-
toolStrip.addMember(new
LocatableIMenuButton(toolStrip.extendLocatorId("Jump"), MSG
.view_configEdit_jumpToSection(), menu));
Show replies by date