summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshawn.f.cook2011-10-19 10:33:22 (EDT)
committer Roberto E. Escobar2011-10-19 10:33:22 (EDT)
commitc590eb29073c815c99f6b93ebf59c301c3f4a89e (patch)
tree3c9a560c88df7a43c7361f26d9c2ffa4f479759e
parent5131bc26434aafb30532bbac5f8e722f16fa4d8a (diff)
downloadorg.eclipse.osee-c590eb29073c815c99f6b93ebf59c301c3f4a89e.zip
org.eclipse.osee-c590eb29073c815c99f6b93ebf59c301c3f4a89e.tar.gz
org.eclipse.osee-c590eb29073c815c99f6b93ebf59c301c3f4a89e.tar.bz2
feature[ats_E6W8N]: Polish up UI interface
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java2
-rw-r--r--plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/components/AtsSearchHeaderImpl.java17
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java12
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseeSearchResultsListComponent.java6
-rw-r--r--plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchHeaderComponent.java2
-rw-r--r--plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/AccountMenuBar.java88
6 files changed, 59 insertions, 68 deletions
diff --git a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java
index 7925255..61c9a6c 100644
--- a/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java
+++ b/plugins/org.eclipse.osee.ats.view.web/src/org/eclipse/osee/ats/view/web/AtsWindowFactory.java
@@ -39,7 +39,7 @@ public class AtsWindowFactory {
}
w.addComponent(createNavigationBar(navigator, provider));
w.addComponent(navigator);
- w.addComponent(createFooter());
+ //w.addComponent(createFooter());
layout.setMargin(false);
layout.setSpacing(true);
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 47d0f26..02bea75 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
@@ -45,10 +45,10 @@ import com.vaadin.ui.Window.Notification;
public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements AtsSearchHeaderComponent, Handler {
private boolean populated = false;
- private final ComboBox programCombo;
- private final ComboBox buildCombo;
- private final CheckBox nameOnlyCheckBox;
- private final TextField searchTextField;
+ private final ComboBox programCombo = new ComboBox("Program:");
+ private final ComboBox buildCombo = new ComboBox("Build:");
+ private final CheckBox nameOnlyCheckBox = new CheckBox("Name Only", true);
+ private final TextField searchTextField = new TextField();
private AtsSearchPresenter searchPresenter;
private AtsNavigator navigator;
private boolean lockProgramCombo = false;
@@ -78,11 +78,6 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
public AtsSearchHeaderImpl(boolean showOseeTitleAbove) {
this.showOseeTitleAbove = showOseeTitleAbove;
- programCombo = new ComboBox("Program:");
- buildCombo = new ComboBox("Build:");
- nameOnlyCheckBox = new CheckBox("Name Only", false);
- searchTextField = new TextField();
-
if (programCombo != null) {
programCombo.setNullSelectionAllowed(false);
programCombo.addListener(new Property.ValueChangeListener() {
@@ -197,8 +192,6 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
rightSideVLayout.addComponent(hLayoutRow2);
rightSideVLayout.setSizeUndefined();
- //TODO: Make the title logo a hyper link to the search home
-
hLayoutRow0.addComponent(oseeTitleLabel);
hLayoutRow0.addComponent(spacer4);
hLayoutRow0.addComponent(rightSideVLayout);
@@ -269,7 +262,7 @@ public class AtsSearchHeaderImpl extends OseeSearchHeaderComponent implements At
buildCombo.setValue(null);
}
if (nameOnlyCheckBox != null) {
- nameOnlyCheckBox.setValue(false);
+ nameOnlyCheckBox.setValue(true);
}
if (searchTextField != null) {
searchTextField.setValue("");
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java
index 4247425..ec572c7 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/components/OseePagingComponent.java
@@ -30,10 +30,10 @@ import com.vaadin.ui.Label;
public class OseePagingComponent extends HorizontalLayout implements PagingComponent {
private int manyItemsTotal = 0;
- private int manyItemsPerPage = 10;
+ private int manyItemsPerPage = 15;
private int manyPages = 0;
private int currentPage = 0;
- private final int MAX_PAGE_NUMBERS_SHOWN = 10;
+ private final int MAX_PAGE_NUMBERS_SHOWN = 4;
public OseePagingComponent() {
super();
@@ -137,14 +137,14 @@ public class OseePagingComponent extends HorizontalLayout implements PagingCompo
this.removeAllComponents();
this.setSizeUndefined();
- Button firstButton = new Button("<<first");
+ Button firstButton = new Button("<< First");
this.addComponent(firstButton);
Label spacer1 = new Label();
spacer1.setWidth(15, UNITS_PIXELS);
this.addComponent(spacer1);
- Button previousButton = new Button("<prev");
+ Button previousButton = new Button("< Prev");
this.addComponent(previousButton);
Label spacer2 = new Label();
@@ -157,14 +157,14 @@ public class OseePagingComponent extends HorizontalLayout implements PagingCompo
spacer3.setWidth(15, UNITS_PIXELS);
this.addComponent(spacer3);
- Button nextButton = new Button("next>");
+ Button nextButton = new Button("Next >");
this.addComponent(nextButton);
Label spacer4 = new Label();
spacer4.setWidth(15, UNITS_PIXELS);
this.addComponent(spacer4);
- Button lastButton = new Button("last>>");
+ Button lastButton = new Button("Last >>");
this.addComponent(lastButton);
if (manyPages <= 0) {
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 45c6dc2..2bc749b 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
@@ -47,7 +47,7 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se
private OseePagingComponent pagingComponent = new OseePagingComponent();
private List<OseeSearchResultComponent> resultList = new ArrayList<OseeSearchResultComponent>();
private SearchHeaderComponent searchHeaderComponent;
- private final CheckBox showVerboseCheckBox = new CheckBox("Show Verbose Search Results", true);
+ private final CheckBox showVerboseCheckBox = new CheckBox("Show Detailed Results", false);
private final TextField manyResultsTextField = new TextField();
public OseeSearchResultsListComponent() {
@@ -125,7 +125,7 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se
Label manySearchResults = new Label(String.format("[%d] ", manySearchResultComponents));
Label spacer = new Label();
spacer.setWidth(5, UNITS_PIXELS);
- Label manySearchResults_suffix = new Label("search result(s) found.");
+ Label manySearchResults_suffix = new Label("Results Found");
manySearchResults.setSizeUndefined();
manySearchResults_suffix.setSizeUndefined();
manySearchResults.setStyleName(CssConstants.OSEE_SEARCHRESULT_MATCH_MANY);
@@ -147,7 +147,7 @@ public class OseeSearchResultsListComponent extends VerticalLayout implements Se
spacer2.setWidth(30, UNITS_PIXELS);
Label spacer3 = new Label();
spacer3.setWidth(5, UNITS_PIXELS);
- Label manyResultsLabel = new Label("Many Results Per Page");
+ Label manyResultsLabel = new Label("Results Per Page");
manySearchResultsHorizLayout.addComponent(spacer2);
manySearchResultsHorizLayout.addComponent(manyResultsTextField);
manySearchResultsHorizLayout.setComponentAlignment(manyResultsTextField, Alignment.TOP_CENTER);
diff --git a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchHeaderComponent.java b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchHeaderComponent.java
index be6683e..5caaec7 100644
--- a/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchHeaderComponent.java
+++ b/plugins/org.eclipse.osee.display.view.web/src/org/eclipse/osee/display/view/web/search/OseeSearchHeaderComponent.java
@@ -20,7 +20,7 @@ import com.vaadin.ui.VerticalLayout;
public class OseeSearchHeaderComponent extends VerticalLayout implements SearchHeaderComponent {
protected boolean showOseeTitleAbove;
- protected boolean showVerboseSearchResults = true;
+ protected boolean showVerboseSearchResults = false;
@Override
public void attach() {
diff --git a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/AccountMenuBar.java b/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/AccountMenuBar.java
index 9ad837e..4dd2c95 100644
--- a/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/AccountMenuBar.java
+++ b/plugins/org.eclipse.osee.vaadin.widgets/src/org/eclipse/osee/vaadin/widgets/AccountMenuBar.java
@@ -11,8 +11,6 @@
package org.eclipse.osee.vaadin.widgets;
import com.vaadin.Application;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
import com.vaadin.ui.MenuBar;
import com.vaadin.ui.Window;
@@ -39,49 +37,49 @@ public class AccountMenuBar extends MenuBar {
final MenuBar menuBar = this;
String userName = getUserName(menuBar.getApplication());
- if (userName.equalsIgnoreCase("guest")) {
- menuBar.addItem("Log In", new Command() {
- @Override
- public void menuSelected(MenuItem selectedItem) {
- System.out.printf("Log In Page: %s\n", getLogInUrl());
- }
- });
-
- menuBar.addItem("Register", new Command() {
- @Override
- public void menuSelected(MenuItem selectedItem) {
- String registrationUrl = getRegistrationUrl();
- System.out.printf("Registration Page: %s \n", registrationUrl);
- showClientDetails(menuBar.getApplication());
- }
- });
- } else {
- MenuItem accountItem = menuBar.addItem("Account", null);
-
- accountItem.addItem("Change Password", new Command() {
- @Override
- public void menuSelected(MenuItem selectedItem) {
- System.out.printf("Change Password");
- }
- });
-
- accountItem.addItem("Log Off", new Command() {
- @Override
- public void menuSelected(MenuItem selectedItem) {
- String logoutUrl = getLogOutUrl(menuBar.getApplication());
- System.out.printf("LogOut: %s \n", logoutUrl);
- }
- });
-
- Resource settingsIcon = new ThemeResource("../runo/icons/16/settings.png");
- MenuItem item = accountItem.addItem("", settingsIcon, new MenuBar.Command() {
- @Override
- public void menuSelected(MenuItem selectedItem) {
- System.out.println("Options");
- }
- });
- item.setDescription("Options");
- }
+ // if (userName.equalsIgnoreCase("guest")) {
+ // menuBar.addItem("Log In", new Command() {
+ // @Override
+ // public void menuSelected(MenuItem selectedItem) {
+ // System.out.printf("Log In Page: %s\n", getLogInUrl());
+ // }
+ // });
+ //
+ // menuBar.addItem("Register", new Command() {
+ // @Override
+ // public void menuSelected(MenuItem selectedItem) {
+ // String registrationUrl = getRegistrationUrl();
+ // System.out.printf("Registration Page: %s \n", registrationUrl);
+ // showClientDetails(menuBar.getApplication());
+ // }
+ // });
+ // } else {
+ // MenuItem accountItem = menuBar.addItem("Account", null);
+ //
+ // accountItem.addItem("Change Password", new Command() {
+ // @Override
+ // public void menuSelected(MenuItem selectedItem) {
+ // System.out.printf("Change Password");
+ // }
+ // });
+ //
+ // accountItem.addItem("Log Off", new Command() {
+ // @Override
+ // public void menuSelected(MenuItem selectedItem) {
+ // String logoutUrl = getLogOutUrl(menuBar.getApplication());
+ // System.out.printf("LogOut: %s \n", logoutUrl);
+ // }
+ // });
+ //
+ // Resource settingsIcon = new ThemeResource("../runo/icons/16/settings.png");
+ // MenuItem item = accountItem.addItem("", settingsIcon, new MenuBar.Command() {
+ // @Override
+ // public void menuSelected(MenuItem selectedItem) {
+ // System.out.println("Options");
+ // }
+ // });
+ // item.setDescription("Options");
+ // }
populated = true;
}