Author: vjrj_ Date: 2011-08-10 19:09:53 +0200 (Wed, 10 Aug 2011) New Revision: 1487 Added: trunk/img/webtemplate/confirmation.png trunk/src/main/java/cc/kune/common/client/resources/cross.png trunk/src/main/java/cc/kune/common/client/resources/kune-close-grey.png trunk/src/main/java/cc/kune/common/client/resources/kune-close-greylight.png trunk/src/main/java/cc/kune/common/client/resources/kune-close.png trunk/src/main/java/cc/kune/core/client/registry/IdGenerator.java trunk/src/main/java/cc/kune/core/client/registry/ShowDeletedRegistry.java trunk/src/main/java/cc/kune/core/client/resources/nav/taskdone.png trunk/src/main/java/cc/kune/core/client/resources/nav/taskfolder.png trunk/src/main/java/cc/kune/core/client/resources/nav/taskfolderadd.png trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderMenuItem.java trunk/src/test/java/cc/kune/core/client/registry/ trunk/src/test/java/cc/kune/core/client/registry/IdGeneratorTest.java Removed: trunk/src/main/java/cc/kune/tasks/client/actions/DelTaskMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java Modified: trunk/img/icons-base.svg trunk/img/webtemplate/web_template-2011.svg trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java trunk/src/main/java/cc/kune/core/client/registry/IconsRegistry.java trunk/src/main/java/cc/kune/core/client/resources/nav/NavResources.java trunk/src/main/java/cc/kune/core/client/resources/nav/task.png trunk/src/main/java/cc/kune/core/client/resources/nav/taskadd.png trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java trunk/src/test/java/org/ourproject/kune/platf/client/actions/IconsRegistryTest.java Log: CLOSED - # 88: Create a tasks tool for groups/persons http://kune.ourproject.org/issues/ticket/88 CLOSED - # 50: Add a Close up button to BasicDialogs (thanks to Alfredo Alvarez) http://kune.ourproject.org/issues/ticket/50 Modified: trunk/img/icons-base.svg =================================================================== --- trunk/img/icons-base.svg 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/img/icons-base.svg 2011-08-10 17:09:53 UTC (rev 1487) @@ -28,12 +28,12 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="268" - inkscape:cy="359" + inkscape:zoom="8.540524" + inkscape:cx="281.33968" + inkscape:cy="353.04378" inkscape:document-units="px" inkscape:current-layer="layer1" - inkscape:window-width="1278" + inkscape:window-width="1080" inkscape:window-height="973" inkscape:window-x="0" inkscape:window-y="21" @@ -5373,17 +5373,7 @@ y="520.36218" x="445" id="image4719" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAdNJREFU -OI2Vk7FrU1EUxn/3vbSCJDGN1JQMhSIGXFy0amIE0RJwdtAhOBRFbR3ExUGXgjgIjvoPNIO7m6hL -1S66OCmRUqjRSEJeb2zQRu85DqGPvMRAPdO937nnx/k+uIaBKpfLxve9587JXL/u+94L56RUqVS0 -XzcAN+fMFQMPFSYUDzt1iXz+CJ5nABBRVlc/sK/+FIMAtFT11uOXLJuFs8R8zwQXzhyMf+lmeRfk -aNkuMzPTGLMDENbXN0glxzma+syUv8Gz12tWVNMxIO55Zmw85vO+kWPp/iOCIKBarUaszc8fIp1O -c+/ubS5mvyGqcWA81v+osw3JZBJVYXb22GA8JBIJtv+AUxNqIUA1kg0rb95G7sVCfggYAQzW6VOF -8KwqiLjRAP1HY2cDVUVFyJ88/n8bFAt5RAQRQVWw1jI5mdkdoH9QpDfc/tHe/QYiLoTUvtZoNhtD -IUcBAz3neoB229JsNCiVzo9yijdqA2s3qX+vIyKhfn3hKpenV0Zb2DumtIIWmUyWTCZLLncYazdR -FW4sXguHfaMRwJaI/u78cntOpD7yYOkOP91wNMX9n1jrHAAgpTWMMVuq2jUAi+d6vxHDxEizfaXa -+41PXrH8F0/m4ZhJIciYAAAAAElFTkSuQmCC -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAdNJREFU OI2Vk7FrU1EUxn/3vbSCJDGN1JQMhSIGXFy0amIE0RJwdtAhOBRFbR3ExUGXgjgIjvoPNIO7m6hL 1S66OCmRUqjRSEJeb2zQRu85DqGPvMRAPdO937nnx/k+uIaBKpfLxve9587JXL/u+94L56RUqVS0 XzcAN+fMFQMPFSYUDzt1iXz+CJ5nABBRVlc/sK/+FIMAtFT11uOXLJuFs8R8zwQXzhyMf+lmeRfk aNkuMzPTGLMDENbXN0glxzma+syUv8Gz12tWVNMxIO55Zmw85vO+kWPp/iOCIKBarUaszc8fIp1O c+/ubS5mvyGqcWA81v+osw3JZBJVYXb22GA8JBIJtv+AUxNqIUA1kg0rb95G7sVCfggYAQzW6VOF 8KwqiLjRAP1HY2cDVUVFyJ88/n8bFAt5RAQRQVWw1jI5mdkdoH9QpDfc/tHe/QYiLoTUvtZoNhtD IUcBAz3neoB229JsNCiVzo9yijdqA2s3qX+vIyKhfn3hKpenV0Zb2DumtIIWmUyWTCZLLncYazdR FW4sXguHfaMRwJaI/u78cntOpD7yYOkOP91wNMX9n1jrHAAgpTWMMVuq2jUAi+d6vxHDxEizfaXa +41PXrH8F0/m4ZhJIciYAAAAAElFTkSuQmCC " height="16" width="16" /> <path @@ -5420,24 +5410,9 @@ y="504.36218" x="268" id="image7247" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAQZJREFU -OI1j/P//PwMlgIki3cPDABZsggVTo2r+M/wv+/HrO+/nbx8/f/jyrmtb+8UWbGoZ0WMhc0JQg6SM -QL2xpgmDjJAqw/6rGxhOXDnM8ODOm94TU56VEPTC1x+fyw009Bn+Mv1l0Jd0ZfjL+JvBQteKgYGB -IRubCzAMeP/lLQcrIw+Dn2YuAwMDA0Ox8ywGZTE9BgYGBg6iDHj78dWPq8+OMXTsTmRgYGBg6NiV -yHD31SUGBgaGH0QZ8O//v94Tl44xsDGwMGy+PI2BjZGF4ciFgwwMDAxTsRmAEYgMDAwMFjlSHQwM -DFkMDAy8DAwMnxkYGKadmPKsgmgDSAEDnxIpNgAAJ+ZYJkBPdSwAAAAASUVORK5CYII= -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAQZJREFU OI1j/P//PwMlgIki3cPDABZsggVTo2r+M/wv+/HrO+/nbx8/f/jyrmtb+8UWbGoZ0WMhc0JQg6SM QL2xpgmDjJAqw/6rGxhOXDnM8ODOm94TU56VEPTC1x+fyw009Bn+Mv1l0Jd0ZfjL+JvBQteKgYGB IRubCzAMeP/lLQcrIw+Dn2YuAwMDA0Ox8ywGZTE9BgYGBg6iDHj78dWPq8+OMXTsTmRgYGBg6NiV yHD31SUGBgaGH0QZ8O//v94Tl44xsDGwMGy+PI2BjZGF4ciFgwwMDAxTsRmAEYgMDAwMFjlSHQwM DFkMDAy8DAwMnxkYGKadmPKsgmgDSAEDnxIpNgAAJ+ZYJkBPdSwAAAAASUVORK5CYII= " height="16" width="16" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#ff2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="m 272.19758,658.71675 -5.61351,5.05002 -1.81751,-2.09221 -2.22424,2.28085 c 1.60629,1.4242 2.80319,2.43911 4.13653,3.80876 2.24198,-2.10143 4.53857,-3.76628 6.97148,-5.34924 -0.3707,-1.58182 -0.85095,-2.67256 -1.45275,-3.69818 z" - id="path7250" - sodipodi:nodetypes="ccccccc" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> <rect rx="2.5" inkscape:export-ydpi="90" @@ -5449,20 +5424,35 @@ height="13.999999" width="14" id="rect7252" - style="opacity:1;fill:none;stroke:#aa4400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="opacity:1;fill:#ffffff;stroke:#aa4400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ff2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 272.19758,658.71675 -5.61351,5.05002 -1.81751,-2.09221 -2.22424,2.28085 c 1.60629,1.4242 2.80319,2.43911 4.13653,3.80876 2.24198,-2.10143 4.53857,-3.76628 6.97148,-5.34924 -0.3707,-1.58182 -0.85095,-2.67256 -1.45275,-3.69818 z" + id="path7250" + sodipodi:nodetypes="ccccccc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <image width="16" height="16" - xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAQZJREFU -OI1j/P//PwMlgIki3cPDABZsggVTo2r+M/wv+/HrO+/nbx8/f/jyrmtb+8UWbGoZ0WMhc0JQg6SM -QL2xpgmDjJAqw/6rGxhOXDnM8ODOm94TU56VEPTC1x+fyw009Bn+Mv1l0Jd0ZfjL+JvBQteKgYGB -IRubCzAMeP/lLQcrIw+Dn2YuAwMDA0Ox8ywGZTE9BgYGBg6iDHj78dWPq8+OMXTsTmRgYGBg6NiV -yHD31SUGBgaGH0QZ8O//v94Tl44xsDGwMGy+PI2BjZGF4ciFgwwMDAxTsRmAEYgMDAwMFjlSHQwM -DFkMDAy8DAwMnxkYGKadmPKsgmgDSAEDnxIpNgAAJ+ZYJkBPdSwAAAAASUVORK5CYII= -" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAQZJREFU OI1j/P//PwMlgIki3cPDABZsggVTo2r+M/wv+/HrO+/nbx8/f/jyrmtb+8UWbGoZ0WMhc0JQg6SM QL2xpgmDjJAqw/6rGxhOXDnM8ODOm94TU56VEPTC1x+fyw009Bn+Mv1l0Jd0ZfjL+JvBQteKgYGB IRubCzAMeP/lLQcrIw+Dn2YuAwMDA0Ox8ywGZTE9BgYGBg6iDHj78dWPq8+OMXTsTmRgYGBg6NiV yHD31SUGBgaGH0QZ8O//v94Tl44xsDGwMGy+PI2BjZGF4ciFgwwMDAxTsRmAEYgMDAwMFjlSHQwM DFkMDAy8DAwMnxkYGKadmPKsgmgDSAEDnxIpNgAAJ+ZYJkBPdSwAAAAASUVORK5CYII= " id="image7254" x="265" y="659.36218" /> + <rect + style="fill:#ffffff;stroke:#aa4400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect7258" + width="14" + height="13.999999" + x="261" + y="686.36218" + ry="2.5" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/core/client/resources/nav/taskdone.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + rx="2.5" /> <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" @@ -5473,16 +5463,70 @@ style="color:#000000;fill:#ff2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" inkscape:connector-curvature="0" /> <rect - style="fill:none;stroke:#aa4400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect7258" + rx="2.5" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/core/client/resources/nav/task.png" + ry="2.5" + y="706.36218" + x="261" + height="13.999999" width="14" - height="13.999999" - x="261" - y="686.36218" - ry="2.5" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/core/client/resources/nav/task.png" + id="rect3596" + style="fill:#ffffff;stroke:#aa4400;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ff2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06250000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.34000001" + d="m 272.19758,708.71675 -5.61351,5.05002 -1.81751,-2.09221 -2.22424,2.28085 c 1.60629,1.4242 2.80319,2.43911 4.13653,3.80876 2.24198,-2.10143 4.53857,-3.76628 6.97148,-5.34924 -0.3707,-1.58182 -0.85095,-2.67256 -1.45275,-3.69818 z" + id="path3594" + sodipodi:nodetypes="ccccccc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/core/client/resources/nav/tasknew.png" inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <image + y="653.36218" + x="285" + id="image4629" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAa1JREFU OI3Fk72KFEEUhb/q7RlbsYcFRXRRBBNnN3dB2GwNTXwCE19BDATBUF9AMwMzQ8FMxMAHWDRTNHAR d9ef6fnd7uqqewy6nRkTkxWspIrLPd89t26Vk8RRVnIk9b8ApADvX1zZyXobG84t80Q1/rgbQ3EV qP5QOQCml6+/CymAU9K/sPWk45wDNWKcI5TfL+3v3N9VGwVY6fakWB9Mvr66DTxLAQgqMX+s2ntE 9CuQ9HAuJ1vbZm3zQRcJMJABwiUnz354vnVvAahdIvNE30Um7PAz9XSfycFrOtk5UA3mkQIQyPt3 usguzu8Ap8zCIX4G8lPq8Yi8f5Ps1Hrb8G8HahykqxCTdAGoE9LjZ1hdvzVPFIb5L4TiJYpDFIYo jFCckJ2/C5VYAkiKJTZ72yTHMQoFVg9QHEIo2vgIxSmognppjFRIFrD6W1MpDlEo2vOgrTyaA6Qw H2wD8JIjovCzFRYL23GIwnghtrJpMywB5G0QZj9O1JNujuWJ1AHLQadRrACPkmZ3SSSWpeStWgDK 6uGnxzc2Eddw5H99uwLcG4/paTPA//0bfwG+iB9/gfCdpwAAAABJRU5ErkJggg== " + height="16" + width="16" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/core/client/resources/nav/taskfolder.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path inkscape:export-ydpi="90" - rx="2.5" /> + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + sodipodi:nodetypes="ccccccc" + id="path4632" + d="m 297.19758,656.71675 -5.61351,5.05002 -1.81751,-2.09221 -2.22424,2.28085 c 1.60629,1.4242 2.80319,2.43911 4.13653,3.80876 2.24198,-2.10143 4.53857,-3.76628 6.97148,-5.34924 -0.3707,-1.58182 -0.85095,-2.67256 -1.45275,-3.69818 z" + style="color:#000000;fill:#ff2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.06250000000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.77" + inkscape:connector-curvature="0" /> + <image + width="16" + height="16" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAa1JREFU OI3Fk72KFEEUhb/q7RlbsYcFRXRRBBNnN3dB2GwNTXwCE19BDATBUF9AMwMzQ8FMxMAHWDRTNHAR d9ef6fnd7uqqewy6nRkTkxWspIrLPd89t26Vk8RRVnIk9b8ApADvX1zZyXobG84t80Q1/rgbQ3EV qP5QOQCml6+/CymAU9K/sPWk45wDNWKcI5TfL+3v3N9VGwVY6fakWB9Mvr66DTxLAQgqMX+s2ntE 9CuQ9HAuJ1vbZm3zQRcJMJABwiUnz354vnVvAahdIvNE30Um7PAz9XSfycFrOtk5UA3mkQIQyPt3 usguzu8Ap8zCIX4G8lPq8Yi8f5Ps1Hrb8G8HahykqxCTdAGoE9LjZ1hdvzVPFIb5L4TiJYpDFIYo jFCckJ2/C5VYAkiKJTZ72yTHMQoFVg9QHEIo2vgIxSmognppjFRIFrD6W1MpDlEo2vOgrTyaA6Qw H2wD8JIjovCzFRYL23GIwnghtrJpMywB5G0QZj9O1JNujuWJ1AHLQadRrACPkmZ3SSSWpeStWgDK 6uGnxzc2Eddw5H99uwLcG4/paTPA//0bfwG+iB9/gfCdpwAAAABJRU5ErkJggg== " + id="image4651" + x="285" + y="673.36218" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/core/client/resources/nav/taskfolderadd.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:connector-curvature="0" + style="opacity:0.76999996;color:#000000;fill:#ff2a2a;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0625;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 297.19758,676.71675 -5.61351,5.05002 -1.81751,-2.09221 -2.22424,2.28085 c 1.60629,1.4242 2.80319,2.43911 4.13653,3.80876 2.24198,-2.10143 4.53857,-3.76628 6.97148,-5.34924 -0.3707,-1.58182 -0.85095,-2.67256 -1.45275,-3.69818 z" + id="path4653" + sodipodi:nodetypes="ccccccc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/checked.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <image + y="677.36218" + x="290" + id="image4655" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAQZJREFU OI1j/P//PwMlgIki3cPDABZsggVTo2r+M/wv+/HrO+/nbx8/f/jyrmtb+8UWbGoZ0WMhc0JQg6SM QL2xpgmDjJAqw/6rGxhOXDnM8ODOm94TU56VEPTC1x+fyw009Bn+Mv1l0Jd0ZfjL+JvBQteKgYGB IRubCzAMeP/lLQcrIw+Dn2YuAwMDA0Ox8ywGZTE9BgYGBg6iDHj78dWPq8+OMXTsTmRgYGBg6NiV yHD31SUGBgaGH0QZ8O//v94Tl44xsDGwMGy+PI2BjZGF4ciFgwwMDAxTsRmAEYgMDAwMFjlSHQwM DFkMDAy8DAwMnxkYGKadmPKsgmgDSAEDnxIpNgAAJ+ZYJkBPdSwAAAAASUVORK5CYII= " + height="16" + width="16" /> </g> </svg> Added: trunk/img/webtemplate/confirmation.png =================================================================== (Binary files differ) Property changes on: trunk/img/webtemplate/confirmation.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/webtemplate/web_template-2011.svg =================================================================== --- trunk/img/webtemplate/web_template-2011.svg 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/img/webtemplate/web_template-2011.svg 2011-08-10 17:09:53 UTC (rev 1487) @@ -78,14 +78,14 @@ borderopacity="1.0" inkscape:pageopacity="0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="488.6491" - inkscape:cy="1879.6308" - inkscape:current-layer="layer1" + inkscape:zoom="2" + inkscape:cx="509.97457" + inkscape:cy="579.66806" + inkscape:current-layer="g8450" inkscape:document-units="px" showgrid="false" - inkscape:window-width="1080" - inkscape:window-height="1824" + inkscape:window-width="1920" + inkscape:window-height="984" inkscape:window-x="0" inkscape:window-y="21" inkscape:window-maximized="1" @@ -258,7 +258,7 @@ id="g5365"> <path transform="matrix(0.102065,0,0,0.102065,387.7515,-17.05636)" - d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" + d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -268,7 +268,7 @@ sodipodi:type="arc" /> <path transform="matrix(0.05245387,0,0,0.05245387,400.1808,-0.554549)" - d="m 277.35793,332.62314 a 26.82268,26.82268 0 1 1 -53.64536,0 26.82268,26.82268 0 1 1 53.64536,0 z" + d="m 277.35793,332.62314 c 0,14.81376 -12.00893,26.82268 -26.82268,26.82268 -14.81376,0 -26.82268,-12.00892 -26.82268,-26.82268 0,-14.81376 12.00892,-26.82268 26.82268,-26.82268 14.81375,0 26.82268,12.00892 26.82268,26.82268 z" sodipodi:ry="26.82268" sodipodi:rx="26.82268" sodipodi:cy="332.62314" @@ -475,22 +475,16 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> - <rect + <path style="color:#000000;fill:#deaa87;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 819.5,118.5 c 18.45998,0 36.91997,0 55.37995,0 0,129.9314 0,259.86279 0,389.79419 -18.45998,0 -36.91997,0 -55.37995,0 0,-129.9314 0,-259.86279 0,-389.79419 z" id="rect3097" - width="55.379948" - height="389.79419" - x="819.5" - y="118.5" /> - <rect - ry="6.3900704" - rx="10" - y="118.5" - x="837.5" - height="389.79419" - width="177" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#deaa87;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999976;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 847.5,118.5 c 53.10074,0.0235 106.20219,-0.0469 159.3025,0.0352 13.3258,4.43265 6.0678,21.90725 7.6975,32.98079 0,116.79605 0,233.59209 0,350.38814 -7.9948,11.56207 -24.38385,4.77722 -36.62591,6.39007 -44.85902,-0.25563 -89.80292,0.5129 -134.60856,-0.38714 -10.65566,-7.08979 -4.20704,-22.48179 -5.76553,-33.65321 0,-116.45459 0,-232.90918 0,-349.36377 0.35401,-4.73035 6.04734,-6.37115 10,-6.39007 z" id="rect3095" - style="color:#000000;fill:#deaa87;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999976;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + inkscape:connector-curvature="0" /> </g> <rect style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" @@ -552,7 +546,7 @@ transform="translate(-751,-12)"> <path transform="translate(0,-3)" - d="m 333,232 a 11,11 0 1 1 -22,0 11,11 0 1 1 22,0 z" + d="m 333,232 c 0,6.07513 -4.92487,11 -11,11 -6.07513,0 -11,-4.92487 -11,-11 0,-6.07513 4.92487,-11 11,-11 6.07513,0 11,4.92487 11,11 z" sodipodi:ry="11" sodipodi:rx="11" sodipodi:cy="232" @@ -720,7 +714,7 @@ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAASCAYAAABB7B6eAAAABHNCSVQICAgIfAhkiAAAAzBJREFU OI2NlE1LK2cUx3+ZMXHGydxE5U5yE2MNuFBKoJRARdpIi34C674LF0q5m/sVur+0uPIbFFHopl2q FequoTXFFruQJjM2hpjoHccMmbcu7s1wzYv0wGGel3P+/zPnOedE6JNKpfLBw8PDt5ZlfXJ3d5d2 HCfSb9OTaDQaJBKJuqqqP0mS9E2hUPhnb2+PjY2N0OaR8+np6VGj0ViRJCmSy+XIZDIoikI0Gh0A dxwH0zSp1+vUajVs2w5SqdQvtVrtMyAkCQkODw+vPM97USgU0DQNgCAIQh0lkchbiEajwdnZGc+e PWvpuj7dIxEATk5OfnVd98Xy8jKapuG6Lo7j4Lounufh+/5I9TwPz/OYnp5maWmJdrs9lc/nm70A hHK5/Gmr1fq4WCwiSRLdbncoqGVZXFxcYFnWSLLx8XGKxSK6rk+vrq5+DyCYpvldKpUimUyOBPd9 H13X2dnZwTCMJ/8oHo+TTCapVqtfAnNjlmUt5nI5XNfFdd2RufZ9HwBRFB/th4mmaVxfX/vAyzHL suSpqSlc1x1w6nQ6XF1dAYRfXdfpdrv4vk8mk0GW5QGCZDLJ+fl5FPhoDECWZWzbHiAwDIPd3d1H Z/v7++F6e3ubfD4/UGXvlfXKGBDmvt8wnU6ztbVFLBbDMAwODg5YX18nm80CMDMzMzRdtm2H67GJ iYnO7e2trCjKgGEsFmN2dhZBEEKnbDZLLpd7VAz9gbVaLRRFsYGoIEnSn7VaDUEQRta54zh4nge8 bb5en/TO+32azSaqqr4BfhdkWX5Zr9fDNxilmqaxublJNpt90s40TUzTZGFh4Qr4LQJwdHT0h23b Hy4uLg6dOz2JRCKIojj0vQBc16VSqaCq6l+lUuk58EU4i46Pj+8ty1Lm5uZQVTWcMf9HgiDANE0u Ly8B7LW1tWosFvsRePUIpVwuN6rV6nNRFEkkEkxOTqIoSthc/aCdToebmxva7Ta2baNp2t+lUqkD eMDnwN1AmPf3968Nw/i60WiIzWZTdBznyehVVX2TTqf/nZ+fj8bj8VlgB3jVux+ahyAIEsBXwMo7 TT7JAj8DP7zT6vsX/wEtdTE7+osNZwAAAABJRU5ErkJggg== " height="18" width="24" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/web_template-2011.png" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <image @@ -2183,7 +2177,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" transform="matrix(0.475,0,0,0.95,-21.570622,377.21335)" - d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" sodipodi:ry="10" sodipodi:rx="20" sodipodi:cy="32.362183" @@ -2196,7 +2190,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,8.0842525,364.37023)" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -2215,14 +2209,14 @@ sodipodi:cy="16.362183" sodipodi:rx="1" sodipodi:ry="1" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,2.7154875,362.20909)" /> <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,7.7663825,370.24449)" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -2241,14 +2235,14 @@ sodipodi:cy="16.362183" sodipodi:rx="1" sodipodi:ry="1" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,2.2467045,371.75097)" /> <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" transform="matrix(1.8840121,0.6711918,-0.6711918,1.8840121,-0.8112855,366.96948)" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -4308,7 +4302,7 @@ inkscape:groupmode="layer" id="layer4" inkscape:label="dialogs" - style="display:inline" + style="display:none" sodipodi:insensitive="true"> <rect style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" @@ -4469,11 +4463,21 @@ sodipodi:nodetypes="cccc" /> </g> <g - style="display:none" + style="display:inline" inkscape:label="confirmation" id="g8450" inkscape:groupmode="layer"> <rect + style="color:#000000;fill:#653616;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect6843" + width="476.85486" + height="7.9567051" + x="277.29156" + y="115.08939" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect ry="10" rx="10" y="113.49999" @@ -4481,7 +4485,10 @@ height="205.09827" width="476.85486" id="rect8452" - style="opacity:0.85;color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="opacity:1;color:#000000;fill:#653616;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <rect style="opacity:0.85;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect8454" @@ -4490,21 +4497,30 @@ x="293.62372" y="149.06573" rx="3" - ry="3" /> + ry="3" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <rect y="112.08939" x="277.29156" height="7.9567051" width="476.85486" id="rect8456" - style="color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#181817;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <text xml:space="preserve" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#241c1c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="317.16895" y="191.81694" id="text8468" - sodipodi:linespacing="125%"><tspan + sodipodi:linespacing="125%" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan sodipodi:role="line" id="tspan8470" x="317.16895" @@ -4517,14 +4533,20 @@ height="26" width="103.29102" id="rect8472" - style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="color:#000000;fill:#f2f2f2;fill-opacity:1;fill-rule:nonzero;stroke:#666666;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <text sodipodi:linespacing="125%" id="text8474" y="298.10547" x="522.03516" style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" - xml:space="preserve"><tspan + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan y="298.10547" x="522.03516" id="tspan8476" @@ -4537,14 +4559,20 @@ x="636" y="280" rx="6.9999995" - ry="7" /> + ry="7" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> <text xml:space="preserve" style="font-size:16px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" x="653.03516" y="298.10547" id="text8490" - sodipodi:linespacing="125%"><tspan + sodipodi:linespacing="125%" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan sodipodi:role="line" id="tspan8492" x="653.03516" @@ -4560,7 +4588,10 @@ y="229.14001" x="317.08438" style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#552200;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan + xml:space="preserve" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"><tspan sodipodi:role="line" id="tspan8502" x="317.08438" @@ -4573,12 +4604,57 @@ inkscape:transform-center-y="-0.62993359" inkscape:transform-center-x="-5.9580116" style="color:#000000;fill:#6c5353;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + style="color:#000000;fill:#a05a2c;fill-opacity:0.94901961000000001;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 738 124 C 736.338 124 735 125.338 735 127 L 735 142 C 735 143.662 736.338 145 738 145 L 751 145 C 752.662 145 754 143.662 754 142 L 754 127 C 754 125.338 752.662 124 751 124 L 738 124 z " + id="rect4000" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <rect + y="124" + x="742.76031" + height="21" + width="11.239679" + id="rect4002" + style="color:#000000;fill:#a05a2c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.40678155000000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <image + y="-71.70166" + x="737.84711" + id="image6818" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABHNCSVQICAgIfAhkiAAAAoFJREFU +OI2lkstPE3EQx+e3rtACTVrA0NKWAlKLbAjYQkMfQFYU8FWQQBoR43/hxZjwL3j1qCiUJkKitKUN +oWjwFcSLB6Pd4gMjPjBd7G4X9vHzQNq0PA7GSebynZlPJvMdhDGG/wlir+AemDrl7JsyH9TcNRhs +6hwKnDgU0Hkx6OjrbQh5usxLHecfmvJrXt8kZXdWz7e0VEe7hx9YszqZo/sC9jP99Y8ou16/S8VL +7p5g17OFka9e3yTldNWEWzvMJkXBgAHHPJcDPcszfia3gaqs6Farw6DnBAnYjAhe2lLv7NYvdVwI +nnW5LGG722zmRQUECYCyG4zFJHkDAABlj0jTcbKqKRP2X23uYQUJKRhDmYqEdSbFVdVqSzlBBgAE +6bQgR2ffBebvDYxhDBjlu0DTcVJPCZGRUeo0K8hIUQBIAsGOjGFbVIBlBelJ6P10dGJwDGPABRvk +Q441ZhavXGv2/uYl4LYl+MmKQCoyXo4kZmL3B4ezwwfaKGq+2RqsunpelOHTLx6YDQ5SvAgigZCu +Qm1r750qcKcA4PZNNno8tRHzycrq1WQKOEECQ7kKEACk0jLUtZkoi1UXzv+THKD93ITNYTdGKm1a +E/M9DYhAUFl8RHr++EOiooRQEALY4mWobTNRNVZtKAvJATQa9e1GR5XlB7sNBIFAryalp2FmlvmT +oV7Or0V0KqQghHabEVKBohwtAGwJm0PxueQLo1YNhtIiaTGUmA0ff+N/Oz2yk/msGViJJaPlxaCs +vV5PfGQ2+l/FRpP7XGjz3SmpM5oWMrz8Ze7uJX/+tWk6TirlmxNcJn1zJXSdyQ1hjAvS5ZpWw/g4 +sVc/LPf9wb/GX4vjPAuggBABAAAAAElFTkSuQmCC +" + height="16" + width="16" + style="fill:#ffffff;stroke:#ffffff" /> + <path + style="color:#000000;fill:#181817;fill-opacity:1;fill-rule:nonzero;stroke:#181817;stroke-width:1.40678155000000005;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 741.5625 129.375 L 740.5 130.4375 L 744.125 134.0625 L 740.5 137.6875 L 741.5625 138.75 L 745.1875 135.125 L 748.8125 138.75 L 749.84375 137.6875 L 746.21875 134.0625 L 749.84375 130.4375 L 748.8125 129.375 L 745.1875 133 L 741.5625 129.375 z " + id="rect6837" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/webtemplate/confirmation.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> </g> <g inkscape:groupmode="layer" id="layer5" inkscape:label="notify" - style="display:inline" + style="display:none" sodipodi:insensitive="true"> <g style="display:inline" Modified: trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/common/client/resources/CommonIconResources.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -25,17 +25,29 @@ public interface CommonIconResources extends ClientBundle { - public static final CommonIconResources INSTANCE = GWT.create(CommonIconResources.class); + public static final CommonIconResources INSTANCE = GWT.create(CommonIconResources.class); - @Source("checked.png") - ImageResource checked(); + @Source("checked.png") + ImageResource checked(); - @Source("radiochecked.png") - ImageResource radioChecked(); + @Source("kune-close.png") + ImageResource kuneClose(); - @Source("radiounchecked.png") - ImageResource radioUnChecked(); + @Source("kune-close-grey.png") + ImageResource kuneCloseGrey(); - @Source("unchecked.png") - ImageResource unChecked(); + @Source("kune-close-greylight.png") + ImageResource kuneCloseGreylight(); + + @Source("radiochecked.png") + ImageResource radioChecked(); + + @Source("radiounchecked.png") + ImageResource radioUnChecked(); + + @Source("cross.png") + ImageResource redCross(); + + @Source("unchecked.png") + ImageResource unChecked(); } Added: trunk/src/main/java/cc/kune/common/client/resources/cross.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/cross.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/common/client/resources/kune-close-grey.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/kune-close-grey.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/common/client/resources/kune-close-greylight.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/kune-close-greylight.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/common/client/resources/kune-close.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/common/client/resources/kune-close.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -32,6 +32,7 @@ import com.google.gwt.user.client.ui.FlowPanel; import com.google.gwt.user.client.ui.HasDirectionalText; import com.google.gwt.user.client.ui.InsertPanel.ForIsWidget; +import com.google.gwt.user.client.ui.PushButton; import com.google.gwt.user.client.ui.VerticalPanel; import com.google.gwt.user.client.ui.Widget; @@ -45,6 +46,8 @@ @UiField FlowPanel btnPanel; @UiField + PushButton closeBtn; + @UiField Button firstBtn; @UiField Button secondBtn; @@ -79,6 +82,11 @@ } @Override + public HasClickHandlers getCloseBtn() { + return closeBtn; + } + + @Override public HasClickHandlers getFirstBtn() { return firstBtn; } @@ -98,6 +106,11 @@ return title; } + @Override + public void setCloseBtnVisible(final boolean visible) { + closeBtn.setVisible(visible); + } + public void setFirstBtnEnabled(final boolean enabled) { firstBtn.setEnabled(enabled); } Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialog.ui.xml 2011-08-10 17:09:53 UTC (rev 1487) @@ -1,19 +1,28 @@ <!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> <ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" xmlns:k="urn:import:cc.kune.common.client.ui" xmlns:g="urn:import:com.google.gwt.user.client.ui"> + <ui:with field='res' type='cc.kune.common.client.resources.CommonIconResources'/> <g:VerticalPanel addStyleNames="k-dialog-outerp, k-bottom-10corners"> <g:FlowPanel> - <g:FlowPanel addStyleNames="k-dialog-innerp, k-3corners"> - <k:IconLabel ui:field="title" addStyleNames="k-dialog-title, " /> - <g:FlowPanel ui:field="vp" addStyleNames="kune-Margin-Medium-trbl" /> - <g:VerticalPanel ui:field="bottomPanel" width="100%"></g:VerticalPanel> + <g:PushButton visible="false" ui:field="closeBtn" + addStyleNames="k-dialog-btn, k-fr, k-dialog-secondBtn, k-5corners, k-btn-min,k-button-left, k-dialog-close-btn"> + <g:upFace image="{res.kuneCloseGrey}" /> + <g:upHoveringFace image="{res.kuneCloseGreylight}" /> + <g:downFace image="{res.kuneClose}" /> + </g:PushButton> + <g:FlowPanel> + <g:FlowPanel addStyleNames="k-dialog-innerp, k-3corners"> + <k:IconLabel ui:field="title" addStyleNames="k-dialog-title, "/> + <g:FlowPanel ui:field="vp" addStyleNames="kune-Margin-Medium-trbl"/> + <g:VerticalPanel ui:field="bottomPanel" width="100%"></g:VerticalPanel> + </g:FlowPanel> </g:FlowPanel> + <g:FlowPanel ui:field="btnPanel" addStyleNames="k-dialog-btn-area, k-clear"> + <g:Button ui:field="firstBtn" + addStyleNames="k-dialog-btn, k-dialog-firstBtn, k-5corners, k-button "/> + <g:Button ui:field="secondBtn" + addStyleNames="k-dialog-btn,k-dialog-secondBtn, k-5corners, k-button"/> + </g:FlowPanel> </g:FlowPanel> - <g:FlowPanel ui:field="btnPanel" addStyleNames="k-dialog-btn-area"> - <g:Button ui:field="firstBtn" - addStyleNames="k-dialog-btn, k-dialog-firstBtn, k-5corners, k-button " /> - <g:Button ui:field="secondBtn" - addStyleNames="k-dialog-btn,k-dialog-secondBtn, k-5corners, k-button" /> - </g:FlowPanel> </g:VerticalPanel> -</ui:UiBinder> \ No newline at end of file +</ui:UiBinder> Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicDialogView.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -33,6 +33,8 @@ HasClickHandlers getSecondBtn(); + HasClickHandlers getCloseBtn(); + HasDirectionalText getTitleText(); void setFirstBtnText(String text); @@ -41,10 +43,12 @@ void setFirstBtnVisible(boolean visible); + void setCloseBtnVisible(boolean visible); + void setSecondBtnText(String text); void setSecondBtnTitle(String title); void setSecondBtnVisible(boolean visible); -} \ No newline at end of file +} Modified: trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/common/client/ui/dialogs/BasicTopDialog.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -22,9 +22,12 @@ import cc.kune.common.client.ui.PopupTopPanel; import cc.kune.common.client.utils.TextUtils; +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.logical.shared.HasCloseHandlers; import com.google.gwt.event.logical.shared.ResizeEvent; import com.google.gwt.event.logical.shared.ResizeHandler; +import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.ui.PopupPanel; import com.google.gwt.user.client.ui.UIObject; @@ -34,6 +37,7 @@ public static class Builder { private final boolean autohide; private boolean autoscroll = false; + private boolean closeBtn = true; private final String dialogId; private String firstButtonId; private String firstButtonTitle; @@ -63,6 +67,11 @@ return new BasicTopDialog(this); } + public Builder closeBtn(final boolean closeBtn) { + this.closeBtn = closeBtn; + return this; + } + public Builder firstButtonId(final String firstButtonId) { this.firstButtonId = firstButtonId; return this; @@ -122,6 +131,7 @@ } + private HandlerRegistration closeClickHandler; private String height; private final PopupTopPanel popup; private String width; @@ -134,6 +144,7 @@ if (TextUtils.notEmpty(builder.icon)) { super.setTitleIcon(builder.icon); } + setCloseBtn(builder.closeBtn); super.setFirstBtnText(builder.firstButtonTitle); super.setFirstBtnId(builder.firstButtonId); super.setFirstBtnTabIndex(builder.tabIndexStart); @@ -164,6 +175,24 @@ popup.hide(); } + private void setCloseBtn(final boolean closeBtn) { + setCloseBtnVisible(closeBtn); + if (closeBtn) { + if (closeClickHandler == null) { + closeClickHandler = super.getCloseBtn().addClickHandler(new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + popup.hide(); + } + }); + } + } else { + if (closeClickHandler != null) { + closeClickHandler.removeHandler(); + } + } + } + @Override public void setFirstBtnTitle(final String title) { super.setFirstBtnTitle(title); Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2011-08-10 17:09:53 UTC (rev 1487) @@ -21,21 +21,24 @@ } .k-opacity80 { - kfilter: alpha(opacity = 80); + kfilter: alpha(opacity = 80 + ); -moz-opacity: 0.80; -khtml-opacity: 0.80; opacity: 0.80; } .k-opacity90 { - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90 + ); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; } .k-opacity95 { - kfilter: alpha(opacity = 95); + kfilter: alpha(opacity = 95 + ); -moz-opacity: 0.95; -khtml-opacity: 0.95; opacity: 0.95; @@ -43,8 +46,8 @@ .gwt-PopupPanelGlass { background-color: #f7ebe3 !important; - kfilter: alpha(opacity = 68) - !important; + kfilter: alpha(opacity = 68 + ) !important; -moz-opacity: 0.68 !important; -khtml-opacity: 0.68 !important; opacity: 0.68 !important; @@ -173,6 +176,16 @@ -khtml-user-select: none; } +.k-dialog-close-btn { + background-color: #a05a2c !important; + color: #181817 !important; + border: 0 none !important; + position: relative; + top: -26px; + height: 17px !important; + left: 1px; +} + .k-dialog-firstBtn { float: left; } @@ -295,7 +308,7 @@ -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -538,7 +551,7 @@ _border-left-color: pink; _border-bottom-color: pink; _border-right-color: pink; - _filter: chroma(color = pink); + _filter: chroma(color = pink); } /* end tooltip */ @@ -681,4 +694,10 @@ padding: 10px; background-color: #F2F0F0; border: 1px solid #D0D0D0; -} \ No newline at end of file +} + +.k-line-through { + text-decoration: line-through; + color: gray; +} + Modified: trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -29,6 +29,8 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.actions.ui.descrip.GuiActionDescProviderCollection; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.core.client.registry.IdGenerator; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.utils.AccessRights; import com.google.inject.Provider; @@ -74,6 +76,14 @@ } public void addAction(@Nonnull final String actionsGroupId, + final @Nonnull Provider<? extends GuiActionDescrip> action, final ContentStatus status, + @Nonnull final String... typeIds) { + for (final String typeId : typeIds) { + addAction(actionsGroupId, action, IdGenerator.generate(typeId, status.toString())); + } + } + + public void addAction(@Nonnull final String actionsGroupId, final @Nonnull Provider<? extends GuiActionDescrip> action, @Nonnull final String... typeIds) { for (final String typeId : typeIds) { final GuiActionDescProviderCollection actionColl = getActions(actionsGroupId, typeId); @@ -97,11 +107,6 @@ } public GuiActionDescCollection getCurrentActions(final Object targetItem, final boolean isLogged, - final AccessRights rights) { - return getCurrentActions(targetItem, GENERIC_TYPE_ID, isLogged, rights, null); - } - - public GuiActionDescCollection getCurrentActions(final Object targetItem, final boolean isLogged, final AccessRights rights, @Nullable final String actionsGroup) { return getCurrentActions(targetItem, GENERIC_TYPE_ID, isLogged, rights, actionsGroup); } @@ -128,6 +133,16 @@ return collection; } + public <T> GuiActionDescCollection getCurrentActions(final Object targetItem, final String typeId, + final ContentStatus status, final boolean isLogged, final AccessRights rights, + @Nullable final String actionsGroupId) { + final GuiActionDescCollection collection = new GuiActionDescCollection(); + collection.addAll(getCurrentActions(targetItem, typeId, isLogged, rights, actionsGroupId)); + collection.addAll(getCurrentActions(targetItem, IdGenerator.generate(typeId, status.toString()), + isLogged, rights, actionsGroupId)); + return collection; + } + private boolean mustAdd(final RolAction action, final boolean isLogged, final AccessRights rights) { if (action.isAuthNeed()) { if (!isLogged) { @@ -144,4 +159,5 @@ return rights.isVisible(); } } + } Modified: trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -37,6 +37,7 @@ private final PublishModerableRegistry publishModerable; private final RateableRegistry rateable; private final RenamableRegistry renamable; + private final ShowDeletedRegistry showDeleted; private final TageableRegistry tageable; private final TranslatableRegistry translatable; private final VersionableRegistry versionable; @@ -53,7 +54,8 @@ final RateableRegistry rateable, final TageableRegistry tageable, final RenamableRegistry renamable, final TranslatableRegistry translatable, final VersionableRegistry versionable, final EmptyMessagesRegistry emptyMessagesRegistry, - final XmppComentableRegistry xmppComentable, final XmppNotifyCapableRegistry xmppNotifyCapable) { + final XmppComentableRegistry xmppComentable, final XmppNotifyCapableRegistry xmppNotifyCapable, + final ShowDeletedRegistry showDeleted) { this.authorable = authorableRegistry; this.newMenus = newMenus; this.aclEditable = aclEditableRegistry; @@ -73,6 +75,7 @@ this.emptyMessagesRegistry = emptyMessagesRegistry; this.xmppComentable = xmppComentable; this.xmppNotifyCapable = xmppNotifyCapable; + this.showDeleted = showDeleted; } public boolean canBeHomepage(final String typeId) { @@ -135,6 +138,10 @@ return renamable; } + public ShowDeletedRegistry getShowDeleted() { + return showDeleted; + } + public TageableRegistry getTageable() { return tageable; } @@ -215,4 +222,8 @@ return xmppNotifyCapable.contains(typeId); } + public boolean showDeleted(final String typeId) { + return showDeleted.contains(typeId); + } + } Modified: trunk/src/main/java/cc/kune/core/client/registry/IconsRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/registry/IconsRegistry.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/core/client/registry/IconsRegistry.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -22,57 +22,62 @@ import java.util.HashMap; import java.util.Map; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.BasicMimeTypeDTO; public class IconsRegistry { - private final Map<String, Object> contentTypesIcons; + private final Map<String, Object> contentTypesIcons; - public IconsRegistry() { - contentTypesIcons = new HashMap<String, Object>(); - } + public IconsRegistry() { + contentTypesIcons = new HashMap<String, Object>(); + } - private String concatenate(final String typeId, final BasicMimeTypeDTO mimeType) { - if (mimeType != null) { - return typeId + "|" + mimeType; - } else { - return typeId; - } - } + public Object getContentTypeIcon(final String typeId) { + return contentTypesIcons.get(typeId); + } - public Object getContentTypeIcon(final String typeId) { - return contentTypesIcons.get(typeId); + /** + * If there is a specific icon for a type/subtype pair or a generic type icon + * in defect + * + * @param typeId + * the kune typeId (see *ClientTool) + * @param mimeType + * @return + */ + public Object getContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType) { + Object icon = getContentTypeIcon(IdGenerator.generate(typeId, + mimeType == null ? null : mimeType.toString())); + if (icon == null) { + if (mimeType == null) { + return getContentTypeIcon(typeId); + } + } else { + return icon; } - - /** - * If there is a specific icon for a type/subtype pair or a generic type - * icon in defect - * - * @param typeId - * the kune typeId (see *ClientTool) - * @param mimeType - * @return - */ - public Object getContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType) { - Object icon = getContentTypeIcon(concatenate(typeId, mimeType)); - if (icon == null) { - if (mimeType == null) { - return getContentTypeIcon(typeId); - } - } else { - return icon; - } - final String subtype = mimeType.getSubtype(); - if (subtype != null && subtype.length() > 0) { - icon = getContentTypeIcon(typeId, new BasicMimeTypeDTO(mimeType.getType())); - } - return icon == null ? getContentTypeIcon(typeId) : icon; + final String subtype = mimeType.getSubtype(); + if (subtype != null && subtype.length() > 0) { + icon = getContentTypeIcon(typeId, new BasicMimeTypeDTO(mimeType.getType())); } + return icon == null ? getContentTypeIcon(typeId) : icon; + } - public void registerContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType, final Object icon) { - registerContentTypeIcon(concatenate(typeId, mimeType), icon); - } + public Object getContentTypeIcon(final String typeId, final ContentStatus contentStatus) { + final Object icon = getContentTypeIcon(IdGenerator.generate(typeId, contentStatus.toString())); + return (icon == null ? getContentTypeIcon(typeId) : icon); + } - public void registerContentTypeIcon(final String contentTypeId, final Object icon) { - contentTypesIcons.put(contentTypeId, icon); - } + public void registerContentTypeIcon(final String typeId, final BasicMimeTypeDTO mimeType, + final Object icon) { + registerContentTypeIcon(IdGenerator.generate(typeId, mimeType.toString()), icon); + } + + public void registerContentTypeIcon(final String typeId, final ContentStatus contentStatus, + final Object icon) { + registerContentTypeIcon(IdGenerator.generate(typeId, contentStatus.toString()), icon); + } + + public void registerContentTypeIcon(final String contentTypeId, final Object icon) { + contentTypesIcons.put(contentTypeId, icon); + } } Added: trunk/src/main/java/cc/kune/core/client/registry/IdGenerator.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/registry/IdGenerator.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/registry/IdGenerator.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -0,0 +1,26 @@ +package cc.kune.core.client.registry; + +import cc.kune.common.client.utils.TextUtils; + +import com.google.gxp.com.google.common.base.Nullable; + +public class IdGenerator { + protected static final String SEPARATOR = "|"; + + /** + * Generates a id concatenating two strings + * + * @param one + * String + * @param two + * String + * @return + */ + public static String generate(@Nullable final String one, @Nullable final String two) { + if (TextUtils.empty(one)) { + return TextUtils.empty(two) ? "" : two; + } else { + return TextUtils.empty(two) ? one : one + SEPARATOR + two; + } + } +} Added: trunk/src/main/java/cc/kune/core/client/registry/ShowDeletedRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/registry/ShowDeletedRegistry.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/registry/ShowDeletedRegistry.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -0,0 +1,28 @@ +/* + * + * Copyright (C) 2007-2011 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 cc.kune.core.client.registry; + +/** + * Conents registered here will be showed as deleted in + * {@link FolderVieverPresenter} + * + */ +public class ShowDeletedRegistry extends AbstractContentRegistry { +} Modified: trunk/src/main/java/cc/kune/core/client/resources/nav/NavResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/nav/NavResources.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/core/client/resources/nav/NavResources.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -114,6 +114,15 @@ @Source("taskadd.png") ImageResource taskadd(); + @Source("taskdone.png") + ImageResource taskdone(); + + @Source("taskfolder.png") + ImageResource taskfolder(); + + @Source("taskfolderadd.png") + ImageResource taskfolderadd(); + @Source("upload.png") ImageResource upload(); Modified: trunk/src/main/java/cc/kune/core/client/resources/nav/task.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/client/resources/nav/taskadd.png =================================================================== (Binary files differ) Copied: trunk/src/main/java/cc/kune/core/client/resources/nav/taskdone.png (from rev 1485, trunk/src/main/java/cc/kune/core/client/resources/nav/task.png) =================================================================== (Binary files differ) Added: trunk/src/main/java/cc/kune/core/client/resources/nav/taskfolder.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/nav/taskfolder.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/nav/taskfolderadd.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/nav/taskfolderadd.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -48,7 +48,6 @@ import cc.kune.core.server.state.StateContainer; import cc.kune.core.server.state.StateContent; import cc.kune.core.server.state.StateService; -import cc.kune.core.server.xmpp.XmppManager; import cc.kune.core.shared.domain.AccessRol; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.RateResult; @@ -84,15 +83,14 @@ private final StateService stateService; private final TagUserContentManager tagManager; private final Provider<UserSession> userSessionProvider; - private final XmppManager xmppManager; @Inject public ContentRPC(final FinderService finderService, final Provider<UserSession> userSessionProvider, final AccessService accessService, final AccessRightsService rightsService, final StateService stateService, final CreationService creationService, - final GroupManager groupManager, final XmppManager xmppManager, - final ContentManager contentManager, final ContainerManager containerManager, - final TagUserContentManager tagManager, final Mapper mapper, final ChatManager chatManager) { + final GroupManager groupManager, final ContentManager contentManager, + final ContainerManager containerManager, final TagUserContentManager tagManager, + final Mapper mapper, final ChatManager chatManager) { this.finderService = finderService; this.userSessionProvider = userSessionProvider; this.accessService = accessService; @@ -100,7 +98,6 @@ this.stateService = stateService; this.creationService = creationService; this.groupManager = groupManager; - this.xmppManager = xmppManager; this.contentManager = contentManager; this.containerManager = containerManager; this.tagManager = tagManager; Modified: trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -53,7 +53,7 @@ public DocsClientActions(final I18nUITranslationService i18n, final Session session, final StateManager stateManager, final ActionRegistryByType registry, final CoreResources res, final Provider<GoParentFolderBtn> folderGoUp, final Provider<NewDocMenuItem> newDocMenuItem, - final Provider<NewDocIconBtn> newDocIconBtn, final Provider<NewFolderMenuItem> newFolderBtn, + final Provider<NewDocIconBtn> newDocIconBtn, final Provider<NewFolderMenuItem> newFolderMenuItem, final Provider<OpenDocMenuItem> openContentMenuItem, final Provider<DelDocMenuItem> delContentMenuItem, final Provider<ContentViewerOptionsMenu> optionsMenuContent, @@ -71,7 +71,7 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderBtn, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderMenuItem, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); Added: trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/SetContentStatusAsAdminMenuItem.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -0,0 +1,120 @@ +/* + * + * Copyright (C) 2007-2011 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 cc.kune.gspace.client.actions; + +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.notify.ConfirmAskEvent; +import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.utils.OnAcceptCallback; +import cc.kune.core.client.actions.RolAction; +import cc.kune.core.client.rpcservices.AsyncCallbackSimple; +import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.AbstractContentSimpleDTO; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.viewers.FolderViewerPresenter; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class SetContentStatusAsAdminMenuItem extends MenuItemDescriptor { + + public static class SetContentStatusAsAdminAction extends RolAction { + + private final Provider<ContentServiceAsync> contentService; + private final EventBus eventBus; + private final I18nTranslationService i18n; + private final Provider<FolderViewerPresenter> presenter; + private final Session session; + private final StateManager stateManager; + + @Inject + public SetContentStatusAsAdminAction(final EventBus eventBus, final StateManager stateManager, + final Session session, final Provider<ContentServiceAsync> contentService, + final I18nTranslationService i18n, final Provider<FolderViewerPresenter> presenter) { + super(AccessRolDTO.Administrator, true); + this.eventBus = eventBus; + this.stateManager = stateManager; + this.session = session; + this.contentService = contentService; + this.i18n = i18n; + this.presenter = presenter; + } + + @Override + public void actionPerformed(final ActionEvent event) { + final Boolean confirm = (Boolean) getValue(CONFIRM); + if (confirm) { + ConfirmAskEvent.fire(eventBus, i18n.t("Please confirm"), i18n.t("Are you sure?"), i18n.t("Yes"), + i18n.t("No"), null, null, new OnAcceptCallback() { + @Override + public void onSuccess() { + doAction(event); + } + }); + } else { + doAction(event); + } + } + + private void doAction(final ActionEvent event) { + NotifyUser.showProgress(); + final ContentStatus status = (ContentStatus) getValue(STATUS); + final StateToken token = ((AbstractContentSimpleDTO) event.getTarget()).getStateToken(); + contentService.get().setStatusAsAdmin(session.getUserHash(), token, status, + new AsyncCallbackSimple<StateAbstractDTO>() { + @Override + public void onSuccess(final StateAbstractDTO state) { + // Is this necessary? + // session.setCurrentState(state); + final StateToken parent = token.copy().clearDocument(); + if (session.getCurrentStateToken().equals(parent)) { + stateManager.refreshCurrentStateWithoutCache(); + // Warning: the previous action + // is asynchronous (it gets a + // content) + presenter.get().refreshState(); + } else { + stateManager.gotoStateToken(parent, false); + } + NotifyUser.hideProgress(); + } + }); + } + + } + private static final String CONFIRM = "setctnconfirm"; + private static final String STATUS = "setctnstatus"; + + public SetContentStatusAsAdminMenuItem(final SetContentStatusAsAdminAction action, + final ContentStatus status, final Boolean confirm) { + super(action); + action.putValue(CONFIRM, confirm); + action.putValue(STATUS, status); + } + +} Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -22,10 +22,13 @@ import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.tool.selector.ToolSelector; +import com.google.gwt.resources.client.ImageResource; + public abstract class FoldableAbstractClientTool extends AbstractClientTool { protected final ContentCapabilitiesRegistry contentCapabilitiesRegistry; @@ -58,6 +61,12 @@ contentCapabilitiesRegistry.getIconsRegistry().registerContentTypeIcon(typeId, mimeType, iconUrl); } + public void registerContentTypeIcon(final String typeId, final ContentStatus contentStatus, + final ImageResource imageResource) { + contentCapabilitiesRegistry.getIconsRegistry().registerContentTypeIcon(typeId, contentStatus, + imageResource); + } + public void registerContentTypeIcon(final String contentTypeId, final Object icon) { contentCapabilitiesRegistry.getIconsRegistry().registerContentTypeIcon(contentTypeId, icon); } @@ -98,6 +107,10 @@ contentCapabilitiesRegistry.getRenamable().register(typeIds); } + protected void registerShowDeleted(final String... typeIds) { + contentCapabilitiesRegistry.getShowDeleted().register(typeIds); + } + protected void registerTageableTypes(final String... typeIds) { contentCapabilitiesRegistry.getTageable().register(typeIds); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2011-08-10 17:09:53 UTC (rev 1487) @@ -20,7 +20,7 @@ .flow { min-height: 30px; - padding: 5px 10px; + padding: 1px 10px; -moz-user-select: none; -khtml-user-select: none; outline: 0; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -30,6 +30,7 @@ import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; @@ -102,6 +103,9 @@ selected = itemWidget; } }); + if (ContentStatus.inTheDustbin.equals(item.getContentStatus())) { + itemWidget.getTitleWidget().addStyleName("k-line-through"); + } itemWidget.getRowDoubleClick().addDoubleClickHandler(doubleClickHandler); itemWidget.getRowMouse().addMouseOutHandler(new MouseOutHandler() { @Override Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -136,18 +136,20 @@ final StateToken stateToken = content.getStateToken(); final String typeId = content.getTypeId(); final String name = content.getName(); - final Object icon = getIcon(stateToken, typeId, mimeType); + final Object icon = mimeType != null ? getIcon(stateToken, typeId, mimeType) : getIcon(stateToken, + typeId, status); final String tooltip = getTooltip(stateToken, mimeType); - final FolderItemDescriptor item = new FolderItemDescriptor(genId(stateToken), - genId(parentStateToken), icon, name, tooltip, status, stateToken, modifiedOn, - capabilitiesRegistry.isDragable(typeId) && rights.isAdministrable(), - capabilitiesRegistry.isDropable(typeId) && rights.isAdministrable(), - actionsRegistry.getCurrentActions(content, typeId, session.isLogged(), rights, - ActionGroups.ITEM_MENU)); - if (status.equals(ContentStatus.inTheDustbin) && !session.getShowDeletedContent()) { + if (status.equals(ContentStatus.inTheDustbin) + && (!capabilitiesRegistry.showDeleted(typeId) && !session.getShowDeletedContent())) { // Don't show // NotifyUser.info("Deleted, don't show"); } else { + final FolderItemDescriptor item = new FolderItemDescriptor(genId(stateToken), + genId(parentStateToken), icon, name, tooltip, status, stateToken, modifiedOn, + capabilitiesRegistry.isDragable(typeId) && rights.isAdministrable(), + capabilitiesRegistry.isDropable(typeId) && rights.isAdministrable(), + actionsRegistry.getCurrentActions(content, typeId, status, session.isLogged(), rights, + ActionGroups.ITEM_MENU)); getView().addItem(item, new ClickHandler() { @Override public void onClick(final ClickEvent event) { @@ -232,6 +234,10 @@ } } + private Object getIcon(final StateToken stateToken, final String typeId, final ContentStatus status) { + return iconsRegistry.getContentTypeIcon(typeId, status); + } + private String getTooltip(final StateToken token, final BasicMimeTypeDTO mimeType) { if (mimeType != null && (mimeType.isImage() || mimeType.isPdf())) { // Used for previews Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -26,6 +26,7 @@ import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -57,12 +58,14 @@ } private void registerIcons() { - registerContentTypeIcon(TYPE_ROOT, navResources.folder()); - registerContentTypeIcon(TYPE_FOLDER, navResources.folder()); + registerContentTypeIcon(TYPE_ROOT, navResources.taskfolder()); + registerContentTypeIcon(TYPE_FOLDER, navResources.taskfolder()); registerContentTypeIcon(TYPE_TASK, navResources.task()); + registerContentTypeIcon(TYPE_TASK, ContentStatus.inTheDustbin, navResources.taskdone()); final String noTask = i18n.t("There isn't any task, create one"); registerEmptyMessages(TYPE_ROOT, noTask); registerEmptyMessages(TYPE_FOLDER, noTask); + registerShowDeleted(TYPE_FOLDER, TYPE_ROOT, TYPE_TASK); } } Deleted: trunk/src/main/java/cc/kune/tasks/client/actions/DelTaskMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/DelTaskMenuItem.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/tasks/client/actions/DelTaskMenuItem.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -1,36 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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 cc.kune.tasks.client.actions; - -import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.actions.DelContentMenuItem; - -import com.google.inject.Inject; - -public class DelTaskMenuItem extends DelContentMenuItem { - - @Inject - public DelTaskMenuItem(final I18nTranslationService i18n, final DelContentAction action, - final CoreResources res) { - super(i18n, action, res); - this.withText(i18n.t("Mark as done")); - } -} Copied: trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java (from rev 1485, trunk/src/main/java/cc/kune/tasks/client/actions/DelTaskMenuItem.java) =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsDoneTaskMenuItem.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -0,0 +1,37 @@ +/* + * + * Copyright (C) 2007-2011 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 cc.kune.tasks.client.actions; + +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.actions.SetContentStatusAsAdminMenuItem; + +import com.google.inject.Inject; + +public class MarkAsDoneTaskMenuItem extends SetContentStatusAsAdminMenuItem { + + @Inject + public MarkAsDoneTaskMenuItem(final I18nTranslationService i18n, + final SetContentStatusAsAdminAction action, final NavResources res) { + super(action, ContentStatus.inTheDustbin, false); + withText(i18n.t("Mark as done")).withIcon(res.taskdone()); + } +} Added: trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/tasks/client/actions/MarkAsNotDoneTaskMenuItem.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -0,0 +1,37 @@ +/* + * + * Copyright (C) 2007-2011 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 cc.kune.tasks.client.actions; + +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.actions.SetContentStatusAsAdminMenuItem; + +import com.google.inject.Inject; + +public class MarkAsNotDoneTaskMenuItem extends SetContentStatusAsAdminMenuItem { + + @Inject + public MarkAsNotDoneTaskMenuItem(final I18nTranslationService i18n, + final SetContentStatusAsAdminAction action, final NavResources res) { + super(action, ContentStatus.publishedOnline, false); + withText(i18n.t("Mark as not done")).withIcon(res.task()); + } +} Deleted: trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -1,38 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 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 cc.kune.tasks.client.actions; - -import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.core.shared.i18n.I18nTranslationService; -import cc.kune.gspace.client.actions.NewContainerBtn; -import cc.kune.tasks.shared.TasksConstants; - -import com.google.inject.Inject; - -public class NewFolderBtn extends NewContainerBtn { - - @Inject - public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, - final NavResources res) { - super(i18n, action, res.taskadd(), i18n.t("New folder"), i18n.t("Create a new folder"), - i18n.t("New folder"), TasksConstants.TYPE_FOLDER); - } - -} Copied: trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderMenuItem.java (from rev 1485, trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java) =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderMenuItem.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -0,0 +1,38 @@ +/* + * + * Copyright (C) 2007-2011 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 cc.kune.tasks.client.actions; + +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.i18n.I18nTranslationService; +import cc.kune.gspace.client.actions.NewContainerMenuItem; +import cc.kune.tasks.shared.TasksConstants; + +import com.google.inject.Inject; + +public class NewFolderMenuItem extends NewContainerMenuItem { + + @Inject + public NewFolderMenuItem(final I18nTranslationService i18n, final NewContainerAction action, + final NavResources res, final TasksNewMenu newMenu) { + super(i18n, action, res.taskfolderadd(), i18n.t("New task folder"), i18n.t("Create a new folder"), + i18n.t("New task folder"), TasksConstants.TYPE_FOLDER, newMenu.get()); + } + +} Modified: trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -29,6 +29,7 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.gspace.client.actions.AbstractFoldableToolActions; import cc.kune.gspace.client.actions.ActionGroups; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; @@ -51,9 +52,11 @@ public TasksClientActions(final I18nUITranslationService i18n, final Session session, final StateManager stateManager, final ActionRegistryByType registry, final CoreResources res, final Provider<GoParentFolderBtn> folderGoUp, final Provider<NewTaskMenuItem> newTaskItem, - final Provider<NewTaskIconBtn> newTaskIconBtn, final Provider<NewFolderBtn> newFolderBtn, + final Provider<NewTaskIconBtn> newTaskIconBtn, + final Provider<NewFolderMenuItem> newFolderMenuItem, final Provider<OpenFolderMenuItem> openContentMenuItem, - final Provider<DelTaskMenuItem> delContentMenuItem, + final Provider<MarkAsDoneTaskMenuItem> marksAsDoneMenuItem, + final Provider<MarkAsNotDoneTaskMenuItem> marksAsNotDoneMenuItem, final Provider<RefreshContentMenuItem> refresh, final Provider<ContentViewerOptionsMenu> optionsMenuContent, final Provider<ParticipateInContentBtn> participateBtn, final TasksNewMenu taskNewMenu, @@ -66,15 +69,17 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, newTaskItem, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, newTaskIconBtn, all); - // actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderBtn, - // containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderMenuItem, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); - actionsRegistry.addAction(ActionGroups.ITEM_MENU, delContentMenuItem, contents); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, marksAsDoneMenuItem, + ContentStatus.publishedOnline, TYPE_TASK); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, marksAsNotDoneMenuItem, + ContentStatus.inTheDustbin, TYPE_TASK); actionsRegistry.addAction(ActionGroups.ITEM_MENU, delFolderMenuItem, containersNoRoot); newMenusRegistry.register(TYPE_FOLDER, taskNewMenu.get()); newMenusRegistry.register(TYPE_ROOT, taskNewMenu.get()); Modified: trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -26,12 +26,14 @@ import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; import java.util.Arrays; +import java.util.Date; import cc.kune.core.server.AbstractServerTool; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.domain.Container; import cc.kune.domain.Content; @@ -80,4 +82,10 @@ createTask(user, group, shortTerm, "A short-term task sample"); return group; } + + @Override + public void onCreateContent(final Content content, final Container parent) { + content.setStatus(ContentStatus.publishedOnline); + content.setPublishedOn(new Date()); + } } Added: trunk/src/test/java/cc/kune/core/client/registry/IdGeneratorTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/registry/IdGeneratorTest.java (rev 0) +++ trunk/src/test/java/cc/kune/core/client/registry/IdGeneratorTest.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -0,0 +1,21 @@ +package cc.kune.core.client.registry; + +import static org.junit.Assert.assertEquals; + +import org.junit.Test; + +public class IdGeneratorTest { + + @Test + public void testBasic() { + assertEquals("", IdGenerator.generate("", "")); + assertEquals("", IdGenerator.generate(null, "")); + assertEquals("", IdGenerator.generate("", null)); + assertEquals("", IdGenerator.generate(null, null)); + assertEquals("a", IdGenerator.generate("a", null)); + assertEquals("a", IdGenerator.generate("a", "")); + assertEquals("b", IdGenerator.generate("", "b")); + assertEquals("b", IdGenerator.generate(null, "b")); + assertEquals("a" + IdGenerator.SEPARATOR + "b", IdGenerator.generate("a", "b")); + } +} Modified: trunk/src/test/java/org/ourproject/kune/platf/client/actions/IconsRegistryTest.java =================================================================== --- trunk/src/test/java/org/ourproject/kune/platf/client/actions/IconsRegistryTest.java 2011-08-08 00:02:51 UTC (rev 1486) +++ trunk/src/test/java/org/ourproject/kune/platf/client/actions/IconsRegistryTest.java 2011-08-10 17:09:53 UTC (rev 1487) @@ -25,78 +25,92 @@ import org.junit.Test; import cc.kune.core.client.registry.IconsRegistry; +import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.dto.BasicMimeTypeDTO; public class IconsRegistryTest { - private static final String CONTENT_TYPE_TEST = "somecontenttype"; - private static final String ICON = "someicon"; - private static final String JUSTANOTHERICON = "justanothericon"; - private static final String OTHERICON = "othericon"; + private static final String CONTENT_TYPE_TEST = "somecontenttype"; + private static final String ICON = "someicon"; + private static final String JUSTANOTHERICON = "justanothericon"; + private static final String OTHERICON = "othericon"; - private IconsRegistry reg; + private IconsRegistry reg; - @Before - public void before() { - reg = new IconsRegistry(); - } + @Before + public void before() { + reg = new IconsRegistry(); + } - @Test - public void testBasic() { - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); - } + @Test + public void testBasic() { + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + } - @Test - public void testBasicMimeType() { - final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); - assertEquals(null, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); - } + @Test + public void testBasicMimeType() { + final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + assertEquals(null, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + } - @Test - public void testBasicMimeTypeWithDef() { - final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, OTHERICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); - assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); - } + @Test + public void testBasicMimeTypeWithDef() { + final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, OTHERICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + } - @Test - public void testBasicMimeTypeWithDefType() { - final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); - final BasicMimeTypeDTO genericMimeType = new BasicMimeTypeDTO("image"); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType, OTHERICON); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, JUSTANOTHERICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); - assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType)); - assertEquals(JUSTANOTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); - } + @Test + public void testBasicMimeTypeWithDefType() { + final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); + final BasicMimeTypeDTO genericMimeType = new BasicMimeTypeDTO("image"); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, mimeType, ICON); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType, OTHERICON); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, JUSTANOTHERICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType)); + assertEquals(JUSTANOTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + } - @Test - public void testBasicMimeTypeWithOnlyDefType() { - final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); - final BasicMimeTypeDTO genericMimeType = new BasicMimeTypeDTO("image"); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType, OTHERICON); - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, JUSTANOTHERICON); - assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); - assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType)); - assertEquals(JUSTANOTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); - } + @Test + public void testBasicMimeTypeWithOnlyDefType() { + final BasicMimeTypeDTO mimeType = new BasicMimeTypeDTO("image/png"); + final BasicMimeTypeDTO genericMimeType = new BasicMimeTypeDTO("image"); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType, OTHERICON); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, JUSTANOTHERICON); + assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, genericMimeType)); + assertEquals(JUSTANOTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST)); + } - @Test - public void testNoResult() { - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, new BasicMimeTypeDTO("text", "plain"), ICON); - assertEquals(null, reg.getContentTypeIcon(CONTENT_TYPE_TEST, new BasicMimeTypeDTO("text", "rtf"))); - } + @Test + public void testContentStatus() { + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ContentStatus.inTheDustbin, ICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, ContentStatus.inTheDustbin)); + } - @Test - public void testNullBasicMimeType() { - final BasicMimeTypeDTO mimeType = null; - reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ICON); - assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); - } + @Test + public void testNoContentStatus() { + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ContentStatus.inTheDustbin, ICON); + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, OTHERICON); + assertEquals(OTHERICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, ContentStatus.editingInProgress)); + } + + @Test + public void testNoResult() { + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, new BasicMimeTypeDTO("text", "plain"), ICON); + assertEquals(null, reg.getContentTypeIcon(CONTENT_TYPE_TEST, new BasicMimeTypeDTO("text", "rtf"))); + } + + @Test + public void testNullBasicMimeType() { + final BasicMimeTypeDTO mimeType = null; + reg.registerContentTypeIcon(CONTENT_TYPE_TEST, ICON); + assertEquals(ICON, reg.getContentTypeIcon(CONTENT_TYPE_TEST, mimeType)); + } }