Author: jvelociter
Date: 2007-12-20 16:07:45 +0100 (Thu, 20 Dec 2007)
New Revision: 6445

Modified:
   
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/Watch.java
   
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/dialog/AnalysisDialog.java
   
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/SearchWidget.java
   xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/TagCloud
Log:
XWATCH-49: Added a clickListener to the tagcloud in the analysis dialog to 
start a search for the clicked tag; Fixed the style of the tag cloud to handle 
most 
frequent tags and to have a mouse pointer on tag hover.


Modified: 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/Watch.java
===================================================================
--- 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/Watch.java
    2007-12-20 14:04:02 UTC (rev 6444)
+++ 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/Watch.java
    2007-12-20 15:07:45 UTC (rev 6445)
@@ -304,6 +304,8 @@
         FilterStatus fstatus = getFilterStatus();
         fstatus.setKeyword(text);
         refreshArticleList();
+        //set the search box selection
+        userInterface.resetSelections("search");
     }
 
     /**

Modified: 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/dialog/AnalysisDialog.java
===================================================================
--- 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/dialog/AnalysisDialog.java
 2007-12-20 14:04:02 UTC (rev 6444)
+++ 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/dialog/AnalysisDialog.java
 2007-12-20 15:07:45 UTC (rev 6445)
@@ -1,11 +1,14 @@
 package com.xpn.xwiki.watch.client.ui.dialog;
 
+import com.google.gwt.user.client.DOM;
+import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.Event;
+import com.google.gwt.user.client.EventListener;
 import com.google.gwt.user.client.ui.*;
 import com.xpn.xwiki.gwt.api.client.app.XWikiGWTApp;
 import com.xpn.xwiki.gwt.api.client.app.XWikiAsyncCallback;
 import com.xpn.xwiki.gwt.api.client.dialog.Dialog;
 import com.xpn.xwiki.watch.client.Watch;
-import com.xpn.xwiki.watch.client.Constants;
 
 /**
  * See the NOTICE file distributed with this work for additional
@@ -54,11 +57,29 @@
 
     protected Widget getAnalysisPanel() {
         analysisHTML = new HTML();
-        Watch watch = (Watch) app;
+        final Watch watch = (Watch) app;
         watch.getDataManager().getAnalysisHTML(watch.getFilterStatus(), new 
XWikiAsyncCallback(watch) {
             public void onSuccess(Object result) {
                 super.onSuccess(result);
                 analysisHTML.setHTML((String) result);
+                //get Element
+                Element DOMEl = analysisHTML.getElement();
+                DOM.sinkEvents(DOMEl, Event.ONCLICK);
+                DOM.setEventListener(DOMEl, new EventListener() {
+                    public void onBrowserEvent(Event event)
+                    {
+                        if (DOM.eventGetType(event) == Event.ONCLICK) {
+                            Element eventTarget = DOM.eventGetTarget(event);
+                            //the ugly way of testing if the eventTarget is an 
anchor
+                            if 
(eventTarget.toString().toLowerCase().startsWith("<a ")) {
+                                //close the dialog
+                                AnalysisDialog.this.cancelDialog();
+                                //search
+                                
watch.refreshOnSearch(DOM.getInnerText(eventTarget));
+                            }
+                        }
+                    }
+                });
             }
         });
         analysisHTML.setStyleName(getCssPrefix() + "-html");

Modified: 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/SearchWidget.java
===================================================================
--- 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/SearchWidget.java
     2007-12-20 14:04:02 UTC (rev 6444)
+++ 
xwiki-products/xwiki-watch/trunk/web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/SearchWidget.java
     2007-12-20 15:07:45 UTC (rev 6445)
@@ -62,4 +62,11 @@
         });
         panel.add(okButton);
     }
+
+    public void resetSelections()
+    {
+        super.resetSelections();
+        //put the keyword text in the text input
+        this.searchBox.setText(watch.getFilterStatus().getKeyword());
+    }
 }

Modified: 
xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/TagCloud
===================================================================
--- xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/TagCloud 
2007-12-20 14:04:02 UTC (rev 6444)
+++ xwiki-products/xwiki-watch/trunk/wiki/src/main/resources/WatchCode/TagCloud 
2007-12-20 15:07:45 UTC (rev 6445)
@@ -56,8 +56,8 @@
 <content>{pre}
 &lt;style&gt;
 &lt;% 
-for(size in 10..60) {
-println ".tagline a.f$size { font-size: ${size}px; line-height: ${size}px; }"
+for(size in 12..64) {
+println ".tagline a.f$size { font-size: ${size}px; line-height: ${size}px; 
cursor: pointer;}"
 }
 %&gt;
 &lt;/style&gt;

_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications

Reply via email to