feature[ats_E6W8N]: Polish ArtPage

7 files changed, 103 insertions, 101 deletions

diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java
index cdf56b1..548edde 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java
@@ -159,59 +159,40 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
       hLayoutRow2.setComponentAlignment(searchTextField, Alignment.MIDDLE_LEFT);
       hLayoutRow2.setComponentAlignment(searchButton, Alignment.MIDDLE_RIGHT);
 
-      if (showOseeTitleAbove) {
-         setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_LARGE);
-         OseeLogoLink oseeTitleLabel =
-            new OseeLogoLink(navigator, CssConstants.OSEE_TITLE_LARGE_TEXT, AtsSearchResultsView.class);
-         hLayoutRow0.addComponent(oseeTitleLabel);
-         hLayoutRow0.setComponentAlignment(oseeTitleLabel, Alignment.MIDDLE_CENTER);
-         oseeTitleLabel.setStyleName(CssConstants.OSEE_TITLE_LARGE_TEXT);
-         hLayoutRow0.setHeight(oseeTitleLabel.getHeight(), UNITS_PIXELS);
-
-         addComponent(hLayoutRow0);
-         addComponent(hLayoutRow1);
-         addComponent(hLayoutRow2);
-
-         hLayoutRow1.setMargin(true);
-
-         setComponentAlignment(hLayoutRow0, Alignment.MIDDLE_CENTER);
-         setComponentAlignment(hLayoutRow1, Alignment.MIDDLE_CENTER);
-         setComponentAlignment(hLayoutRow2, Alignment.MIDDLE_CENTER);
-      } else {
-         setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_SMALL);
-
-         OseeLogoLink oseeTitleLabel =
-            new OseeLogoLink(navigator, CssConstants.OSEE_TITLE_MEDIUM_TEXT, AtsSearchResultsView.class);
-         Label spacer4 = new Label("");
-         spacer4.setWidth(15, UNITS_PIXELS);
-         oseeTitleLabel.setHeight(70, UNITS_PIXELS);
-         oseeTitleLabel.setWidth(70, UNITS_PIXELS);
-
-         VerticalLayout rightSideVLayout = new VerticalLayout();
-         rightSideVLayout.addComponent(hLayoutRow1);
-         rightSideVLayout.addComponent(hLayoutRow2);
-         rightSideVLayout.setSizeUndefined();
-
-         Label spacer7 = new Label();
-         spacer7.setWidth(5, UNITS_PIXELS);
-
-         hLayoutRow0.addComponent(spacer7);
-         hLayoutRow0.addComponent(oseeTitleLabel);
-         hLayoutRow0.addComponent(spacer4);
-         hLayoutRow0.addComponent(rightSideVLayout);
-         hLayoutRow0.setComponentAlignment(oseeTitleLabel, Alignment.TOP_CENTER);
-         hLayoutRow0.setComponentAlignment(rightSideVLayout, Alignment.TOP_CENTER);
-
-         Label spacer5 = new Label("");
-         spacer5.setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_FOOTER);
-
-         Label spacer6 = new Label("");
-         spacer6.setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_FOOTER);
-
-         addComponent(spacer6);
-         addComponent(hLayoutRow0);
-         addComponent(spacer5);
-      }
+      setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_SMALL);
+
+      OseeLogoLink oseeTitleLabel =
+         new OseeLogoLink(navigator, CssConstants.OSEE_TITLE_MEDIUM_TEXT, AtsSearchResultsView.class);
+      Label spacer4 = new Label("");
+      spacer4.setWidth(15, UNITS_PIXELS);
+      oseeTitleLabel.setHeight(70, UNITS_PIXELS);
+      oseeTitleLabel.setWidth(70, UNITS_PIXELS);
+
+      VerticalLayout rightSideVLayout = new VerticalLayout();
+      rightSideVLayout.addComponent(hLayoutRow1);
+      rightSideVLayout.addComponent(hLayoutRow2);
+      rightSideVLayout.setSizeUndefined();
+
+      Label spacer7 = new Label();
+      spacer7.setWidth(15, UNITS_PIXELS);
+
+      hLayoutRow0.addComponent(spacer7);
+      hLayoutRow0.addComponent(oseeTitleLabel);
+      hLayoutRow0.addComponent(spacer4);
+      hLayoutRow0.addComponent(rightSideVLayout);
+      hLayoutRow0.setComponentAlignment(oseeTitleLabel, Alignment.TOP_CENTER);
+      hLayoutRow0.setComponentAlignment(rightSideVLayout, Alignment.TOP_CENTER);
+
+      Label spacer5 = new Label("");
+      spacer5.setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_FOOTER);
+
+      Label spacer6 = new Label("");
+      spacer6.setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT_FOOTER);
+
+      addComponent(spacer6);
+      addComponent(hLayoutRow0);
+      addComponent(spacer5);
+
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java
index 015384c..f874f6b 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/CssConstants.java
@@ -44,7 +44,7 @@ public final class CssConstants {
    public static final String OSEE_SEARCHRESULTS_MANYRESULTSFIELD = "osee-searchresults-manyresultsfield";
    public static final String OSEE_SEARCHRESULT_ARTNAME = "osee-searchresult-artname";
    public static final String OSEE_SEARCHRESULT_ARTTYPE = "osee-searchresult-arttype";
-   public static final String OSEE_SEARCHRESULT_MATCH = "osee-searchresult-match";
+   public static final String OSEE_ATTRNAME = "osee-attrname";
    public static final String OSEE_SEARCHRESULT_MATCH_MANY = "osee-searchresult-match-many";
 
    public static final String OSEE_HORIZONTAL_LINE = "osee-horizontal-line";
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java
index 28f9b0b..6cac3c3 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeAttributeComponent.java
@@ -84,7 +84,7 @@ public class OseeAttributeComponent extends VerticalLayout implements AttributeC
       Label spacer = new Label("");
       spacer.setWidth(15, UNITS_PIXELS);
       Label spacer2 = new Label("");
-      spacer2.setWidth(15, UNITS_PIXELS);
+      spacer2.setWidth(5, UNITS_PIXELS);
       attributesLayout.addComponent(spacer);
       attributesLayout.addComponent(attrLabelsLayout);
       attributesLayout.addComponent(spacer2);
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java
index 9f2412c..5ab1197 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultComponent.java
@@ -102,7 +102,7 @@ public class OseeSearchResultComponent extends VerticalLayout implements SearchR
    private class OseeSearchResultMatchComponent extends HorizontalLayout {
       public OseeSearchResultMatchComponent(SearchResultMatch match) {
          Label matchLabel = new Label(String.format("%s: ", match.getAttributeType(), Label.CONTENT_XHTML));
-         matchLabel.setStyleName(CssConstants.OSEE_SEARCHRESULT_MATCH);
+         matchLabel.setStyleName(CssConstants.OSEE_ATTRNAME);
          Label spacer4 = new Label();
          spacer4.setWidth(15, UNITS_PIXELS);
          Label matchLabelHint = new Label(String.format("%s", match.getMatchHint()), Label.CONTENT_XHTML);
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java
index dbee0c7..1e03fd2 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeArtifactView.java
@@ -39,6 +39,7 @@ public class OseeArtifactView extends CustomComponent implements Navigator.View,
    protected OseeAttributeComponent attributeComp = new OseeAttributeComponent();
    private final OseeBreadcrumbComponent breadcrumbComp = new OseeBreadcrumbComponent(null);
    private ViewArtifact artifact;
+   private final int LEFTMARGIN_WIDTH = 5;
 
    @Override
    public void attach() {
@@ -48,78 +49,92 @@ public class OseeArtifactView extends CustomComponent implements Navigator.View,
    protected void createLayout() {
       setSizeFull();
 
+      searchHeader.setWidth(100, UNITS_PERCENTAGE);
+      searchHeader.setHeight(null);
+
       Label spacer = new Label();
       spacer.setHeight(5, UNITS_PIXELS);
 
-      HorizontalLayout leftMarginAndBody = new HorizontalLayout();
-      leftMarginAndBody.setSizeFull();
+      HorizontalLayout hLayout_LeftMargAndBody = new HorizontalLayout();
+      hLayout_LeftMargAndBody.setSizeFull();
       Label leftMarginSpace = new Label("");
-      leftMarginSpace.setWidth(80, UNITS_PIXELS);
-      leftMarginAndBody.addComponent(leftMarginSpace);
+      leftMarginSpace.setWidth(LEFTMARGIN_WIDTH, UNITS_PIXELS);
+      hLayout_LeftMargAndBody.addComponent(leftMarginSpace);
 
       if (artifact != null) {
-         VerticalLayout artNameVertLayout = new VerticalLayout();
-         artNameVertLayout.setSizeFull();
+         VerticalLayout vLayout_OutBody = new VerticalLayout();
+         vLayout_OutBody.setSizeFull();
 
          breadcrumbComp.setArtifact(artifact);
-         artNameVertLayout.addComponent(breadcrumbComp);
+
+         Label vSpacer = new Label();
+         vSpacer.setHeight(5, UNITS_PIXELS);
 
          OseeArtifactNameLinkComponent artifactName = new OseeArtifactNameLinkComponent(artifact);
          artifactName.setSizeUndefined();
+
          Label spacer1 = new Label();
          spacer1.setWidth(10, UNITS_PIXELS);
          spacer1.setHeight(null);
+
          Label artifactType = new Label(String.format("[%s]", artifact.getArtifactType()), Label.CONTENT_XHTML);
          artifactType.setSizeUndefined();
-         HorizontalLayout artNameAndTypeLayout = new HorizontalLayout();
-         artNameAndTypeLayout.setSizeUndefined();
-         artNameAndTypeLayout.addComponent(artifactName);
-         artNameAndTypeLayout.addComponent(spacer1);
-         artNameAndTypeLayout.addComponent(artifactType);
-         artNameAndTypeLayout.setComponentAlignment(artifactType, Alignment.BOTTOM_CENTER);
-         artNameVertLayout.addComponent(artNameAndTypeLayout);
+
+         HorizontalLayout hLayout_ArtNameAndType = new HorizontalLayout();
+         hLayout_ArtNameAndType.setSizeUndefined();
 
          VerticalLayout artRelSpacer = new VerticalLayout();
          artRelSpacer.setHeight(15, UNITS_PIXELS);
-         artNameVertLayout.addComponent(artRelSpacer);
 
-         VerticalLayout bodyVertLayout = new VerticalLayout();
-         bodyVertLayout.setMargin(true);
-         bodyVertLayout.setSizeFull();
-         bodyVertLayout.addComponent(relationsComp);
+         VerticalLayout vLayout_Body = new VerticalLayout();
+         vLayout_Body.setMargin(false, false, false, true);
+         vLayout_Body.setSizeFull();
 
          VerticalLayout relAttrSpacer = new VerticalLayout();
          relAttrSpacer.setHeight(15, UNITS_PIXELS);
-         bodyVertLayout.addComponent(relAttrSpacer);
-
-         bodyVertLayout.addComponent(attributeComp);
 
          VerticalLayout bottomSpacer = new VerticalLayout();
-         bodyVertLayout.addComponent(bottomSpacer);
-         bodyVertLayout.setExpandRatio(bottomSpacer, 1.0f);
-
-         Panel mainLayoutPanel = new Panel();
-         mainLayoutPanel.setScrollable(true);
-         mainLayoutPanel.getContent().setSizeUndefined();
-         mainLayoutPanel.setContent(bodyVertLayout);
-         mainLayoutPanel.setSizeFull();
-
-         artNameVertLayout.addComponent(mainLayoutPanel);
-         artNameVertLayout.setExpandRatio(mainLayoutPanel, 1.0f);
-         leftMarginAndBody.addComponent(artNameVertLayout);
-         leftMarginAndBody.setExpandRatio(artNameVertLayout, 1.0f);
+
+         Panel panel_Body = new Panel();
+         panel_Body.setScrollable(true);
+         panel_Body.getContent().setSizeUndefined();
+         panel_Body.setSizeFull();
+
+         hLayout_ArtNameAndType.addComponent(artifactName);
+         hLayout_ArtNameAndType.addComponent(spacer1);
+         hLayout_ArtNameAndType.addComponent(artifactType);
+
+         vLayout_Body.addComponent(vSpacer);
+         vLayout_Body.addComponent(hLayout_ArtNameAndType);
+         vLayout_Body.addComponent(artRelSpacer);
+         vLayout_Body.addComponent(relationsComp);
+         vLayout_Body.addComponent(relAttrSpacer);
+         vLayout_Body.addComponent(attributeComp);
+         vLayout_Body.addComponent(bottomSpacer);
+
+         panel_Body.setContent(vLayout_Body);
+
+         vLayout_OutBody.addComponent(breadcrumbComp);
+         vLayout_OutBody.addComponent(panel_Body);
+
+         hLayout_LeftMargAndBody.addComponent(vLayout_OutBody);
+
+         hLayout_ArtNameAndType.setComponentAlignment(artifactType, Alignment.BOTTOM_CENTER);
+         vLayout_Body.setExpandRatio(bottomSpacer, 1.0f);
+         vLayout_OutBody.setExpandRatio(panel_Body, 1.0f);
+         hLayout_LeftMargAndBody.setExpandRatio(vLayout_OutBody, 1.0f);
       }
 
       final VerticalLayout vertLayout = new VerticalLayout();
+      vertLayout.setSizeFull();
+
       vertLayout.addComponent(searchHeader);
       vertLayout.addComponent(spacer);
+      vertLayout.addComponent(hLayout_LeftMargAndBody);
+
       vertLayout.setComponentAlignment(searchHeader, Alignment.TOP_LEFT);
-      searchHeader.setWidth(100, UNITS_PERCENTAGE);
-      searchHeader.setHeight(null);
-      vertLayout.addComponent(leftMarginAndBody);
-      vertLayout.setExpandRatio(leftMarginAndBody, 1.0f);
+      vertLayout.setExpandRatio(hLayout_LeftMargAndBody, 1.0f);
 
-      vertLayout.setSizeFull();
       setCompositionRoot(vertLayout);
    }
 
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java
index eb77f15..f574161 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchResultsView.java
@@ -40,13 +40,15 @@ public class OseeSearchResultsView extends CustomComponent implements Navigator.
       leftMarginAndBody.setSizeFull();
       Label leftMarginSpace = new Label("");
       leftMarginSpace.setWidth(LEFTMARGIN_WIDTH, UNITS_PIXELS);
-      leftMarginAndBody.addComponent(leftMarginSpace);
 
-      leftMarginAndBody.addComponent(searchResultsListComponent);
       searchResultsListComponent.setSizeFull();
-      leftMarginAndBody.setExpandRatio(searchResultsListComponent, 1.0f);
 
       final VerticalLayout vertLayout = new VerticalLayout();
+      vertLayout.setSizeFull();
+
+      leftMarginAndBody.addComponent(leftMarginSpace);
+      leftMarginAndBody.addComponent(searchResultsListComponent);
+
       if (searchHeader != null) {
          searchHeader.setShowOseeTitleAbove(false);
          vertLayout.addComponent(searchHeader);
@@ -54,11 +56,13 @@ public class OseeSearchResultsView extends CustomComponent implements Navigator.
          searchHeader.setWidth(100, UNITS_PERCENTAGE);
          searchHeader.setHeight(null);
       }
+
       vertLayout.addComponent(spacer);
       vertLayout.addComponent(leftMarginAndBody);
+
+      leftMarginAndBody.setExpandRatio(searchResultsListComponent, 1.0f);
       vertLayout.setExpandRatio(leftMarginAndBody, 1.0f);
 
-      vertLayout.setSizeFull();
       setCompositionRoot(vertLayout);
    }
 
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css
index f4bbcfc..58fd7c6 100644
--- a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css
+++ b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/styles.css
@@ -115,7 +115,7 @@
 	color: black;
 }
 
-.osee-searchresult-match {
+.osee-attrname {
 	font-size: 12px;
 	color: green;
 }
@@ -151,6 +151,8 @@
 
 .osee-attributelabel {
 	text-align:right;
+	font-size: 12px;
+	color: green;
 }
 
 .osee-attributevalue {