[kune-commits] r845 - in trunk: img img/nav-icons
img/nav-icons/suplentes script
src/main/java/org/ourproject/kune/app/public
src/main/java/org/ourproject/kune/app/public/css
src/main/java/org/ourproject/kune/app/public/js
src/main/java/org/ourproject/kune/docs/client
src/main/java/org/ourproject/kune/docs/client/ctx
src/main/java/org/ourproject/kune/platf/client/actions
src/main/java/org/ourproject/kune/platf/public/images
src/main/java/org/ourproject/kune/platf/public/images/nav
src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items
vjrj
vjrj at ourproject.org
Mon Sep 8 02:12:26 CEST 2008
Author: vjrj
Date: 2008-09-08 02:11:31 +0200 (Mon, 08 Sep 2008)
New Revision: 845
Added:
trunk/img/kune-refresh.svg
trunk/img/nav-icons/
trunk/img/nav-icons/blog.gif
trunk/img/nav-icons/blog.png
trunk/img/nav-icons/film.gif
trunk/img/nav-icons/film.png
trunk/img/nav-icons/folder_add.gif
trunk/img/nav-icons/folder_add.png
trunk/img/nav-icons/gallery.gif
trunk/img/nav-icons/gallery.png
trunk/img/nav-icons/go.gif
trunk/img/nav-icons/go.png
trunk/img/nav-icons/page.gif
trunk/img/nav-icons/page.png
trunk/img/nav-icons/page_add.gif
trunk/img/nav-icons/page_add.png
trunk/img/nav-icons/page_pdf.gif
trunk/img/nav-icons/page_pdf.png
trunk/img/nav-icons/page_text.gif
trunk/img/nav-icons/page_text.png
trunk/img/nav-icons/page_zip.gif
trunk/img/nav-icons/page_zip.png
trunk/img/nav-icons/picture.gif
trunk/img/nav-icons/picture.png
trunk/img/nav-icons/post.gif
trunk/img/nav-icons/post.png
trunk/img/nav-icons/refresh.png
trunk/img/nav-icons/suplentes/
trunk/img/nav-icons/suplentes/gallery-1.png
trunk/img/nav-icons/suplentes/page_white_database.png
trunk/img/nav-icons/suplentes/page_white_excel.png
trunk/img/nav-icons/suplentes/page_white_powerpoint.png
trunk/img/nav-icons/suplentes/page_white_word.png
trunk/img/nav-icons/suplentes/photo.png
trunk/img/nav-icons/suplentes/photos.png
trunk/img/nav-icons/suplentes/pictures.png
trunk/img/nav-icons/suplentes/refresh.png
trunk/img/nav-icons/suplentes/refresh_small.png
trunk/img/nav-icons/suplentes/refresh_wb.png
trunk/img/nav-icons/suplentes/rename.png
trunk/img/nav-icons/upload.gif
trunk/img/nav-icons/upload.png
trunk/src/main/java/org/ourproject/kune/app/public/js/pngfix.js
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCollection.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java
trunk/src/main/java/org/ourproject/kune/platf/public/images/folder-go-up.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/folderpathmenu.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/blog.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/blog.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/film.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/film.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/folder_add.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/folder_add.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/gallery.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/gallery.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/go.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/go.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_add.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_add.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_pdf.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_pdf.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_text.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_text.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_zip.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_zip.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/picture.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/picture.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/post.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/post.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/refresh.png
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/upload.gif
trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/upload.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorItem.java
Removed:
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionCollection.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionDescriptor.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigationItem.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorImages.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/bullet_arrow_right.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/chat-blue.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/chat-green.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folder-go-up-light.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folder-go-up.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folder.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folder_add.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folderpathmenu.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/go-up-light.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/go-up.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/page.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/page_add.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/page_white.png
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/page_white_add.png
Modified:
trunk/script/css-compact-and-tidy.css
trunk/src/main/java/org/ourproject/kune/app/public/Kune.html
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/docs/client/DocumentClientModule.java
trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java
trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPanel.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java
trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionPosition.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigator.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorPanel.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorPresenter.java
trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorView.java
Log:
Context refactorization, new actions, new context icons, more cleanup.
Added: trunk/img/kune-refresh.svg
===================================================================
--- trunk/img/kune-refresh.svg 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/img/kune-refresh.svg 2008-09-08 00:11:31 UTC (rev 845)
@@ -0,0 +1,251 @@
+<?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://web.resource.org/cc/"
+ 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="16px"
+ height="16px"
+ id="svg2160"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ sodipodi:docbase="/Users/vjrj/Desktop"
+ sodipodi:docname="kune-refresh.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/Users/vjrj/Desktop/kune-refresh.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs2162">
+ <marker
+ inkscape:stockid="Arrow1Send"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Send"
+ style="overflow:visible;">
+ <path
+ id="path3159"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+ transform="scale(0.2) rotate(180) translate(6,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Mend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Mend"
+ style="overflow:visible;">
+ <path
+ id="path3153"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+ transform="scale(0.4) rotate(180) translate(10,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Lend"
+ style="overflow:visible;">
+ <path
+ id="path3165"
+ style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) rotate(180) translate(1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Send"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Send"
+ style="overflow:visible;">
+ <path
+ id="path3177"
+ style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(0.3) rotate(180) translate(-2.3,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Mend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Mend"
+ style="overflow:visible;">
+ <path
+ id="path3171"
+ style="font-size:12.0;fill-rule:evenodd;stroke-width:0.62500000;stroke-linejoin:round;"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(0.6) rotate(180) translate(0,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Lend"
+ style="overflow:visible;">
+ <path
+ id="path3147"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;marker-start:none;"
+ transform="scale(0.8) rotate(180) translate(12.5,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="25.418655"
+ inkscape:cx="7.9575212"
+ inkscape:cy="7.8584016"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1280"
+ inkscape:window-height="1002"
+ inkscape:window-x="1443"
+ inkscape:window-y="0" />
+ <metadata
+ id="metadata2165">
+ <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
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <g
+ id="g3420"
+ style="stroke:#b3b3b3"
+ transform="translate(0.2265575,0.2831969)">
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1.37520182;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3422"
+ sodipodi:cx="3.8699188"
+ sodipodi:cy="10.480608"
+ sodipodi:rx="5.1810389"
+ sodipodi:ry="3.4469769"
+ d="M 8.5624031,11.941823 A 5.1810389,3.4469769 0 1 1 7.5078976,8.026334"
+ transform="matrix(1.2152803,0,0,1.7404064,2.5942803,-9.2405172)"
+ sodipodi:start="0.43776035"
+ sodipodi:end="5.490832"
+ sodipodi:open="true" />
+ <g
+ id="g3424"
+ transform="matrix(1.3802224,0,0,1.3802224,-27.027504,-11.519572)"
+ style="stroke:#b3b3b3">
+ <path
+ style="fill-rule:evenodd;stroke:#b3b3b3;stroke-width:0.14490418pt;marker-start:none"
+ d="M 27.37522,11.773331 L 24.640913,12.4551 L 31.022208,14.272344 L 27.244233,8.641918 L 27.37522,11.773331 z "
+ id="path3426"
+ sodipodi:nodetypes="ccccc" />
+ </g>
+ </g>
+ <g
+ id="g3415">
+ <path
+ sodipodi:open="true"
+ sodipodi:end="5.490832"
+ sodipodi:start="0.43776035"
+ transform="matrix(1.2152803,0,0,1.7404064,2.5942803,-9.2405172)"
+ d="M 8.5624031,11.941823 A 5.1810389,3.4469769 0 1 1 7.5078976,8.026334"
+ sodipodi:ry="3.4469769"
+ sodipodi:rx="5.1810389"
+ sodipodi:cy="10.480608"
+ sodipodi:cx="3.8699188"
+ id="path3375"
+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.37520182;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <g
+ transform="matrix(1.3802224,0,0,1.3802224,-27.027504,-11.519572)"
+ id="g3380">
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path3386"
+ d="M 27.37522,11.773331 L 24.640913,12.4551 L 31.022208,14.272344 L 27.244233,8.641918 L 27.37522,11.773331 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:0.14490418pt;marker-start:none" />
+ </g>
+ </g>
+ <g
+ id="g3448"
+ transform="translate(-17,-4.6866787)"
+ inkscape:export-filename="/Users/vjrj/Desktop/kune-refresh.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90"
+ style="opacity:0.7">
+ <g
+ id="g3432"
+ style="stroke:#b3b3b3"
+ transform="translate(0.2265575,0.2831969)">
+ <path
+ sodipodi:type="arc"
+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1.37520182;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="path3434"
+ sodipodi:cx="3.8699188"
+ sodipodi:cy="10.480608"
+ sodipodi:rx="5.1810389"
+ sodipodi:ry="3.4469769"
+ d="M 8.5624031,11.941823 A 5.1810389,3.4469769 0 1 1 7.5078976,8.026334"
+ transform="matrix(1.2152803,0,0,1.7404064,2.5942803,-9.2405172)"
+ sodipodi:start="0.43776035"
+ sodipodi:end="5.490832"
+ sodipodi:open="true" />
+ <g
+ id="g3436"
+ transform="matrix(1.3802224,0,0,1.3802224,-27.027504,-11.519572)"
+ style="stroke:#b3b3b3">
+ <path
+ style="fill-rule:evenodd;stroke:#b3b3b3;stroke-width:0.14490418pt;marker-start:none"
+ d="M 27.37522,11.773331 L 24.640913,12.4551 L 31.022208,14.272344 L 27.244233,8.641918 L 27.37522,11.773331 z "
+ id="path3438"
+ sodipodi:nodetypes="ccccc" />
+ </g>
+ </g>
+ <g
+ id="g3440">
+ <path
+ sodipodi:open="true"
+ sodipodi:end="5.490832"
+ sodipodi:start="0.43776035"
+ transform="matrix(1.2152803,0,0,1.7404064,2.5942803,-9.2405172)"
+ d="M 8.5624031,11.941823 A 5.1810389,3.4469769 0 1 1 7.5078976,8.026334"
+ sodipodi:ry="3.4469769"
+ sodipodi:rx="5.1810389"
+ sodipodi:cy="10.480608"
+ sodipodi:cx="3.8699188"
+ id="path3442"
+ style="color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.37520182;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ sodipodi:type="arc" />
+ <g
+ transform="matrix(1.3802224,0,0,1.3802224,-27.027504,-11.519572)"
+ id="g3444">
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="path3446"
+ d="M 27.37522,11.773331 L 24.640913,12.4551 L 31.022208,14.272344 L 27.244233,8.641918 L 27.37522,11.773331 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:0.14490418pt;marker-start:none" />
+ </g>
+ </g>
+ </g>
+ </g>
+</svg>
Added: trunk/img/nav-icons/blog.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/blog.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/blog.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/blog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/film.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/film.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/film.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/film.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/folder_add.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/folder_add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/folder_add.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/folder_add.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/gallery.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/gallery.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/gallery.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/gallery.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/go.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/go.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/go.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/go.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page_add.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page_add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page_add.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page_add.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page_pdf.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page_pdf.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page_pdf.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page_pdf.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page_text.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page_text.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page_text.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page_text.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page_zip.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page_zip.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/page_zip.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/page_zip.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/picture.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/picture.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/picture.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/picture.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/post.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/post.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/post.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/post.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/refresh.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/refresh.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/gallery-1.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/gallery-1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/page_white_database.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/page_white_database.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/page_white_excel.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/page_white_excel.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/page_white_powerpoint.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/page_white_powerpoint.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/page_white_word.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/page_white_word.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/photo.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/photo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/photos.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/photos.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/pictures.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/pictures.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/refresh.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/refresh.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/refresh_small.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/refresh_small.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/refresh_wb.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/refresh_wb.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/suplentes/rename.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/suplentes/rename.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/upload.gif
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/upload.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/img/nav-icons/upload.png
===================================================================
(Binary files differ)
Property changes on: trunk/img/nav-icons/upload.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/script/css-compact-and-tidy.css
===================================================================
--- trunk/script/css-compact-and-tidy.css 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/script/css-compact-and-tidy.css 2008-09-08 00:11:31 UTC (rev 845)
@@ -8,11 +8,13 @@
EXTTMPFILE=$ORIG/js/ext/resources/css/ext-all.css-tmp
sed 's/normal 11px/normal 100\%/g' $ORIG/js/ext/resources/css/ext-all.css |\
-sed 's/bold 11px/normal 100\%/g' |\
-sed 's/normal 12px/normal 108\%/g' |\
-sed 's/bold 12px/bold 108\%/g' |\
+sed 's/bold 11px/bold 100\%/g' |\
+sed 's/normal 12px/normal 100\%/g' |\
+sed 's/bold 12px/bold 100\%/g' |\
+sed 's/normal 10px/normal 100\%/g' |\
+sed 's/normal 9px/normal 100\%/g' |\
sed 's/font-size:11px/font-size:100\%/g' |\
-sed 's/font-size:12px/font-size:108\%/g' |\
+sed 's/font-size:12px/font-size:100\%/g' |\
sed 's/ arial,tahoma,helvetica,sans-serif/ arial,sans/g' |\
sed 's/ tahoma,arial,helvetica,sans-serif/ arial,sans/g' |\
sed 's/ tahoma,arial,verdana,sans-serif/ arial,sans/g' |\
Modified: trunk/src/main/java/org/ourproject/kune/app/public/Kune.html
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/Kune.html 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/app/public/Kune.html 2008-09-08 00:11:31 UTC (rev 845)
@@ -37,6 +37,11 @@
}
</style>
+
+<!--[if lt IE 7.]>
+<script defer type="text/javascript" src="js/pngfix.js"></script>
+<![endif]-->
+
</head>
<body>
<script type="text/javascript" language="javascript"
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-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/all.css 2008-09-08 00:11:31 UTC (rev 845)
@@ -147,7 +147,7 @@
.x-tab-panel-tbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;}
.x-border-layout-ct .x-tab-panel{background:white;}
- .x-form-field{margin:0;font:normal 108% arial,sans;}
+ .x-form-field{margin:0;font:normal 100% arial,sans;}
.x-form-text,textarea.x-form-field{padding:1px 3px;background:#fff url(../js/ext/resources/images/default/form/text-bg.gif) repeat-x 0 0;border:1px solid #B5B8C8;}
textarea.x-form-field{padding:2px 3px;}
.x-form-text{height:22px;line-height:18px;vertical-align:middle;}
@@ -184,9 +184,9 @@
.ext-ie .x-form-check-wrap input{width:15px;height:15px;}
.x-editor .x-form-check-wrap{padding:3px;}
.x-editor .x-form-checkbox{height:13px;}
-.x-form-grow-sizer{font:normal 108% arial,sans;left:-10000px;padding:8px 3px;position:absolute;visibility:hidden;top:-10000px;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;zoom:1;}
+.x-form-grow-sizer{font:normal 100% arial,sans;left:-10000px;padding:8px 3px;position:absolute;visibility:hidden;top:-10000px;white-space:pre-wrap;white-space:-moz-pre-wrap;white-space:-pre-wrap;white-space:-o-pre-wrap;word-wrap:break-word;zoom:1;}
.x-form-grow-sizer p{margin:0!important;border:0 none!important;padding:0!important;}
-.x-form-item{font:normal 108% arial,sans;display:block;margin-bottom:4px;}
+.x-form-item{font:normal 100% arial,sans;display:block;margin-bottom:4px;}
.x-form-item label{display:block;float:left;width:100px;padding:3px;padding-left:0;clear:left;z-index:2;position:relative;}
.x-form-element{padding-left:105px;position:relative;}
.x-form-invalid-msg{color:#e00;padding:2px;padding-left:18px;font:normal 100% arial,sans;background:transparent url(../js/ext/resources/images/default/shared/warning.gif) no-repeat 0 2px;line-height:16px;width:200px;}
@@ -199,7 +199,7 @@
.x-small-editor .x-form-text{height:20px;line-height:16px;vertical-align:middle;}
.ext-ie .x-small-editor .x-form-text{margin-top:-1px!important;margin-bottom:-1px!important;height:20px!important;line-height:16px!important;}
.ext-strict .x-small-editor .x-form-text{height:16px!important;}
-.ext-safari .x-small-editor .x-form-field{font:normal 108% arial,sans;}
+.ext-safari .x-small-editor .x-form-field{font:normal 100% arial,sans;}
.ext-ie .x-small-editor .x-form-text{height:20px;line-height:16px;}
.ext-border-box .x-small-editor .x-form-text{height:20px;}
.x-small-editor .x-form-select-one{height:20px;line-height:16px;vertical-align:middle;}
@@ -224,7 +224,7 @@
.x-form .x-form-btns-ct .x-btn-click .x-btn-left{background-position:0 -63px;}
.x-form-invalid-icon{width:16px;height:18px;visibility:hidden;position:absolute;left:0;top:0;display:block;background:transparent url(../js/ext/resources/images/default/form/exclamation.gif) no-repeat 0 2px;}
.x-fieldset{border:1px solid #B5B8C8;padding:10px;margin-bottom:10px;}
-.x-fieldset legend{font:normal 100% arial,sans;color:#15428b;}
+.x-fieldset legend{font:bold 100% arial,sans;color:#15428b;}
.ext-ie .x-fieldset legend{margin-bottom:10px;}
.ext-ie .x-fieldset{padding-top:0;padding-bottom:10px;}
.x-fieldset legend .x-tool-toggle{margin-right:3px;margin-left:0;float:left!important;}
@@ -430,7 +430,7 @@
.x-grid3-check-col-on{width:100%;height:16px;background-position:center center;background-repeat:no-repeat;background-color:transparent;background-image:url(../js/ext/resources/images/default/menu/checked.gif);}
.x-grid-group,.x-grid-group-body,.x-grid-group-hd{zoom:1;}
.x-grid-group-hd{border-bottom:2px solid #99bbe8;cursor:pointer;padding-top:6px;}
-.x-grid-group-hd div{background:transparent url(../js/ext/resources/images/default/grid/group-expand-sprite.gif) no-repeat 3px -47px;padding:4px 4px 4px 17px;color:#3764a0;font:normal 100% arial,sans;}
+.x-grid-group-hd div{background:transparent url(../js/ext/resources/images/default/grid/group-expand-sprite.gif) no-repeat 3px -47px;padding:4px 4px 4px 17px;color:#3764a0;font:bold 100% arial,sans;}
.x-grid-group-collapsed .x-grid-group-hd div{background-position:3px 3px;}
.x-grid-group-collapsed .x-grid-group-body{display:none;}
.x-group-by-icon{background-image:url(../js/ext/resources/images/default/grid/group-by.gif);}
@@ -519,7 +519,7 @@
.x-date-picker{border:1px solid #1b376c;border-top:0 none;background:#fff;position:relative;}
.x-date-picker a{-moz-outline:0 none;outline:0 none;}
.x-date-inner,.x-date-inner td,.x-date-inner th{border-collapse:separate;}
-.x-date-middle,.x-date-left,.x-date-right{background:url(../js/ext/resources/images/default/shared/hd-sprite.gif) repeat-x 0 -83px;color:#FFF;font:normal 100% arial,sans;overflow:hidden;}
+.x-date-middle,.x-date-left,.x-date-right{background:url(../js/ext/resources/images/default/shared/hd-sprite.gif) repeat-x 0 -83px;color:#FFF;font:bold 100% arial,sans;overflow:hidden;}
.x-date-middle .x-btn-left,.x-date-middle .x-btn-center,.x-date-middle .x-btn-right{background:transparent!important;vertical-align:middle;}
.x-date-middle .x-btn .x-btn-text{color:#fff;}
.x-date-middle .x-btn-with-menu .x-btn-center em{background:transparent url(../js/ext/resources/images/default/toolbar/btn-arrow-light.gif) no-repeat right 0;}
@@ -532,7 +532,7 @@
.x-date-left a{background-image:url(../js/ext/resources/images/default/shared/left-btn.gif);margin-left:2px;text-decoration:none!important;}
table.x-date-inner{width:100%;table-layout:fixed;}
.x-date-inner th{width:25px;}
-.x-date-inner th{background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;text-align:right!important;border-bottom:1px solid #a3bad9;font:normal 10px arial,sans;color:#233d6d;cursor:default;padding:0;border-collapse:separate;}
+.x-date-inner th{background:#dfecfb url(../js/ext/resources/images/default/shared/glass-bg.gif) repeat-x left top;text-align:right!important;border-bottom:1px solid #a3bad9;font:normal 100% arial,sans;color:#233d6d;cursor:default;padding:0;border-collapse:separate;}
.x-date-inner th span{display:block;padding:2px;padding-right:7px;}
.x-date-inner td{border:1px solid #fff;text-align:right;padding:0;}
.x-date-inner a{padding:2px 5px;display:block;font:normal 100% arial,sans;text-decoration:none;color:black;text-align:right;zoom:1;}
@@ -577,7 +577,7 @@
.x-tip .x-tip-ml{background:#fff url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat 0 -124px;padding-left:6px;zoom:1;}
.x-tip .x-tip-mr{background:transparent url(../js/ext/resources/images/default/qtip/tip-sprite.gif) no-repeat right -124px;padding-right:6px;zoom:1;}
.ext-ie .x-tip .x-tip-header,.ext-ie .x-tip .x-tip-tc{font-size:0;line-height:0;}
-.x-tip .x-tip-header-text{font:normal 100% arial,sans;padding:0;margin:0 0 2px 0;color:#444;}
+.x-tip .x-tip-header-text{font:bold 100% arial,sans;padding:0;margin:0 0 2px 0;color:#444;}
.x-tip .x-tip-body{font:normal 100% arial,sans;margin:0!important;line-height:14px;color:#444;padding:0;}
.x-tip .x-tip-body .loading-indicator{margin:0;}
.x-tip-draggable .x-tip-header,.x-tip-draggable .x-tip-header-text{cursor:move;}
@@ -622,7 +622,7 @@
.x-box-tc{height:8px;background:transparent url(../js/ext/resources/images/default/box/tb.gif) repeat-x 0 0;overflow:hidden;}
.x-box-tr{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat right -8px;}
.x-box-ml{background:transparent url(../js/ext/resources/images/default/box/l.gif) repeat-y 0;padding-left:4px;overflow:hidden;zoom:1;}
-.x-box-mc{background:#eee url(../js/ext/resources/images/default/box/tb.gif) repeat-x 0 -16px;padding:4px 10px;font-family:"Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;color:#393939;font-size:108%;}
+.x-box-mc{background:#eee url(../js/ext/resources/images/default/box/tb.gif) repeat-x 0 -16px;padding:4px 10px;font-family:"Myriad Pro","Myriad Web","Tahoma","Helvetica","Arial",sans-serif;color:#393939;font-size:100%;}
.x-box-mc h3{font-size:14px;font-weight:bold;margin:0 0 4px 0;zoom:1;}
.x-box-mr{background:transparent url(../js/ext/resources/images/default/box/r.gif) repeat-y right;padding-right:4px;overflow:hidden;}
.x-box-bl{background:transparent url(../js/ext/resources/images/default/box/corners.gif) no-repeat 0 -16px;zoom:1;}
@@ -648,23 +648,23 @@
.x-combo-list{border:1px solid #98c0f4;background:#ddecfe;zoom:1;overflow:hidden;}
.x-combo-list-inner{overflow:auto;background:white;position:relative;zoom:1;overflow-x:hidden;}
-.x-combo-list-hd{font:normal 100% arial,sans;color:#15428b;background-image:url(../js/ext/resources/images/default/layout/panel-title-light-bg.gif);border-bottom:1px solid #98c0f4;padding:3px;}
+.x-combo-list-hd{font:bold 100% arial,sans;color:#15428b;background-image:url(../js/ext/resources/images/default/layout/panel-title-light-bg.gif);border-bottom:1px solid #98c0f4;padding:3px;}
.x-resizable-pinned .x-combo-list-inner{border-bottom:1px solid #98c0f4;}
-.x-combo-list-item{font:normal 108% arial,sans;padding:2px;border:1px solid #fff;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
+.x-combo-list-item{font:normal 100% arial,sans;padding:2px;border:1px solid #fff;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;}
.x-combo-list .x-combo-selected{border:1px dotted #a3bae9!important;background:#DFE8F6;cursor:pointer;}
.x-combo-noedit{cursor:pointer;}
.x-combo-list .x-toolbar{border-top:1px solid #98c0f4;border-bottom:0 none;}
.x-combo-list-small .x-combo-list-item{font:normal 100% arial,sans;}
.x-panel{border-style:solid;border-color:#99bbe8;border-width:0;}
-.x-panel-header{overflow:hidden;zoom:1;color:#15428b;font:normal 100% arial,sans;padding:5px 3px 4px 5px;border:1px solid #99bbe8;line-height:15px;background:transparent url(../js/ext/resources/images/default/panel/white-top-bottom.gif) repeat-x 0 -1px;}
+.x-panel-header{overflow:hidden;zoom:1;color:#15428b;font:bold 100% arial,sans;padding:5px 3px 4px 5px;border:1px solid #99bbe8;line-height:15px;background:transparent url(../js/ext/resources/images/default/panel/white-top-bottom.gif) repeat-x 0 -1px;}
.x-panel-body{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;background:white;position:relative;}
.x-panel-bbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;}
.x-panel-tbar .x-toolbar{border:1px solid #99bbe8;border-top:0 none;overflow:hidden;padding:2px;}
.x-panel-tbar-noheader .x-toolbar,.x-panel-mc .x-panel-tbar .x-toolbar{border-top:1px solid #99bbe8;border-bottom:0 none;}
.x-panel-body-noheader,.x-panel-mc .x-panel-body{border-top:1px solid #99bbe8;}
.x-panel-header{overflow:hidden;zoom:1;}
-.x-panel-tl .x-panel-header{color:#15428b;font:normal 100% arial,sans;padding:5px 0 4px 0;border:0 none;background:transparent;}
+.x-panel-tl .x-panel-header{color:#15428b;font:bold 100% arial,sans;padding:5px 0 4px 0;border:0 none;background:transparent;}
.x-panel-tl .x-panel-icon,.x-window-tl .x-panel-icon{padding-left:20px!important;background-repeat:no-repeat;background-position:0 4px;zoom:1;}
.x-panel-inline-icon{width:16px;height:16px;background-repeat:no-repeat;background-position:0 0;vertical-align:middle;margin-right:4px;margin-top:-1px;margin-bottom:-1px;}
.x-panel-tc{background:transparent url(../js/ext/resources/images/default/panel/top-bottom.gif) repeat-x 0 0;overflow:hidden;}
@@ -758,7 +758,7 @@
.x-window-proxy{background:#C7DFFC;border:1px solid #99bbe8;z-index:12000;overflow:hidden;position:absolute;left:0;top:0;display:none;opacity:.5;-moz-opacity:.5;filter:alpha(opacity=50);}
.x-window-header{overflow:hidden;zoom:1;}
.x-window-bwrap{z-index:1;position:relative;zoom:1;}
-.x-window-tl .x-window-header{color:#15428b;font:normal 100% arial,sans;padding:5px 0 4px 0;}
+.x-window-tl .x-window-header{color:#15428b;font:bold 100% arial,sans;padding:5px 0 4px 0;}
.x-window-header-text{cursor:pointer;}
.x-window-tc{background:transparent url(../js/ext/resources/images/default/window/top-bottom.png) repeat-x 0 0;overflow:hidden;zoom:1;}
.x-window-tl{background:transparent url(../js/ext/resources/images/default/window/left-corners.png) no-repeat 0 0;padding-left:6px;zoom:1;z-index:1;position:relative;}
@@ -885,9 +885,9 @@
.x-window-dlg .x-window-body{border:0 none!important;padding:5px 10px;overflow:hidden!important;}
.x-window-dlg .x-window-mc{border:0 none!important;}
-.x-window-dlg .ext-mb-text,.x-window-dlg .x-window-header-text{font-size:108%;}
+.x-window-dlg .ext-mb-text,.x-window-dlg .x-window-header-text{font-size:100%;}
.x-window-dlg .ext-mb-input{margin-top:4px;width:95%;}
-.x-window-dlg .ext-mb-textarea{margin-top:4px;font:normal 108% arial,sans;}
+.x-window-dlg .ext-mb-textarea{margin-top:4px;font:normal 100% arial,sans;}
.x-window-dlg .x-progress-wrap{margin-top:4px;}
.ext-ie .x-window-dlg .x-progress-wrap{margin-top:6px;}
.x-window-dlg .x-msg-box-wait{background:transparent url(../js/ext/resources/images/default/grid/loading.gif) no-repeat left;display:block;width:300px;padding-left:18px;line-height:18px;}
@@ -3214,7 +3214,7 @@
.x-toolbar td, .x-toolbar span, .x-toolbar input, .x-toolbar div, .x-toolbar select, .x-toolbar label {
white-space: nowrap;
- font: normal 13px arial, sans;
+ font: normal 100% arial,sans;
line-height: 19px;
}
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-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/app/public/css/kune-new.css 2008-09-08 00:11:31 UTC (rev 845)
@@ -379,7 +379,7 @@
.x-toolbar td, .x-toolbar span, .x-toolbar input, .x-toolbar div, .x-toolbar select, .x-toolbar label {
white-space: nowrap;
- font: normal 13px arial, sans;
+ font: normal 100% arial,sans;
line-height: 19px;
}
Added: trunk/src/main/java/org/ourproject/kune/app/public/js/pngfix.js
===================================================================
--- trunk/src/main/java/org/ourproject/kune/app/public/js/pngfix.js 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/app/public/js/pngfix.js 2008-09-08 00:11:31 UTC (rev 845)
@@ -0,0 +1,39 @@
+/*
+
+Correctly handle PNG transparency in Win IE 5.5 & 6.
+http://homepage.ntlworld.com/bobosola. Updated 18-Jan-2006.
+
+Use in <HEAD> with DEFER keyword wrapped in conditional comments:
+<!--[if lt IE 7]>
+<script defer type="text/javascript" src="pngfix.js"></script>
+<![endif]-->
+
+*/
+
+var arVersion = navigator.appVersion.split("MSIE")
+var version = parseFloat(arVersion[1])
+
+if ((version >= 5.5) && (document.body.filters))
+{
+ for(var i=0; i<document.images.length; i++)
+ {
+ var img = document.images[i]
+ var imgName = img.src.toUpperCase()
+ if (imgName.substring(imgName.length-3, imgName.length) == "PNG")
+ {
+ var imgID = (img.id) ? "id='" + img.id + "' " : ""
+ var imgClass = (img.className) ? "class='" + img.className + "' " : ""
+ var imgTitle = (img.title) ? "title='" + img.title + "' " : "title='" + img.alt + "' "
+ var imgStyle = "display:inline-block;" + img.style.cssText
+ if (img.align == "left") imgStyle = "float:left;" + imgStyle
+ if (img.align == "right") imgStyle = "float:right;" + imgStyle
+ if (img.parentElement.href) imgStyle = "cursor:hand;" + imgStyle
+ var strNewHTML = "<span " + imgID + imgClass + imgTitle
+ + " style=\"" + "width:" + img.width + "px; height:" + img.height + "px;" + imgStyle + ";"
+ + "filter:progid:DXImageTransform.Microsoft.AlphaImageLoader"
+ + "(src=\'" + img.src + "\', sizingMethod='scale');\"></span>"
+ img.outerHTML = strNewHTML
+ i = i-1
+ }
+ }
+}
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientModule.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -57,7 +57,8 @@
register(SingletonScope.class, new Factory<DocumentClientTool>(DocumentClientTool.class) {
public DocumentClientTool create() {
return new DocumentClientTool(i18n, $(ToolSelector.class), $(WsThemePresenter.class),
- $(WorkspaceSkeleton.class), $$(DocumentContext.class));
+ $(WorkspaceSkeleton.class), $$(DocumentContext.class), $(ContextNavigator.class),
+ $(Session.class), $(StateManager.class), $$(ContentServiceAsync.class));
}
});
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/DocumentClientTool.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -21,13 +21,25 @@
package org.ourproject.kune.docs.client;
import org.ourproject.kune.docs.client.ctx.DocumentContext;
+import org.ourproject.kune.platf.client.actions.ActionDescriptor;
+import org.ourproject.kune.platf.client.actions.ActionPosition;
+import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import org.ourproject.kune.platf.client.dto.StateDTO;
+import org.ourproject.kune.platf.client.dto.StateToken;
+import org.ourproject.kune.platf.client.rpc.AsyncCallbackSimple;
+import org.ourproject.kune.platf.client.rpc.ContentServiceAsync;
+import org.ourproject.kune.platf.client.state.Session;
+import org.ourproject.kune.platf.client.state.StateManager;
import org.ourproject.kune.platf.client.tool.AbstractClientTool;
import org.ourproject.kune.platf.client.tool.ToolSelector;
import org.ourproject.kune.workspace.client.i18n.I18nUITranslationService;
+import org.ourproject.kune.workspace.client.sitebar.Site;
+import org.ourproject.kune.workspace.client.ui.ctx.items.ContextNavigator;
import org.ourproject.kune.workspace.client.ui.newtmp.skel.WorkspaceSkeleton;
import org.ourproject.kune.workspace.client.ui.newtmp.themes.WsThemePresenter;
import com.calclab.suco.client.provider.Provider;
+import com.calclab.suco.client.signal.Slot;
public class DocumentClientTool extends AbstractClientTool {
public static final String TYPE_ROOT = "docs.root";
@@ -35,24 +47,164 @@
public static final String TYPE_DOCUMENT = "docs.doc";
public static final String NAME = "docs";
private final Provider<DocumentContext> documentContextProvider;
+ private final ContextNavigator contextNavigator;
+ private final StateManager stateManager;
+ private final I18nUITranslationService i18n;
+ private final Session session;
+ private final Provider<ContentServiceAsync> contentServiceProvider;
public DocumentClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector,
final WsThemePresenter wsThemePresenter, final WorkspaceSkeleton ws,
- final Provider<DocumentContext> documentContextProvider) {
+ final Provider<DocumentContext> documentContextProvider, final ContextNavigator contextNavigator,
+ final Session session, final StateManager stateManager,
+ final Provider<ContentServiceAsync> contentServiceProvider) {
super(NAME, i18n.t("documents"), toolSelector, wsThemePresenter, ws);
+ this.i18n = i18n;
this.documentContextProvider = documentContextProvider;
+ this.contextNavigator = contextNavigator;
+ this.session = session;
+ this.stateManager = stateManager;
+ this.contentServiceProvider = contentServiceProvider;
+ createActions();
+ registerDragDropTypes();
}
public String getName() {
return NAME;
}
+ @Deprecated
public void onCancel() {
documentContextProvider.get().showFolders();
}
+ @Deprecated
public void onEdit() {
documentContextProvider.get().showAdmin();
}
+ private void createActions() {
+ final ActionDescriptor<StateToken> addFolder = new ActionDescriptor<StateToken>(AccessRolDTO.Editor,
+ ActionPosition.topbarAndItemMenu, new Slot<StateToken>() {
+ public void onEvent(final StateToken parameter) {
+ contentServiceProvider.get().addFolder(session.getUserHash(),
+ session.getCurrentState().getGroup().getShortName(), new Long(parameter.getFolder()),
+ i18n.t("New folder"), new AsyncCallbackSimple<StateDTO>() {
+ public void onSuccess(final StateDTO state) {
+ contextNavigator.setState(state);
+ stateManager.setRetrievedState(state);
+ stateManager.reload();
+ contextNavigator.editItem(state.getStateToken());
+ }
+ });
+ }
+ });
+ addFolder.setTextDescription(i18n.t("New folder"));
+ addFolder.setParentMenuTitle(i18n.t("New"));
+ addFolder.setIconUrl("images/nav/folder_add.png");
+
+ final ActionDescriptor<StateToken> addDoc = new ActionDescriptor<StateToken>(AccessRolDTO.Editor,
+ ActionPosition.topbarAndItemMenu, new Slot<StateToken>() {
+ public void onEvent(final StateToken token) {
+ contentServiceProvider.get().addContent(session.getUserHash(),
+ session.getCurrentState().getGroup().getShortName(),
+ session.getCurrentState().getFolder().getId(), i18n.t("New document"),
+ new AsyncCallbackSimple<StateDTO>() {
+ public void onSuccess(final StateDTO state) {
+ contextNavigator.setState(state);
+ stateManager.setRetrievedState(state);
+ stateManager.reload();
+ contextNavigator.editItem(state.getStateToken());
+ }
+ });
+
+ }
+ });
+ addDoc.setTextDescription(i18n.t("New document"));
+ addDoc.setParentMenuTitle(i18n.t("New"));
+ addDoc.setIconUrl("images/nav/page_add.png");
+
+ final ActionDescriptor<StateToken> delContainer = new ActionDescriptor<StateToken>(AccessRolDTO.Administrator,
+ ActionPosition.itemMenu, new Slot<StateToken>() {
+ public void onEvent(final StateToken token) {
+ Site.info("Sorry, in development");
+ }
+ });
+ delContainer.setTextDescription(i18n.t("Delete"));
+ delContainer.setMustBeConfirmed(true);
+ delContainer.setConfirmationTitle(i18n.t("Please confirm"));
+ delContainer.setConfirmationText(i18n.t("You will delete it and also all its contents. Are you sure?"));
+
+ final ActionDescriptor<StateToken> delContent = new ActionDescriptor<StateToken>(AccessRolDTO.Administrator,
+ ActionPosition.itemMenu, new Slot<StateToken>() {
+ public void onEvent(final StateToken token) {
+ contentServiceProvider.get().delContent(session.getUserHash(),
+ session.getCurrentState().getGroup().getShortName(), token.getDocument(),
+ new AsyncCallbackSimple<String>() {
+ public void onSuccess(final String result) {
+ final StateToken parent = token.clone();
+ parent.setDocument(null);
+ stateManager.gotoToken(parent);
+ }
+ });
+ }
+ });
+ delContent.setTextDescription(i18n.t("Delete"));
+ delContent.setMustBeConfirmed(true);
+ delContent.setConfirmationTitle(i18n.t("Please confirm"));
+ delContent.setConfirmationText(i18n.t("Are you sure?"));
+
+ final ActionDescriptor<StateToken> go = new ActionDescriptor<StateToken>(AccessRolDTO.Viewer,
+ ActionPosition.itemMenu, new Slot<StateToken>() {
+ public void onEvent(final StateToken token) {
+ stateManager.gotoToken(token);
+ }
+ });
+ go.setTextDescription(i18n.t("Open"));
+ go.setIconUrl("images/nav/go.png");
+
+ final ActionDescriptor<StateToken> rename = new ActionDescriptor<StateToken>(AccessRolDTO.Editor,
+ ActionPosition.itemMenu, new Slot<StateToken>() {
+ public void onEvent(final StateToken stateToken) {
+ contextNavigator.editItem(stateToken);
+ }
+ });
+ rename.setTextDescription(i18n.t("Rename"));
+
+ final ActionDescriptor<StateToken> refresh = new ActionDescriptor<StateToken>(AccessRolDTO.Viewer,
+ ActionPosition.topbar, new Slot<StateToken>() {
+ public void onEvent(StateToken stateToken) {
+ stateManager.reload();
+ contextNavigator.selectItem(stateToken);
+
+ }
+ });
+ refresh.setIconUrl("images/nav/refresh.png");
+ refresh.setToolTip(i18n.t("Refresh"));
+
+ contextNavigator.addAction(TYPE_FOLDER, go);
+ contextNavigator.addAction(TYPE_FOLDER, addDoc);
+ contextNavigator.addAction(TYPE_FOLDER, addFolder);
+ contextNavigator.addAction(TYPE_FOLDER, delContainer);
+ contextNavigator.addAction(TYPE_FOLDER, rename);
+ contextNavigator.addAction(TYPE_FOLDER, refresh);
+
+ contextNavigator.addAction(TYPE_ROOT, addDoc);
+ contextNavigator.addAction(TYPE_ROOT, addFolder);
+ contextNavigator.addAction(TYPE_ROOT, refresh);
+
+ contextNavigator.addAction(TYPE_DOCUMENT, go);
+ contextNavigator.addAction(TYPE_DOCUMENT, delContent);
+ contextNavigator.addAction(TYPE_DOCUMENT, rename);
+ contextNavigator.addAction(TYPE_DOCUMENT, refresh);
+ }
+
+ private void registerDragDropTypes() {
+ contextNavigator.registerDraggableType(TYPE_DOCUMENT);
+ contextNavigator.registerDraggableType(TYPE_FOLDER);
+ contextNavigator.registerDroppableType(TYPE_ROOT);
+ contextNavigator.registerDroppableType(TYPE_FOLDER);
+ contextNavigator.registerDroppableType(TYPE_DOCUMENT);
+ }
+
}
Modified: trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPanel.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/docs/client/ctx/DocumentContextPanel.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -5,10 +5,7 @@
public class DocumentContextPanel implements DocumentContextView {
- private final WorkspaceSkeleton ws;
-
public DocumentContextPanel(final WorkspaceSkeleton ws) {
- this.ws = ws;
}
@Deprecated
Copied: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCollection.java (from rev 844, trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionCollection.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionCollection.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionCollection.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -0,0 +1,9 @@
+package org.ourproject.kune.platf.client.actions;
+
+import java.util.ArrayList;
+
+public class ActionCollection<T> extends ArrayList<ActionDescriptor<T>> {
+
+ private static final long serialVersionUID = 1L;
+
+}
Copied: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java (from rev 844, trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionDescriptor.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionDescriptor.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionDescriptor.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -0,0 +1,158 @@
+package org.ourproject.kune.platf.client.actions;
+
+import org.ourproject.kune.platf.client.dto.AccessRolDTO;
+import org.ourproject.kune.platf.client.services.ImageDescriptor;
+
+import com.allen_sauer.gwt.log.client.Log;
+import com.calclab.suco.client.signal.Slot;
+
+public class ActionDescriptor<T> {
+
+ private String iconUrl;
+ private ImageDescriptor iconDescriptor;
+ private String textDescription;
+ private String toolTip;
+
+ private boolean mustBeConfirmed;
+ private String confirmationTitle;
+ private String confirmationText;
+
+ private boolean isMenuAction;
+ private String parentMenuTitle;
+ private String parentMenuIconUrl;
+ private String parentSubMenuTitle;
+
+ private final Slot<T> onPerformCall;
+ private final Slot<T> onNotConfirmed;
+
+ private AccessRolDTO accessRol;
+
+ private ActionPosition actionPosition;
+
+ public ActionDescriptor(final AccessRolDTO accessRolDTO, final ActionPosition actionPosition,
+ final Slot<T> onPerformCall) {
+ accessRol = accessRolDTO;
+ this.actionPosition = actionPosition;
+ this.onPerformCall = onPerformCall;
+ mustBeConfirmed = false;
+ onNotConfirmed = null;
+ isMenuAction = false;
+ }
+
+ @SuppressWarnings("unchecked")
+ public void fireOnNotConfirmed(final Object parameter) {
+ if (onNotConfirmed != null) {
+ onNotConfirmed.onEvent((T) parameter);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public void fireOnPerformCall(final Object parameter) {
+ onPerformCall.onEvent((T) parameter);
+ }
+
+ public AccessRolDTO getAccessRol() {
+ return accessRol;
+ }
+
+ public ActionPosition getActionPosition() {
+ return actionPosition;
+ }
+
+ public String getConfirmationText() {
+ return confirmationText;
+ }
+
+ public String getConfirmationTitle() {
+ return confirmationTitle;
+ }
+
+ public ImageDescriptor getIconDescriptor() {
+ return iconDescriptor;
+ }
+
+ public String getIconUrl() {
+ return iconUrl;
+ }
+
+ public String getParentMenuIconUrl() {
+ return parentMenuIconUrl;
+ }
+
+ public String getParentMenuTitle() {
+ return parentMenuTitle;
+ }
+
+ public String getParentSubMenuTitle() {
+ return parentSubMenuTitle;
+ }
+
+ public String getText() {
+ return textDescription;
+ }
+
+ public String getToolTip() {
+ return toolTip;
+ }
+
+ public boolean isMenuAction() {
+ return isMenuAction;
+ }
+
+ public boolean isMustBeConfirmed() {
+ return mustBeConfirmed;
+ }
+
+ public void setAccessRol(final AccessRolDTO accessRol) {
+ this.accessRol = accessRol;
+ }
+
+ public void setActionPosition(final ActionPosition actionPosition) {
+ this.actionPosition = actionPosition;
+ }
+
+ public void setConfirmationText(final String confirmationText) {
+ this.confirmationText = confirmationText;
+ }
+
+ public void setConfirmationTitle(final String confirmationTitle) {
+ this.confirmationTitle = confirmationTitle;
+ }
+
+ public void setIconDescriptor(final ImageDescriptor iconDescriptor) {
+ this.iconDescriptor = iconDescriptor;
+ }
+
+ public void setIconUrl(final String iconUrl) {
+ this.iconUrl = iconUrl;
+ }
+
+ public void setMustBeConfirmed(final boolean mustBeConfirmed) {
+ this.mustBeConfirmed = mustBeConfirmed;
+ }
+
+ public void setParentMenuIconUrl(final String parentMenuIconUrl) {
+ this.parentMenuIconUrl = parentMenuIconUrl;
+ }
+
+ public void setParentMenuTitle(final String parentMenuTitle) {
+ isMenuAction = true;
+ this.parentMenuTitle = parentMenuTitle;
+ }
+
+ public void setParentSubMenuTitle(final String parentSubMenuTitle) {
+ if (parentMenuTitle == null) {
+ Log.warn("Please set parentMenuTitle before");
+ }
+ this.parentSubMenuTitle = parentSubMenuTitle;
+ }
+
+ public void setTextDescription(final String textDescription) {
+ this.textDescription = textDescription;
+ }
+
+ public void setToolTip(final String toolTip) {
+ this.toolTip = toolTip;
+ }
+
+}
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionManager.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -12,7 +12,7 @@
this.ws = ws;
}
- public void doAction(final ClientActionDescriptor<?> action, final Object parameter) {
+ public void doAction(final ActionDescriptor<?> action, final Object parameter) {
if (action.isMustBeConfirmed()) {
ws.askConfirmation(action.getConfirmationTitle(), action.getConfirmationText(), new Slot0() {
public void onEvent() {
Modified: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionPosition.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionPosition.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ActionPosition.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -1,5 +1,5 @@
package org.ourproject.kune.platf.client.actions;
public enum ActionPosition {
- topbar, bottombar, itemMenu, topBarAndItemMenu, bootombarAndItemMenu
+ topbar, bottombar, itemMenu, topbarAndItemMenu, bootombarAndItemMenu
}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionCollection.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionCollection.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionCollection.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -1,9 +0,0 @@
-package org.ourproject.kune.platf.client.actions;
-
-import java.util.ArrayList;
-
-public class ClientActionCollection<T> extends ArrayList<ClientActionDescriptor<T>> {
-
- private static final long serialVersionUID = 1L;
-
-}
Deleted: trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionDescriptor.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionDescriptor.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/platf/client/actions/ClientActionDescriptor.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -1,158 +0,0 @@
-package org.ourproject.kune.platf.client.actions;
-
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
-import org.ourproject.kune.platf.client.services.ImageDescriptor;
-
-import com.allen_sauer.gwt.log.client.Log;
-import com.calclab.suco.client.signal.Slot;
-
-public class ClientActionDescriptor<T> {
-
- private String iconUrl;
- private ImageDescriptor iconDescriptor;
- private String textDescription;
- private String toolTip;
-
- private boolean mustBeConfirmed;
- private String confirmationTitle;
- private String confirmationText;
-
- private boolean isMenuAction;
- private String parentMenuTitle;
- private String parentMenuIconUrl;
- private String parentSubMenuTitle;
-
- private final Slot<T> onPerformCall;
- private final Slot<T> onNotConfirmed;
-
- private AccessRolDTO accessRol;
-
- private ActionPosition actionPosition;
-
- public ClientActionDescriptor(final AccessRolDTO accessRolDTO, final ActionPosition actionPosition,
- final Slot<T> onPerformCall) {
- accessRol = accessRolDTO;
- this.actionPosition = actionPosition;
- this.onPerformCall = onPerformCall;
- mustBeConfirmed = false;
- onNotConfirmed = null;
- isMenuAction = false;
- }
-
- @SuppressWarnings("unchecked")
- public void fireOnNotConfirmed(final Object parameter) {
- if (onNotConfirmed != null) {
- onNotConfirmed.onEvent((T) parameter);
- }
- }
-
- @SuppressWarnings("unchecked")
- public void fireOnPerformCall(final Object parameter) {
- onPerformCall.onEvent((T) parameter);
- }
-
- public AccessRolDTO getAccessRol() {
- return accessRol;
- }
-
- public ActionPosition getActionPosition() {
- return actionPosition;
- }
-
- public String getConfirmationText() {
- return confirmationText;
- }
-
- public String getConfirmationTitle() {
- return confirmationTitle;
- }
-
- public ImageDescriptor getIconDescriptor() {
- return iconDescriptor;
- }
-
- public String getIconUrl() {
- return iconUrl;
- }
-
- public String getParentMenuIconUrl() {
- return parentMenuIconUrl;
- }
-
- public String getParentMenuTitle() {
- return parentMenuTitle;
- }
-
- public String getParentSubMenuTitle() {
- return parentSubMenuTitle;
- }
-
- public String getText() {
- return textDescription;
- }
-
- public String getToolTip() {
- return toolTip;
- }
-
- public boolean isMenuAction() {
- return isMenuAction;
- }
-
- public boolean isMustBeConfirmed() {
- return mustBeConfirmed;
- }
-
- public void setAccessRol(final AccessRolDTO accessRol) {
- this.accessRol = accessRol;
- }
-
- public void setConfirmationText(final String confirmationText) {
- this.confirmationText = confirmationText;
- }
-
- public void setConfirmationTitle(final String confirmationTitle) {
- this.confirmationTitle = confirmationTitle;
- }
-
- public void setIconDescriptor(final ImageDescriptor iconDescriptor) {
- this.iconDescriptor = iconDescriptor;
- }
-
- public void setIconUrl(final String iconUrl) {
- this.iconUrl = iconUrl;
- }
-
- public void setMustBeConfirmed(final boolean mustBeConfirmed) {
- this.mustBeConfirmed = mustBeConfirmed;
- }
-
- public void setActionPosition(final ActionPosition actionPosition) {
- this.actionPosition = actionPosition;
- }
-
- public void setParentMenuIconUrl(final String parentMenuIconUrl) {
- this.parentMenuIconUrl = parentMenuIconUrl;
- }
-
- public void setParentMenuTitle(final String parentMenuTitle) {
- isMenuAction = true;
- this.parentMenuTitle = parentMenuTitle;
- }
-
- public void setParentSubMenuTitle(final String parentSubMenuTitle) {
- if (parentMenuTitle == null) {
- Log.warn("Please set parentMenuTitle before");
- }
- this.parentSubMenuTitle = parentSubMenuTitle;
- }
-
- public void setTextDescription(final String textDescription) {
- this.textDescription = textDescription;
- }
-
- public void setToolTip(final String toolTip) {
- this.toolTip = toolTip;
- }
-
-}
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/folder-go-up.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/folder-go-up.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/folderpathmenu.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/folderpathmenu.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/blog.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/blog.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/blog.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/blog.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/film.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/film.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/film.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/film.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/folder_add.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/folder_add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/folder_add.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/folder_add.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/gallery.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/gallery.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/gallery.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/gallery.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/go.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/go.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/go.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/go.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_add.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_add.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_add.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_add.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_pdf.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_pdf.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_pdf.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_pdf.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_text.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_text.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_text.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_text.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_zip.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_zip.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_zip.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/page_zip.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/picture.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/picture.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/picture.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/picture.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/post.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/post.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/post.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/post.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/refresh.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/refresh.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/upload.gif
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/upload.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/upload.png
===================================================================
(Binary files differ)
Property changes on: trunk/src/main/java/org/ourproject/kune/platf/public/images/nav/upload.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigationItem.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigationItem.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigationItem.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -1,68 +0,0 @@
-package org.ourproject.kune.workspace.client.ui.ctx.items;
-
-import org.ourproject.kune.platf.client.actions.ClientActionCollection;
-import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
-import org.ourproject.kune.platf.client.dto.StateToken;
-
-public class ContextNavigationItem {
- private final String id;
- private final String parentId;
- private final String iconUrl;
- private final String text;
- private final ContentStatusDTO contentStatusDTO;
- private final StateToken token;
- private final ClientActionCollection<StateToken> actionCollection;
- private final boolean allowDrag;
- private final boolean allowDrop;
-
- public ContextNavigationItem(final String id, final String parentId, final String iconUrl, final String text,
- final ContentStatusDTO contentStatusDTO, final StateToken token, final boolean allowDrag,
- final boolean allowDrop, final ClientActionCollection<StateToken> actionCollection) {
- this.id = id;
- this.parentId = parentId;
- this.iconUrl = iconUrl;
- this.text = text;
- this.contentStatusDTO = contentStatusDTO;
- this.token = token;
- this.allowDrag = allowDrag;
- this.allowDrop = allowDrop;
- this.actionCollection = actionCollection;
- }
-
- public ClientActionCollection<StateToken> getActionCollection() {
- return actionCollection;
- }
-
- public ContentStatusDTO getContentStatus() {
- return contentStatusDTO;
- }
-
- public String getIconUrl() {
- return iconUrl;
- }
-
- public String getId() {
- return id;
- }
-
- public String getParentId() {
- return parentId;
- }
-
- public StateToken getStateToken() {
- return token;
- }
-
- public String getText() {
- return text;
- }
-
- public boolean isDraggable() {
- return allowDrag;
- }
-
- public boolean isDroppable() {
- return allowDrop;
- }
-
-}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigator.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigator.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigator.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -21,18 +21,26 @@
package org.ourproject.kune.workspace.client.ui.ctx.items;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.actions.ClientActionDescriptor;
+import org.ourproject.kune.platf.client.actions.ActionDescriptor;
import org.ourproject.kune.platf.client.dto.StateDTO;
import org.ourproject.kune.platf.client.dto.StateToken;
public interface ContextNavigator {
- public View getView();
+ void addAction(String contentTypeId, ActionDescriptor<StateToken> action);
- public void setState(StateDTO state);
+ void editItem(StateToken stateToken);
- void addAction(String contentTypeId, ClientActionDescriptor<StateToken> action);
+ View getView();
- void removeAction(String contentTypeId, ClientActionDescriptor<StateToken> action);
+ void registerDraggableType(String typeId);
+ void registerDroppableType(String typeId);
+
+ void removeAction(String contentTypeId, ActionDescriptor<StateToken> action);
+
+ void selectItem(StateToken stateToken);
+
+ void setState(StateDTO state);
+
}
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorImages.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorImages.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorImages.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -1,88 +0,0 @@
-/*
- *
- * Copyright (C) 2007-2008 The kune development team (see CREDITS for details)
- * This file is part of kune.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-package org.ourproject.kune.workspace.client.ui.ctx.items;
-
-import com.google.gwt.core.client.GWT;
-import com.google.gwt.user.client.ui.AbstractImagePrototype;
-import com.google.gwt.user.client.ui.ImageBundle;
-
-/**
- *
- * http://code.google.com/p/google-web-toolkit/wiki/ImageBundleDesign
- *
- */
-public interface ContextNavigatorImages extends ImageBundle {
-
- public static class App {
- private static ContextNavigatorImages ourInstance = null;
-
- @Deprecated
- public static synchronized ContextNavigatorImages getInstance() {
- if (ourInstance == null) {
- ourInstance = (ContextNavigatorImages) GWT.create(ContextNavigatorImages.class);
- }
- return ourInstance;
- }
- }
-
- @Resource("bullet_arrow_right.png")
- AbstractImagePrototype bulletArrowRight();
-
- @Resource("chat-blue.png")
- AbstractImagePrototype chatBlue();
-
- @Resource("chat-green.png")
- AbstractImagePrototype chatGreen();
-
- @Resource("folder.png")
- AbstractImagePrototype folder();
-
- @Resource("folder_add.png")
- AbstractImagePrototype folderAdd();
-
- @Resource("folder-go-up.png")
- AbstractImagePrototype folderGoUp();
-
- @Resource("folder-go-up-light.png")
- AbstractImagePrototype folderGoUpLight();
-
- @Resource("folderpathmenu.png")
- AbstractImagePrototype folderpathmenu();
-
- @Resource("go-up.png")
- AbstractImagePrototype goUp();
-
- @Resource("go-up-light.png")
- AbstractImagePrototype goUpLight();
-
- @Resource("page.png")
- AbstractImagePrototype page();
-
- @Resource("page_add.png")
- AbstractImagePrototype pageAdd();
-
- @Resource("page_white.png")
- AbstractImagePrototype pageWhite();
-
- @Resource("page_white_add.png")
- AbstractImagePrototype pageWhiteAdd();
-
-}
Copied: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorItem.java (from rev 844, trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigationItem.java)
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigationItem.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorItem.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -0,0 +1,68 @@
+package org.ourproject.kune.workspace.client.ui.ctx.items;
+
+import org.ourproject.kune.platf.client.actions.ActionCollection;
+import org.ourproject.kune.platf.client.dto.ContentStatusDTO;
+import org.ourproject.kune.platf.client.dto.StateToken;
+
+public class ContextNavigatorItem {
+ private final String id;
+ private final String parentId;
+ private final String iconUrl;
+ private final String text;
+ private final ContentStatusDTO contentStatusDTO;
+ private final StateToken token;
+ private final ActionCollection<StateToken> actionCollection;
+ private final boolean allowDrag;
+ private final boolean allowDrop;
+
+ public ContextNavigatorItem(final String id, final String parentId, final String iconUrl, final String text,
+ final ContentStatusDTO contentStatusDTO, final StateToken token, final boolean allowDrag,
+ final boolean allowDrop, final ActionCollection<StateToken> actionCollection) {
+ this.id = id;
+ this.parentId = parentId;
+ this.iconUrl = iconUrl;
+ this.text = text;
+ this.contentStatusDTO = contentStatusDTO;
+ this.token = token;
+ this.allowDrag = allowDrag;
+ this.allowDrop = allowDrop;
+ this.actionCollection = actionCollection;
+ }
+
+ public ActionCollection<StateToken> getActionCollection() {
+ return actionCollection;
+ }
+
+ public ContentStatusDTO getContentStatus() {
+ return contentStatusDTO;
+ }
+
+ public String getIconUrl() {
+ return iconUrl;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public String getParentId() {
+ return parentId;
+ }
+
+ public StateToken getStateToken() {
+ return token;
+ }
+
+ public String getText() {
+ return text;
+ }
+
+ public boolean isDraggable() {
+ return allowDrag;
+ }
+
+ public boolean isDroppable() {
+ return allowDrop;
+ }
+
+}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorPanel.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorPanel.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorPanel.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -22,9 +22,9 @@
import java.util.HashMap;
+import org.ourproject.kune.platf.client.actions.ActionCollection;
+import org.ourproject.kune.platf.client.actions.ActionDescriptor;
import org.ourproject.kune.platf.client.actions.ActionManager;
-import org.ourproject.kune.platf.client.actions.ClientActionCollection;
-import org.ourproject.kune.platf.client.actions.ClientActionDescriptor;
import org.ourproject.kune.platf.client.dto.StateToken;
import org.ourproject.kune.platf.client.services.I18nTranslationService;
import org.ourproject.kune.platf.client.state.StateManager;
@@ -41,7 +41,6 @@
import com.gwtext.client.widgets.Editor;
import com.gwtext.client.widgets.Panel;
import com.gwtext.client.widgets.ToolbarButton;
-import com.gwtext.client.widgets.ToolbarMenuButton;
import com.gwtext.client.widgets.event.ButtonListenerAdapter;
import com.gwtext.client.widgets.event.EditorListenerAdapter;
import com.gwtext.client.widgets.form.TextField;
@@ -77,11 +76,15 @@
toolbarMenus = new HashMap<String, Menu>();
}
- public void addItem(final ContextNavigationItem item) {
+ public void addItem(final ContextNavigatorItem item) {
final String nodeId = item.getId();
if (treePanel.getNodeById(nodeId) == null) {
final TreeNode child = new TreeNode(item.getText());
child.setId(nodeId);
+ final String icon = item.getIconUrl();
+ if (icon != null) {
+ child.setIcon(icon);
+ }
child.setHref("#" + item.getStateToken().toString());
child.setAllowDrag(item.isDraggable());
child.setAllowDrop(item.isDroppable());
@@ -107,6 +110,8 @@
stateManager.gotoToken(node.getAttribute("href").substring(1));
}
});
+ } else {
+ child.setLeaf(true);
}
parent.appendChild(child);
} else {
@@ -137,15 +142,18 @@
final TreeNode item = getNode(id);
if (item != null) {
item.select();
- // item.ensureVisible();
+ item.ensureVisible();
+ if (item.getChildNodes().length > 0) {
+ item.expand();
+ }
} else {
Log.error("Error building file tree, current token not found");
}
}
- public void setBottomActions(final StateToken stateToken, final ClientActionCollection<StateToken> operations) {
+ public void setBottomActions(final StateToken stateToken, final ActionCollection<StateToken> actions) {
final Toolbar toolBar = ws.getEntityWorkspace().getContextBottomBar();
- setToolbarOperations(toolBar, stateToken, operations);
+ setToolbarActions(toolBar, stateToken, actions);
}
public void setRootItem(final String id, final String text, final StateToken stateToken) {
@@ -154,25 +162,24 @@
}
}
- public void setTopActions(final StateToken stateToken, final ClientActionCollection<StateToken> operations) {
+ public void setTopActions(final StateToken stateToken, final ActionCollection<StateToken> actions) {
final Toolbar toolBar = ws.getEntityWorkspace().getContextTopBar();
- setToolbarOperations(toolBar, stateToken, operations);
+ setToolbarActions(toolBar, stateToken, actions);
}
- private Menu createItemMenu(final ClientActionCollection<StateToken> operationCollection,
- final StateToken stateToken) {
- if (operationCollection != null) {
+ private Menu createItemMenu(final ActionCollection<StateToken> actionCollection, final StateToken stateToken) {
+ if (actionCollection != null) {
final Menu menu = new Menu();
// Remove if when retrieved rights of siblings
- for (final ClientActionDescriptor<StateToken> operation : operationCollection) {
- final Item item = new Item(operation.getText());
- item.setIcon(operation.getIconUrl());
+ for (final ActionDescriptor<StateToken> action : actionCollection) {
+ final Item item = new Item(action.getText());
+ item.setIcon(action.getIconUrl());
menu.addItem(item);
item.addListener(new BaseItemListenerAdapter() {
public void onClick(final BaseItem item, final EventObject e) {
DeferredCommand.addCommand(new Command() {
public void execute() {
- actionManagerProvider.get().doAction(operation, stateToken);
+ actionManagerProvider.get().doAction(action, stateToken);
}
});
}
@@ -183,15 +190,20 @@
return null;
}
- private Menu createToolbarMenu(final String iconUrl, final String menuTitle) {
- Menu menu;
- menu = new Menu();
- final ToolbarMenuButton toolbarMenu = new ToolbarMenuButton(menuTitle);
+ private Menu createToolbarMenu(final Toolbar bar, final String iconUrl, final String menuTitle) {
+ final Menu menu = new Menu();
+ final ToolbarButton toolbarMenu = new ToolbarButton(menuTitle);
if (iconUrl != null) {
toolbarMenu.setIcon(iconUrl);
}
- toolbarMenu.setMenu(menu);
+ toolbarMenu.addListener(new ButtonListenerAdapter() {
+ @Override
+ public void onClick(final Button button, final EventObject e) {
+ menu.showAt(e.getXY());
+ }
+ });
toolbarMenus.put(menuTitle, menu);
+ bar.add(toolbarMenu);
return menu;
}
@@ -240,8 +252,8 @@
ws.getEntityWorkspace().setContext(panel);
}
- private void doOperation(final ClientActionDescriptor<StateToken> operation, final StateToken stateToken) {
- actionManagerProvider.get().doAction(operation, stateToken);
+ private void doAction(final ActionDescriptor<StateToken> action, final StateToken stateToken) {
+ actionManagerProvider.get().doAction(action, stateToken);
}
private TreeNode getNode(final String id) {
@@ -252,33 +264,38 @@
return node;
}
- private void setToolbarOperations(final Toolbar toolBar, final StateToken stateToken,
- final ClientActionCollection<StateToken> operations) {
+ private void setToolbarActions(final Toolbar toolBar, final StateToken stateToken,
+ final ActionCollection<StateToken> actions) {
toolBar.removeAll();
- for (final ClientActionDescriptor<StateToken> operation : operations) {
- Log.info("Procesing operation: " + operation.getText());
- if (!operation.isMenuAction()) {
- final ToolbarButton button = new ToolbarButton(operation.getText(), new ButtonListenerAdapter() {
+ for (final ActionDescriptor<StateToken> action : actions) {
+ Log.info("Procesing action: " + action.getText());
+ if (!action.isMenuAction()) {
+ final ToolbarButton button = new ToolbarButton();
+ final String text = action.getText();
+ if (text != null) {
+ button.setText(text);
+ }
+ button.addListener(new ButtonListenerAdapter() {
@Override
public void onClick(final Button button, final EventObject e) {
- doOperation(operation, stateToken);
+ doAction(action, stateToken);
}
});
- button.setIcon(operation.getIconUrl());
- button.setTooltip(operation.getToolTip());
+ button.setIcon(action.getIconUrl());
+ button.setTooltip(action.getToolTip());
toolBar.add(button);
} else {
- // Menu operation
- final Item item = new Item(operation.getText(), new BaseItemListenerAdapter() {
+ // Menu action
+ final Item item = new Item(action.getText(), new BaseItemListenerAdapter() {
@Override
public void onClick(BaseItem item, EventObject e) {
- doOperation(operation, stateToken);
+ doAction(action, stateToken);
}
});
- item.setIcon(operation.getIconUrl());
+ item.setIcon(action.getIconUrl());
- final String menuTitle = operation.getParentMenuTitle();
- final String menuSubTitle = operation.getParentSubMenuTitle();
+ final String menuTitle = action.getParentMenuTitle();
+ final String menuSubTitle = action.getParentSubMenuTitle();
final String subMenuKey = menuTitle + "-" + menuSubTitle;
Menu menu = toolbarMenus.get(menuTitle);
Menu subMenu = toolbarMenus.get(subMenuKey);
@@ -287,8 +304,7 @@
subMenu = new Menu();
final MenuItem subMenuItem = new MenuItem(menuSubTitle, subMenu);
if (menu == null) {
- menu = createToolbarMenu(operation.getParentMenuIconUrl(), menuTitle);
- toolBar.add(menu);
+ menu = createToolbarMenu(toolBar, action.getParentMenuIconUrl(), menuTitle);
}
menu.addItem(subMenuItem);
toolBar.doLayoutIfNeeded();
@@ -296,10 +312,9 @@
}
subMenu.addItem(item);
} else {
- // Menu operation without submenu
+ // Menu action without submenu
if (menu == null) {
- menu = createToolbarMenu(operation.getParentMenuIconUrl(), menuTitle);
- toolBar.add(menu);
+ menu = createToolbarMenu(toolBar, action.getParentMenuIconUrl(), menuTitle);
}
menu.addItem(item);
toolBar.doLayoutIfNeeded();
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorPresenter.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorPresenter.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorPresenter.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -23,13 +23,10 @@
import java.util.ArrayList;
import java.util.HashMap;
-import org.ourproject.kune.docs.client.DocumentClientTool;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.actions.ActionPosition;
-import org.ourproject.kune.platf.client.actions.ClientActionCollection;
-import org.ourproject.kune.platf.client.actions.ClientActionDescriptor;
+import org.ourproject.kune.platf.client.actions.ActionCollection;
+import org.ourproject.kune.platf.client.actions.ActionDescriptor;
import org.ourproject.kune.platf.client.dto.AccessRightsDTO;
-import org.ourproject.kune.platf.client.dto.AccessRolDTO;
import org.ourproject.kune.platf.client.dto.ContainerDTO;
import org.ourproject.kune.platf.client.dto.ContainerSimpleDTO;
import org.ourproject.kune.platf.client.dto.ContentDTO;
@@ -56,7 +53,7 @@
private final Session session;
private final Provider<ContentServiceAsync> contentServiceProvider;
private final I18nUITranslationService i18n;
- private final HashMap<String, ClientActionCollection<StateToken>> actions;
+ private final HashMap<String, ActionCollection<StateToken>> actions;
private final ArrayList<String> draggables;
private final ArrayList<String> droppables;
@@ -66,22 +63,24 @@
this.session = session;
this.contentServiceProvider = contentServiceProvider;
this.i18n = i18n;
- actions = new HashMap<String, ClientActionCollection<StateToken>>();
+ actions = new HashMap<String, ActionCollection<StateToken>>();
draggables = new ArrayList<String>();
droppables = new ArrayList<String>();
- createActions();
- registerDragDropTypes();
}
- public void addAction(final String contentTypeId, final ClientActionDescriptor<StateToken> action) {
- ClientActionCollection<StateToken> actionColl = actions.get(contentTypeId);
+ public void addAction(final String contentTypeId, final ActionDescriptor<StateToken> action) {
+ ActionCollection<StateToken> actionColl = actions.get(contentTypeId);
if (actionColl == null) {
- actionColl = new ClientActionCollection<StateToken>();
+ actionColl = new ActionCollection<StateToken>();
actions.put(contentTypeId, actionColl);
}
actionColl.add(action);
}
+ public void editItem(final StateToken stateToken) {
+ view.editItem(genId(stateToken));
+ }
+
public View getView() {
return view;
}
@@ -134,10 +133,14 @@
droppables.add(type);
}
- public void removeAction(final String contentTypeId, final ClientActionDescriptor<StateToken> action) {
+ public void removeAction(final String contentTypeId, final ActionDescriptor<StateToken> action) {
actions.get(contentTypeId).remove(action);
}
+ public void selectItem(final StateToken stateToken) {
+ view.selectItem(genId(stateToken));
+ }
+
public void setState(final StateDTO state) {
final StateToken stateToken = state.getStateToken().clone();
final String treeId = genId(stateToken);
@@ -164,12 +167,12 @@
// here check deletion mark
- final ClientActionCollection<StateToken> topActions = new ClientActionCollection<StateToken>();
- final ClientActionCollection<StateToken> itemActions = new ClientActionCollection<StateToken>();
- final ClientActionCollection<StateToken> bottomActions = new ClientActionCollection<StateToken>();
+ final ActionCollection<StateToken> topActions = new ActionCollection<StateToken>();
+ final ActionCollection<StateToken> itemActions = new ActionCollection<StateToken>();
+ final ActionCollection<StateToken> bottomActions = new ActionCollection<StateToken>();
boolean add = false;
- for (final ClientActionDescriptor<StateToken> action : actions.get(state.getTypeId())) {
+ for (final ActionDescriptor<StateToken> action : actions.get(state.getTypeId())) {
switch (action.getAccessRol()) {
case Administrator:
add = rights.isAdministrable();
@@ -183,7 +186,7 @@
}
if (add) {
switch (action.getActionPosition()) {
- case topBarAndItemMenu:
+ case topbarAndItemMenu:
itemActions.add(action);
case topbar:
topActions.add(action);
@@ -203,20 +206,20 @@
view.setTopActions(stateToken, topActions);
view.setBottomActions(stateToken, bottomActions);
- final ContextNavigationItem item = new ContextNavigationItem(treeId, containerTreeId, "", state.getTitle(),
- visible ? ContentStatusDTO.publicVisible : ContentStatusDTO.nonPublicVisible, stateToken, isDraggable(
- state.getTypeId(), rights.isAdministrable()), isDroppable(state.getTypeId(), rights
- .isAdministrable()), itemActions);
+ final ContextNavigatorItem item = new ContextNavigatorItem(treeId, containerTreeId, "images/nav/page.png",
+ state.getTitle(), visible ? ContentStatusDTO.publicVisible : ContentStatusDTO.nonPublicVisible,
+ stateToken, isDraggable(state.getTypeId(), rights.isAdministrable()), isDroppable(state.getTypeId(),
+ rights.isAdministrable()), itemActions);
view.addItem(item);
for (final ContentDTO content : container.getContents()) {
final StateToken siblingToken = stateToken.clone().setDocument(content.getId().toString());
final StateToken siblingParentToken = stateToken.clone().setDocument(null);
// TODO: rights not correct
- final ContextNavigationItem sibling = new ContextNavigationItem(genId(siblingToken),
- genId(siblingParentToken), "", content.getTitle(), ContentStatusDTO.publicVisible, siblingToken,
- isDraggable(content.getTypeId(), rights.isAdministrable()), isDroppable(content.getTypeId(), rights
- .isAdministrable()), null);
+ final ContextNavigatorItem sibling = new ContextNavigatorItem(genId(siblingToken),
+ genId(siblingParentToken), "images/nav/page.png", content.getTitle(),
+ ContentStatusDTO.publicVisible, siblingToken, isDraggable(content.getTypeId(), rights
+ .isAdministrable()), isDroppable(content.getTypeId(), rights.isAdministrable()), null);
view.addItem(sibling);
}
@@ -227,7 +230,7 @@
final StateToken siblingParentToken = stateToken.clone().setDocument(null).setFolder(
siblingFolder.getParentFolderId().toString());
// TODO: rights not correct
- final ContextNavigationItem sibling = new ContextNavigationItem(genId(siblingToken),
+ final ContextNavigatorItem sibling = new ContextNavigatorItem(genId(siblingToken),
genId(siblingParentToken), "", siblingFolder.getName(), ContentStatusDTO.publicVisible,
siblingToken, isDraggable(container.getTypeId(), rights.isAdministrable()), isDroppable(container
.getTypeId(), rights.isAdministrable()), null);
@@ -236,144 +239,6 @@
view.selectItem(treeId);
}
- private void createActions() {
- final ClientActionDescriptor<StateToken> addFolder = new ClientActionDescriptor<StateToken>(
- AccessRolDTO.Editor, ActionPosition.topBarAndItemMenu, new Slot<StateToken>() {
- public void onEvent(final StateToken parameter) {
- contentServiceProvider.get().addFolder(session.getUserHash(),
- session.getCurrentState().getGroup().getShortName(), new Long(parameter.getFolder()),
- i18n.t("New folder"), new AsyncCallbackSimple<StateDTO>() {
- public void onSuccess(final StateDTO state) {
- setState(state);
- stateManager.setRetrievedState(state);
- stateManager.reload();
- view.editItem(genId(state.getStateToken()));
- }
- });
- }
- });
- addFolder.setTextDescription(i18n.t("New folder"));
- addFolder.setParentMenuTitle(i18n.t("New"));
-
- final ClientActionDescriptor<StateToken> addDoc = new ClientActionDescriptor<StateToken>(AccessRolDTO.Editor,
- ActionPosition.topBarAndItemMenu, new Slot<StateToken>() {
- public void onEvent(final StateToken token) {
- contentServiceProvider.get().addContent(session.getUserHash(),
- session.getCurrentState().getGroup().getShortName(),
- session.getCurrentState().getFolder().getId(), i18n.t("New document"),
- new AsyncCallbackSimple<StateDTO>() {
- public void onSuccess(final StateDTO state) {
- setState(state);
- stateManager.setRetrievedState(state);
- stateManager.reload();
- view.editItem(genId(state.getStateToken()));
- }
- });
-
- }
- });
- addDoc.setTextDescription(i18n.t("New document"));
- addDoc.setParentMenuTitle(i18n.t("New"));
-
- final ClientActionDescriptor<StateToken> delContainer = new ClientActionDescriptor<StateToken>(
- AccessRolDTO.Administrator, ActionPosition.itemMenu, new Slot<StateToken>() {
- public void onEvent(final StateToken token) {
- Site.info("Sorry, in development");
- }
- });
- delContainer.setTextDescription(i18n.t("Delete"));
- delContainer.setMustBeConfirmed(true);
- delContainer.setConfirmationTitle(i18n.t("Please confirm"));
- delContainer.setConfirmationText(i18n.t("You will delete it and also all its contents. Are you sure?"));
-
- final ClientActionDescriptor<StateToken> delContent = new ClientActionDescriptor<StateToken>(
- AccessRolDTO.Administrator, ActionPosition.itemMenu, new Slot<StateToken>() {
- public void onEvent(final StateToken token) {
- contentServiceProvider.get().delContent(session.getUserHash(),
- session.getCurrentState().getGroup().getShortName(), token.getDocument(),
- new AsyncCallbackSimple<String>() {
- public void onSuccess(final String result) {
- final StateToken parent = token.clone();
- parent.setDocument(null);
- stateManager.gotoToken(parent);
- }
- });
- }
- });
- delContent.setTextDescription(i18n.t("Delete"));
- delContent.setMustBeConfirmed(true);
- delContent.setConfirmationTitle(i18n.t("Please confirm"));
- delContent.setConfirmationText(i18n.t("Are you sure?"));
-
- final ClientActionDescriptor<StateToken> go = new ClientActionDescriptor<StateToken>(AccessRolDTO.Viewer,
- ActionPosition.itemMenu, new Slot<StateToken>() {
- public void onEvent(final StateToken token) {
- stateManager.gotoToken(token);
- }
- });
- go.setTextDescription(i18n.t("Open"));
-
- final ClientActionDescriptor<StateToken> rename = new ClientActionDescriptor<StateToken>(AccessRolDTO.Editor,
- ActionPosition.itemMenu, new Slot<StateToken>() {
- public void onEvent(final StateToken stateToken) {
- view.editItem(genId(stateToken));
- }
- });
- rename.setTextDescription(i18n.t("Rename"));
-
- addAction(DocumentClientTool.TYPE_FOLDER, go);
- addAction(DocumentClientTool.TYPE_FOLDER, addDoc);
- addAction(DocumentClientTool.TYPE_FOLDER, addFolder);
- addAction(DocumentClientTool.TYPE_FOLDER, delContainer);
- addAction(DocumentClientTool.TYPE_FOLDER, rename);
- addAction(DocumentClientTool.TYPE_ROOT, addDoc);
- addAction(DocumentClientTool.TYPE_ROOT, addFolder);
- addAction(DocumentClientTool.TYPE_DOCUMENT, go);
- addAction(DocumentClientTool.TYPE_DOCUMENT, delContent);
- addAction(DocumentClientTool.TYPE_DOCUMENT, rename);
- }
-
- // public void showContainer(final StateToken state, final ContainerDTO
- // container, final AccessRightsDTO rights) {
- // final StateToken stateLoc = state.clone();
- //
- // createTreePath(stateLoc, container.getAbsolutePath());
- //
- // stateLoc.setDocument(null);
- // view.clear();
- // final List<ContainerDTO> folders = container.getChilds();
- // for (int index = 0; index < folders.size(); index++) {
- // final ContainerDTO folder = folders.get(index);
- // stateLoc.setFolder(folder.getId().toString());
- // // view.addItem(folder.getName(), folder.getTypeId(),
- // // stateLoc.getEncoded(), rights.isEditable());
- // final String parentFolderId = folder.getParentFolderId() == null ? null :
- // folder.getParentFolderId()
- // .toString();
- // final String token = StateToken.encode(stateLoc.getGroup(),
- // stateLoc.getTool(), folder.getId().toString(),
- // null);
- // view.addItem(folder.getId(), folder.getName(), parentFolderId, "#" +
- // token, false);
- // }
- //
- // stateLoc.setFolder(container.getId().toString());
- // final List<ContentDTO> contents = container.getContents();
- // for (int index = 0; index < contents.size(); index++) {
- // final ContentDTO dto = contents.get(index);
- // stateLoc.setDocument(dto.getId().toString());
- // // view.addItem(dto.getTitle(), dto.getTypeId(),
- // // stateLoc.getEncoded(), rights.isEditable());
- // final String token = StateToken.encode(stateLoc.getGroup(),
- // stateLoc.getTool(), stateLoc.getFolder(), dto
- // .getId().toString());
- // view.addItem(dto.getId(), dto.getTitle(), stateLoc.getFolder(), "#" +
- // token, true);
- // }
- // // view.selectItem(state.isComplete() ? state.getDocument() :
- // // state.getFolder(), state.isComplete());
- // }
-
private void createTreePath(final StateToken state, final ContainerSimpleDTO[] absolutePath) {
for (int i = 0; i < absolutePath.length; i++) {
final ContainerSimpleDTO folder = absolutePath[i];
@@ -383,7 +248,7 @@
final StateToken parentStateToken = state.clone().setDocument(null).setFolder(parentFolderId);
if (folder.getParentFolderId() != null) {
// Bad rights, draggable/droppable
- final ContextNavigationItem parent = new ContextNavigationItem(genId(folderStateToken),
+ final ContextNavigatorItem parent = new ContextNavigatorItem(genId(folderStateToken),
genId(parentStateToken), "", folder.getName(), ContentStatusDTO.publicVisible,
folderStateToken, false, true, null);
view.addItem(parent);
@@ -406,12 +271,4 @@
return administrable && droppables.contains(typeId);
}
- @Deprecated
- private void registerDragDropTypes() {
- draggables.add(DocumentClientTool.TYPE_DOCUMENT);
- draggables.add(DocumentClientTool.TYPE_FOLDER);
- droppables.add(DocumentClientTool.TYPE_ROOT);
- droppables.add(DocumentClientTool.TYPE_FOLDER);
- droppables.add(DocumentClientTool.TYPE_DOCUMENT);
- }
}
Modified: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorView.java
===================================================================
--- trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorView.java 2008-09-07 14:07:16 UTC (rev 844)
+++ trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/ContextNavigatorView.java 2008-09-08 00:11:31 UTC (rev 845)
@@ -21,12 +21,12 @@
package org.ourproject.kune.workspace.client.ui.ctx.items;
import org.ourproject.kune.platf.client.View;
-import org.ourproject.kune.platf.client.actions.ClientActionCollection;
+import org.ourproject.kune.platf.client.actions.ActionCollection;
import org.ourproject.kune.platf.client.dto.StateToken;
public interface ContextNavigatorView extends View {
- void addItem(ContextNavigationItem contextNavigationItem);
+ void addItem(ContextNavigatorItem contextNavigatorItem);
void clear();
@@ -34,10 +34,10 @@
void selectItem(String id);
- void setBottomActions(StateToken stateToken, ClientActionCollection<StateToken> actions);
+ void setBottomActions(StateToken stateToken, ActionCollection<StateToken> actions);
void setRootItem(String id, String text, StateToken stateToken);
- void setTopActions(StateToken stateToken, ClientActionCollection<StateToken> actions);
+ void setTopActions(StateToken stateToken, ActionCollection<StateToken> actions);
}
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/bullet_arrow_right.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/chat-blue.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/chat-green.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folder-go-up-light.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folder-go-up.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folder.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folder_add.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/folderpathmenu.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/go-up-light.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/go-up.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/page.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/page_add.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/page_white.png
===================================================================
(Binary files differ)
Deleted: trunk/src/main/java/org/ourproject/kune/workspace/client/ui/ctx/items/page_white_add.png
===================================================================
(Binary files differ)
More information about the kune-commits
mailing list