feature[ats_E6W8N]: Polish UI interface

5 files changed, 26 insertions, 9 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 02bea75..fe36b2a 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
@@ -192,6 +192,10 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
          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);
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
index e2bcb68..84d5b5d 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeRelationsComponent.java
@@ -37,6 +37,7 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
    private boolean populated = false;
    private final ListSelect relationTypesListSelect = new ListSelect();
    private final ListSelect relationsListSelect = new ListSelect();
+   private final ListSelect sideBSelect = new ListSelect();
    private SearchPresenter<?> searchPresenter = null;
    private SearchNavigator navigator = null;
    private boolean lockRelTypesListener = false;
@@ -117,6 +118,7 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
       listBoxesLayout.addComponent(rightArrow);
       listBoxesLayout.setComponentAlignment(rightArrow, Alignment.MIDDLE_CENTER);
       listBoxesLayout.addComponent(relationsListSelect);
+      listBoxesLayout.addComponent(sideBSelect);
 
       addComponent(titleLabel);
       addComponent(listBoxesLayout);
@@ -125,6 +127,7 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
       //Fixed width lists make for a prettier layout
       relationTypesListSelect.setWidth(LISTBOX_MINWIDTH, UNITS_PIXELS);
       relationsListSelect.setWidth(LISTBOX_MINWIDTH, UNITS_PIXELS);
+      sideBSelect.setWidth(LISTBOX_MINWIDTH, UNITS_PIXELS);
    }
 
    public OseeRelationsComponent() {
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 c8d1f20..fe10af4 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
@@ -30,6 +30,7 @@ public class OseeSearchResultComponent extends VerticalLayout implements SearchR
    private WebArtifact artifact;
    private final Collection<SearchResultMatch> matches = new ArrayList<SearchResultMatch>();
    private boolean showVerboseSearchResults = true;
+   private final int TOPBOTTOM_VERT_SPACE = 8;
 
    public OseeSearchResultComponent() {
       //Stupid hack. Web layout is driving me crazy.
@@ -61,8 +62,15 @@ public class OseeSearchResultComponent extends VerticalLayout implements SearchR
          row0.addComponent(artifactType);
          row0.setComponentAlignment(artifactName, Alignment.BOTTOM_LEFT);
          row0.setComponentAlignment(artifactType, Alignment.MIDDLE_LEFT);
-         addComponent(row0);
 
+         Label bottomSpacer = new Label("");
+         bottomSpacer.setHeight(TOPBOTTOM_VERT_SPACE, UNITS_PIXELS);
+
+         Label topSpacer = new Label("");
+         topSpacer.setHeight(TOPBOTTOM_VERT_SPACE, UNITS_PIXELS);
+
+         addComponent(topSpacer);
+         addComponent(row0);
          if (showVerboseSearchResults) {
             OseeBreadcrumbComponent breadcrumbComp = new OseeBreadcrumbComponent(artifact);
 
@@ -73,10 +81,7 @@ public class OseeSearchResultComponent extends VerticalLayout implements SearchR
                addComponent(matchComp);
             }
          }
-
-         Label spacer2 = new Label("");
-         spacer2.setHeight(15, UNITS_PIXELS);
-         addComponent(spacer2);
+         addComponent(bottomSpacer);
       }
    }
 
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
index 46dfe95..7452351 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java
@@ -48,7 +48,6 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se
    private List<OseeSearchResultComponent> resultList = new ArrayList<OseeSearchResultComponent>();
    private SearchHeaderComponent searchHeaderComponent;
    private final CheckBox showVerboseCheckBox = new CheckBox("Show Detailed Results", false);
-   //   private final TextField manyResultsTextField = new TextField();
    private final ComboBox manyResultsComboBox = new ComboBox();
    private final int INIT_MANY_RES_PER_PAGE = 15;
 
@@ -85,17 +84,22 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se
       this.addComponent(pagingComponent);
 
       showVerboseCheckBox.setImmediate(true);
+      final boolean showVerbose = showVerboseCheckBox.toString().equalsIgnoreCase("true");
       showVerboseCheckBox.addListener(new Property.ValueChangeListener() {
          @Override
          public void valueChange(ValueChangeEvent event) {
-            boolean showVerbose = showVerboseCheckBox.toString().equalsIgnoreCase("true");
-            OseeSearchResultsListComponent.this.searchHeaderComponent.setShowVerboseSearchResults(showVerbose);
+            if (OseeSearchResultsListComponent.this.searchHeaderComponent != null) {
+               OseeSearchResultsListComponent.this.searchHeaderComponent.setShowVerboseSearchResults(showVerbose);
+            }
             for (OseeSearchResultComponent resultComp : resultList) {
                resultComp.setShowVerboseSearchResults(showVerbose);
             }
             updateSearchResultsLayout();
          }
       });
+      if (searchHeaderComponent != null) {
+         searchHeaderComponent.setShowVerboseSearchResults(showVerbose);
+      }
 
       manyResultsComboBox.setImmediate(true);
       manyResultsComboBox.setTextInputAllowed(false);
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 a8f8d0d..ff645e9 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
@@ -27,6 +27,7 @@ public class OseeSearchResultsView extends CustomComponent implements Navigator.
 
    protected OseeSearchHeaderComponent searchHeader;
    protected OseeSearchResultsListComponent searchResultsListComponent = new OseeSearchResultsListComponent();
+   private final int LEFTMARGIN_WIDTH = 5;
 
    protected void createLayout() {
       setSizeFull();
@@ -37,7 +38,7 @@ public class OseeSearchResultsView extends CustomComponent implements Navigator.
       HorizontalLayout leftMarginAndBody = new HorizontalLayout();
       leftMarginAndBody.setSizeFull();
       Label leftMarginSpace = new Label("");
-      leftMarginSpace.setWidth(80, UNITS_PIXELS);
+      leftMarginSpace.setWidth(LEFTMARGIN_WIDTH, UNITS_PIXELS);
       leftMarginAndBody.addComponent(leftMarginSpace);
 
       leftMarginAndBody.addComponent(searchResultsListComponent);