SORMAS-Foundation#3547 - Adjusted margins and spacings

Author: MateStrysewske

sormas-ui/src/main/java/de/symeda/sormas/ui/caze/messaging/SmsComponent.java

@@ -29,6 +29,7 @@ public SmsComponent(long missingPhoneNumbers) {
 	protected Component initContent() {
 		final VerticalLayout mainLayout = new VerticalLayout();
 		mainLayout.setSpacing(false);
+		mainLayout.setMargin(false);
 		mainLayout.setSizeUndefined();
 		mainLayout.setWidth(100, Unit.PERCENTAGE);
 
@@ -48,7 +49,7 @@ protected Component initContent() {
 		smsTextArea = new TextArea();
 		smsTextArea.setWidth(100, Unit.PERCENTAGE);
 		smsTextArea.setRows(4);
-		mainLayout.addComponent(tTextFieldWithMaxLengthWrapper.wrap(smsTextArea, Captions.Messages_characters));
+		mainLayout.addComponent(tTextFieldWithMaxLengthWrapper.wrap(smsTextArea, Captions.Messages_characters, false));
 
 		final Label numberOfMessagesLabel = new Label(String.format(I18nProperties.getCaption(Captions.Messages_numberOfMessages), 0));
 		numberOfMessagesLabel.addStyleNames(CssStyles.ALIGN_RIGHT, CssStyles.FIELD_EXTRA_INFO, CssStyles.LABEL_ITALIC);

sormas-ui/src/main/java/de/symeda/sormas/ui/utils/FieldWrapper.java

@@ -22,5 +22,8 @@
 
 public interface FieldWrapper<T extends Component> {
 
+	ComponentContainer wrap(T component, String caption, boolean withMargin);
+
 	ComponentContainer wrap(T component, String caption);
+
 }

sormas-ui/src/main/java/de/symeda/sormas/ui/utils/TextFieldWithMaxLengthWrapper.java

@@ -35,13 +35,15 @@ public class TextFieldWithMaxLengthWrapper<T extends AbstractTextField> implemen
 	private static final int MIN_ROWS = 4;
 
 	@Override
-	public ComponentContainer wrap(T textField, String caption) {
+	public ComponentContainer wrap(T textField, String caption, boolean withMargin) {
 
 		VerticalLayout layout = new VerticalLayout();
 		layout.setSpacing(false);
 		layout.setMargin(false);
 		layout.setWidth(100, Sizeable.Unit.PERCENTAGE);
-		layout.addStyleName(CssStyles.FIELD_WRAPPER);
+		if (withMargin) {
+			layout.addStyleName(CssStyles.FIELD_WRAPPER);
+		}
 
 		textField.setWidth(100, Sizeable.Unit.PERCENTAGE);
 		textField.addStyleName(CssStyles.RESIZABLE);
@@ -75,6 +77,12 @@ public ComponentContainer wrap(T textField, String caption) {
 		return layout;
 	}
 
+	@Override
+	public ComponentContainer wrap(T textField, String caption) {
+
+		return wrap(textField, caption, true);
+	}
+
 	private String buildLabelMessage(String text, T textField, String caption) {
 		return String.format(I18nProperties.getCaption(caption), Strings.nullToEmpty(text).length(), textField.getMaxLength());
 	}