Mon Dec 22 03:49:00 CET 2008

Author: vjrj
Date: 2008-12-22 03:48:58 +0100 (Mon, 22 Dec 2008)
New Revision: 1011

Added:
   trunk/img/icons/styl1.png
   trunk/img/icons/styl2.png
   trunk/img/icons/styl3.png
   trunk/img/icons/styl4.png
   trunk/img/icons/styl5.png
   trunk/img/icons/styl6.png
   trunk/img/styling-props.svg
   trunk/src/main/java/org/ourproject/kune/app/public/images/styles/
   trunk/src/main/java/org/ourproject/kune/app/public/images/styles/styl1.png
   trunk/src/main/java/org/ourproject/kune/app/public/images/styles/styl2.png
   trunk/src/main/java/org/ourproject/kune/app/public/images/styles/styl3.png
   trunk/src/main/java/org/ourproject/kune/app/public/images/styles/styl4.png
   trunk/src/main/java/org/ourproject/kune/app/public/images/styles/styl5.png
   trunk/src/main/java/org/ourproject/kune/app/public/images/styles/styl6.png
Modified:
   trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java
   trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java
   trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerUtils.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementView.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java
   trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java
Log:
Complete - task EntityLicensePanel issues 

Complete - Download managers returns 404 (not Exception) when not found

Complete - Editor insert Links tab titles and panel size

Incomplete - task Public configurator

Added: trunk/img/icons/styl1.png
===================================================================
(Binary files differ)


Property changes on: trunk/img/icons/styl1.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/img/icons/styl2.png
===================================================================
(Binary files differ)


Property changes on: trunk/img/icons/styl2.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/img/icons/styl3.png
===================================================================
(Binary files differ)


Property changes on: trunk/img/icons/styl3.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/img/icons/styl4.png
===================================================================
(Binary files differ)


Property changes on: trunk/img/icons/styl4.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/img/icons/styl5.png
===================================================================
(Binary files differ)


Property changes on: trunk/img/icons/styl5.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/img/icons/styl6.png
===================================================================
(Binary files differ)


Property changes on: trunk/img/icons/styl6.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/img/styling-props.svg
===================================================================

--- trunk/img/styling-props.svg	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/img/styling-props.svg	2008-12-22 02:48:58 UTC (rev 1011)
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="210mm"
+   height="297mm"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.46"
+   sodipodi:docname="styling-props.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective10" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="205.35928"
+     inkscape:cy="896.04215"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="777"
+     inkscape:window-x="0"
+     inkscape:window-y="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Capa 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <rect
+       style="fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2385"
+       width="100"
+       height="100.00001"
+       x="44.359291"
+       y="50.820026"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#808000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2387"
+       width="25.957596"
+       height="71.897675"
+       x="47.983913"
+       y="76.01535"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#b3ff80;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2389"
+       width="94.297974"
+       height="20.96336"
+       x="47.757717"
+       y="53.568924"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl1.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="50.820026"
+       x="154.3593"
+       height="100.00001"
+       width="100"
+       id="rect2424"
+       style="fill:#f4eed7;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="76.01535"
+       x="157.98392"
+       height="71.897675"
+       width="25.957596"
+       id="rect2426"
+       style="fill:#a0892c;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="53.568924"
+       x="157.75772"
+       height="20.96336"
+       width="94.297974"
+       id="rect2428"
+       style="fill:#decd87;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl2.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#ffd5f6;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2432"
+       width="100"
+       height="100.00001"
+       x="264.35928"
+       y="50.820026"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl3.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#de87cd;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2434"
+       width="25.957596"
+       height="71.897675"
+       x="267.98392"
+       y="76.01535"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl3.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#aa0088;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2436"
+       width="94.297974"
+       height="20.96336"
+       x="267.75772"
+       y="53.568924"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl3.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="161.82002"
+       x="-144.35928"
+       height="100.00001"
+       width="100"
+       id="rect2440"
+       style="fill:#ffd5f6;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl4.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="187.01535"
+       x="-140.73466"
+       height="71.897675"
+       width="25.957596"
+       id="rect2442"
+       style="fill:#de87cd;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl4.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="164.56892"
+       x="-140.96086"
+       height="20.96336"
+       width="94.297974"
+       id="rect2444"
+       style="fill:#aa0088;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl4.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#f4eed7;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2448"
+       width="100"
+       height="100.00001"
+       x="-256.35928"
+       y="161.82002"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl5.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#a0892c;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2450"
+       width="25.957596"
+       height="71.897675"
+       x="-252.73466"
+       y="187.01535"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl5.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       style="fill:#decd87;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect2452"
+       width="94.297974"
+       height="20.96336"
+       x="-252.96086"
+       y="164.56892"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl5.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="161.82002"
+       x="-366.35928"
+       height="100.00001"
+       width="100"
+       id="rect2456"
+       style="fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl6.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="187.01535"
+       x="-362.73468"
+       height="71.897675"
+       width="25.957596"
+       id="rect2458"
+       style="fill:#808000;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl6.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <rect
+       y="164.56892"
+       x="-362.96088"
+       height="20.96336"
+       width="94.297974"
+       id="rect2460"
+       style="fill:#b3ff80;fill-opacity:1;fill-rule:nonzero;stroke:none;marker:none;marker-start:none;marker-mid:none;marker-end:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       transform="scale(-1,1)"
+       inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/styl6.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>

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


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

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


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

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


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

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


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

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


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

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


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

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/EntityLogoDownloadManager.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -20,6 +20,7 @@
 
 import java.io.IOException;
 
+import javax.persistence.NoResultException;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -46,16 +47,21 @@
         // final String userHash = req.getParameter(FileParams.HASH);
         final StateToken stateToken = new StateToken(req.getParameter(FileParams.TOKEN));
 
-        Group group = groupManager.findByShortName(stateToken.getGroup());
+        Group group = Group.NO_GROUP;
+        try {
+            group = groupManager.findByShortName(stateToken.getGroup());
+            if (group == Group.NO_GROUP) {
+                throw new NoResultException("Group not found trying to get the logo");
+            }
 
-        if (group == Group.NO_GROUP) {
-            throw new ServletException("Group not found trying to get the logo");
+            if (!group.hasLogo()) {
+                throw new NoResultException("This Group has no logo");
+            }
+        } catch (NoResultException e) {
+            FileDownloadManagerUtils.returnNotFound(resp);
+            return;
         }
 
-        if (!group.hasLogo()) {
-            throw new ServletException("This Group has no logo");
-        }
-
         byte[] logo = group.getLogo();
 
         resp.setContentLength(logo.length);

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManager.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -75,11 +75,15 @@
         final String downloadS = req.getParameter(FileParams.DOWNLOAD);
         String imageSizeS = req.getParameter(FileParams.IMGSIZE);
 
-        final Content cnt = getContentForDownload(userHash, stateToken);
-
-        String absFilename = buildResponse(cnt, stateToken, downloadS, imageSizeS, resp, fileUtils);
-        final OutputStream out = resp.getOutputStream();
-        FileDownloadManagerUtils.returnFile(absFilename, out);
+        try {
+            Content cnt = getContentForDownload(userHash, stateToken);
+            String absFilename = buildResponse(cnt, stateToken, downloadS, imageSizeS, resp, fileUtils);
+            final OutputStream out = resp.getOutputStream();
+            FileDownloadManagerUtils.returnFile(absFilename, out);
+        } catch (ContentNotFoundException e) {
+            FileDownloadManagerUtils.returnNotFound(resp);
+            return;
+        }
     }
 
     String buildResponse(final Content cnt, final StateToken stateToken, final String downloadS, String imageSizeS,
@@ -127,13 +131,8 @@
 
     @Authenticated(mandatory = false)
     @Authorizated(accessRolRequired = AccessRol.Viewer, actionLevel = ActionLevel.content)
-    private Content getContentForDownload(final String userHash, final StateToken stateToken) throws ServletException {
-        try {
-            return contentManager.find(ContentUtils.parseId(stateToken.getDocument()));
-        } catch (final ContentNotFoundException e) {
-            // what response to send in this case ?
-            throw new ServletException();
-        }
-
+    private Content getContentForDownload(final String userHash, final StateToken stateToken)
+            throws ContentNotFoundException {
+        return contentManager.find(ContentUtils.parseId(stateToken.getDocument()));
     }
 }

Modified: trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerUtils.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerUtils.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/platf/server/manager/file/FileDownloadManagerUtils.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -25,6 +25,8 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 
+import javax.servlet.http.HttpServletResponse;
+
 public class FileDownloadManagerUtils {
 
     private static final long serialVersionUID = 1L;
@@ -45,4 +47,9 @@
             }
         }
     }
+
+    public static void returnNotFound(HttpServletResponse resp) throws IOException {
+        resp.getWriter().println("Content not found");
+        resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
+    }
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementPanel.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -16,8 +16,8 @@
     public TextEditorInsertElementPanel(final TextEditorInsertElementPresenter presenter, final WorkspaceSkeleton ws,
             Images images, I18nTranslationService i18n, final TextEditorInsertElementGroup textEditorInsertElementGroup) {
         super(TEXT_EDT_INSERT_DIALOG, i18n.tWithNT("Insert an element",
-                "Option in a text editor to insert links and other elements"), 380, 170, 380, 170, true, images,
-                TEXT_EDT_INSERT_DIALOG_ERROR_ID);
+                "Option in a text editor to insert links and other elements"), 380, HEIGHT + 90, 380, HEIGHT + 90,
+                true, images, TEXT_EDT_INSERT_DIALOG_ERROR_ID);
         // super.setIconCls("k-options-icon");
         this.textEditorInsertElementGroup = textEditorInsertElementGroup;
         super.addHideListener(new Listener0() {

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementView.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/TextEditorInsertElementView.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -4,5 +4,5 @@
 import org.ourproject.kune.workspace.client.options.AbstractOptionsView;
 
 public interface TextEditorInsertElementView extends AbstractOptionsView, View {
-
+    int HEIGHT = 200;
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPanel.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkemail/TextEditorInsertLinkEmailPanel.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -2,6 +2,7 @@
 
 import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
+import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementView;
 
 import com.gwtext.client.core.EventObject;
 import com.gwtext.client.widgets.Button;
@@ -16,8 +17,9 @@
 
     public TextEditorInsertLinkEmailPanel(final TextEditorInsertLinkEmailPresenter presenter,
             I18nTranslationService i18n) {
+        super(i18n.t("Email link"));
         super.setAutoWidth(true);
-        super.setAutoHeight(true);
+        super.setHeight(TextEditorInsertElementView.HEIGHT);
         emailField = new TextField();
         emailField.setTabIndex(4);
         emailField.setFieldLabel(i18n.t("Email"));

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linkext/TextEditorInsertLinkExtPanel.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -2,6 +2,7 @@
 
 import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.dialogs.DefaultForm;
+import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementView;
 
 import com.gwtext.client.core.EventObject;
 import com.gwtext.client.widgets.Button;
@@ -16,8 +17,9 @@
 
     public TextEditorInsertLinkExtPanel(final TextEditorInsertLinkExtPresenter presenter,
             final I18nTranslationService i18n) {
+        super(i18n.t("External link"));
         super.setAutoWidth(true);
-        super.setAutoHeight(true);
+        super.setHeight(TextEditorInsertElementView.HEIGHT);
         linkField = new TextField();
         linkField.setTabIndex(1);
         linkField.setFieldLabel(i18n.t("External link (URL)"));

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/editor/insert/linklocal/TextEditorInsertLinkLocalPanel.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -4,6 +4,7 @@
 import org.ourproject.kune.platf.client.dto.StateToken;
 import org.ourproject.kune.platf.client.services.I18nTranslationService;
 import org.ourproject.kune.platf.client.ui.download.FileDownloadUtils;
+import org.ourproject.kune.workspace.client.editor.insert.TextEditorInsertElementView;
 import org.ourproject.kune.workspace.client.search.AbstractLiveSearcherPanel;
 import org.ourproject.kune.workspace.client.skel.WorkspaceSkeleton;
 
@@ -21,7 +22,8 @@
             }
         });
         super.setTitle(i18n.t("Local link"));
-        super.setHeight(110);
+        super.setFrame(true);
+        super.setHeight(TextEditorInsertElementView.HEIGHT);
         super.setPaddings(20);
     }
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/licensefoot/EntityLicensePanel.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -40,10 +40,12 @@
     private final Label licenseLabel;
     private final I18nTranslationService i18n;
     private final SimpleToolbar licenseBar;
+    private final WorkspaceSkeleton ws;
 
     public EntityLicensePanel(final EntityLicensePresenter presenter, final I18nTranslationService i18n,
             final WorkspaceSkeleton ws) {
         this.i18n = i18n;
+        this.ws = ws;
         licenseImage = new Image();
         licenseLabel = new Label();
 
@@ -83,11 +85,13 @@
     }
 
     public void attach() {
-        Ext.get(licenseBar.getElement()).setOpacity(1, false);
+        licenseBar.setVisible(true);
+        // Ext.get(licenseBar.getElement()).setOpacity(1, false);
     }
 
     public void detach() {
-        Ext.get(licenseBar.getElement()).setOpacity(0, false);
+        licenseBar.setVisible(false);
+        // Ext.get(licenseBar.getElement()).setOpacity(0, false);
     }
 
     public void openWindow(final String url) {
@@ -105,5 +109,6 @@
     private void fade(final boolean in) {
         ExtElement element = Ext.get(licenseLabel.getElement());
         element.setOpacity(in ? 1 : 0, true);
+        ws.getEntityWorkspace().refreshBottomTitle();
     }
 }

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 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/logo/EntityOptionsLogoPanel.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -30,6 +30,7 @@
 import com.gwtext.client.core.Connection;
 import com.gwtext.client.core.EventCallback;
 import com.gwtext.client.core.EventObject;
+import com.gwtext.client.core.Position;
 import com.gwtext.client.widgets.Button;
 import com.gwtext.client.widgets.event.ButtonListenerAdapter;
 import com.gwtext.client.widgets.form.Field;
@@ -56,6 +57,7 @@
             I18nTranslationService i18n) {
         this.i18n = i18n;
         super.setHeight(EntityOptionsView.HEIGHT);
+        super.setButtonAlign(Position.LEFT);
         super.setFrame(true);
         super.setAutoScroll(false);
         super.setBorder(false);

Modified: 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 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/options/pscape/EntityOptionsPublicSpaceConfPanel.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -1,13 +1,17 @@
 package org.ourproject.kune.workspace.client.options.pscape;
 
 import org.ourproject.kune.platf.client.services.I18nTranslationService;
+import org.ourproject.kune.platf.client.ui.BasicThumb;
 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.ClickListener;
+import com.google.gwt.user.client.ui.FlowPanel;
 import com.google.gwt.user.client.ui.HorizontalPanel;
 import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Widget;
 import com.gwtext.client.widgets.Panel;
 import com.gwtext.client.widgets.ToolbarButton;
 
@@ -17,7 +21,7 @@
             final WorkspaceSkeleton ws, I18nTranslationService i18n, WsThemePresenter wsPresenter) {
         super.setTitle(i18n.t("Styling"));
         super.setIconCls("k-colors-icon");
-        super.setAutoScroll(false);
+        super.setAutoScroll(true);
         super.setBorder(false);
         super.setHeight(EntityOptionsView.HEIGHT);
         super.setFrame(true);
@@ -30,11 +34,20 @@
         wsHP.add(wsThemeInfo);
         wsHP.add(toolbarWsChange);
         add(wsHP);
-        Label wsInfo = new Label(i18n.t("Configure the public space theme:"));
+        Label wsInfo = new Label(i18n.t("Select and configure the public space theme of this group:"));
         wsInfo.addStyleName("kune-Margin-Medium-tb");
-        Label wsDev = new Label(Site.IN_DEVELOPMENT);
-        wsDev.addStyleName("kune-Margin-Medium-tb");
         add(wsInfo);
-        add(wsDev);
+
+        FlowPanel stylesPanel = new FlowPanel();
+        for (int i = 1; i <= 6; i++) {
+            BasicThumb thumb = new BasicThumb("images/styles/styl" + i + ".png", "Style " + i, new ClickListener() {
+                public void onClick(Widget sender) {
+                    Site.info(Site.IN_DEVELOPMENT);
+                }
+            });
+            thumb.setTooltip(i18n.t("Click to select and configure this theme"));
+            add(thumb);
+        }
+        add(stylesPanel);
     }
 }

Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java	2008-12-21 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/skel/EntityWorkspace.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -51,6 +51,7 @@
     private final RoundedPanel roundedBottom;
     private final Panel cntCtxBorderLayout;
     private final Panel mainFitPanel;
+    private final Panel bottomPanel;
 
     public EntityWorkspace() {
         mainFitPanel = new Panel();
@@ -67,7 +68,7 @@
         final Panel titles = new Panel();
         titles.setBorder(false);
         titles.setLayout(new AnchorLayout());
-        final Panel bottomPanel = new Panel();
+        bottomPanel = new Panel();
         bottomPanel.setBorder(false);
         bottomPanel.setLayout(new AnchorLayout());
 
@@ -81,7 +82,7 @@
         bottom = new SimpleToolbar();
         bottom.setHeight("" + (WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT - 2));
         bottom.setStylePrimaryName(ENTITY_BOTTOM);
-        bottom.ensureDebugId(ENTITY_BOTTOM);
+        // bottom.ensureDebugId(ENTITY_BOTTOM);
 
         roundedTitle = new RoundedPanel(title, RoundedPanel.TOPLEFT, 2);
         roundedBottom = new RoundedPanel(bottom, RoundedPanel.BOTTOMLEFT, 2);
@@ -90,6 +91,7 @@
         titles.add(subTitle, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT));
         bottomPanel.add(roundedBottom, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT));
         titles.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 2);
+        bottomPanel.setHeight(WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT);
 
         final Panel contentWrap = new Panel();
         final Panel contextWrap = new Panel();
@@ -137,7 +139,7 @@
         mainAnchorLayout.add(titles, new AnchorLayoutData("100%"));
         mainAnchorLayout.add(cntCtxBorderLayout, new AnchorLayoutData("100% -"
                 + ((WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 3))));
-        mainAnchorLayout.add(bottomPanel, new AnchorLayoutData("100%"));
+        mainAnchorLayout.add(bottomPanel, new AnchorLayoutData("100% -" + WorkspaceSkeleton.DEF_TOOLBAR_HEIGHT * 3));
         mainFitPanel.add(mainAnchorLayout);
     }
 
@@ -193,6 +195,12 @@
         return title;
     }
 
+    public void refreshBottomTitle() {
+        if (bottomPanel.isRendered()) {
+            // bottomPanel.doLayout(false);
+        }
+    }
+
     public void setContent(final Widget widget) {
         setPanel(content, widget);
     }

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 16:12:07 UTC (rev 1010)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/themes/WsThemePanel.java	2008-12-22 02:48:58 UTC (rev 1011)
@@ -44,7 +44,7 @@
         menu.setDefaultAlign("br-tr");
         super.setMenu(menu);
         super.setIcon("images/colors.gif");
-        super.setTooltip(i18n.t("Select Workspace theme for this group"));
+        // super.setTooltip(i18n.t("Select Workspace theme for this group"));
         // ws.getSiteTraybar().addButton(this);
         presenter.onThemeChanged(new Listener2<WsTheme, WsTheme>() {
             public void onEvent(final WsTheme oldTheme, final WsTheme newTheme) {


