r1681 - in trunk: . img/screenshots src/main/java/cc/kune/barters/client src/main/java/cc/kune/blogs/client src/main/java/cc/kune/chat/client src/main/java/cc/kune/core/client/resources src/main/java/cc/kune/core/client/resources/iconic src/main/java/cc/kune/docs/client src/main/java/cc/kune/events/client src/main/java/cc/kune/gspace/client/tool src/main/java/cc/kune/gspace/client/tool/selector src/main/java/cc/kune/lists/client src/main/java/cc/kune/tasks/client src/main/java/cc/kune/wiki/cl
Author: vjrj_ Date: 2012-02-13 10:24:34 +0100 (Mon, 13 Feb 2012) New Revision: 1681 Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/ trunk/src/main/java/cc/kune/core/client/resources/iconic/IconicResources.java trunk/src/main/java/cc/kune/core/client/resources/iconic/barters.png trunk/src/main/java/cc/kune/core/client/resources/iconic/blogs.png trunk/src/main/java/cc/kune/core/client/resources/iconic/chats.png trunk/src/main/java/cc/kune/core/client/resources/iconic/delete.png trunk/src/main/java/cc/kune/core/client/resources/iconic/docs.png trunk/src/main/java/cc/kune/core/client/resources/iconic/edit.png trunk/src/main/java/cc/kune/core/client/resources/iconic/events.png trunk/src/main/java/cc/kune/core/client/resources/iconic/link.png trunk/src/main/java/cc/kune/core/client/resources/iconic/lists.png trunk/src/main/java/cc/kune/core/client/resources/iconic/reply.png trunk/src/main/java/cc/kune/core/client/resources/iconic/tasks.png trunk/src/main/java/cc/kune/core/client/resources/iconic/wikis.png Modified: trunk/.classpath trunk/COPYRIGHT trunk/TODO trunk/img/screenshots/kune-home-stats.png trunk/img/screenshots/kune-inbox.png trunk/img/screenshots/kune-newgroup.png trunk/img/screenshots/kune-register.png trunk/img/screenshots/kune-social-net.png trunk/pom.xml trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java trunk/src/main/java/cc/kune/events/client/EventsClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java trunk/src/main/resources/wave-server.properties Log: Added new icons to Wave and tools Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/.classpath 2012-02-13 09:24:34 UTC (rev 1681) @@ -13,19 +13,19 @@ <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/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.11/box-0.3.11.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.11/box-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.11/box-src-0.3.11-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/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.11/client-0.3.11.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.11/client-common-0.3.11.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.11/client-common-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.11/client-common-src-0.3.11-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.11/client-scheduler-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.11/client-scheduler-src-0.3.11-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.11/client-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.11/client-src-0.3.11-sources.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-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/cobogw/gwt/cobogw/1.3.1/cobogw-1.3.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.11/common-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.11/common-src-0.3.11-sources.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/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"/> @@ -34,8 +34,8 @@ <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.11/communication-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.11/communication-src-0.3.11-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.11/concurrencycontrol-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.11/concurrencycontrol-src-0.3.11-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/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"/> @@ -57,7 +57,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.11/gwt-util-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.11/gwt-util-src-0.3.11-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/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"/> @@ -114,16 +114,16 @@ <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.11/media-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.11/media-src-0.3.11-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/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.11/model-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.11/model-src-0.3.11-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/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.11/proto-msg-0.3.11.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/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"/> @@ -148,9 +148,9 @@ <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.11/util-src-0.3.11.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.11/util-src-0.3.11-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/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.11/waveinabox-server-0.3-0.3.11.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/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/COPYRIGHT =================================================================== --- trunk/COPYRIGHT 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/COPYRIGHT 2012-02-13 09:24:34 UTC (rev 1681) @@ -190,3 +190,8 @@ Ort43v Creative Commons Attribution-Share Alike 3.0 Unported license http://creativecommons.org/licenses/by-sa/3.0/deed.en + +#Iconic# +http://somerandomdude.com/work/iconic/ +Creative Commons Share Alike 3.0 +http://creativecommons.org/licenses/by-sa/3.0/us/ \ No newline at end of file Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/TODO 2012-02-13 09:24:34 UTC (rev 1681) @@ -12,6 +12,18 @@ nick == assigned to * SHORT-TERM (URGENT) +** icons in WIAB +<div class="NWC"> +<div class="ILC"></div> +</div> + +.ILC { + background: url("data:image/png;base6,4iVBORw0KGgoAAAANSUhEUgAAAA4AAAAWCAYAAADwza0nAAAAXUlEQVR42mNgGAWUgbS0tP8gTLKmp0+f/r927RrxmmGaQPTx48f/79y5k7BmZJtAmkD8VatW4deIrglkE0wTCAxlTcihR1ATTCO20MOrCaaRJJvQkxQME6VpFOAGALlX45hq7h8nAAAAAElFTkSuQmCC") no-repeat scroll 0 0 transparent; + height: 22px; + overflow: hidden; + width: 14px; +} + ** deploy automatize (update) *** copy jar *** copy via rsync gwt compilation (no delete to prevent code fail message) Modified: trunk/img/screenshots/kune-home-stats.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-inbox.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-newgroup.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-register.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-social-net.png =================================================================== (Binary files differ) Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/pom.xml 2012-02-13 09:24:34 UTC (rev 1681) @@ -19,7 +19,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.11</wiab.version> + <wiab.version>0.3.12</wiab.version> <skipTests>true</skipTests> </properties> <repositories> Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -25,6 +25,7 @@ import static cc.kune.barters.shared.BartersConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -37,12 +38,13 @@ @Inject public BartersClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t("barters"), i18n.t("A decentralized way to offer (or ask for) services and goods to your groups or to anyone. Bartering means the exchange of goods by the agreement of two people"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.barters(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_BARTER); Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -27,6 +27,7 @@ import cc.kune.blogs.shared.BlogsConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -37,12 +38,13 @@ @Inject public BlogsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t(BlogsConstants.ROOT_NAME), i18n.t("Blogs are a chronological list of posts (ordered by date) about a specific topic. Each post can be commented by the visitors"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.blogs(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(); registerAuthorableTypes(TYPE_POST, TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -25,6 +25,7 @@ import cc.kune.common.shared.utils.TextUtils; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -38,14 +39,14 @@ @Inject public ChatClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, - final ChatResources res) { + final ChatResources res, final IconicResources icons) { // FIXME: change this in ChatConstants and in db via migration super( NAME, i18n.t("chatrooms"), i18n.t( "A 'room' where you can have a group-chat with many users at once. Rooms can be public or private. Users can be from [%s] or other sites (compatible with gmail chat)", - i18n.getSiteCommonName()), toolSelector, cntCapRegistry, i18n, navResources); + i18n.getSiteCommonName()), icons.chats(), toolSelector, cntCapRegistry, i18n, navResources); this.res = res; registerIcons(); } Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/IconicResources.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/resources/iconic/IconicResources.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/resources/iconic/IconicResources.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -0,0 +1,50 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.resources.iconic; + +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; + +public interface IconicResources extends ClientBundle { + + @Source("barters.png") + ImageResource barters(); + + @Source("blogs.png") + ImageResource blogs(); + + @Source("chats.png") + ImageResource chats(); + + @Source("docs.png") + ImageResource docs(); + + @Source("events.png") + ImageResource events(); + + @Source("lists.png") + ImageResource lists(); + + @Source("tasks.png") + ImageResource tasks(); + + @Source("wikis.png") + ImageResource wikis(); +} Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/barters.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/barters.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/blogs.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/blogs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/chats.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/chats.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/delete.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/delete.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/docs.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/docs.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/edit.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/edit.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/events.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/events.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/link.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/link.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/lists.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/lists.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/reply.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/reply.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/tasks.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/tasks.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/java/cc/kune/core/client/resources/iconic/wikis.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/client/resources/iconic/wikis.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.docs.shared.DocsConstants; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; @@ -39,12 +40,13 @@ @Inject public DocsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t(DocsConstants.ROOT_NAME), i18n.t("Here you can create or upload your personal, group or public documents. These documents can be edited and commented collaboratively and simultaneously. These docs can be static pages in your web page if you publish them"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.docs(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -25,6 +25,7 @@ import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -35,9 +36,10 @@ @Inject public EventsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { - super(NAME, i18n.t(ROOT_NAME), i18n.t("A calendar to schedule activities and events"), toolSelector, - cntCapRegistry, i18n, navResources); + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { + super(NAME, i18n.t(ROOT_NAME), i18n.t("A calendar to schedule activities and events"), + icons.events(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); registerAuthorableTypes(TYPE_MEETING); Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -23,13 +23,15 @@ import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPresenter; +import com.google.gwt.resources.client.ImageResource; + public abstract class AbstractClientTool { public AbstractClientTool(final String shortName, final String longName, final String tooltip, - final ToolSelector toolSelector) { + final ImageResource icon, final ToolSelector toolSelector) { final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, tooltip, toolSelector); - final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(shortName); + final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(shortName, icon); presenter.init(panel); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -37,9 +37,10 @@ protected final NavResources navResources; public FoldableAbstractClientTool(final String shortName, final String longName, final String tooltip, - final ToolSelector toolSelector, final ContentCapabilitiesRegistry contentCapabilitiesRegistry, - final I18nTranslationService i18n, final NavResources navResources) { - super(shortName, longName, tooltip, toolSelector); + final ImageResource icon, final ToolSelector toolSelector, + final ContentCapabilitiesRegistry contentCapabilitiesRegistry, final I18nTranslationService i18n, + final NavResources navResources) { + super(shortName, longName, tooltip, icon, toolSelector); this.contentCapabilitiesRegistry = contentCapabilitiesRegistry; this.i18n = i18n; this.navResources = navResources; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import com.google.gwt.event.dom.client.HasClickHandlers; import com.google.gwt.event.dom.client.MouseOutEvent; import com.google.gwt.event.dom.client.MouseOverEvent; +import com.google.gwt.resources.client.ImageResource; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.uibinder.client.UiHandler; @@ -60,11 +61,11 @@ @UiField FocusPanel self; - public ToolSelectorItemPanel(final String shortName) { + public ToolSelectorItemPanel(final String shortName, final ImageResource icon) { initWidget(uiBinder.createAndBindUi(this)); ensureDebugId(TOOL_ID_PREFIX + shortName); setVisibleImpl(false); - iconLeft.setVisible(false); + iconLeft.setResource(icon); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.ui.xml 2012-02-13 09:24:34 UTC (rev 1681) @@ -6,8 +6,9 @@ text-decoration: none; font-size: 16px; color: white; /* - text-shadow: 1px 1px 6px grey; - */ + text-shadow: 1px 1px 6px grey; + */ + margin-left: 5px; } .link a:link { @@ -18,8 +19,7 @@ } - .flow { - /* min-height: 30px; */ + .flow { /* min-height: 30px; */ padding: 1px 10px; -moz-user-select: none; -khtml-user-select: none; @@ -27,7 +27,6 @@ } .iconLeft { - } .iconRight { @@ -38,13 +37,14 @@ } </ui:style> <ui:with field='res' - type='cc.kune.gspace.client.tool.selector.ToolResources' /> + type='cc.kune.gspace.client.tool.selector.ToolResources'/> <g:FocusPanel ui:field="self" stylePrimaryName="k-tool-item"> <g:FlowPanel styleName="{style.flow}" ui:field="flow"> - <g:Image ui:field="iconLeft" styleName="{style.iconLeft}" /> - <g:Image ui:field="iconRight" styleName="{style.iconRight}" /> <!-- resource {res.arrowRightDef}' --> - <g:InlineLabel ui:field="label" styleName="{style.label}" /> - <g:HTMLPanel ui:field="arrow" addStyleNames="k-tool-item-selected-arrow, k-fr" /> + <g:Image ui:field="iconLeft" styleName="{style.iconLeft}"/> + <g:Image ui:field="iconRight" styleName="{style.iconRight}"/> <!-- resource {res.arrowRightDef}' --> + <g:InlineLabel ui:field="label" styleName="{style.label}"/> + <g:HTMLPanel ui:field="arrow" + addStyleNames="k-tool-item-selected-arrow, k-fr"/> </g:FlowPanel> </g:FocusPanel> </ui:UiBinder> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -36,12 +37,13 @@ @Inject public ListsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t(ROOT_NAME), i18n.t("Lists behave like a mailing list or a forum. You can subscribe and discuss about specific topics"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.lists(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(); registerAuthorableTypes(TYPE_POST); Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; @@ -39,12 +40,13 @@ @Inject public TasksClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t(ROOT_NAME), i18n.t("A collaborative TO-DO list for the group. Any group-member can participate in any proposed task, add others to a task, comment them, add info, etc"), - toolSelector, cntCapRegistry, i18n, navResources); + icons.tasks(), toolSelector, cntCapRegistry, i18n, navResources); // registerAclEditableTypes(); registerAuthorableTypes(TYPE_TASK); Modified: trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-02-13 09:24:34 UTC (rev 1681) @@ -26,6 +26,7 @@ import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -38,13 +39,14 @@ @Inject public WikiClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, - final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { + final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, + final IconicResources icons) { super( NAME, i18n.t("wiki"), i18n.t( "Wiki-pages are Documents that can be edited by any visitor (in [%s]), instead of only by the group. This accelerates updating and construction", - i18n.getSiteCommonName()), toolSelector, cntCapRegistry, i18n, navResources); + i18n.getSiteCommonName()), icons.wikis(), toolSelector, cntCapRegistry, i18n, navResources); registerAuthorableTypes(TYPE_WIKIPAGE, TYPE_UPLOADEDFILE); registerDragableTypes(TYPE_WIKIPAGE, TYPE_FOLDER, TYPE_UPLOADEDFILE); Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2012-02-11 21:13:06 UTC (rev 1680) +++ trunk/src/main/resources/wave-server.properties 2012-02-13 09:24:34 UTC (rev 1681) @@ -103,7 +103,7 @@ disable_registration = false # Enable SSL for all address/port combinations listed (makes the next 2 settings non-optional) -enable_ssl = false +enable_ssl = true # Path to keystore containg the ssl certificates to server ssl_keystore_path = src/main/resources/wiab.ks
participants (1)
-
Vicente J. Ruiz Jurado