Mon Jun 29 21:41:23 CEST 2009

Author: vjrj
Date: 2009-06-29 21:41:17 +0200 (Mon, 29 Jun 2009)
New Revision: 1132

Added:
   trunk/script/generateAbout.sh
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/add-green.png
   trunk/src/main/java/org/ourproject/kune/platf/public/images/addGreen.png
   trunk/src/main/java/org/ourproject/kune/workspace/client/site/SiteResources.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java
Removed:
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/
   trunk/src/main/java/org/ourproject/kune/workspace/client/events/
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddie.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieView.java
Modified:
   trunk/COPYRIGHT
   trunk/TODO
   trunk/debian/TODO
   trunk/script/deploy_gwt.sh
   trunk/src/main/java/org/ourproject/kune/app/public/css/all.css
   trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css
   trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/InfoDialog.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css
   trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsView.java
Log:
Incomplete - task User/GroupOptions cleanup 

Complete - task Add As Buddie button 

Complete - task About kune 


Modified: trunk/COPYRIGHT
===================================================================

--- trunk/COPYRIGHT	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/COPYRIGHT	2009-06-29 19:41:17 UTC (rev 1132)
@@ -81,13 +81,13 @@
 others
 --------------------------------------------------------------------------------
 suco
-     http://suco.googlecode.com
-     Copyright: under GNU Lesser General Public License
+   http://suco.googlecode.com
+   Copyright: under GNU Lesser General Public License
    http://www.gnu.org/licenses/lgpl.html
 
 emite
-     http://emite.googlecode.com
-     Copyright: under GNU Lesser General Public License
+   http://emite.googlecode.com
+   Copyright: under GNU Lesser General Public License
    http://www.gnu.org/licenses/lgpl.html
 
 fonts-min.css and reset.css
@@ -100,7 +100,7 @@
    under GNU GPL license
 
 extjs
-  http://extjs.com/
+   http://extjs.com/
    Copyright: under GNU Lesser General Public License
    http://www.gnu.org/licenses/lgpl.html
 

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/TODO	2009-06-29 19:41:17 UTC (rev 1132)
@@ -212,8 +212,9 @@
    https://code.fluendo.com/flumotion/trac/browser/cortado/trunk/README
    http://en.flossmanuals.net/TheoraCookbook/Cortado
    - for mp3+flv :: flowplayer
+   http://flv-player.net/
    - for avi :: some links:
-   http://www.w3schools.com/media/media_browservideos.asp
+   http://www.w3schools.com/media/media_browservideos.asp   
    http://www.solitude.dk/archives/embedquicktime/
    http://www.solitude.dk/archives/embedquicktime/jquery.embedquicktime-source.js
 ** TODO <d> Inform to translators when original content changes

Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/debian/TODO	2009-06-29 19:41:17 UTC (rev 1132)
@@ -1,6 +1,6 @@
 - create user kune
 - create /var/lib/kune/uploads and give permissions
 - create /var/lib/kune/lucene 
-- deps: libjmagick6-jni
+- deps: libjmagick6-jni, csstidy
 - cp -a $EXTSRC/source/locale/ src/main/java/org/ourproject/kune/app/public/js/ext/source/
 

Modified: trunk/script/deploy_gwt.sh
===================================================================
--- trunk/script/deploy_gwt.sh	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/script/deploy_gwt.sh	2009-06-29 19:41:17 UTC (rev 1132)
@@ -6,6 +6,7 @@
 
 #script/css-compact-and-tidy.sh
 script/css-update.sh
+script/generateAbout.sh
 
 #cp target/kune-0.0.5/org.ourproject.kune.app.Kune/js/ext/ext-all-debug.js target/kune-0.0.5/org.ourproject.kune.app.Kune/js/ext/ext-all.js 
 #rsync --delete -C -r -p war/ws/ src/main/webapp/gwt/ws/

Added: trunk/script/generateAbout.sh
===================================================================
--- trunk/script/generateAbout.sh	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/script/generateAbout.sh	2009-06-29 19:41:17 UTC (rev 1132)
@@ -0,0 +1,21 @@
+# Determine how to set the tempfile
+if [ -n "`which tempfile`" ]; then
+  tmp=`tempfile`
+else
+  tmp=/tmp/kune.$$
+fi
+trap "rm -rf $tmp" 1 2 3 9 15
+
+
+REV=`svn info --xml| grep -m 1 revi | cut -d\" -f 2`
+COMMITSPENDING=`svn status | grep -c ""`
+SVNVER=r$REV+c$COMMITSPENDING
+VER=`grep "<version>" pom.xml | head -1 | sed 's/..version.//g'`
+
+
+echo Kune >> $tmp
+echo "--------------------------------------------------------------------------------" >> $tmp
+echo Version $VER '('$SVNVER')' >> $tmp
+
+txt2html -h 80 --preserve_indent -8 --style_url /ws/css/richtext.css --infile $tmp --infile CREDITS --infile COPYRIGHT --outfile war/ws/about.html
+rm $tmp


Property changes on: trunk/script/generateAbout.sh
___________________________________________________________________
Name: svn:executable
   + *

Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/all.css
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/css/all.css	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css	2009-06-29 19:41:17 UTC (rev 1132)
@@ -41,4 +41,4 @@
     padding: 1px 0px 1px 1px;
     text-decoration:none;
 }
-*/.x-tree-node .k-ctn-status-normal a span{}.x-tree-node .k-ctn-status-deleted a span{text-decoration:line-through;color:gray;}.x-tree-node .k-ctn-status-rejected a span{text-decoration:line-through;/* color: #FF6633; */color:#F30;}.x-tree-node .k-ctn-status-editing a span{font-style:italic;color:gray;}.x-tree-node .k-ctn-status-submitted a span{color:green;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:left;padding:3px;cursor:pointer;color:#00F;}.k-tsp-cloud{line-height:1.5em;text-align:center;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-film-icon{background-image:url(img/film.png)!important;}.k-specialchars-icon{background-image:url(img/specialchars.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;}/* duplicated in rte.css */.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}.k-specialchar-grid{border:1px solid #ACA899;}.k-specialchar-grid table{}.k-specialchar-grid div{line-height:22px;}.k-specialchar-grid td{padding:1px;}.k-specialchar-pb{border:1px solid #EBE8D7;cursor:pointer;font-size:108%!important;text-align:center;vertical-align:middle;width:18px;height:18px;}.k-specialchar-pb-up{}.k-specialchar-big{padding:3px;line-height:22px;font-size:197%!important;}.k-specialchar-adv-label{margin-left:-10px;}.k-specialchar-popup,{border:1px px solid silver;z-index:9999!important;background-color:#FFF;}.k-specialchar-pb-down{color:#161616;}.k-specialchar-pb-up-hovering{border:thin solid #ACA899;}.k-specialchar-pb-down-hovering{color:#161616;}.k-preview-panel{border:dashed 1px gray;padding:5px;}.k-rte-changelink{white-space:nowrap;color:navy;cursor:pointer;text-decoration:underline;margin:5px;}.k-rte-changelink-popup{border:1px solid silver;z-index:9999!important;background-color:#ECECEC;}.e-ui-room{height:27px;line-height:22px;}.e-ui-room input{font-size:100%;margin-left:0;margin-top:0;}.k-def-popup{z-index:9999!important;background-color:#FFF;border:1px solid gray;}#k-mshortcut{position:absolute;right:10px;}#k-mshortcut-hidden{visibility:hidden;}#k-mshortcut a{text-decoration:none;color:#000;}
\ No newline at end of file
+*/.x-tree-node .k-ctn-status-normal a span{}.x-tree-node .k-ctn-status-deleted a span{text-decoration:line-through;color:gray;}.x-tree-node .k-ctn-status-rejected a span{text-decoration:line-through;/* color: #FF6633; */color:#F30;}.x-tree-node .k-ctn-status-editing a span{font-style:italic;color:gray;}.x-tree-node .k-ctn-status-submitted a span{color:green;}.k-info-links{text-decoration:underline;color:gray;cursor:pointer;}.x-tool-kmenu{background-position:0 -75px;}.x-tool-kmenu-over{background-position:-15px -75px;}.k-border-openbox{border-bottom:1px #D0D0D0 solid;border-right:1px #D0D0D0 solid;border-left:1px #D0D0D0 solid;}/* SiteToastMessages */.k-stm-info-icon{background-image:url(img/info.gif)!important;}.k-stm-imp-icon{background-image:url(img/alert.gif)!important;}.k-stm-verimp-icon{background-image:url(img/important.gif)!important;}.k-stm-error-icon{background-image:url(img/error.gif)!important;}.k-error-tb{background:#FFB380 none repeat scroll 0 50%;color:#250;}.k-infod-head{font-size:108%;margin-bottom:10px;}.gwt-DisclosurePanel{}.gwt-DisclosurePanel-open{}.gwt-DisclosurePanel-closed{}.gwt-DisclosurePanel .header,.gwt-DisclosurePanel .header a,.gwt-DisclosurePanel .header td{text-decoration:none;/* Remove underline from header */color:#000;cursor:pointer;cursor:hand;}.gwt-DisclosurePanel .content{border-left:3px solid #e8eef7;padding:4px 0 4px 8px;margin-left:6px;}.k-basic-thumb{background:#FAFAFA none repeat scroll 0 50%;border:1px solid #EBEBEB;padding:3px;margin:3px;}.k-basic-thumb td{padding:2px 3px;border:none;}.k-text-gray{color:gray;}.k-elp-limg{margin-top:4px;margin-left:5px;cursor:pointer;overflow:hidden;}.k-tsp-tag{float:left;padding:3px;cursor:pointer;color:#00F;}.k-tsp-cloud{line-height:1.5em;text-align:center;}.k-link-icon{background-image:url(img/link.gif)!important;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-copyleft-icon{background-image:url(img/copyleft.png)!important;}.k-picture-icon{background-image:url(img/picture.png)!important;}.k-film-icon{background-image:url(img/film.png)!important;}.k-specialchars-icon{background-image:url(img/specialchars.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!important;}.k-colors-icon{background-image:url(img/colors.gif)!important;}.x-toolbar-body table{/* width: 100%; */}.k-preview-msg{background:#FCA;}.k-preview-msg-lab{background:#FCA;padding:0 5px;}.k-eil-edit{border:thin solid #000;}/* duplicated in rte.css */.k-rte-comment{border:1px dashed silver;line-height:1.4;padding:1px;background-color:#D7FFD7;}.k-specialchar-grid{border:1px solid #ACA899;}.k-specialchar-grid table{}.k-specialchar-grid div{line-height:22px;}.k-specialchar-grid td{padding:1px;}.k-specialchar-pb{border:1px solid #EBE8D7;cursor:pointer;font-size:108%!important;text-align:center;vertical-align:middle;width:18px;height:18px;}.k-specialchar-pb-up{}.k-specialchar-big{padding:3px;line-height:22px;font-size:197%!important;}.k-specialchar-adv-label{margin-left:-10px;}.k-specialchar-popup,{border:1px px solid silver;z-index:9999!important;background-color:#FFF;}.k-specialchar-pb-down{color:#161616;}.k-specialchar-pb-up-hovering{border:thin solid #ACA899;}.k-specialchar-pb-down-hovering{color:#161616;}.k-preview-panel{border:dashed 1px gray;padding:5px;}.k-rte-changelink{white-space:nowrap;color:navy;cursor:pointer;text-decoration:underline;margin:5px;}.k-rte-changelink-popup{border:1px solid silver;z-index:9999!important;background-color:#ECECEC;}.e-ui-room{height:27px;line-height:22px;}.e-ui-room input{font-size:100%;margin-left:0;margin-top:0;}.k-def-popup{z-index:9999!important;background-color:#FFF;border:1px solid gray;}#k-mshortcut{position:absolute;right:10px;}#k-mshortcut-hidden{visibility:hidden;}#k-mshortcut a{text-decoration:none;color:#000;}.k-plain-iframe iframe{border:1px solid gray;}
\ No newline at end of file

Modified: trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css	2009-06-29 19:41:17 UTC (rev 1132)
@@ -823,7 +823,7 @@
 
 .k-tsp-cloud {
   line-height: 1.5em;
-  text-align : center;
+  text-align: center;
 }
 
 .k-link-icon {
@@ -931,33 +931,49 @@
 ,
 {
 border
+
+
 :
 
+
+
 1
 px
 
+
+
 solid
 
+
+
 #C0C0C0
+
+
 ;
+z-index
 
 
-z-index
 :
 
+
+
 9999
 !
 important
+
+
 ;
+background-color
 
 
-background-color
 :
 
+
+
 #FFF
-;
 
 
+;
 }
 .k-specialchar-pb-down {
   color: #161616;
@@ -1008,8 +1024,8 @@
 }
 
 #k-mshortcut {
-    position: absolute;
-    right: 10px;
+  position: absolute;
+  right: 10px;
 }
 
 #k-mshortcut-hidden {
@@ -1017,6 +1033,10 @@
 }
 
 #k-mshortcut a {
-    text-decoration: none;
-    color: black;
+  text-decoration: none;
+  color: black;
+}
+
+.k-plain-iframe iframe {
+  border: 1px solid gray;
 }
\ No newline at end of file

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/shortcuts/GlobalShortcutRegister.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -3,6 +3,7 @@
 import org.ourproject.kune.platf.client.actions.AbstractAction;
 import org.ourproject.kune.platf.client.actions.ActionEvent;
 import org.ourproject.kune.platf.client.actions.InputMap;
+import org.ourproject.kune.platf.client.actions.KeyStroke;
 import org.ourproject.kune.platf.client.actions.Shortcut;
 
 import com.allen_sauer.gwt.log.client.Log;
@@ -46,4 +47,13 @@
     public void enable() {
         handlerReg = Event.addNativePreviewHandler(eventHandler);
     }
+
+    @Override
+    public void put(final KeyStroke keystroke, final AbstractAction action) {
+        final AbstractAction previous = super.get(keystroke);
+        if (previous != null) {
+            Log.warn("Shortcut already registed by: " + previous + "(overriding)");
+        }
+        super.put(keystroke, action);
+    }
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/InfoDialog.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/InfoDialog.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/InfoDialog.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -19,16 +19,20 @@
  \*/
 package org.ourproject.kune.platf.client.ui.dialogs;
 
+import com.google.gwt.user.client.ui.HTML;
 import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Widget;
 import com.gwtext.client.core.EventObject;
 import com.gwtext.client.widgets.Button;
 import com.gwtext.client.widgets.Panel;
 import com.gwtext.client.widgets.event.ButtonListenerAdapter;
 
 public class InfoDialog extends BasicDialog {
-    public InfoDialog(final String dialogId, final String title, final String header, final String text,
-            final String okButtonText, final String okButtonId, final boolean modal, final boolean autoScroll,
-            final int width, final int height) {
+
+    private final Panel mainPanel;
+
+    public InfoDialog(final String dialogId, final String title, final String okButtonText, final String okButtonId,
+            final boolean modal, final boolean autoScroll, final int width, final int height) {
         super(dialogId, title, modal, autoScroll, width, height);
         final Button okButton = new Button(okButtonText);
         okButton.setId(okButtonId);
@@ -38,21 +42,44 @@
                 destroy();
             }
         });
-        final Panel panel = new Panel();
-        panel.setBorder(false);
-        panel.setHeader(false);
-        panel.setPaddings(20);
+        mainPanel = new Panel();
+        mainPanel.setBorder(false);
+        mainPanel.setHeader(false);
+        mainPanel.setPaddings(20);
+        super.add(mainPanel);
+        addButton(okButton);
+    }
 
+    public InfoDialog(final String dialogId, final String title, final String header, final String text,
+            final String okButtonText, final String okButtonId, final boolean modal, final boolean autoScroll,
+            final int width, final int height) {
+        this(dialogId, title, header, text, okButtonText, okButtonId, modal, autoScroll, width, height, false);
+    }
+
+    public InfoDialog(final String dialogId, final String title, final String header, final String text,
+            final String okButtonText, final String okButtonId, final boolean modal, final boolean autoScroll,
+            final int width, final int height, final boolean isHtml) {
+        this(dialogId, title, okButtonText, okButtonId, modal, autoScroll, width, height);
+
         final Label headerLabel = new Label(header);
-        final Label textLabel = new Label(text);
+        Widget textLabel;
+        if (isHtml) {
+            textLabel = new HTML(text);
+        } else {
+            textLabel = new Label(text);
+        }
 
-        panel.add(headerLabel);
-        panel.add(textLabel);
-        super.add(panel);
+        mainPanel.add(headerLabel);
+        mainPanel.add(textLabel);
 
         headerLabel.addStyleName("k-infod-head");
+    }
 
-        addButton(okButton);
-        show();
+    public void add(final Panel panel) {
+        mainPanel.add(panel);
     }
+
+    public void setMainPanelPaddings(final int padding) {
+        mainPanel.setPaddings(padding);
+    }
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/ImgResources.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -6,6 +6,9 @@
 
 public interface ImgResources extends ImmutableResourceBundle {
 
+    @Resource("add-green.png")
+    ImageResource addGreen();
+
     @Resource("kimg.css")
     CssResource css();
 

Added: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/add-green.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/add-green.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/img/kimg.css	2009-06-29 19:41:17 UTC (rev 1132)
@@ -18,6 +18,10 @@
   gwt-image: 'groupHome';
 }
 
+ at sprite div .k-icon-addGreen {
+  gwt-image: 'addGreen';
+}
+
 @sprite div .k-icon-maximize {
   gwt-image: 'maximize';
 }

Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/addGreen.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/addGreen.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/WorkspaceModule.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -225,9 +225,7 @@
 import org.ourproject.kune.workspace.client.socialnet.ParticipationSummaryPresenter;
 import org.ourproject.kune.workspace.client.socialnet.ParticipationSummaryView;
 import org.ourproject.kune.workspace.client.socialnet.UserActionRegistry;
-import org.ourproject.kune.workspace.client.socialnet.other.AddAsBuddie;
-import org.ourproject.kune.workspace.client.socialnet.other.AddAsBuddiePanel;
-import org.ourproject.kune.workspace.client.socialnet.other.AddAsBuddiePresenter;
+import org.ourproject.kune.workspace.client.socialnet.other.AddAsBuddieHeaderButton;
 import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionBuddiesSummaryToolbar;
 import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionBuddiesSummaryToolbarPresenter;
 import org.ourproject.kune.workspace.client.socialnet.toolbar.ActionGroupSummaryToolbar;
@@ -553,15 +551,11 @@
             }
         });
 
-        register(ApplicationComponentGroup.class, new Factory<AddAsBuddie>(AddAsBuddie.class) {
+        register(ApplicationComponentGroup.class, new Factory<AddAsBuddieHeaderButton>(AddAsBuddieHeaderButton.class) {
             @Override
-            public AddAsBuddie create() {
-                final AddAsBuddiePresenter presenter = new AddAsBuddiePresenter(p(ChatEngine.class),
-                        i(StateManager.class), i(Session.class));
-                final AddAsBuddiePanel panel = new AddAsBuddiePanel(presenter, i(EntityHeader.class), i(Images.class),
-                        i(I18nTranslationService.class));
-                presenter.init(panel);
-                return presenter;
+            public AddAsBuddieHeaderButton create() {
+                return new AddAsBuddieHeaderButton(p(ChatEngine.class), i(Session.class), i(StateManager.class),
+                        i(I18nTranslationService.class), i(ImgResources.class), i(EntityHeader.class));
             }
         });
 

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/GroupOptionsPresenter.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -71,6 +71,7 @@
         groupPrefsAction.putValue(Action.SMALL_ICON, ImgConstants.toPath(img.prefs()));
         prefsItem = new ButtonDescriptor(groupPrefsAction);
         prefsItem.setId(GROUP_OPTIONS_ICON);
+        prefsItem.setVisible(false);
         view.addAction(prefsItem);
     }
 }

Added: trunk/src/main/java/org/ourproject/kune/workspace/client/site/SiteResources.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/site/SiteResources.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/site/SiteResources.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -0,0 +1,12 @@
+package org.ourproject.kune.workspace.client.site;
+
+import com.google.gwt.core.client.GWT;
+import com.google.gwt.libideas.resources.client.ImmutableResourceBundle;
+import com.google.gwt.libideas.resources.client.TextResource;
+
+public interface SiteResources extends ImmutableResourceBundle {
+    public static final SiteResources INSTANCE = GWT.create(SiteResources.class);
+
+    @Resource("about.html")
+    public TextResource aboutKune();
+}
\ No newline at end of file

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPanel.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -22,15 +22,25 @@
 import org.ourproject.kune.platf.client.actions.ui.GuiBindingsRegister;
 import org.ourproject.kune.platf.client.i18n.I18nUITranslationService;
 import org.ourproject.kune.platf.client.ui.AbstractToolbar;
+import org.ourproject.kune.platf.client.ui.dialogs.InfoDialog;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
+import com.google.gwt.user.client.ui.Frame;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.layout.FitLayout;
+
 public class SiteOptionsPanel extends AbstractSiteOptionsPanel implements SiteOptionsView {
 
     public static final String SITE_OPTIONS_MENU = "kune-sop-om";
+    public static final String ABOUT_KUNE_ID = "kune-about-diag";
+    public static final String ABOUT_KUNE_BTN_ID = "kune-about-button-diag";
+    private final I18nUITranslationService i18n;
+    private InfoDialog infoDialog;
 
     public SiteOptionsPanel(final WorkspaceSkeleton wspace, final I18nUITranslationService i18n,
             final GuiBindingsRegister bindings) {
         super(bindings, SITE_OPTIONS_MENU);
+        this.i18n = i18n;
         setBtnText(i18n.t("Options"));
         final AbstractToolbar siteBar = wspace.getSiteBar();
         siteBar.addSeparator();
@@ -38,4 +48,22 @@
         siteBar.addSpacer();
         siteBar.addSpacer();
     }
+
+    public void showAboutDialog() {
+        if (infoDialog == null) {
+            final Frame aboutFrame = new Frame("/ws/about.html");
+            final Panel aboutPanel = new Panel();
+            aboutPanel.setCls("k-plain-iframe");
+            aboutPanel.setLayout(new FitLayout());
+            aboutPanel.add(aboutFrame);
+            aboutPanel.setBorder(false);
+            aboutPanel.setHeight(300);
+            infoDialog = new InfoDialog(ABOUT_KUNE_ID, i18n.t("About Kune"), i18n.t("Ok"), ABOUT_KUNE_BTN_ID, true,
+                    true, 400, 400);
+            infoDialog.add(aboutPanel);
+            infoDialog.setIconCls("k-newgroup-icon");
+            infoDialog.setMainPanelPaddings(10);
+        }
+        infoDialog.show();
+    }
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsPresenter.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -73,10 +73,22 @@
                 KuneWindowUtils.open("http://ourproject.org/tracker/?group_id=407");
             }
         };
-        bugsAction.putValue(Action.NAME, i18n.t("Report kune bugs"));
-        bugsAction.putValue(Action.SMALL_ICON, img.kuneIcon16());
+        bugsAction.putValue(Action.NAME, i18n.t("Report Kune issues/problems"));
+        bugsAction.putValue(Action.SMALL_ICON, img.info());
         final MenuItemDescriptor item = new MenuItemDescriptor(bugsAction);
         addAction(item);
+
+        // final KeyStroke shortcut = Shortcut.getShortcut(true, true, false,
+        // false, Character.valueOf('K'));
+        final AbstractExtendedAction aboutAction = new AbstractExtendedAction() {
+            public void actionPerformed(final ActionEvent event) {
+                view.showAboutDialog();
+            }
+        };
+        aboutAction.putValue(Action.NAME, i18n.t("About kune"));
+        aboutAction.putValue(Action.SMALL_ICON, img.kuneIcon16());
+        // aboutAction.setShortcut(shortcut);
+        // shortcutReg.put(shortcut, aboutAction);
+        addAction(new MenuItemDescriptor(aboutAction));
     }
-
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsView.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/sitebar/siteoptions/SiteOptionsView.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -26,4 +26,6 @@
 
     void setMenu(MenuDescriptor menuDescriptor);
 
+    void showAboutDialog();
+
 }

Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddie.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddie.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddie.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -1,5 +0,0 @@
-package org.ourproject.kune.workspace.client.socialnet.other;
-
-public interface AddAsBuddie {
-
-}

Added: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieHeaderButton.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -0,0 +1,83 @@
+package org.ourproject.kune.workspace.client.socialnet.other;
+
+import org.ourproject.kune.chat.client.ChatEngine;
+import org.ourproject.kune.platf.client.actions.AbstractAction;
+import org.ourproject.kune.platf.client.actions.AbstractExtendedAction;
+import org.ourproject.kune.platf.client.actions.Action;
+import org.ourproject.kune.platf.client.actions.ActionEvent;
+import org.ourproject.kune.platf.client.actions.PropertyChangeEvent;
+import org.ourproject.kune.platf.client.actions.PropertyChangeListener;
+import org.ourproject.kune.platf.client.actions.ui.ButtonDescriptor;
+import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
+import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
+import org.ourproject.kune.platf.client.state.Session;
+import org.ourproject.kune.platf.client.state.StateManager;
+import org.ourproject.kune.platf.client.ui.img.ImgConstants;
+import org.ourproject.kune.platf.client.ui.img.ImgResources;
+import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
+import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
+
+import com.calclab.suco.client.events.Listener;
+import com.calclab.suco.client.events.Listener0;
+import com.calclab.suco.client.ioc.Provider;
+
+public class AddAsBuddieHeaderButton {
+
+    public static class AddAsBuddieAction extends AbstractExtendedAction {
+        private final Provider<ChatEngine> chatEngine;
+        private final Session session;
+
+        public AddAsBuddieAction(final Provider<ChatEngine> chatEngine, final Session session,
+                final StateManager stateManager, final I18nTranslationService i18n, final ImgResources img) {
+            super();
+            this.chatEngine = chatEngine;
+            this.session = session;
+            stateManager.onStateChanged(new Listener<StateAbstractDTO>() {
+                public void onEvent(final StateAbstractDTO state) {
+                    setState(state);
+                }
+            });
+            chatEngine.get().addOnRosterChanged(new Listener0() {
+                public void onEvent() {
+                    setState(session.getCurrentState());
+                }
+            });
+            putValue(Action.NAME, i18n.t("Add as a buddie"));
+            putValue(Action.SMALL_ICON, ImgConstants.toPath(img.addGreen()));
+        }
+
+        public void actionPerformed(final ActionEvent event) {
+            chatEngine.get().addNewBuddie(session.getCurrentState().getGroup().getShortName());
+            NotifyUser.info("Added as buddie. Waiting buddie response");
+            setEnabled(false);
+        }
+
+        private void setState(final StateAbstractDTO state) {
+            final String groupName = state.getGroup().getShortName();
+            final boolean isPersonal = state.getGroup().isPersonal();
+            final boolean isLogged = session.isLogged();
+            if (isLogged && isPersonal && (!chatEngine.get().isBuddie(groupName))
+                    && (!session.getCurrentUser().getShortName().equals(groupName))) {
+                setEnabled(true);
+            } else {
+                setEnabled(false);
+            }
+        }
+    }
+
+    public AddAsBuddieHeaderButton(final Provider<ChatEngine> chatEngine, final Session session,
+            final StateManager stateManager, final I18nTranslationService i18n, final ImgResources img,
+            final EntityHeader entityHeader) {
+        final AddAsBuddieAction buddieAction = new AddAsBuddieAction(chatEngine, session, stateManager, i18n, img);
+        final ButtonDescriptor button = new ButtonDescriptor(buddieAction);
+        button.setVisible(false);
+        buddieAction.addPropertyChangeListener(new PropertyChangeListener() {
+            public void propertyChange(final PropertyChangeEvent event) {
+                if (event.getPropertyName().equals(AbstractAction.ENABLED)) {
+                    button.setVisible((Boolean) event.getNewValue());
+                }
+            }
+        });
+        entityHeader.addAction(button);
+    }
+}
\ No newline at end of file

Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePanel.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -1,33 +0,0 @@
-package org.ourproject.kune.workspace.client.socialnet.other;
-
-import org.ourproject.kune.platf.client.i18n.I18nTranslationService;
-import org.ourproject.kune.platf.client.services.Images;
-import org.ourproject.kune.workspace.client.entityheader.EntityHeader;
-import org.ourproject.kune.workspace.client.entityheader.EntityHeaderButton;
-
-import com.google.gwt.event.dom.client.ClickEvent;
-import com.google.gwt.event.dom.client.ClickHandler;
-
-public class AddAsBuddiePanel implements AddAsBuddieView {
-
-    public static final String ADD_BUDDIE_BUTTON = "k-aabp-bt";
-    private final EntityHeaderButton button;
-
-    public AddAsBuddiePanel(final AddAsBuddiePresenter presenter, final EntityHeader entityHeader, final Images images,
-            final I18nTranslationService i18n) {
-        button = new EntityHeaderButton(images.addGreen(), i18n.t("Add as a buddie"));
-        button.addClickHandler(new ClickHandler() {
-            public void onClick(final ClickEvent event) {
-                presenter.onAdd();
-            }
-        });
-        button.ensureDebugId(ADD_BUDDIE_BUTTON);
-        button.addStyleName("kune-Margin-Medium-t");
-        button.addStyleName("kune-pointer");
-        entityHeader.addWidget(button);
-    }
-
-    public void setVisible(final boolean visible) {
-        button.setVisible(visible);
-    }
-}

Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePresenter.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddiePresenter.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -1,60 +0,0 @@
-package org.ourproject.kune.workspace.client.socialnet.other;
-
-import org.ourproject.kune.chat.client.ChatEngine;
-import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
-import org.ourproject.kune.platf.client.state.Session;
-import org.ourproject.kune.platf.client.state.StateManager;
-import org.ourproject.kune.platf.client.ui.noti.NotifyUser;
-
-import com.calclab.suco.client.events.Listener;
-import com.calclab.suco.client.events.Listener0;
-import com.calclab.suco.client.ioc.Provider;
-
-public class AddAsBuddiePresenter implements AddAsBuddie {
-
-    private AddAsBuddieView view;
-    private final Session session;
-    private final Provider<ChatEngine> chatEngine;
-
-    public AddAsBuddiePresenter(Provider<ChatEngine> chatEngine, StateManager stateManager, final Session session) {
-        this.chatEngine = chatEngine;
-        this.session = session;
-        stateManager.onStateChanged(new Listener<StateAbstractDTO>() {
-            public void onEvent(StateAbstractDTO state) {
-                setState(state);
-            }
-        });
-        chatEngine.get().addOnRosterChanged(new Listener0() {
-            public void onEvent() {
-                setState(session.getCurrentState());
-            }
-        });
-    }
-
-    public View getView() {
-        return view;
-    }
-
-    public void init(AddAsBuddieView view) {
-        this.view = view;
-    }
-
-    public void onAdd() {
-        chatEngine.get().addNewBuddie(session.getCurrentState().getGroup().getShortName());
-        NotifyUser.info("Added as buddie. Waiting buddie response");
-        view.setVisible(false);
-    }
-
-    private void setState(StateAbstractDTO state) {
-        String groupName = state.getGroup().getShortName();
-        boolean isPersonal = state.getGroup().isPersonal();
-        boolean isLogged = session.isLogged();
-        if (isLogged && isPersonal && (!chatEngine.get().isBuddie(groupName))
-                && (!session.getCurrentUser().getShortName().equals(groupName))) {
-            view.setVisible(true);
-        } else {
-            view.setVisible(false);
-        }
-    }
-}

Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieView.java	2009-06-27 22:41:14 UTC (rev 1131)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/socialnet/other/AddAsBuddieView.java	2009-06-29 19:41:17 UTC (rev 1132)
@@ -1,8 +0,0 @@
-package org.ourproject.kune.workspace.client.socialnet.other;
-
-import org.ourproject.kune.platf.client.View;
-
-public interface AddAsBuddieView extends View {
-
-    void setVisible(boolean visible);
-}


