Author: dward
Date: 2007-10-04 19:34:04 +0200 (Thu, 04 Oct 2007)
New Revision: 5290
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SearcherPanel.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorPanel.java
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorTogglePanel.java
Log:
- CURRIKI-1005
- Change style applied to results scroll panel depending on if advanced
filters open or not.
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
2007-10-04 17:07:27 UTC (rev 5289)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/ResultsPanel.java
2007-10-04 17:34:04 UTC (rev 5290)
@@ -315,6 +315,11 @@
}
}
+ public ScrollPanel getScrollPanel()
+ {
+ return s;
+ }
+
public class hoverOnMouseover extends MouseListenerAdapter {
public void onMouseEnter(Widget w){
w.addStyleName("mouse-over");
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SearcherPanel.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SearcherPanel.java
2007-10-04 17:07:27 UTC (rev 5289)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SearcherPanel.java
2007-10-04 17:34:04 UTC (rev 5290)
@@ -74,6 +74,7 @@
results.addStyleName("search-results");
results.setSelector(selector);
add(results);
+ selector.addResultsScrollPanel(results.getScrollPanel());
pagination = new PaginationPanel();
pagination.addStyleName("search-pagination");
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorPanel.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorPanel.java
2007-10-04 17:07:27 UTC (rev 5289)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorPanel.java
2007-10-04 17:34:04 UTC (rev 5290)
@@ -28,6 +28,7 @@
import com.google.gwt.user.client.ui.SourcesClickEvents;
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.ScrollPanel;
import org.curriki.gwt.client.search.history.ClientState;
import org.curriki.gwt.client.search.history.KeepsState;
import org.curriki.gwt.client.search.selectors.Selectable;
@@ -173,4 +174,9 @@
// If we have a cancel callback then we are in CB, so open selectors
by default
bottom.setToggleValue(true);
}
+
+ public void addResultsScrollPanel(ScrollPanel scrollPanel)
+ {
+ bottom.addResultsScrollPanel(scrollPanel);
+ }
}
Modified:
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorTogglePanel.java
===================================================================
---
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorTogglePanel.java
2007-10-04 17:07:27 UTC (rev 5289)
+++
xwiki-products/curriki/trunk/gwt/src/main/java/org/curriki/gwt/client/search/panels/SelectorTogglePanel.java
2007-10-04 17:34:04 UTC (rev 5290)
@@ -26,6 +26,7 @@
import com.google.gwt.user.client.ui.VerticalPanel;
import com.google.gwt.user.client.ui.ClickListener;
import com.google.gwt.user.client.ui.Widget;
+import com.google.gwt.user.client.ui.ScrollPanel;
import org.curriki.gwt.client.Main;
import org.curriki.gwt.client.Constants;
import org.curriki.gwt.client.search.history.KeepsState;
@@ -34,6 +35,7 @@
public class SelectorTogglePanel extends VerticalPanel implements
ClickListener, KeepsState
{
protected SelectorFilterPanel filters;
+ protected ScrollPanel scroller;
protected HTML toggleWidget;
public SelectorTogglePanel()
@@ -73,8 +75,16 @@
if (filters.isVisible()){
toggleWidget.setHTML(Main.getTranslation("search.instruction.adv.close"));
+ if (scroller != null){
+ scroller.removeStyleName("find-results-scroller-simple");
+ scroller.addStyleName("find-results-scroller-advanced");
+ }
} else {
toggleWidget.setHTML(Main.getTranslation("search.instruction.adv.open"));
+ if (scroller != null){
+ scroller.removeStyleName("find-results-scroller-advanced");
+ scroller.addStyleName("find-results-scroller-simple");
+ }
}
}
@@ -101,4 +111,9 @@
public void saveState(ClientState state){
state.setValue(Constants.HISTORY_FIELD_ADV_TOGGLE,
(filters.isVisible()?"1":"0"));
}
+
+ public void addResultsScrollPanel(ScrollPanel scrollPanel)
+ {
+ scroller = scrollPanel;
+ }
}
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
