diff --git a/hsarweb/WebContent/VAADIN/themes/hs/layout/footer.html b/hsarweb/WebContent/VAADIN/themes/hs/layout/footer.html index 31dc7b7..becaf72 100644 --- a/hsarweb/WebContent/VAADIN/themes/hs/layout/footer.html +++ b/hsarweb/WebContent/VAADIN/themes/hs/layout/footer.html @@ -1,4 +1,4 @@
(c) Hostsharing eG, Impressum
-
hsarweb (Vers. 2.0a, 23.05.2011)
+
hsarweb (Vers. 2.0b, 25.05.2011)
\ No newline at end of file diff --git a/hsarweb/src/de/hsadmin/web/EMailAddressModule.java b/hsarweb/src/de/hsadmin/web/EMailAddressModule.java index dc3d4e3..8bdc8d5 100644 --- a/hsarweb/src/de/hsadmin/web/EMailAddressModule.java +++ b/hsarweb/src/de/hsadmin/web/EMailAddressModule.java @@ -54,6 +54,7 @@ public class EMailAddressModule extends GenericModule { }); domainProp.setWriteOnce(true); PropertyConfig targetProp = new PropertyConfig(moduleConfig, "target", String.class, new EMailTargetPropertyFieldFactory(this)); + targetProp.setExpandRatio(0.8f); targetProp.setDefaultValue(new PropertyDefaultValue() { @Override public String getDefaultValue() { diff --git a/hsarweb/src/de/hsadmin/web/EMailAliasModule.java b/hsarweb/src/de/hsadmin/web/EMailAliasModule.java index ff6f04e..21769e4 100644 --- a/hsarweb/src/de/hsadmin/web/EMailAliasModule.java +++ b/hsarweb/src/de/hsadmin/web/EMailAliasModule.java @@ -38,6 +38,7 @@ public class EMailAliasModule extends GenericModule { }); nameProp.setWriteOnce(true); PropertyConfig targetProp = new PropertyConfig(moduleConfig, "target", String.class, new EMailTargetPropertyFieldFactory(this)); + targetProp.setExpandRatio(0.8f); targetProp.setDefaultValue(new PropertyDefaultValue() { @Override public String getDefaultValue() { diff --git a/hsarweb/src/de/hsadmin/web/QueueTaskModule.java b/hsarweb/src/de/hsadmin/web/QueueTaskModule.java index 8bca559..2ce7402 100644 --- a/hsarweb/src/de/hsadmin/web/QueueTaskModule.java +++ b/hsarweb/src/de/hsadmin/web/QueueTaskModule.java @@ -17,7 +17,9 @@ public class QueueTaskModule extends AbstractModule { protected void initModule() { moduleConfig = new ModuleConfig("q", getApplication().getLocale()); moduleConfig.addProperty(new PropertyConfig(moduleConfig, "id", Long.class, PropertyTableColumn.INTERNAL_KEY)); - moduleConfig.addProperty(new PropertyConfig(moduleConfig, "title", String.class)); + PropertyConfig titleProp = new PropertyConfig(moduleConfig, "title", String.class); + titleProp.setExpandRatio(0.7f); + moduleConfig.addProperty(titleProp); moduleConfig.addProperty(new PropertyConfig(moduleConfig, "status", String.class)); moduleConfig.addProperty(new PropertyConfig(moduleConfig, "started", Date.class, new DatePropertyFieldFactory())); moduleConfig.addProperty(new PropertyConfig(moduleConfig, "finished", Date.class, new DatePropertyFieldFactory())); diff --git a/hsarweb/src/de/hsadmin/web/UnixUserModule.java b/hsarweb/src/de/hsadmin/web/UnixUserModule.java index 4198990..dc7f2ee 100644 --- a/hsarweb/src/de/hsadmin/web/UnixUserModule.java +++ b/hsarweb/src/de/hsadmin/web/UnixUserModule.java @@ -68,6 +68,7 @@ public class UnixUserModule extends GenericModule { }); PropertyConfig passwordProp = new PropertyConfig(moduleConfig, "password", String.class, PropertyTableColumn.NONE, new PasswordPropertyFieldFactory(this)); PropertyConfig commentProp = new PropertyConfig(moduleConfig, "comment", String.class); + commentProp.setExpandRatio(0.7f); PropertyConfig shellProp = new PropertyConfig(moduleConfig, "shell", String.class, new SelectPropertyFieldFactory()); shellProp.setDefaultValue(new PropertyDefaultValue() { @Override diff --git a/hsarweb/src/de/hsadmin/web/config/PropertyConfig.java b/hsarweb/src/de/hsadmin/web/config/PropertyConfig.java index cfbead6..cfe95e9 100644 --- a/hsarweb/src/de/hsadmin/web/config/PropertyConfig.java +++ b/hsarweb/src/de/hsadmin/web/config/PropertyConfig.java @@ -18,6 +18,7 @@ public class PropertyConfig implements Serializable, PropertyDefaultValue, Prope private PropertyDefaultValue defaultValue; private PropertySelectValues selectValues; private boolean showInForm = true; + private float expandRatio; public PropertyConfig(ModuleConfig moduleConfig, String id, Class clasz) { this.moduleConfig = moduleConfig; @@ -27,6 +28,7 @@ public class PropertyConfig implements Serializable, PropertyDefaultValue, Prope this.setPropFieldFactory(new DefaultPropertyFieldFactory()); this.defaultValue = null; this.selectValues = null; + this.setExpandRatio(0.5f); } public PropertyConfig(ModuleConfig moduleConfig, String id, Class clasz, PropertyFieldFactory fieldFactory) { @@ -137,5 +139,13 @@ public class PropertyConfig implements Serializable, PropertyDefaultValue, Prope public void setShowInForm(boolean show) { showInForm = show; } + + public float getExpandRatio() { + return expandRatio; + } + + public void setExpandRatio(float expandRatio) { + this.expandRatio = expandRatio; + } } diff --git a/hsarweb/src/de/hsadmin/web/vaadin/TableComponentFactory.java b/hsarweb/src/de/hsadmin/web/vaadin/TableComponentFactory.java index 9b46fe0..a44bc90 100644 --- a/hsarweb/src/de/hsadmin/web/vaadin/TableComponentFactory.java +++ b/hsarweb/src/de/hsadmin/web/vaadin/TableComponentFactory.java @@ -71,11 +71,12 @@ public class TableComponentFactory implements ComponentFactory, Serializable { table.setSelectable(false); table.setImmediate(true); table.setColumnCollapsingAllowed(true); - table.setColumnReorderingAllowed(true); + table.setColumnReorderingAllowed(false); for (PropertyConfig prop : config.getPropertyList()) { PropertyTableColumn propTableColumn = prop.getPropTableColumn(); if (propTableColumn != PropertyTableColumn.NONE) { table.addContainerProperty(prop.getId(), prop.getType(), prop.getDefaultValue()); + table.setColumnExpandRatio(prop.getId(), prop.getExpandRatio()); table.setColumnHeader(prop.getId(), prop.getLabel()); if (propTableColumn == PropertyTableColumn.HIDDEN) { table.setColumnCollapsed(prop.getId(), true);