feature[ats_E6W8N]: Continue to polish web interface layout

7 files changed, 48 insertions, 12 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 a2de15c..47d0f26 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
@@ -125,7 +125,6 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
       this.removeAllComponents();
       setHeight(null);
       setWidth(100, UNITS_PERCENTAGE);
-      setStyleName(CssConstants.OSEE_SEARCH_HEADER_COMPONENT);
 
       HorizontalLayout hLayoutRow0 = new HorizontalLayout();
       HorizontalLayout hLayoutRow1 = new HorizontalLayout();
@@ -166,6 +165,7 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
       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, AtsSearchHomeView.class);
          hLayoutRow0.addComponent(oseeTitleLabel);
@@ -183,6 +183,8 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
          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, AtsSearchHomeView.class);
          Label spacer4 = new Label("");
@@ -204,9 +206,12 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
          hLayoutRow0.setComponentAlignment(rightSideVLayout, Alignment.TOP_CENTER);
 
          Label spacer5 = new Label("");
-         spacer5.setHeight(15, UNITS_PIXELS);
-         spacer5.setStyleName(CssConstants.OSEE_HORIZONTAL_LINE);
+         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);
       }
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 6d498d0..edf2c7b 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
@@ -33,7 +33,9 @@ public final class CssConstants {
    public static final String OSEE_FOOTER_BAR = "osee-footer-bar";
    public static final String OSEE_PRODUCT_SUMMARY = "osee-product-summary";
 
-   public static final String OSEE_SEARCH_HEADER_COMPONENT = ".osee-search-header-component";
+   public static final String OSEE_SEARCH_HEADER_COMPONENT_LARGE = "osee-search-header-component-large";
+   public static final String OSEE_SEARCH_HEADER_COMPONENT_SMALL = "osee-search-header-component-small";
+   public static final String OSEE_SEARCH_HEADER_COMPONENT_FOOTER = "osee-search-header-component-footer";
    public static final String OSEE_TITLE_LARGE = "osee-title-large";
    public static final String OSEE_TITLE_LARGE_TEXT = "osee-title-large-text";
    public static final String OSEE_TITLE_MEDIUM_TEXT = "osee-title-medium-text";
@@ -48,6 +50,8 @@ public final class CssConstants {
    public static final String OSEE_HORIZONTAL_LINE = "osee-horizontal-line";
    public static final String OSEE_BREADCRUMB_ARTNAME = "osee-breadcrumb-artname";
 
+   public static final String OSEE_RIGHTARROW = "osee-rightarrow";
+
    public static final String OSEE_ATTRIBUTELABEL = "osee-attributelabel";
    public static final String OSEE_ATTRIBUTEVALUE = "osee-attributevalue";
    public static final String OSEE_ATTRIBUTESTITLELABEL = "osee-attributestitlelabel";
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 1880fbe..0e3757e 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
@@ -20,6 +20,7 @@ import org.eclipse.osee.display.view.web.OseeUiApplication;
 import com.vaadin.Application;
 import com.vaadin.data.Property;
 import com.vaadin.data.Property.ValueChangeEvent;
+import com.vaadin.ui.Alignment;
 import com.vaadin.ui.HorizontalLayout;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.ListSelect;
@@ -117,11 +118,14 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
 
       Label spacer = new Label();
       spacer.setWidth(15, UNITS_PIXELS);
-      Label spacer2 = new Label();
-      spacer2.setWidth(15, UNITS_PIXELS);
+
+      Label rightArrow = new Label();
+      rightArrow.setStyleName(CssConstants.OSEE_RIGHTARROW);
+
       listBoxesLayout.addComponent(spacer);
       listBoxesLayout.addComponent(relationTypesListSelect);
-      listBoxesLayout.addComponent(spacer2);
+      listBoxesLayout.addComponent(rightArrow);
+      listBoxesLayout.setComponentAlignment(rightArrow, Alignment.MIDDLE_CENTER);
       listBoxesLayout.addComponent(relationsListSelect);
 
       addComponent(titleLabel);
@@ -130,8 +134,8 @@ public class OseeRelationsComponent extends VerticalLayout implements RelationCo
       setExpandRatio(listBoxesLayout, 1.0f);
 
       //Fixed width lists make for a prettier layout
-      relationTypesListSelect.setWidth(200, UNITS_PIXELS);
-      relationsListSelect.setWidth(200, UNITS_PIXELS);
+      //      relationTypesListSelect.setWidth(200, UNITS_PIXELS);
+      //      relationsListSelect.setWidth(200, UNITS_PIXELS);
    }
 
    public OseeRelationsComponent() {
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 7366f60..8d77d2c 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
@@ -46,6 +46,9 @@ public class OseeArtifactView extends CustomComponent implements Navigator.View,
    protected void createLayout() {
       setSizeFull();
 
+      Label spacer = new Label();
+      spacer.setHeight(5, UNITS_PIXELS);
+
       HorizontalLayout leftMarginAndBody = new HorizontalLayout();
       leftMarginAndBody.setSizeFull();
       Label leftMarginSpace = new Label("");
@@ -87,6 +90,7 @@ public class OseeArtifactView extends CustomComponent implements Navigator.View,
 
       final VerticalLayout vertLayout = new VerticalLayout();
       vertLayout.addComponent(searchHeader);
+      vertLayout.addComponent(spacer);
       vertLayout.setComponentAlignment(searchHeader, Alignment.TOP_LEFT);
       searchHeader.setWidth(100, UNITS_PERCENTAGE);
       searchHeader.setHeight(null);
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 60ba58d..a8f8d0d 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
@@ -31,6 +31,9 @@ public class OseeSearchResultsView extends CustomComponent implements Navigator.
    protected void createLayout() {
       setSizeFull();
 
+      Label spacer = new Label();
+      spacer.setHeight(5, UNITS_PIXELS);
+
       HorizontalLayout leftMarginAndBody = new HorizontalLayout();
       leftMarginAndBody.setSizeFull();
       Label leftMarginSpace = new Label("");
@@ -49,6 +52,7 @@ public class OseeSearchResultsView extends CustomComponent implements Navigator.
          searchHeader.setWidth(100, UNITS_PERCENTAGE);
          searchHeader.setHeight(null);
       }
+      vertLayout.addComponent(spacer);
       vertLayout.addComponent(leftMarginAndBody);
       vertLayout.setExpandRatio(leftMarginAndBody, 1.0f);
 
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 18377d8..b806f86 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
@@ -64,7 +64,6 @@
 	background: #333333 repeat-x;
 	background-image: url(img/bg.png);
 	color: #d1d3d6;
-	text-shadow: rgba(0, 0, 0, .9) 0 1px 0;
 }
 
 .osee-product-summary {
@@ -77,8 +76,16 @@
 	
 }
 
-.osee-search-header-component {
-	background: blue;
+.osee-search-header-component-large {
+}
+
+.osee-search-header-component-small {
+	background: #AAAAAA;
+}
+
+.osee-search-header-component-footer {
+	background: #555555;
+	height: 1px;
 }
 
 .osee-title-large {
@@ -95,6 +102,7 @@
 }
 
 .osee-search-textfield {
+	width: 335px;
 }
 
 .osee-searchresult-artname {
@@ -127,6 +135,13 @@
 	background-repeat:repeat-x;
 }
 
+.osee-rightarrow {
+	background-image:url('woodsonArrow.png');
+	width: 35px;
+	height: 35px;
+	background-repeat:no-repeat;
+}
+
 .osee-attributelabel {
 	text-align:right;
 }
diff --git a/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow.png b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow.png
new file mode 100644
index 0000000..ff8a06a
--- a/dev/null
+++ b/plugins/org.eclipse.osee.vaadin.themes/src/VAADIN/themes/osee/woodsonArrow.png