Sun Dec 21 04:20:37 CET 2008

Author: vjrj
Date: 2008-12-21 04:20:35 +0100 (Sun, 21 Dec 2008)
New Revision: 1008

Added:
   trunk/src/main/java/org/ourproject/kune/app/public/css/img/colors.gif
   trunk/src/main/java/org/ourproject/kune/app/public/css/img/picture.png
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConf.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java
Modified:
   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/services/KuneWorkspaceModule.java
   trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeView.java
   trunk/src/main/webapp/WEB-INF/web.xml
Log:
Complete - task New License Wizard 


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	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css	2008-12-21 03:20:35 UTC (rev 1008)
@@ -41,4 +41,4 @@
     padding: 1px 0px 1px 1px;
     text-decoration:none;
 }
-*/.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;}.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:right;margin-right:5px;cursor:pointer;color:#00F;}.k-tsp-cloud{vertical-align:bottom;}.k-options-icon{background-image:url(img/emblem-system.gif)!important;}.k-deflicense-icon{background-image:url(img/copyleft.png)!important;}.k-info-icon{background-image:url(img/info.gif)!important;}.k-newgroup-icon{background-image:url(img/kune-icon16.png)!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;}
\ No newline at end of file
+*/.k-textlinethrough{text-decoration:line-through;color:red;}.k-textnormal{text-decoration:inherit;color:green;}.k-textunderline{text-decoration:underline;}.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:right;margin-right:5px;cursor:pointer;color:#00F;}.k-tsp-cloud{vertical-align:bottom;}.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-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;}
\ No newline at end of file

Added: trunk/src/main/java/org/ourproject/kune/app/public/css/img/colors.gif
===================================================================
(Binary files differ)


Property changes on: trunk/src/main/java/org/ourproject/kune/app/public/css/img/colors.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/src/main/java/org/ourproject/kune/app/public/css/img/picture.png
===================================================================
(Binary files differ)


Property changes on: trunk/src/main/java/org/ourproject/kune/app/public/css/img/picture.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

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	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css	2008-12-21 03:20:35 UTC (rev 1008)
@@ -821,10 +821,14 @@
   background-image: url(img/emblem-system.gif) !important;
 }
 
-.k-deflicense-icon {
+.k-copyleft-icon {
   background-image: url(img/copyleft.png) !important;
 }
 
+.k-picture-icon {
+  background-image: url(img/picture.png) !important;
+}
+
 .k-info-icon {
   background-image: url(img/info.gif) !important;
 }
@@ -833,6 +837,10 @@
   background-image: url(img/kune-icon16.png) !important;
 }
 
+.k-colors-icon {
+  background-image: url(img/colors.gif) !important;
+}
+
 .x-toolbar-body table {
     /* width: 100%; */
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/services/KuneWorkspaceModule.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -73,6 +73,9 @@
 import org.ourproject.kune.workspace.client.options.logo.EntityOptionsLogo;
 import org.ourproject.kune.workspace.client.options.logo.EntityOptionsLogoPanel;
 import org.ourproject.kune.workspace.client.options.logo.EntityOptionsLogoPresenter;
+import org.ourproject.kune.workspace.client.options.pscape.EntityOptionsPublicSpaceConf;
+import org.ourproject.kune.workspace.client.options.pscape.EntityOptionsPublicSpaceConfPanel;
+import org.ourproject.kune.workspace.client.options.pscape.EntityOptionsPublicSpaceConfPresenter;
 import org.ourproject.kune.workspace.client.options.tools.EntityOptionsToolsConf;
 import org.ourproject.kune.workspace.client.options.tools.EntityOptionsToolsConfPanel;
 import org.ourproject.kune.workspace.client.options.tools.EntityOptionsToolsConfPresenter;
@@ -489,6 +492,20 @@
             }
         });
 
+        register(EntityOptionsGroup.class,
+                new Factory<EntityOptionsPublicSpaceConf>(EntityOptionsPublicSpaceConf.class) {
+                    @Override
+                    public EntityOptionsPublicSpaceConf create() {
+                        final EntityOptionsPublicSpaceConfPresenter presenter = new EntityOptionsPublicSpaceConfPresenter(
+                                $(EntityOptions.class));
+                        final EntityOptionsPublicSpaceConfPanel panel = new EntityOptionsPublicSpaceConfPanel(
+                                presenter, $(WorkspaceSkeleton.class), $(I18nTranslationService.class),
+                                $(WsThemePresenter.class));
+                        presenter.init(panel);
+                        return presenter;
+                    }
+                });
+
         register(Singleton.class, new Factory<LicenseChangeAction>(LicenseChangeAction.class) {
             @Override
             public LicenseChangeAction create() {

Modified: trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/ui/dialogs/DefaultForm.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -117,6 +117,10 @@
         form.setHideLabels(hide);
     }
 
+    public void setIconCls(String iconCls) {
+        form.setIconCls(iconCls);
+    }
+
     public void setPaddings(int padding) {
         form.setPaddings(padding);
     }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensewizard/LicenseWizardPanel.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -39,6 +39,6 @@
                     }
                 });
         super.setFinishText(i18n.t("Select"));
-        super.setIconCls("k-deflicense-icon");
+        super.setIconCls("k-copyleft-icon");
     }
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsPanel.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -31,7 +31,7 @@
 
     public EntityOptionsPanel(final EntityOptions presenter, final EntityHeader entityHeader,
             I18nTranslationService i18n, Images images, EntityOptionsGroup entityOptionsGroup) {
-        super(ENTITY_OP_PANEL_ID, "", 400, 250, 400, 250, false, images, GROUP_OPTIONS_ERROR_ID);
+        super(ENTITY_OP_PANEL_ID, "", 400, HEIGHT + 80, 400, HEIGHT + 80, false, images, GROUP_OPTIONS_ERROR_ID);
         this.entityHeader = entityHeader;
         this.i18n = i18n;
         this.images = images;
@@ -53,13 +53,11 @@
     public void setGroupTitle() {
         super.setTitle(i18n.t(PlatfMessages.ENT_OPTIONS_GROUP_TITLE));
         optionsButton.setText(i18n.t(PlatfMessages.ENT_OPTIONS_GROUP_TITLE));
-        // optionsButton.setTitle(i18n.t("Configure this group preferences"));
     }
 
     public void setPersonalTitle() {
         super.setTitle(i18n.t(PlatfMessages.ENT_OPTIONS_USER_TITLE));
         optionsButton.setText(i18n.t(PlatfMessages.ENT_OPTIONS_USER_TITLE));
-        // optionsButton.setTitle(i18n.t("Configure your preferences"));
     }
 
     private void createOptionsButton() {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/EntityOptionsView.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -4,6 +4,8 @@
 
 public interface EntityOptionsView extends View, AbstractOptionsView {
 
+    int HEIGHT = 270;
+
     void setButtonVisible(boolean visible);
 
     void setGroupTitle();

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/license/EntityOptionsDefLicensePanel.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -5,6 +5,7 @@
 import org.ourproject.kune.platf.client.ui.KuneUiUtils;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils;
+import org.ourproject.kune.workspace.client.options.EntityOptionsView;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
 import com.google.gwt.user.client.ui.ClickListener;
@@ -25,8 +26,9 @@
     public EntityOptionsDefLicensePanel(final EntityOptionsDefLicensePresenter presenter, final WorkspaceSkeleton ws,
             I18nTranslationService i18n) {
         super(i18n.t("License"));
-        super.setAutoWidth(true);
-        super.setAutoHeight(true);
+        super.setIconCls("k-copyleft-icon");
+        super.setHeight(EntityOptionsView.HEIGHT);
+        super.setFrame(true);
         super.getFormPanel().setButtonAlign(Position.LEFT);
         Label intro = new Label();
         intro.setHtml(i18n.t("This is the default license for all the contents of this group (you can also select another different license per content):")

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -23,6 +23,7 @@
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultFormUtils;
 import org.ourproject.kune.platf.client.ui.download.FileParams;
 import org.ourproject.kune.workspace.client.entityheader.EntityHeaderView;
+import org.ourproject.kune.workspace.client.options.EntityOptionsView;
 import org.ourproject.kune.workspace.client.site.Site;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
@@ -54,11 +55,13 @@
     public EntityOptionsLogoPanel(final EntityOptionsLogoPresenter presenter, final WorkspaceSkeleton ws,
             I18nTranslationService i18n) {
         this.i18n = i18n;
+        super.setHeight(EntityOptionsView.HEIGHT);
         super.setFrame(true);
         super.setAutoScroll(false);
         super.setBorder(false);
         super.setFileUpload(true);
         super.setWidth(400);
+        super.setIconCls("k-picture-icon");
         super.setMethod(Connection.POST);
         super.setUrl(ICON_UPLOAD_SERVLET);
         super.setWaitMsgTarget(true);
@@ -115,7 +118,6 @@
         });
         sendButton.setId(SET_LOGO_ID);
         super.addButton(sendButton);
-        super.setHeight(170);
     }
 
     // BrowseButton browseButton = new BrowseButton("SelectIcon");

Added: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConf.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConf.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConf.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -0,0 +1,5 @@
+package org.ourproject.kune.workspace.client.options.pscape;
+
+public interface EntityOptionsPublicSpaceConf {
+
+}

Added: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -0,0 +1,40 @@
+package org.ourproject.kune.workspace.client.options.pscape;
+
+import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.workspace.client.options.EntityOptionsView;
+import org.ourproject.kune.workspace.client.site.Site;
+import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
+import org.ourproject.kune.workspace.client.themes.WsThemePresenter;
+
+import com.google.gwt.user.client.ui.HorizontalPanel;
+import com.google.gwt.user.client.ui.Label;
+import com.gwtext.client.widgets.Panel;
+import com.gwtext.client.widgets.ToolbarButton;
+
+public class EntityOptionsPublicSpaceConfPanel extends Panel implements EntityOptionsPublicSpaceConfView {
+
+    public EntityOptionsPublicSpaceConfPanel(final EntityOptionsPublicSpaceConfPresenter presenter,
+            final WorkspaceSkeleton ws, I18nTranslationService i18n, WsThemePresenter wsPresenter) {
+        super.setTitle(i18n.t("Styling"));
+        super.setIconCls("k-colors-icon");
+        super.setAutoScroll(false);
+        super.setBorder(false);
+        super.setHeight(EntityOptionsView.HEIGHT);
+        super.setFrame(true);
+        super.setPaddings(10);
+
+        HorizontalPanel wsHP = new HorizontalPanel();
+        Label wsThemeInfo = new Label(i18n.t("Change this workspace theme:"));
+        ToolbarButton toolbarWsChange = (ToolbarButton) wsPresenter.getView();
+        toolbarWsChange.addStyleName("kune-Margin-Medium-l");
+        wsHP.add(wsThemeInfo);
+        wsHP.add(toolbarWsChange);
+        add(wsHP);
+        Label wsInfo = new Label(i18n.t("Configure the public space theme:"));
+        wsInfo.addStyleName("kune-Margin-Medium-tb");
+        Label wsDev = new Label(Site.IN_DEVELOPMENT);
+        wsDev.addStyleName("kune-Margin-Medium-tb");
+        add(wsInfo);
+        add(wsDev);
+    }
+}

Added: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPresenter.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -0,0 +1,23 @@
+package org.ourproject.kune.workspace.client.options.pscape;
+
+import org.ourproject.kune.platf.client.View;
+import org.ourproject.kune.workspace.client.options.EntityOptions;
+
+public class EntityOptionsPublicSpaceConfPresenter implements EntityOptionsPublicSpaceConf {
+
+    private EntityOptionsPublicSpaceConfView view;
+    private final EntityOptions entityOptions;
+
+    public EntityOptionsPublicSpaceConfPresenter(EntityOptions entityOptions) {
+        this.entityOptions = entityOptions;
+    }
+
+    public View getView() {
+        return view;
+    }
+
+    public void init(EntityOptionsPublicSpaceConfView view) {
+        this.view = view;
+        entityOptions.addOptionTab(view);
+    }
+}

Added: trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfView.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -0,0 +1,7 @@
+package org.ourproject.kune.workspace.client.options.pscape;
+
+import org.ourproject.kune.platf.client.View;
+
+public interface EntityOptionsPublicSpaceConfView extends View {
+}
+

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/tools/EntityOptionsToolsConfPanel.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -5,6 +5,7 @@
 import org.ourproject.kune.platf.client.dto.ToolSimpleDTO;
 import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
+import org.ourproject.kune.workspace.client.options.EntityOptionsView;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
 import com.allen_sauer.gwt.log.client.Log;
@@ -24,8 +25,8 @@
             I18nTranslationService i18n) {
         super(i18n.t("Tools"));
         this.i18n = i18n;
-        super.setAutoWidth(true);
-        super.setAutoHeight(true);
+        super.setHeight(EntityOptionsView.HEIGHT);
+        super.setFrame(true);
         super.add(new Hidden());
         super.getFormPanel().setLabelWidth(20);
         this.presenter = presenter;

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -45,7 +45,7 @@
         super.setMenu(menu);
         super.setIcon("images/colors.gif");
         super.setTooltip(i18n.t("Select Workspace theme for this group"));
-        ws.getSiteTraybar().addButton(this);
+        // ws.getSiteTraybar().addButton(this);
         presenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() {
             public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) {
                 ws.setTheme(oldTheme, newTheme);
@@ -54,8 +54,8 @@
     }
 
     public void setThemes(final String[] themes) {
-        for (int i = 0; i < themes.length; i++) {
-            final WsTheme theme = new WsTheme(themes[i]);
+        for (String theme2 : themes) {
+            final WsTheme theme = new WsTheme(theme2);
             final MenuItem item = new MenuItem();
             final String name = theme.getName();
             item.setIconCls("k-wstheme-icon-" + name);
@@ -70,6 +70,7 @@
         }
     }
 
+    @Override
     public void setVisible(final boolean visible) {
         super.setVisible(visible);
     }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePresenter.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -18,6 +18,7 @@
  *
  */package org.ourproject.kune.workspace.client.themes;
 
+import org.ourproject.kune.platf.client.View;
 import org.ourproject.kune.platf.client.dto.InitDataDTO;
 import org.ourproject.kune.platf.client.dto.StateAbstractDTO;
 import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
@@ -59,6 +60,10 @@
         });
     }
 
+    public View getView() {
+        return view;
+    }
+
     public void init(final WsThemeView view) {
         this.view = view;
     }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeView.java	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemeView.java	2008-12-21 03:20:35 UTC (rev 1008)
@@ -18,8 +18,10 @@
  *
  */package org.ourproject.kune.workspace.client.themes;
 
-public interface WsThemeView {
+import org.ourproject.kune.platf.client.View;
 
+public interface WsThemeView extends View {
+
     void setThemes(String[] themes);
 
     void setVisible(boolean visible);

Modified: trunk/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/src/main/webapp/WEB-INF/web.xml	2008-12-21 02:35:36 UTC (rev 1007)
+++ trunk/src/main/webapp/WEB-INF/web.xml	2008-12-21 03:20:35 UTC (rev 1008)
@@ -21,6 +21,7 @@
     <url-pattern>/*</url-pattern>
   </filter-mapping>
 
+
   <context-param>
     <param-name>jruby.standalone</param-name>
     <param-value>true</param-value>


