Author: vjrj_ Date: 2012-03-10 08:36:46 +0100 (Sat, 10 Mar 2012) New Revision: 1754 Added: trunk/img/icons/world-16.png trunk/src/main/java/cc/kune/gspace/client/actions/ActionStyles.java trunk/src/main/java/cc/kune/gspace/client/actions/AddPublicToContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerShareMenu.java trunk/src/main/resources/icons/add-participant.png trunk/src/main/resources/icons/world-16.png Removed: trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java.txt Modified: trunk/.classpath trunk/img/icons-base.svg trunk/img/icons/from-private-to-public.svg trunk/img/kune-logos.svg trunk/pom.xml trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java trunk/src/main/java/cc/kune/core/client/sn/AdminsGroupSNDropController.java trunk/src/main/java/cc/kune/core/client/sn/AllMembersGroupSNDropController.java trunk/src/main/java/cc/kune/core/client/sn/CollabsGroupSNDropController.java trunk/src/main/java/cc/kune/core/client/sn/GroupSNDropController.java trunk/src/main/java/cc/kune/core/public/ws.css trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java trunk/src/main/java/cc/kune/core/server/manager/impl/GroupServerUtils.java trunk/src/main/java/cc/kune/core/server/manager/impl/KuneWaveManagerDefault.java trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkSubGroup.java trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java trunk/src/main/java/cc/kune/events/server/EventsServlet.java trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java trunk/src/main/java/cc/kune/gspace/client/actions/AbstractEditorsMenu.java trunk/src/main/java/cc/kune/gspace/client/actions/AddAdminMembersToContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/AddAllMembersToContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/AddCollabMembersToContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/AddMembersToContentMenuItem.java trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java trunk/src/main/webapp/ws.html Log: Improved "share" of contents functionality Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/.classpath 2012-03-10 07:36:46 UTC (rev 1754) @@ -11,22 +11,24 @@ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/api/0.3.13/api-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/api-src/0.3.13/api-src-0.3.13.jar"/> <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.12/box-0.3.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.12/box-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.12/box-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.13/box-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.13/box-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.13/box-src-0.3.13-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/2.0b4/bsh-2.0b4.jar"/> <classpathentry kind="var" path="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1.jar" sourcepath="M2_REPO/c3p0/c3p0/0.9.1/c3p0-0.9.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar" sourcepath="M2_REPO/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/classworlds/classworlds/1.1-alpha-2/classworlds-1.1-alpha-2.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.12/client-0.3.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.12/client-common-0.3.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.12/client-common-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.12/client-common-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler/0.3.12/client-scheduler-0.3.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.12/client-scheduler-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.12/client-scheduler-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.12/client-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.12/client-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.13/client-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.13/client-common-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.13/client-common-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.13/client-common-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler/0.3.13/client-scheduler-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.13/client-scheduler-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.13/client-scheduler-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.13/client-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.13/client-src-0.3.13-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.12/common-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.12/common-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.13/common-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.13/common-src-0.3.13-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" sourcepath="M2_REPO/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2.jar" sourcepath="M2_REPO/commons-cli/commons-cli/1.2/commons-cli-1.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/> @@ -35,8 +37,10 @@ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.12/communication-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.12/communication-src-0.3.12-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.12/concurrencycontrol-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.12/concurrencycontrol-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.13/communication-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.13/communication-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.13/concurrencycontrol-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.13/concurrencycontrol-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/crypto/0.3.13/crypto-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/crypto-src/0.3.13/crypto-src-0.3.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5.jar" sourcepath="M2_REPO/net/sourceforge/cssparser/cssparser/0.9.5/cssparser-0.9.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar" sourcepath="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0.jar" sourcepath="M2_REPO/net/sf/dozer/dozer/4.0/dozer-4.0-sources.jar"/> @@ -61,7 +65,7 @@ <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/log/gwt-log/gwt-log/3.0.1/gwt-log-3.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-servlet/2.1.1/gwt-servlet-2.1.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1.jar" sourcepath="M2_REPO/com/google/gwt/gwt-user/2.1.1/gwt-user-2.1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.12/gwt-util-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.12/gwt-util-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.13/gwt-util-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.13/gwt-util-src-0.3.13-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/allen_sauer/gwt/voices/gwt-voices/gwt-voices/2.0.0/gwt-voices-2.0.0.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-all/0.5/gwtp-all-0.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5.jar" sourcepath="M2_REPO/com/gwtplatform/gwtp-clients-common/0.5/gwtp-clients-common-0.5-sources.jar"/> @@ -118,16 +122,17 @@ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.12/media-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.12/media-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.13/media-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.13/media-src-0.3.13-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5.jar" sourcepath="M2_REPO/org/mockito/mockito-core/1.8.5/mockito-core-1.8.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.12/model-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.12/model-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model/0.3.13/model-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.13/model-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.13/model-src-0.3.13-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16.jar" sourcepath="M2_REPO/org/mvel/mvel2/2.0.16/mvel2-2.0.16-sources.jar"/> <classpathentry kind="var" path="M2_REPO/mysql/mysql-connector-java/5.1.13/mysql-connector-java-5.1.13.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15.jar" sourcepath="M2_REPO/net/sourceforge/nekohtml/nekohtml/1.9.15/nekohtml-1.9.15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0.jar" sourcepath="M2_REPO/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-container-default/1.0-alpha-8/plexus-container-default-1.0-alpha-8-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4.jar" sourcepath="M2_REPO/org/codehaus/plexus/plexus-utils/1.0.4/plexus-utils-1.0.4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.12/proto-msg-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.13/proto-msg-0.3.13.jar"/> <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0-sources.jar"/> @@ -152,9 +157,10 @@ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.12/util-src-0.3.12.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.12/util-src-0.3.12-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util/0.3.13/util-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.13/util-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.13/util-src-0.3.13-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5.jar" sourcepath="M2_REPO/org/apache/maven/wagon/wagon-provider-api/1.0-alpha-5/wagon-provider-api-1.0-alpha-5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.12/waveinabox-server-0.3-0.3.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.13/waveinabox-server-0.3-0.3.13.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1.jar" sourcepath="M2_REPO/xalan/xalan/2.7.1/xalan-2.7.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/> <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2-sources.jar"/> Modified: trunk/img/icons/from-private-to-public.svg =================================================================== --- trunk/img/icons/from-private-to-public.svg 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/img/icons/from-private-to-public.svg 2012-03-10 07:36:46 UTC (rev 1754) @@ -14,7 +14,7 @@ height="297mm" id="svg3010" version="1.1" - inkscape:version="0.48.1 r9760" + inkscape:version="0.48.2 r9819" sodipodi:docname="from-private-to-public.svg"> <defs id="defs3012" /> @@ -25,16 +25,16 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.2968783" + inkscape:zoom="0.66041902" inkscape:cx="372.04724" - inkscape:cy="865.45734" + inkscape:cy="526.18109" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1078" inkscape:window-height="897" inkscape:window-x="0" - inkscape:window-y="947" + inkscape:window-y="972" inkscape:window-maximized="0" showguides="true" inkscape:guide-bbox="true" @@ -72,9 +72,9 @@ height="90" x="301.92883" y="67.511871" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/world-90.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/world-16.png" + inkscape:export-xdpi="16" + inkscape:export-ydpi="16" /> <path sodipodi:type="arc" style="color:#000000;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591000000002;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" @@ -301,28 +301,6 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <path - transform="matrix(0.475,0,0,0.95,14.25,8.6181091)" - d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z" - sodipodi:ry="10" - sodipodi:rx="20" - sodipodi:cy="32.362183" - sodipodi:cx="90" - id="path4967" - style="color:#000000;fill:#aaeeff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591000000002;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" - sodipodi:type="arc" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - sodipodi:nodetypes="cccccccc" - inkscape:connector-curvature="0" - id="path4969" - d="m 54.870524,30.509779 c -1.153029,0.318922 -2.103799,1.0872 -3.128131,1.667682 -0.588269,0.436973 -1.282465,1.630717 -0.490344,2.151434 0.627041,0.105509 1.130685,-0.428017 1.747951,-0.466712 0.720932,-0.166168 1.456986,-0.297538 2.140464,-0.591045 1.16756,-0.367925 1.16756,-0.367925 1.286901,-0.798635 0.05666,-0.648504 -0.404279,-1.249681 -0.839485,-1.692902 -0.198553,-0.16279 -0.45055,-0.315388 -0.717356,-0.269822 z" - style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:1;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" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path transform="matrix(2,0,0,2,-15,6.6378171)" d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" sodipodi:ry="1" @@ -400,38 +378,63 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + <g + id="g9947"> + <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" + sodipodi:type="arc" + style="color:#000000;fill:#aaeeff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591000000002;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" + id="path4967" + sodipodi:cx="90" + sodipodi:cy="32.362183" + sodipodi:rx="20" + sodipodi:ry="10" + d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z" + transform="matrix(0.475,0,0,0.95,14.25,8.6181091)" /> + <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" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:1;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 54.870524,30.509779 c -1.153029,0.318922 -2.103799,1.0872 -3.128131,1.667682 -0.588269,0.436973 -1.282465,1.630717 -0.490344,2.151434 0.627041,0.105509 1.130685,-0.428017 1.747951,-0.466712 0.720932,-0.166168 1.456986,-0.297538 2.140464,-0.591045 1.16756,-0.367925 1.16756,-0.367925 1.286901,-0.798635 0.05666,-0.648504 -0.404279,-1.249681 -0.839485,-1.692902 -0.198553,-0.16279 -0.45055,-0.315388 -0.717356,-0.269822 z" + id="path4969" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cccccccc" /> + <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" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:1;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 64,36.862183 c -1.635366,0.833939 -3.561037,1.673743 -4.270781,3.334577 -0.218268,0.510757 0.09005,1.113048 0.166644,1.657967 0.31147,0.58051 -0.449632,1.092308 -0.224964,1.674953 0.268852,0.60499 1.037105,0.513829 1.54657,0.319626 0.519221,-0.178436 -0.216522,-0.689274 0,0 0.235528,0.550919 2.168495,0.719023 2.751281,0.46881 0.560483,-0.205502 0.941907,-0.302405 1.209461,-0.770233 0.877296,-1.784781 1.30809,-3.805794 1.170202,-5.793316 -0.043,-0.535579 -0.207688,-1.053837 -0.401099,-1.54807 -0.200049,-0.65216 -0.875714,0.007 -1.141464,0.275076 -0.243481,0.172262 -0.51356,0.313709 -0.80585,0.38061 z" + id="path4983" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cacccccccccc" /> + <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" + inkscape:connector-curvature="0" + id="path4985" + d="m 51.123421,37.285483 c -0.962787,0.365836 -2.002892,0.61665 -2.881868,1.153083 -0.728654,0.613744 -0.637957,1.734715 -0.260199,2.516018 0.463562,0.999999 0.831314,2.0464 1.38527,3.002579 0.535766,0.706283 -0.03615,0.399028 0.61473,0.997421 0.183957,0.219055 1.329994,1.326569 2,1 0.333986,-0.162789 0.25047,-0.655004 0.22155,-1.092401 0.210465,-0.907183 -0.333281,-1.774627 -0.289937,-2.688331 -0.02338,-1.147216 0.201822,-2.280691 0.338507,-3.41565 0.078,-0.629269 -0.277045,-1.800236 -1.128053,-1.472719 z" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:1;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" + sodipodi:nodetypes="cccccacccc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceEnabled.png" + transform="matrix(0.475,0,0,0.95,14.25,8.6181091)" + d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z" + sodipodi:ry="10" + sodipodi:rx="20" + sodipodi:cy="32.362183" + sodipodi:cx="90" + id="path4987" + style="color:#000000;fill:none;stroke:#002255;stroke-width:1.48864591000000002;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" + sodipodi:type="arc" /> + </g> <path - sodipodi:nodetypes="cacccccccccc" - inkscape:connector-curvature="0" - id="path4983" - d="m 64,36.862183 c -1.635366,0.833939 -3.561037,1.673743 -4.270781,3.334577 -0.218268,0.510757 0.09005,1.113048 0.166644,1.657967 0.31147,0.58051 -0.449632,1.092308 -0.224964,1.674953 0.268852,0.60499 1.037105,0.513829 1.54657,0.319626 0.519221,-0.178436 -0.216522,-0.689274 0,0 0.235528,0.550919 2.168495,0.719023 2.751281,0.46881 0.560483,-0.205502 0.941907,-0.302405 1.209461,-0.770233 0.877296,-1.784781 1.30809,-3.805794 1.170202,-5.793316 -0.043,-0.535579 -0.207688,-1.053837 -0.401099,-1.54807 -0.200049,-0.65216 -0.875714,0.007 -1.141464,0.275076 -0.243481,0.172262 -0.51356,0.313709 -0.80585,0.38061 z" - style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:1;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" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - sodipodi:nodetypes="cccccacccc" - style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:1;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 51.123421,37.285483 c -0.962787,0.365836 -2.002892,0.61665 -2.881868,1.153083 -0.728654,0.613744 -0.637957,1.734715 -0.260199,2.516018 0.463562,0.999999 0.831314,2.0464 1.38527,3.002579 0.535766,0.706283 -0.03615,0.399028 0.61473,0.997421 0.183957,0.219055 1.329994,1.326569 2,1 0.333986,-0.162789 0.25047,-0.655004 0.22155,-1.092401 0.210465,-0.907183 -0.333281,-1.774627 -0.289937,-2.688331 -0.02338,-1.147216 0.201822,-2.280691 0.338507,-3.41565 0.078,-0.629269 -0.277045,-1.800236 -1.128053,-1.472719 z" - id="path4985" - inkscape:connector-curvature="0" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - sodipodi:type="arc" - style="color:#000000;fill:none;stroke:#002255;stroke-width:1.48864591000000002;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" - id="path4987" - sodipodi:cx="90" - sodipodi:cy="32.362183" - sodipodi:rx="20" - sodipodi:ry="10" - d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z" - transform="matrix(0.475,0,0,0.95,14.25,8.6181091)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceEnabled.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceDisabled.png" @@ -644,9 +647,9 @@ <g id="g6729" transform="translate(-4.999997,-4.9999999)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/world-90.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/world-16.png" + inkscape:export-xdpi="16" + inkscape:export-ydpi="16"> <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" @@ -833,5 +836,65 @@ inkscape:export-ydpi="90" /> </g> </g> + <g + id="g9954" + transform="matrix(0.8,0,0,0.8,147.4,15.872437)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/resources/icons/world-16.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + transform="matrix(0.475,0,0,0.95,14.25,8.6181091)" + 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" + sodipodi:cx="90" + id="path9956" + style="color:#000000;fill:#aaeeff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;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" + sodipodi:type="arc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:nodetypes="cccccccc" + inkscape:connector-curvature="0" + id="path9958" + d="m 54.870524,30.509779 c -1.153029,0.318922 -2.103799,1.0872 -3.128131,1.667682 -0.588269,0.436973 -1.282465,1.630717 -0.490344,2.151434 0.627041,0.105509 1.130685,-0.428017 1.747951,-0.466712 0.720932,-0.166168 1.456986,-0.297538 2.140464,-0.591045 1.16756,-0.367925 1.16756,-0.367925 1.286901,-0.798635 0.05666,-0.648504 -0.404279,-1.249681 -0.839485,-1.692902 -0.198553,-0.16279 -0.45055,-0.315388 -0.717356,-0.269822 z" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:1;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" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:nodetypes="cacccccccccc" + inkscape:connector-curvature="0" + id="path9960" + d="m 64,36.862183 c -1.635366,0.833939 -3.561037,1.673743 -4.270781,3.334577 -0.218268,0.510757 0.09005,1.113048 0.166644,1.657967 0.31147,0.58051 -0.449632,1.092308 -0.224964,1.674953 0.268852,0.60499 1.037105,0.513829 1.54657,0.319626 0.519221,-0.178436 -0.216522,-0.689274 0,0 0.235528,0.550919 2.168495,0.719023 2.751281,0.46881 0.560483,-0.205502 0.941907,-0.302405 1.209461,-0.770233 0.877296,-1.784781 1.30809,-3.805794 1.170202,-5.793316 -0.043,-0.535579 -0.207688,-1.053837 -0.401099,-1.54807 -0.200049,-0.65216 -0.875714,0.007 -1.141464,0.275076 -0.243481,0.172262 -0.51356,0.313709 -0.80585,0.38061 z" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:1;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" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:nodetypes="cccccacccc" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:1;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 51.123421,37.285483 c -0.962787,0.365836 -2.002892,0.61665 -2.881868,1.153083 -0.728654,0.613744 -0.637957,1.734715 -0.260199,2.516018 0.463562,0.999999 0.831314,2.0464 1.38527,3.002579 0.535766,0.706283 -0.03615,0.399028 0.61473,0.997421 0.183957,0.219055 1.329994,1.326569 2,1 0.333986,-0.162789 0.25047,-0.655004 0.22155,-1.092401 0.210465,-0.907183 -0.333281,-1.774627 -0.289937,-2.688331 -0.02338,-1.147216 0.201822,-2.280691 0.338507,-3.41565 0.078,-0.629269 -0.277045,-1.800236 -1.128053,-1.472719 z" + id="path9962" + inkscape:connector-curvature="0" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:type="arc" + style="color:#000000;fill:none;stroke:#002255;stroke-width:1.48864591;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" + id="path9964" + sodipodi:cx="90" + sodipodi:cy="32.362183" + sodipodi:rx="20" + sodipodi:ry="10" + 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" + transform="matrix(0.475,0,0,0.95,14.25,8.6181091)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/publicSpaceEnabled.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> </g> </svg> Added: trunk/img/icons/world-16.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/world-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/icons-base.svg =================================================================== --- trunk/img/icons-base.svg 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/img/icons-base.svg 2012-03-10 07:36:46 UTC (rev 1754) @@ -14,7 +14,7 @@ height="297mm" id="svg21019" sodipodi:version="0.32" - inkscape:version="0.48.1 r9760" + inkscape:version="0.48.2 r9819" sodipodi:docname="icons-base.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape" inkscape:export-filename="/tmp/buttons.png" @@ -35,8 +35,8 @@ inkscape:current-layer="layer1" inkscape:window-width="1078" inkscape:window-height="897" - inkscape:window-x="0" - inkscape:window-y="947" + inkscape:window-x="-40" + inkscape:window-y="957" showgrid="false" showguides="true" inkscape:guide-bbox="true" @@ -1914,7 +1914,7 @@ <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - <dc:title /> + <dc:title></dc:title> </cc:Work> </rdf:RDF> </metadata> @@ -4695,11 +4695,11 @@ <image sodipodi:absref="/home/vjrj/proyectos/dev/kune/trunk/img/icons/lock_break.png" xlink:href="icons/lock_break.png" - width="16" + y="450.82797" + x="330.84604" + id="image2972" height="16" - id="image2972" - x="330.84604" - y="450.82797" /> + width="16" /> <use x="0" y="0" @@ -4790,12 +4790,12 @@ <image sodipodi:absref="/home/vjrj/proyectos/dev/kune/trunk/img/icons/lock_break.png" xlink:href="icons/lock_break.png" - transform="scale(-1,1)" + y="432.36218" + x="-371" + id="image3958" + height="16" width="16" - height="16" - id="image3958" - x="-371" - y="432.36218" /> + transform="scale(-1,1)" /> <g id="g3962" transform="translate(-43.509019,-21.462476)"> @@ -5711,5 +5711,34 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/core/client/resources/nav/task.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + <image + y="330.36218" + x="321" + id="image11985" + xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACEAAAAYCAYAAAB0kZQKAAAABHNCSVQICAgIfAhkiAAAA+JJREFU +SIm9lk9II1ccx78vzCTjTCaaxJiooLsxQaMDWyqi0oNFe+mp0D/soYc97NJLRaQXL7304MHSgkhv +28Me+ufc0kOhFioU6s0ENGijqIkRMpMYjZOZTEze66FE1t2oma7bDzx47/H7vff9vfd+jx/BNSST +yX5d1z83TfPtSqXSWyqV2q6zbYbH4zEFQciKorg2Njb25CZb0mzz09PTZ6qqTgmCQAKBAHp6euD1 +euF0OkHISy4vYZomNE3D8fExNE0DpZR1dXWteTyeR4qipG8UEY/HHx4dHX0nyzKnKAp8Pl8LMd8M +Ywz5fB6JRAKU0ove3t5PFEV51lREPB5/eHBw8KOiKGRgYACMMTDGXllEg4uLC6RSKezv72N4eHgh +Eol8eUVEMpns39nZ2R8cHCSxWAyU0jsV8DxbW1vIZrMYHx9/1+/3/woAHACoqvpbZ2cnicViqNfr +oJS+FgEAEI1Gkc/nsbu7+zNjLEAIOXNsbGy8VSwWoyMjI6CUolargVL62prD4cDQ0BDS6TRvWda3 +AMCZpvmZLMvo6OiAZVm2rmF+fh4AsLy8bOs0vF4vRFFEOp3+gDHWwRmGMREKhUApRb1et7VYA57n +YVmWLZ9AIABVVWk0Gn3EmabZFQwGL6/hv8AYs+3r8/mwvb1NAExxlUqFkyQJtVrtlTLCrq8oijBN +0wHgAccYA8/zKJfLty60sLDQdH52dvbKeGlp6VYRPM83uvc4AJdpeVd/gyiK0HX9RptarXbZ5wRB +qOm6zhFCbr3XxcVFyLJ8OZ6bmwMArKysXLFr5Y2USiW4XK4aAAcnCIKmqmp3d3d3S9lRKpVszV9H +sViEJEklAKcOl8v1VzabBcdxtj+eBo3I7bRCoQC/368BSHA8z3+dz+ffr1ar/1uKlstlGIaBcDjM +A/iDAMDq6uq+JEn37t+/f+XBtILX6wXw7/G2yubmJnieT09PT/cAiHAAIIrix7lc7s/29nYiSVJL +hUuDQqFgS7SqqjAMg83MzJwA+J0Qcni52/r6+jeZTObTSCRyJ8XMizDGkMlkoGkaGx0dfdrX1/ch +gDeviACAZDL5NJVKPRFFEaFQCG63+04E6LqOdDoNy7LY5OTkL6FQaBLAO4SQBNCkxiwUCh8dHh7+ +sLe3xwmCALfbDVmWIYpiSzUmpRTVahXlchnn5+fQdR31ep35fL6/JyYmDJfL1Q9guiGgqQgAYIy1 +G4bxlaZpj3O5XO3k5ITous7Zib6tra3idrvPgsHgWTgcdjmdzjYA3wP4ghBy9rztjWExxtoBvAdg +CsAbAB7YEQIgASAOYA3ATy9u3uAfDs9TNu1kEp0AAAAASUVORK5CYII= +" + height="24" + width="33" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/resources/icons/add-participant.png" + inkscape:export-xdpi="45" + inkscape:export-ydpi="45" /> </g> </svg> Modified: trunk/img/kune-logos.svg =================================================================== --- trunk/img/kune-logos.svg 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/img/kune-logos.svg 2012-03-10 07:36:46 UTC (rev 1754) @@ -878,7 +878,7 @@ </g> </g> <g - style="opacity:0.2" + style="opacity:0.05" inkscape:export-ydpi="1797.08" inkscape:export-xdpi="1797.08" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-background.png" Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/pom.xml 2012-03-10 07:36:46 UTC (rev 1754) @@ -22,7 +22,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <slf4j.version>1.6.1</slf4j.version> <openjpa.version>2.0.1</openjpa.version> - <wiab.version>0.3.12</wiab.version> + <wiab.version>0.3.13</wiab.version> <jetty.version>8.0.1.v20110908</jetty.version> <skipTests>true</skipTests> </properties> @@ -558,11 +558,26 @@ </dependency> <dependency> <groupId>org.waveprotocol</groupId> + <artifactId>model</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> <artifactId>model-src</artifactId> <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> + <artifactId>api</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>api-src</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> <artifactId>client</artifactId> <version>${wiab.version}</version> </dependency> @@ -573,11 +588,26 @@ </dependency> <dependency> <groupId>org.waveprotocol</groupId> + <artifactId>crypto</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>crypto-src</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> <artifactId>common-src</artifactId> <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> + <artifactId>util</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> <artifactId>util-src</artifactId> <version>${wiab.version}</version> </dependency> Modified: trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -32,7 +32,9 @@ import cc.kune.gspace.client.actions.AddAdminMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddAllMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddCollabMembersToContentMenuItem; +import cc.kune.gspace.client.actions.AddPublicToContentMenuItem; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.ContentViewerShareMenu; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.TutorialContainerBtn; @@ -54,20 +56,24 @@ final Provider<OpenBartersMenuItem> openContentMenuItem, final Provider<DelBartersMenuItem> delContentMenuItem, final Provider<ContentViewerOptionsMenu> optionsMenuContent, + final Provider<ContentViewerShareMenu> shareMenuContent, final Provider<AddAllMembersToContentMenuItem> addAllMenuItem, final Provider<AddAdminMembersToContentMenuItem> addAdminMembersMenuItem, final Provider<AddCollabMembersToContentMenuItem> addCollabMembersMenuItem, + final Provider<AddPublicToContentMenuItem> addPublicMenuItem, final Provider<TutorialContainerBtn> tutorialBtn, final Provider<ParticipateInContentBtn> participateBtn, final Provider<DelFolderMenuItem> delFolderMenuItem, final Provider<RefreshContentMenuItem> refresh) { super(session, stateManager, i18n, registry); actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, newBartersBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); @@ -79,6 +85,7 @@ actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAllMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAdminMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, addPublicMenuItem, contents); } @Override Modified: trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -36,7 +36,9 @@ import cc.kune.gspace.client.actions.AddAdminMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddAllMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddCollabMembersToContentMenuItem; +import cc.kune.gspace.client.actions.AddPublicToContentMenuItem; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.ContentViewerShareMenu; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; @@ -63,18 +65,17 @@ final Provider<DelPostMenuItem> delContentMenuItem, final Provider<RefreshContentMenuItem> refresh, final Provider<TutorialContainerBtn> tutorialBtn, final Provider<ContentViewerOptionsMenu> optionsMenuContent, + final Provider<ContentViewerShareMenu> shareMenuContent, final Provider<AddAllMembersToContentMenuItem> addAllMenuItem, final Provider<AddAdminMembersToContentMenuItem> addAdminMembersMenuItem, final Provider<AddCollabMembersToContentMenuItem> addCollabMembersMenuItem, + final Provider<AddPublicToContentMenuItem> addPublicMenuItem, final Provider<ParticipateInContentBtn> participateBtn, final BlogsNewMenu blogNewMenu, final PostNewMenu postNewMenu, final NewMenusForTypeIdsRegistry newMenusRegistry, final Provider<ChatAboutContentBtn> chatAbout, final Provider<DelBlogMenuItem> delFolderMenuItem, final Provider<SetAsHomePageMenuItem> setAsHomePage) { super(session, stateManager, i18n, registry); actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostIconBtn, noRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, blogNewMenu, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, postNewMenu, contents); @@ -83,6 +84,11 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, newBlogBtn, TYPE_ROOT); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); @@ -93,6 +99,7 @@ actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAllMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAdminMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, addPublicMenuItem, contents); newMenusRegistry.register(TYPE_BLOG, blogNewMenu.get()); newMenusRegistry.register(TYPE_POST, (MenuDescriptor) postNewMenu.get().withText(i18n.t("Add Gadget"))); Modified: trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -128,4 +128,7 @@ @Source("unchecked.png") ImageResource unChecked(); + + @Source("icons/world-16.png") + ImageResource world16(); } Modified: trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/client/resources/CoreResources.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -539,6 +539,9 @@ @Source("wave-icon.png") ImageResource waveIcon(); + @Source("icons/add-participant.png") + ImageResource addParticipant(); + } Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -6,6 +6,7 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkSubGroup; +import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import com.google.inject.Provider; @@ -25,10 +26,16 @@ public void addParticipants(final StateToken token, final SocialNetworkSubGroup subGroup) { contentService.get().addParticipants(session.getUserHash(), token, - session.getCurrentGroupShortName(), subGroup, new AsyncCallbackSimple<Boolean>() { + session.getCurrentGroupShortName(), subGroup, new AsyncCallback<Boolean>() { @Override + public void onFailure(final Throwable caught) { + NotifyUser.important(i18n.t("Seems that the list of partipants were added partially. Please, retry")); + } + + @Override public void onSuccess(final Boolean result) { - NotifyUser.info(result ? i18n.t("Shared with members") + NotifyUser.info(result ? subGroup.equals(SocialNetworkSubGroup.PUBLIC) ? i18n.t("Shared with general public. Now anyone can participate") + : i18n.t("Shared with members") : i18n.t("All these members are already partipating")); } }); Modified: trunk/src/main/java/cc/kune/core/client/sn/AdminsGroupSNDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AdminsGroupSNDropController.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/client/sn/AdminsGroupSNDropController.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -15,7 +15,7 @@ public AdminsGroupSNDropController(final KuneDragController dragController, final ContentServiceHelper contentService, final Session session, final I18nTranslationService i18n, final SocialNetServiceHelper sNClientUtils) { - super(dragController, SocialNetworkSubGroup.admins, contentService, session, i18n, sNClientUtils); + super(dragController, SocialNetworkSubGroup.ADMINS, contentService, session, i18n, sNClientUtils); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/AllMembersGroupSNDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/AllMembersGroupSNDropController.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/client/sn/AllMembersGroupSNDropController.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -15,7 +15,7 @@ public AllMembersGroupSNDropController(final KuneDragController dragController, final ContentServiceHelper contentService, final Session session, final I18nTranslationService i18n, final SocialNetServiceHelper sNClientUtils) { - super(dragController, SocialNetworkSubGroup.all, contentService, session, i18n, sNClientUtils); + super(dragController, SocialNetworkSubGroup.ALL_GROUP_MEMBERS, contentService, session, i18n, sNClientUtils); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/CollabsGroupSNDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/CollabsGroupSNDropController.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/client/sn/CollabsGroupSNDropController.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -15,7 +15,7 @@ public CollabsGroupSNDropController(final KuneDragController dragController, final ContentServiceHelper contentService, final Session session, final I18nTranslationService i18n, final SocialNetServiceHelper sNClientUtils) { - super(dragController, SocialNetworkSubGroup.collabs, contentService, session, i18n, sNClientUtils); + super(dragController, SocialNetworkSubGroup.COLLABS, contentService, session, i18n, sNClientUtils); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/GroupSNDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/GroupSNDropController.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/client/sn/GroupSNDropController.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -41,10 +41,10 @@ } if (widget instanceof BasicDragableThumb) { final String shortName = ((BasicDragableThumb) widget).getToken().getGroup(); - if (subGroup.equals(SocialNetworkSubGroup.admins)) { + if (subGroup.equals(SocialNetworkSubGroup.ADMINS)) { sNClientUtils.changeToAdmin(shortName); } - if (subGroup.equals(SocialNetworkSubGroup.collabs)) { + if (subGroup.equals(SocialNetworkSubGroup.COLLABS)) { sNClientUtils.changeToCollab(shortName); } } Modified: trunk/src/main/java/cc/kune/core/public/ws.css =================================================================== --- trunk/src/main/java/cc/kune/core/public/ws.css 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/public/ws.css 2012-03-10 07:36:46 UTC (rev 1754) @@ -1,18 +1,18 @@ GCHARSET "UTF-8 "; body { background-color: transparent; color: black; - font-family: 'Ubuntu', Arial; + font-family: "Ubuntu Beta",UbuntuBeta,Ubuntu,"Bitstream Vera Sans","DejaVu Sans",Tahoma,sans-serif; font-size: small; margin: 5px; overflow: hidden; } * { - font-family: 'Ubuntu', Arial; + font-family: "Ubuntu Beta",UbuntuBeta,Ubuntu,"Bitstream Vera Sans","DejaVu Sans",Tahoma,sans-serif; } body.fontface { - font: 'Ubuntu', Arial; + font-family: "Ubuntu Beta",UbuntuBeta,Ubuntu,"Bitstream Vera Sans","DejaVu Sans",Tahoma,sans-serif; } div,span { @@ -784,7 +784,7 @@ .x-fieldset-header-text,.x-form-group-label,.x-form-cb-label { font-size: 14px; - font-family: 'Ubuntu', Arial; + font-family: "Ubuntu Beta",UbuntuBeta,Ubuntu,"Bitstream Vera Sans","DejaVu Sans",Tahoma,sans-serif; } .k-form-intro { Modified: trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/server/content/ContentManagerDefault.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -165,7 +165,11 @@ public boolean addParticipants(final User user, final Long contentId, final Group group, final SocialNetworkSubGroup whichOnes) { final Set<String> members = new HashSet<String>(); - GroupServerUtils.getAllUserMembersAsString(members, group, whichOnes); + if (whichOnes.equals(SocialNetworkSubGroup.PUBLIC)) { + members.add(participantUtils.getPublicParticipantId().toString()); + } else { + GroupServerUtils.getAllUserMembersAsString(members, group, whichOnes); + } final Content content = finder.getContent(contentId); return addParticipants(user, content, members.toArray(new String[members.size()])); } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/GroupServerUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/GroupServerUtils.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupServerUtils.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -55,11 +55,11 @@ public static final Collection<Group> getGroupMembers(final Group ofGroup, final SocialNetworkSubGroup subGroup) { final Collection<Group> members = new LinkedHashSet<Group>(); - if (subGroup.equals(SocialNetworkSubGroup.admins) || subGroup.equals(SocialNetworkSubGroup.all)) { + if (subGroup.equals(SocialNetworkSubGroup.ADMINS) || subGroup.equals(SocialNetworkSubGroup.ALL_GROUP_MEMBERS)) { final Set<Group> admins = ofGroup.getSocialNetwork().getAccessLists().getAdmins().getList(); members.addAll(admins); } - if (subGroup.equals(SocialNetworkSubGroup.collabs) || subGroup.equals(SocialNetworkSubGroup.all)) { + if (subGroup.equals(SocialNetworkSubGroup.COLLABS) || subGroup.equals(SocialNetworkSubGroup.ALL_GROUP_MEMBERS)) { final Set<Group> collabs = ofGroup.getSocialNetwork().getAccessLists().getEditors().getList(); members.addAll(collabs); } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/KuneWaveManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/KuneWaveManagerDefault.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/KuneWaveManagerDefault.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -101,8 +101,8 @@ if (!AccessRightsUtils.correctMember(user, group, AccessRol.Editor)) { throw new AccessViolationException("You cannot write because you are not a member"); } - GroupServerUtils.getAllUserMembers(toList, group, onlyToAdmins ? SocialNetworkSubGroup.admins - : SocialNetworkSubGroup.all); + GroupServerUtils.getAllUserMembers(toList, group, onlyToAdmins ? SocialNetworkSubGroup.ADMINS + : SocialNetworkSubGroup.ALL_GROUP_MEMBERS); } return KuneWaveServerUtils.getUrl(waveService.createWave(title, message, KuneWaveService.DO_NOTHING_CBACK, participantUtils.listFrom(toList))); Modified: trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -36,14 +36,14 @@ public void notifyGroup(final Group groupToNotify, final Group groupSender, final String subject, final String message) { final Set<User> members = new HashSet<User>(); - GroupServerUtils.getAllUserMembers(members, groupToNotify, SocialNetworkSubGroup.all); + GroupServerUtils.getAllUserMembers(members, groupToNotify, SocialNetworkSubGroup.ALL_GROUP_MEMBERS); notifyToAll(groupSender, subject, message, members); } public void notifyGroupAdmins(final Group groupToNotify, final Group groupSender, final String subject, final String message) { final Set<User> adminMembers = new HashSet<User>(); - GroupServerUtils.getAllUserMembers(adminMembers, groupToNotify, SocialNetworkSubGroup.admins); + GroupServerUtils.getAllUserMembers(adminMembers, groupToNotify, SocialNetworkSubGroup.ADMINS); notifyToAll(groupSender, subject, message, adminMembers); } Modified: trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkSubGroup.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkSubGroup.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/core/shared/dto/SocialNetworkSubGroup.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -27,9 +27,11 @@ */ public enum SocialNetworkSubGroup implements IsSerializable { /** The admins members only */ - admins, + ADMINS, /** all members */ - all, + ALL_GROUP_MEMBERS, /** The collabs members only */ - collabs + COLLABS, + /** Public in general **/ + PUBLIC } Modified: trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -36,7 +36,9 @@ import cc.kune.gspace.client.actions.AddAdminMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddAllMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddCollabMembersToContentMenuItem; +import cc.kune.gspace.client.actions.AddPublicToContentMenuItem; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.ContentViewerShareMenu; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; @@ -62,9 +64,11 @@ final Provider<OpenDocMenuItem> openContentMenuItem, final Provider<NewFolderBtn> newFolderBtn, final Provider<DelDocMenuItem> delContentMenuItem, final Provider<ContentViewerOptionsMenu> optionsMenuContent, + final Provider<ContentViewerShareMenu> shareMenuContent, final Provider<AddAllMembersToContentMenuItem> addAllMenuItem, final Provider<AddAdminMembersToContentMenuItem> addAdminMembersMenuItem, final Provider<AddCollabMembersToContentMenuItem> addCollabMembersMenuItem, + final Provider<AddPublicToContentMenuItem> addPublicMenuItem, final Provider<ParticipateInContentBtn> participateBtn, final Provider<DelFolderMenuItem> delFolderMenuItem, final Provider<TutorialContainerBtn> tutorialBtn, final Provider<ChatAboutContentBtn> chatAbout, @@ -75,9 +79,6 @@ super(session, stateManager, i18n, registry); actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, newDocIconBtn, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, foldersNewMenu, containers); @@ -85,6 +86,11 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, newDocMenuItem, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderMenuItem, containers); @@ -97,6 +103,7 @@ actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAllMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAdminMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, addPublicMenuItem, contents); newMenusRegistry.register(TYPE_FOLDER, foldersNewMenu.get()); newMenusRegistry.register(TYPE_ROOT, foldersNewMenu.get()); newMenusRegistry.register(TYPE_DOCUMENT, Modified: trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -31,7 +31,9 @@ import cc.kune.gspace.client.actions.AddAdminMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddAllMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddCollabMembersToContentMenuItem; +import cc.kune.gspace.client.actions.AddPublicToContentMenuItem; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.ContentViewerShareMenu; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; @@ -51,9 +53,11 @@ final Provider<OpenMeetingMenuItem> openContentMenuItem, final Provider<DelMeetingMenuItem> delContentMenuItem, final Provider<ContentViewerOptionsMenu> optionsMenuContent, + final Provider<ContentViewerShareMenu> shareMenuContent, final Provider<AddAllMembersToContentMenuItem> addAllMenuItem, final Provider<AddAdminMembersToContentMenuItem> addAdminMembersMenuItem, final Provider<AddCollabMembersToContentMenuItem> addCollabMembersMenuItem, + final Provider<AddPublicToContentMenuItem> addPublicMenuItem, final Provider<ParticipateInContentBtn> participateBtn, final Provider<Calendar1DayViewSelectBtn> cal1DayBtn, final Provider<Calendar3DaysViewSelectBtn> cal3DaysBtn, @@ -67,9 +71,6 @@ final Provider<RefreshContentMenuItem> refresh) { super(session, stateManager, i18n, registry); actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, goToday, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, calPrevBtn, containers); @@ -81,6 +82,11 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, export, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); // On over calendar menu actionsRegistry.addAction(ActionGroups.TOOLBAR, onOverMenu, containers); Modified: trunk/src/main/java/cc/kune/events/server/EventsServlet.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -5,6 +5,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.Map.Entry; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; @@ -75,6 +76,9 @@ events.add(vEvent); } catch (final Exception e) { LOG.warn("Invalid appointments in " + token, e); + for (final Entry<String, String> val : props.entrySet()) { + LOG.warn(String.format("Prop: %s, value: %s", val.getKey(), val.getValue())); + } } } } else { Modified: trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/gspace/client/GSpaceGinModule.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -30,6 +30,7 @@ import cc.kune.core.client.sn.actions.WriteToBuddyHeaderButton; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; import cc.kune.gspace.client.actions.ContentViewerOptionsShareSubMenu; +import cc.kune.gspace.client.actions.ContentViewerShareMenu; import cc.kune.gspace.client.actions.GiveUsFeedbackBtn; import cc.kune.gspace.client.actions.RenameAction; import cc.kune.gspace.client.armor.GSpaceArmor; @@ -209,6 +210,7 @@ // Actions s(ContentViewerOptionsMenu.class); + s(ContentViewerShareMenu.class); s(ContentViewerOptionsShareSubMenu.class); s(RenameAction.class); s(GiveUsFeedbackBtn.class); Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AbstractEditorsMenu.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AbstractEditorsMenu.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AbstractEditorsMenu.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -28,7 +28,7 @@ public AbstractEditorsMenu(final AccessRightsClientManager rightsManager) { super(); - this.withStyles("k-button, k-btn, k-5corners, k-def-docbtn, k-fl"); + this.withStyles(ActionStyles.MENU_BTN_STYLE_LEFT); rightsManager.onRightsChanged(true, new AccessRightsChangedHandler() { @Override public void onAccessRightsChanged(final AccessRightsChangedEvent event) { Added: trunk/src/main/java/cc/kune/gspace/client/actions/ActionStyles.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/ActionStyles.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ActionStyles.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -0,0 +1,8 @@ +package cc.kune.gspace.client.actions; + +public class ActionStyles { + + // FIXME add here more styles and use then + public static final String MENU_BTN_STYLE_LEFT = "k-button, k-btn, k-5corners, k-def-docbtn, k-fl"; + public static final String MENU_BTN_STYLE_RIGHT = "k-button, k-btn, k-5corners, k-def-docbtn, k-fr"; +} Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AddAdminMembersToContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AddAdminMembersToContentMenuItem.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AddAdminMembersToContentMenuItem.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -29,9 +29,8 @@ @Inject public AddAdminMembersToContentMenuItem(final I18nTranslationService i18n, - final AddMembersToContentAction action, final ContentViewerOptionsMenu optionsMenu, - final CoreResources res) { - super(i18n.t("Share with admins"), SocialNetworkSubGroup.admins, action, optionsMenu, res); + final AddMembersToContentAction action, final ContentViewerShareMenu menu, final CoreResources res) { + super(i18n.t("Share with admins"), SocialNetworkSubGroup.ADMINS, action, menu, res); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AddAllMembersToContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AddAllMembersToContentMenuItem.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AddAllMembersToContentMenuItem.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -29,9 +29,8 @@ @Inject public AddAllMembersToContentMenuItem(final I18nTranslationService i18n, - final AddMembersToContentAction action, final ContentViewerOptionsMenu optionsMenu, - final CoreResources res) { - super(i18n.t("Share with all group members"), SocialNetworkSubGroup.all, action, optionsMenu, res); + final AddMembersToContentAction action, final ContentViewerShareMenu menu, final CoreResources res) { + super(i18n.t("Share with all group members"), SocialNetworkSubGroup.ALL_GROUP_MEMBERS, action, menu, res); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AddCollabMembersToContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AddCollabMembersToContentMenuItem.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AddCollabMembersToContentMenuItem.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -29,9 +29,8 @@ @Inject public AddCollabMembersToContentMenuItem(final I18nTranslationService i18n, - final AddMembersToContentAction action, final ContentViewerOptionsMenu optionsMenu, - final CoreResources res) { - super(i18n.t("Share with collaborators"), SocialNetworkSubGroup.collabs, action, optionsMenu, res); + final AddMembersToContentAction action, final ContentViewerShareMenu menu, final CoreResources res) { + super(i18n.t("Share with collaborators"), SocialNetworkSubGroup.COLLABS, action, menu, res); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/AddMembersToContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AddMembersToContentMenuItem.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AddMembersToContentMenuItem.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -26,11 +26,10 @@ public class AddMembersToContentMenuItem extends MenuItemDescriptor { public AddMembersToContentMenuItem(final String text, final SocialNetworkSubGroup subGroup, - final AddMembersToContentAction action, final ContentViewerOptionsMenu optionsMenu, - final CoreResources res) { + final AddMembersToContentAction action, final ContentViewerShareMenu menu, final CoreResources res) { super(action); action.setSubGroup(subGroup); - this.withText(text).withIcon(res.addGreen()).withParent(optionsMenu, false); + this.withText(text).withIcon(res.addParticipant()).withParent(menu, false); } } Added: trunk/src/main/java/cc/kune/gspace/client/actions/AddPublicToContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/AddPublicToContentMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/AddPublicToContentMenuItem.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -0,0 +1,36 @@ +/* + * + * 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.shared.i18n.I18nTranslationService; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.shared.dto.SocialNetworkSubGroup; + +import com.google.inject.Inject; + +public class AddPublicToContentMenuItem extends AddMembersToContentMenuItem { + + @Inject + public AddPublicToContentMenuItem(final I18nTranslationService i18n, + final AddMembersToContentAction action, final ContentViewerShareMenu menu, final CoreResources res) { + super(i18n.t("Allow any person to edit this"), SocialNetworkSubGroup.PUBLIC, action, menu, res); + this.withIcon(res.world16()); + } +} Added: trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerShareMenu.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerShareMenu.java (rev 0) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerShareMenu.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -0,0 +1,39 @@ +/* + * + * 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.ui.descrip.MenuDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.resources.CoreResources; + +import com.google.inject.Inject; + +public class ContentViewerShareMenu extends MenuDescriptor { + + private static final String ID = "k-cnt-viewer-share-menu"; + + @Inject + public ContentViewerShareMenu(final CoreResources res, final I18nTranslationService i18n) { + super(); + this.withText(i18n.t("Share")).withToolTip(i18n.t("Share this with group members, etc")).withIcon( + res.world16()).withStyles(ActionStyles.MENU_BTN_STYLE_RIGHT).withId(ID); + } + +} Modified: trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -35,6 +35,8 @@ import cc.kune.gspace.client.actions.AddAdminMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddAllMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddCollabMembersToContentMenuItem; +import cc.kune.gspace.client.actions.AddPublicToContentMenuItem; +import cc.kune.gspace.client.actions.ContentViewerShareMenu; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; import cc.kune.gspace.client.actions.TutorialContainerBtn; @@ -59,11 +61,13 @@ final Provider<OpenFolderMenuItem> openContentMenuItem, final Provider<RefreshListMenuItem> refresh, final Provider<SubscribeToListBtn> subscribeBtn, final Provider<OptionsListMenu> optionsMenuContent, + final Provider<ContentViewerShareMenu> shareMenuContent, final Provider<ShowSubscribersOfListBtn> subscribersCount, final Provider<TutorialContainerBtn> tutorialBtn, final Provider<AddAllMembersToContentMenuItem> addAllMenuItem, final Provider<AddAdminMembersToContentMenuItem> addAdminMembersMenuItem, final Provider<AddCollabMembersToContentMenuItem> addCollabMembersMenuItem, + final Provider<AddPublicToContentMenuItem> addPublicMenuItem, final Provider<SetListOpenessMenuItem> listOpenessMenuItem, final Provider<ParticipateInContentBtn> participateBtn, final ListsNewMenu listNewMenu, final PostNewMenu postNewMenu, final NewMenusForTypeIdsRegistry newMenusRegistry, @@ -71,9 +75,6 @@ final Provider<SetAsHomePageMenuItem> setAsHomePage) { super(session, stateManager, i18n, registry); actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostIconBtn, noRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, newListBtn, TYPE_ROOT); actionsRegistry.addAction(ActionGroups.TOOLBAR, listNewMenu, containersNoRoot); @@ -87,6 +88,11 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, subscribersCount, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); @@ -96,6 +102,7 @@ actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAllMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAdminMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, addPublicMenuItem, contents); newMenusRegistry.register(TYPE_LIST, listNewMenu.get()); newMenusRegistry.register(TYPE_ROOT, listNewMenu.get()); newMenusRegistry.register(TYPE_POST, Modified: trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -36,7 +36,9 @@ import cc.kune.gspace.client.actions.AddAdminMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddAllMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddCollabMembersToContentMenuItem; +import cc.kune.gspace.client.actions.AddPublicToContentMenuItem; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.ContentViewerShareMenu; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; @@ -63,20 +65,19 @@ final Provider<MarkAsNotDoneTaskMenuItem> marksAsNotDoneMenuItem, final Provider<RefreshContentMenuItem> refresh, final Provider<ContentViewerOptionsMenu> optionsMenuContent, + final Provider<ContentViewerShareMenu> shareMenuContent, final Provider<ParticipateInContentBtn> participateBtn, final Provider<TutorialContainerBtn> tutorialBtn, final Provider<AddAllMembersToContentMenuItem> addAllMenuItem, final Provider<AddAdminMembersToContentMenuItem> addAdminMembersMenuItem, final Provider<AddCollabMembersToContentMenuItem> addCollabMembersMenuItem, + final Provider<AddPublicToContentMenuItem> addPublicMenuItem, final TasksFolderNewMenu taskFolderNewMenu, final TasksNewMenu taskNewMenu, final NewMenusForTypeIdsRegistry newMenusRegistry, final Provider<ChatAboutContentBtn> chatAbout, final Provider<DelFolderMenuItem> delFolderMenuItem, final Provider<SetAsHomePageMenuItem> setAsHomePage) { super(session, stateManager, i18n, registry); actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, newTaskIconBtn, all); // actionsRegistry.addAction(ActionGroups.TOOLBAR, taskFolderNewMenu, @@ -87,6 +88,11 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); @@ -101,6 +107,7 @@ actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAllMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAdminMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, addPublicMenuItem, contents); // Currently new menu in folders has no sense (because we have buttons for // the same contents) // newMenusRegistry.register(TYPE_FOLDER, taskFolderNewMenu.get()); Modified: trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/wave/server/ParticipantUtils.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -60,6 +60,10 @@ return atDomain; } + public ParticipantId getPublicParticipantId() { + return of(getAtDomain()); + } + public ParticipantId getSuperAdmin() { return superAdmin; } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-03-10 07:36:46 UTC (rev 1754) @@ -36,7 +36,9 @@ import cc.kune.gspace.client.actions.AddAdminMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddAllMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddCollabMembersToContentMenuItem; +import cc.kune.gspace.client.actions.AddPublicToContentMenuItem; import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.ContentViewerShareMenu; import cc.kune.gspace.client.actions.ParticipateInContentBtn; import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; @@ -61,11 +63,13 @@ final Provider<OpenWikiMenuItem> openContentMenuItem, final Provider<DelWikiMenuItem> delContentMenuItem, final Provider<ContentViewerOptionsMenu> optionsMenuContent, + final Provider<ContentViewerShareMenu> shareMenuContent, final Provider<ParticipateInContentBtn> participateBtn, final Provider<TutorialContainerBtn> tutorialBtn, final Provider<AddAllMembersToContentMenuItem> addAllMenuItem, final Provider<AddAdminMembersToContentMenuItem> addAdminMembersMenuItem, final Provider<AddCollabMembersToContentMenuItem> addCollabMembersMenuItem, + final Provider<AddPublicToContentMenuItem> addPublicMenuItem, final Provider<DelFolderMenuItem> delFolderMenuItem, final Provider<NewFolderBtn> newFolderBtn, final Provider<ChatAboutContentBtn> chatAbout, final Provider<RefreshContentMenuItem> refresh, final Provider<SetAsHomePageMenuItem> setAsHomePage, @@ -73,9 +77,6 @@ final WikiPageNewMenu wikipageNewMenu) { super(session, stateManager, i18n, registry); actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, newWikiIconBtn, all); actionsRegistry.addAction(ActionGroups.TOOLBAR, newFolderBtn, containers); @@ -88,6 +89,11 @@ // containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, shareMenuContent, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAllMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addAdminMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, tutorialBtn, containers); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); @@ -99,6 +105,7 @@ actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAllMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAdminMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addCollabMembersMenuItem, contents); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, addPublicMenuItem, contents); // Currently new menu in folders has no sense (because we have buttons for // the same contents) // newMenusRegistry.register(TYPE_FOLDER, folderNewMenu.get()); Added: trunk/src/main/resources/icons/add-participant.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/icons/add-participant.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/resources/icons/world-16.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/icons/world-16.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/main/webapp/ws.html 2012-03-10 07:36:46 UTC (rev 1754) @@ -7,7 +7,7 @@ <meta name="gwt:property" content="locale=es" /> --> <script type="text/javascript" language="javascript" - src="ws/ws.nocache.js"></script> + src="ws/ws.nocache.js"></script> <!-- We will use this string for mention this site in messages like: "Thanks for joining this site" Your can use another string and the message will looks like "Thanks for joining example.org" @@ -34,52 +34,61 @@ <meta name="hablar.height" content="400px" /> <link rel="shortcut icon" href="ws/favicon.ico" /> <link rel="stylesheet" type="text/css" - href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css"> + href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css"> <!-- FIXME: make something local --> -<script src="//ajax.googleapis.com/ajax/libs/webfont/1/webfont.js"></script> -<script> - WebFont.load({ - google : { - families : [ 'Ubuntu' ] - } - }); +<script type="text/javascript"> + WebFontConfig = { + google : { + families : [ 'Ubuntu' ] + } + }; + (function() { + var wf = document.createElement('script'); + wf.src = ('https:' == document.location.protocol ? 'https' : 'http') + + '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js'; + wf.type = 'text/javascript'; + wf.async = 'true'; + var s = document.getElementsByTagName('script')[0]; + s.parentNode.insertBefore(wf, s); + })(); </script> <link - href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' - rel='stylesheet' type='text/css'> + href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' + rel='stylesheet' type='text/css'> <!-- <link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'> --> <link type="text/css" rel="stylesheet" href="ws/gxt/css/gxt-all.css"> <link type="text/css" rel="stylesheet" href="ws/gxt/css/gxt-gray.css"> <link type="text/css" rel="stylesheet" - href="ws/gxt-custom/css/gxt-op-common.css"> + href="ws/gxt-custom/css/gxt-op-common.css"> <link type="text/css" rel="stylesheet" href="ws/kune-hablar.css"> <link type="text/css" rel="stylesheet" href="ws/kune-chat.css"> <link type="text/css" rel="stylesheet" href="ws/kune-common.css"> <link type="text/css" rel="stylesheet" - href="ws/fontface/ubuntufontface.css"> + href="ws/fontface/ubuntufontface.css"> <link type="text/css" rel="stylesheet" href="ws/kune-message.css"> <link type="text/css" rel="stylesheet" - href="others/splash/style/permalink.css"> + href="others/splash/style/permalink.css"> <link type="text/css" rel="stylesheet" - href="others/splash/style/stuff.css"> + href="others/splash/style/stuff.css"> <link type="text/css" rel="stylesheet" - href="others/splash/style/main.css"> + href="others/splash/style/main.css"> <link type="text/css" rel="stylesheet" href="ws/ws.css"> <script type="text/javascript" src="others/splash/js/gadget.js"></script> <script type="text/javascript" src="others/splash/js/rpc.js"></script> <script type="text/javascript" src="others/splash/js/common_client.js"></script> <script type="text/javascript" - src="others/splash/js/permalink_client.js"></script> + src="others/splash/js/permalink_client.js"></script> <script type="text/javascript" - src="http://wave.google.com/gadgets/js/core:rpc.js?c=1"></script> + src="http://wave.google.com/gadgets/js/core:rpc.js?c=1"></script> <style type="text/css"> body { background-color: white; color: black; - font-family: 'Ubuntu', Arial; + font-family: "Ubuntu Beta", UbuntuBeta, Ubuntu, "Bitstream Vera Sans", + "DejaVu Sans", Tahoma, sans-serif; font-size: small; overflow: hidden; } @@ -220,7 +229,7 @@ } #k-home-global-stats { - + } .k-home-title { @@ -251,7 +260,7 @@ } .k-home-group-inbox-link { - + } .k-home-group-inbox-link a { @@ -281,109 +290,109 @@ <![endif]--> </head> <body> - <!-- // This is only used for selenium tests (comment/remove in production) --> - <div id="kcursor" - style="visibility: hidden; position: absolute; z-Index: 100001; height: 0; width: 0"> - <img src="/others/cursor-orange.png"> - </div> - <script src="others/js/fake-selenium-pointer.js"></script> - <!-- // End : This is only used for selenium tests (comment/remove in production) --> + <!-- // This is only used for selenium tests (comment/remove in production) --> + <div id="kcursor" + style="visibility: hidden; position: absolute; z-Index: 100001; height: 0; width: 0"> + <img src="/others/cursor-orange.png"> + </div> + <script src="others/js/fake-selenium-pointer.js"></script> + <!-- // End : This is only used for selenium tests (comment/remove in production) --> - <!-- Banner for wave errors --> - <div class="banner" id="banner"></div> - <!-- Autocomplete user/pass --> - <form method="post" action="javascript:void(0)" style="display: none"> - <input type="text" id="address" name="address" value="" /> <input - type="password" id="password" name="password" value="" /> <input - type="submit" value="Login" id="login" /> <input type="submit" - class="wiab le button" name="signIn" id="signIn" value="Sign in"> - </form> - <!-- RECOMMENDED if your web app will not function without JavaScript enabled --> - <noscript> - <div - style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> - Your web browser must have JavaScript enabled in order for this - application to display correctly.</div> - </noscript> - <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> - <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> - <div id="kuneinitialcurtain"></div> - <div id="kuneloading"> - <div class="kuneloading-indicator"> - <img src="ws/images/kune-anim-g.gif" width="35" height="35" - alt="kune-loading" - style="margin-right: 3px; float: left; vertical-align: top;" />kune         <br /> - <span id="kuneloading-msg">Starting...</span> - </div> - </div> - <div id="k-home-prewrap"> - <div id="k-home-wrapper"> - <!-- This id is required for kune (you can create a different .html but preserve this id) --> - <div id="k-home-table"> - <div id="k-home-header"></div> - <!-- div home-header --> - <div id="k-home-intro"> - <div id="k-home-summary-left"> - <div id="k-home-logo"> - <img src="ws/logo-big-home.png" alt="" /> - </div> - <div id="k-home-summary"> - <ul> - <li - style="background-image: url(ws/images/kune-intro-user.png);"> - <a href="#inbox">Comunicate with others</a> - </li> - <li - style="background-image: url(ws/images/kune-intro-group.png);"> - <!-- Put here your site default group name --> <a - href="#site">Work in collaboration</a> - </li> - <li - style="background-image: url(ws/images/kune-intro-world.png);"> - <a href="#preview()">And share with the world</a> - </li> - </ul> - </div> - <!-- k-home-summary --> - </div> - <!-- k-home-summary-left --> - <div id="k-home-summary-right"> - <div id="k-home-ini"> - Welcome! This site is a Kune node. Kune, which means - "together" in esperanto, is a network of interconnected - sites like this one, where you can <strong>communicate, - share, collaborate with others and create your web - spaces easily</strong>. <a href="#signin">Join!</a> - </div> - <!-- div home-ini --> - <!-- k-home-summary-right --> - </div> - <!-- div home-header --> - </div> - <div id="k-home-body"> - <div id="k-home-left"> - <div id="k-home-group-stats" style="display: none;"> - <!-- This id is optional for kune (you can create a different .html and preserve this id if you want this stats) --> - </div> - <!-- div home-group-stats --> - </div> - <!-- div k-home-left --> - <div id="k-home-right"> - <div id="k-home-global-stats" style="display: none;"> - <!-- This id is optinal for kune (you can create a different .html but preserve this id if you want this stats) --> - </div> - </div> - <!-- div k-home-right --> - </div> - <!-- div k-home-body --> - <!-- <div id="k-home-footer" style="display: none;"> --> - <!-- </div> --> - <!-- div k-home-footer --> - </div> - <!-- div home-table --> - </div> - <!-- home-wrapper --> - </div> - <!-- home-prewrap --> + <!-- Banner for wave errors --> + <div class="banner" id="banner"></div> + <!-- Autocomplete user/pass --> + <form method="post" action="javascript:void(0)" style="display: none"> + <input type="text" id="address" name="address" value="" /> <input + type="password" id="password" name="password" value="" /> <input + type="submit" value="Login" id="login" /> <input type="submit" + class="wiab le button" name="signIn" id="signIn" value="Sign in"> + </form> + <!-- RECOMMENDED if your web app will not function without JavaScript enabled --> + <noscript> + <div + style="width: 22em; position: absolute; left: 50%; margin-left: -11em; color: red; background-color: white; border: 1px solid red; padding: 4px; font-family: sans-serif"> + Your web browser must have JavaScript enabled in order for this + application to display correctly.</div> + </noscript> + <iframe id="__gwt_historyFrame" style="width: 0; height: 0; border: 0"></iframe> + <iframe src="" id="__download" style="width: 0; height: 0; border: 0"></iframe> + <div id="kuneinitialcurtain"></div> + <div id="kuneloading"> + <div class="kuneloading-indicator"> + <img src="ws/images/kune-anim-g.gif" width="35" height="35" + alt="kune-loading" + style="margin-right: 3px; float: left; vertical-align: top;" />kune         <br /> + <span id="kuneloading-msg">Starting...</span> + </div> + </div> + <div id="k-home-prewrap"> + <div id="k-home-wrapper"> + <!-- This id is required for kune (you can create a different .html but preserve this id) --> + <div id="k-home-table"> + <div id="k-home-header"></div> + <!-- div home-header --> + <div id="k-home-intro"> + <div id="k-home-summary-left"> + <div id="k-home-logo"> + <img src="ws/logo-big-home.png" alt="" /> + </div> + <div id="k-home-summary"> + <ul> + <li + style="background-image: url(ws/images/kune-intro-user.png);"> + <a href="#inbox">Comunicate with others</a> + </li> + <li + style="background-image: url(ws/images/kune-intro-group.png);"> + <!-- Put here your site default group name --> <a + href="#site">Work in collaboration</a> + </li> + <li + style="background-image: url(ws/images/kune-intro-world.png);"> + <a href="#preview()">And share with the world</a> + </li> + </ul> + </div> + <!-- k-home-summary --> + </div> + <!-- k-home-summary-left --> + <div id="k-home-summary-right"> + <div id="k-home-ini"> + Welcome! This site is a Kune node. Kune, which means + "together" in esperanto, is a network of interconnected + sites like this one, where you can <strong>communicate, + share, collaborate with others and create your web + spaces easily</strong>. <a href="#signin">Join!</a> + </div> + <!-- div home-ini --> + <!-- k-home-summary-right --> + </div> + <!-- div home-header --> + </div> + <div id="k-home-body"> + <div id="k-home-left"> + <div id="k-home-group-stats" style="display: none;"> + <!-- This id is optional for kune (you can create a different .html and preserve this id if you want this stats) --> + </div> + <!-- div home-group-stats --> + </div> + <!-- div k-home-left --> + <div id="k-home-right"> + <div id="k-home-global-stats" style="display: none;"> + <!-- This id is optinal for kune (you can create a different .html but preserve this id if you want this stats) --> + </div> + </div> + <!-- div k-home-right --> + </div> + <!-- div k-home-body --> + <!-- <div id="k-home-footer" style="display: none;"> --> + <!-- </div> --> + <!-- div k-home-footer --> + </div> + <!-- div home-table --> + </div> + <!-- home-wrapper --> + </div> + <!-- home-prewrap --> </body> </html> Deleted: trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java.txt =================================================================== --- trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java.txt 2012-03-10 06:23:34 UTC (rev 1753) +++ trunk/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java.txt 2012-03-10 07:36:46 UTC (rev 1754) @@ -1,18 +0,0 @@ -package cc.kune.core.server.auth.openfire; - -import org.jivesoftware.openfire.auth.ConnectionException; -import org.jivesoftware.openfire.auth.InternalUnauthenticatedException; -import org.jivesoftware.openfire.auth.UnauthorizedException; -import org.junit.Ignore; -import org.junit.Test; - -public class KuneAuthProviderTest { - - @Test - @Ignore - public void maintest() throws UnauthorizedException, ConnectionException, - InternalUnauthenticatedException { - final KuneAuthProvider auth = new KuneAuthProvider(); - auth.authenticate("admin", "169le0ik2rma81xhj4560ul7fm"); - } -}