modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
| 6 -
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
| 39 ++++------
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
| 32 ++++----
4 files changed, 41 insertions(+), 42 deletions(-)
New commits:
commit 44e258f3415ce45c48b0d97650bbe136e861136b
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Nov 24 18:13:14 2010 -0500
move the save button over to the left - all of our buttons are always left-aligned on
the screen - making the config editing views more consistent. plus, no one looks for a
save button on the top-right of a screen :)
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
index 3db389b..e23f204 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/configuration/GroupResourceConfigurationEditView.java
@@ -29,7 +29,6 @@ import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
-import com.smartgwt.client.widgets.layout.LayoutSpacer;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.core.domain.configuration.Configuration;
@@ -86,8 +85,9 @@ public class GroupResourceConfigurationEditView extends LocatableVLayout
impleme
ToolStrip toolStrip = new ToolStrip();
toolStrip.setWidth100();
-
- toolStrip.addMember(new LayoutSpacer());
+ toolStrip.setExtraSpace(10);
+ toolStrip.setMembersMargin(5);
+ toolStrip.setLayoutMargin(5);
this.saveButton = new LocatableIButton(this.extendLocatorId("Save"),
MSG.common_button_save());
this.saveButton.setTooltip(MSG.view_group_resConfig_edit_saveTooltip());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
index 525b6a3..f878ee8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ResourceConfigurationEditView.java
@@ -26,7 +26,6 @@ import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.IButton;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
-import com.smartgwt.client.widgets.layout.LayoutSpacer;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.core.domain.configuration.Configuration;
@@ -51,8 +50,8 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* @author Greg Hinkle
* @author Ian Springer
*/
-public class ResourceConfigurationEditView extends LocatableVLayout
- implements PropertyValueChangeListener, RefreshableView {
+public class ResourceConfigurationEditView extends LocatableVLayout implements
PropertyValueChangeListener,
+ RefreshableView {
private Resource resource;
private ResourcePermission resourcePermission;
@@ -72,8 +71,9 @@ public class ResourceConfigurationEditView extends LocatableVLayout
ToolStrip toolStrip = new ToolStrip();
toolStrip.setWidth100();
-
- toolStrip.addMember(new LayoutSpacer());
+ toolStrip.setExtraSpace(10);
+ toolStrip.setMembersMargin(5);
+ toolStrip.setLayoutMargin(5);
this.saveButton = new LocatableIButton(this.extendLocatorId("Save"),
MSG.common_button_save());
this.saveButton.addClickHandler(new ClickHandler() {
@@ -87,8 +87,8 @@ public class ResourceConfigurationEditView extends LocatableVLayout
refresh();
if (!this.resourcePermission.isConfigureWrite()) {
- Message message = new Message(MSG.view_configurationDetails_noPermission(),
- Message.Severity.Info, EnumSet.of(Message.Option.Transient,
Message.Option.Sticky));
+ Message message = new Message(MSG.view_configurationDetails_noPermission(),
Message.Severity.Info, EnumSet
+ .of(Message.Option.Transient, Message.Option.Sticky));
CoreGUI.getMessageCenter().notify(message);
}
}
@@ -101,15 +101,15 @@ public class ResourceConfigurationEditView extends LocatableVLayout
editor.destroy();
removeMember(editor);
}
- editor = new ConfigurationEditor(this.extendLocatorId("Editor"),
resource.getId(),
- resource.getResourceType().getId());
+ editor = new ConfigurationEditor(this.extendLocatorId("Editor"),
resource.getId(), resource.getResourceType()
+ .getId());
editor.setOverflow(Overflow.AUTO);
editor.addPropertyValueChangeListener(this);
editor.setReadOnly(!this.resourcePermission.isConfigureWrite());
- addMember(editor);
+ addMember(editor);
// TODO (ips): If editor != null, use editor.reload() instead.
}
-
+
private void save() {
Configuration updatedConfiguration = editor.getConfiguration();
@@ -121,9 +121,8 @@ public class ResourceConfigurationEditView extends LocatableVLayout
public void onSuccess(ResourceConfigurationUpdate result) {
CoreGUI.getMessageCenter().notify(
- new Message(MSG.view_configurationDetails_messageConcise(),
-
MSG.view_configurationDetails_messageDetailed(resource.getName()),
- Message.Severity.Info));
+ new Message(MSG.view_configurationDetails_messageConcise(), MSG
+
.view_configurationDetails_messageDetailed(resource.getName()), Message.Severity.Info));
refresh();
}
});
@@ -136,18 +135,18 @@ public class ResourceConfigurationEditView extends LocatableVLayout
if (event.isValidationStateChanged()) {
Set<String> invalidPropertyNames = event.getInvalidPropertyNames();
if (invalidPropertyNames.isEmpty()) {
- this.saveButton.enable();
- message = new
Message(MSG.view_configurationDetails_allPropertiesValid(),
- Message.Severity.Info, EnumSet.of(Message.Option.Transient,
Message.Option.Sticky));
+ this.saveButton.enable();
+ message = new Message(MSG.view_configurationDetails_allPropertiesValid(),
Message.Severity.Info,
+ EnumSet.of(Message.Option.Transient, Message.Option.Sticky));
} else {
this.saveButton.disable();
- message = new
Message(MSG.view_configurationDetails_somePropertiesInvalid(invalidPropertyNames.toString()),
- Message.Severity.Error, EnumSet.of(Message.Option.Transient,
Message.Option.Sticky));
+ message = new
Message(MSG.view_configurationDetails_somePropertiesInvalid(invalidPropertyNames
+ .toString()), Message.Severity.Error,
EnumSet.of(Message.Option.Transient, Message.Option.Sticky));
}
messageCenter.notify(message);
} else {
this.saveButton.enable();
}
}
-
+
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
index fcfbf05..76adc19 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/inventory/PluginConfigurationEditView.java
@@ -25,7 +25,6 @@ import com.google.gwt.user.client.rpc.AsyncCallback;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.events.ClickEvent;
import com.smartgwt.client.widgets.events.ClickHandler;
-import com.smartgwt.client.widgets.layout.LayoutSpacer;
import com.smartgwt.client.widgets.toolbar.ToolStrip;
import org.rhq.core.domain.configuration.Configuration;
@@ -50,8 +49,8 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableVLayout;
* @author Greg Hinkle
* @author Ian Springer
*/
-public class PluginConfigurationEditView extends LocatableVLayout
- implements PropertyValueChangeListener, RefreshableView {
+public class PluginConfigurationEditView extends LocatableVLayout implements
PropertyValueChangeListener,
+ RefreshableView {
private Resource resource;
private ResourcePermission resourcePermission;
@@ -71,8 +70,9 @@ public class PluginConfigurationEditView extends LocatableVLayout
ToolStrip toolStrip = new ToolStrip();
toolStrip.setWidth100();
-
- toolStrip.addMember(new LayoutSpacer());
+ toolStrip.setExtraSpace(10);
+ toolStrip.setMembersMargin(5);
+ toolStrip.setLayoutMargin(5);
this.saveButton = new LocatableIButton(this.extendLocatorId("Save"),
MSG.common_button_save());
this.saveButton.addClickHandler(new ClickHandler() {
@@ -87,8 +87,8 @@ public class PluginConfigurationEditView extends LocatableVLayout
refresh();
if (!this.resourcePermission.isInventory()) {
- Message message = new
Message(MSG.view_connectionSettingsDetails_noPermission(),
- Message.Severity.Info, EnumSet.of(Message.Option.Transient));
+ Message message = new
Message(MSG.view_connectionSettingsDetails_noPermission(), Message.Severity.Info,
+ EnumSet.of(Message.Option.Transient));
CoreGUI.getMessageCenter().notify(message);
}
}
@@ -96,13 +96,13 @@ public class PluginConfigurationEditView extends LocatableVLayout
@Override
public void refresh() {
this.saveButton.disable();
-
+
if (editor != null) {
editor.destroy();
removeMember(editor);
}
- editor = new ConfigurationEditor(extendLocatorId("Editor"),
resource.getId(),
- resource.getResourceType().getId(), ConfigurationEditor.ConfigType.plugin);
+ editor = new ConfigurationEditor(extendLocatorId("Editor"),
resource.getId(), resource.getResourceType()
+ .getId(), ConfigurationEditor.ConfigType.plugin);
editor.setOverflow(Overflow.AUTO);
editor.addPropertyValueChangeListener(this);
editor.setReadOnly(!this.resourcePermission.isInventory());
@@ -122,8 +122,8 @@ public class PluginConfigurationEditView extends LocatableVLayout
public void onSuccess(PluginConfigurationUpdate result) {
CoreGUI.getMessageCenter().notify(
- new
Message(MSG.view_connectionSettingsDetails_messageConcise_updateSuccess(),
-
MSG.view_connectionSettingsDetails_messageDetailed_updateSuccess(resource.getName())));
+ new
Message(MSG.view_connectionSettingsDetails_messageConcise_updateSuccess(), MSG
+
.view_connectionSettingsDetails_messageDetailed_updateSuccess(resource.getName())));
refresh();
}
});
@@ -137,12 +137,12 @@ public class PluginConfigurationEditView extends LocatableVLayout
Set<String> invalidPropertyNames = event.getInvalidPropertyNames();
if (invalidPropertyNames.isEmpty()) {
this.saveButton.enable();
- message = new
Message(MSG.view_connectionSettingsDetails_allPropertiesValid(),
- Message.Severity.Info, EnumSet.of(Message.Option.Transient,
Message.Option.Sticky));
+ message = new
Message(MSG.view_connectionSettingsDetails_allPropertiesValid(), Message.Severity.Info,
+ EnumSet.of(Message.Option.Transient, Message.Option.Sticky));
} else {
this.saveButton.disable();
- message = new
Message(MSG.view_connectionSettingsDetails_somePropertiesInvalid(invalidPropertyNames.toString()),
- Message.Severity.Error, EnumSet.of(Message.Option.Transient,
Message.Option.Sticky));
+ message = new
Message(MSG.view_connectionSettingsDetails_somePropertiesInvalid(invalidPropertyNames
+ .toString()), Message.Severity.Error,
EnumSet.of(Message.Option.Transient, Message.Option.Sticky));
}
messageCenter.notify(message);
} else {
commit 567f3e84025bce205ab5a189e6837123417dbc8c
Merge: a82b956... 9bde193...
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Nov 24 18:02:14 2010 -0500
Merge branch 'master' of
ssh://git.fedorahosted.org/git/rhq/rhq.git
commit a82b956f006ebff91fd019e765894152af3c65ec
Author: John Mazzitelli <mazz(a)redhat.com>
Date: Wed Nov 24 18:01:38 2010 -0500
trying to get an empty list to not collapse the width of columns. this still
doesn't seem to work though
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
index 7c20be5..0427c31 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
@@ -85,9 +85,9 @@ public class AlertDataSource extends RPCDataSource<Alert> {
@Override
protected List<DataSourceField> addDataSourceFields() {
// for some reason, the client seems to crash if you don't specify any data
source fields
- // even though we know we defined override ListGridFields for all columns. Define
at least one field here.
+ // even though we know we defined override ListGridFields for all columns.
List<DataSourceField> fields = super.addDataSourceFields();
- fields.add(new DataSourceTextField("name", MSG.common_title_name()));
+ fields.add(new DataSourceTextField("name"));
return fields;
}
@@ -112,7 +112,7 @@ public class AlertDataSource extends RPCDataSource<Alert> {
fields.add(nameField);
ListGridField conditionField = new ListGridField("conditionText",
MSG.view_alerts_field_condition_text());
- conditionField.setWidth("*");
+ conditionField.setWidth("40%");
fields.add(conditionField);
ListGridField priorityField = new ListGridField("priority",
MSG.view_alerts_field_priority());