- kune-commits - lists.ourproject.org

23 Nov '11

Author: vjrj_ Date: 2011-11-23 15:33:50 +0100 (Wed, 23 Nov 2011) New Revision: 1618 Removed: trunk/src/main/java/org/waveprotocol/box/webclient/client/HistorySupport.java trunk/src/main/java/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java Modified: trunk/.classpath trunk/CREDITS trunk/img/kune-logos.svg 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/core/client/cnt/FoldableContentPresenter.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java trunk/src/main/java/cc/kune/core/client/state/StateManager.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/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 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/wave/client/KuneStagesProvider.java trunk/src/main/java/cc/kune/wave/client/WebClient.java trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java Log: NEW - # 135: Some Calendar integration http://kune.ourproject.org/issues/ticket/135 NEW - # 163: Empty messages in Views where not logged shoul be different to logged http://kune.ourproject.org/issues/ticket/163 CLOSED - # 62: Tool links should point to the previous content (not the root) http://kune.ourproject.org/issues/ticket/62 Wave updated with many fixes and lib upgrades Big bug fix: you can now safety move to other locations while editing a wave Attachments now should work also in Group Space Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/.classpath 2011-11-23 14:33:50 UTC (rev 1618) @@ -12,19 +12,19 @@ <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/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.5/box-0.3.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.5/box-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.7/box-0.3.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.7/box-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.7/box-src-0.3.7-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.5/client-0.3.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.5/client-common-0.3.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.5/client-common-src-0.3.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.5/client-scheduler-src-0.3.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.5/client-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.7/client-0.3.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.7/client-common-0.3.7.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.7/client-common-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.7/client-common-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.7/client-scheduler-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.7/client-scheduler-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.7/client-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.7/client-src-0.3.7-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.5/common-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.7/common-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.7/common-src-0.3.7-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"/> @@ -33,8 +33,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.5/communication-src-0.3.5.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.5/concurrencycontrol-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.7/communication-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.7/communication-src-0.3.7-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.7/concurrencycontrol-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.7/concurrencycontrol-src-0.3.7-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"/> @@ -55,7 +55,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.5/gwt-util-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.7/gwt-util-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.7/gwt-util-src-0.3.7-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"/> @@ -111,16 +111,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.5/media-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.7/media-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.7/media-src-0.3.7-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.5/model-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.7/model-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.7/model-src-0.3.7-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.5/proto-msg-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.7/proto-msg-0.3.7.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"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0-sources.jar"/> @@ -144,9 +144,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.5/util-src-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.7/util-src-0.3.7.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.7/util-src-0.3.7-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.5/waveinabox-server-0.3-0.3.5.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.7/waveinabox-server-0.3-0.3.7.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/CREDITS =================================================================== --- trunk/CREDITS 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/CREDITS 2011-11-23 14:33:50 UTC (rev 1618) @@ -24,6 +24,6 @@ * Daniel Jiménez for the initial help and coordination * Johnattan Rupire, William Austen Bradbury and Rana Hassan for their web contributions and translations -* Bastien Guerry for his French translation +* Bastien Guerry for his French translation and for his ideas, feedback, support, inspiration * and <URL:http://ourproject.org> and again <URL:http://xsto.info> and <URL:http://iepala.es> for sharing with us their resources Modified: trunk/img/kune-logos.svg =================================================================== --- trunk/img/kune-logos.svg 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/img/kune-logos.svg 2011-11-23 14:33:50 UTC (rev 1618) @@ -57,15 +57,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.27" - inkscape:cx="372.04724" - inkscape:cy="526.18109" + inkscape:zoom="1" + inkscape:cx="518.29119" + inkscape:cy="649.99995" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1078" inkscape:window-height="1867" - inkscape:window-x="0" - inkscape:window-y="24" + inkscape:window-x="1" + inkscape:window-y="52" showguides="true" inkscape:guide-bbox="true" inkscape:guide-points="true" @@ -543,10 +543,10 @@ <g inkscape:export-ydpi="90" inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px.png" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px-low.png" transform="matrix(0.31973654,0,0,0.31973654,157.58786,-7.1498137)" id="g3289" - style="opacity:0.4"> + style="opacity:0.5"> <g id="g3291" transform="translate(380,-30)"> @@ -556,7 +556,7 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" id="path3293" d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + style="font-size:58.13353347999999698px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" inkscape:connector-curvature="0" /> <g inkscape:export-ydpi="399.59854" @@ -568,38 +568,38 @@ transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3297" d="m 60.321717,411.99998 377.014613,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247000000033;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3299" d="m 252.61203,788.60332 0,-377.01178" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958000000355;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3301" d="m 252.86937,597.15755 377.0124,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721000000248;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3303" d="m 437.45588,596.97447 0,-377.01491" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195000000463;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3305" d="m 372.87905,411.27704 64.93441,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947905999999364;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" inkscape:connector-curvature="0" /> </g> </g> <text transform="scale(-1,1)" xml:space="preserve" - style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + style="font-size:58.94304656999999992px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" x="-1306.0667" y="1115.2828" id="text3307" @@ -610,7 +610,7 @@ y="1115.2828">cc</tspan></text> <text xml:space="preserve" - style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + style="font-size:87.16403198000000430px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" x="1218.1743" y="1115.0084" id="text3311" @@ -716,5 +716,96 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/favicon-demo.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> + <g + transform="translate(-64.205696,-101.81263)" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px-low.png" + id="g4171" + style="opacity:0.5"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353347999999698px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 206.0077,119.17481 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.0791 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" + id="path4173" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <g + id="g4175" + transform="matrix(0.1111494,0,0,0.111008,121.5678,22.515968)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247000000033;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path4177" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958000000355;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path4179" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721000000248;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path4181" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195000000463;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path4183" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947905999999364;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path4185" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <g + id="g4187" + transform="matrix(0.1111494,0,0,0.111008,214.3621,-79.296659)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-icon16-low.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + style="opacity:0.5"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247000000033;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path4189" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958000000355;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path4191" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721000000248;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path4193" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195000000463;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path4195" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947905999999364;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path4197" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> </g> </svg> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/pom.xml 2011-11-23 14:33:50 UTC (rev 1618) @@ -19,6 +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.7</wiab.version> <skipTests>true</skipTests> </properties> <repositories> @@ -528,12 +529,12 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>proto-msg</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>gwt-util-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -543,52 +544,52 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>model-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>waveinabox-server-0.3</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>proto-msg</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>gwt-util-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>com.google.guava</groupId> @@ -598,67 +599,67 @@ <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>model-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-common-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>common-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>util-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>concurrencycontrol-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>client-scheduler-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>media-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>org.waveprotocol</groupId> <artifactId>communication-src</artifactId> - <version>0.3.5</version> + <version>${wiab.version}</version> </dependency> <dependency> <groupId>net.sourceforge.findbugs</groupId> Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -33,6 +33,8 @@ public class BartersClientTool extends FoldableAbstractClientTool { + private static final String THERE_ISN_T_ANY_BARTER = "There isn't any barter. "; + @Inject public BartersClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { @@ -63,8 +65,10 @@ registerContentTypeIcon(TYPE_FOLDER, navResources.folder()); registerContentTypeIcon(TYPE_ROOT, navResources.folder()); registerContentTypeIcon(TYPE_BARTER, navResources.barter()); - registerEmptyMessages(TYPE_FOLDER, i18n.t("This folder is empty")); - registerEmptyMessages(TYPE_ROOT, i18n.t("There isn't any barter")); + registerEmptyMessages(TYPE_FOLDER, i18n.t(THERE_ISN_T_ANY_BARTER + "You can create some here")); + registerEmptyMessages(TYPE_ROOT, i18n.t(THERE_ISN_T_ANY_BARTER)); + registerEmptyMessagesNotLogged(TYPE_FOLDER, i18n.t(THERE_ISN_T_ANY_BARTER)); + registerEmptyMessagesNotLogged(TYPE_ROOT, i18n.t(THERE_ISN_T_ANY_BARTER)); } } Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -68,6 +68,8 @@ registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); registerEmptyMessages(TYPE_ROOT, i18n.t("There isn't any blog, create one")); registerEmptyMessages(TYPE_BLOG, i18n.t("This blog hasn't any post, create one")); + registerEmptyMessagesNotLogged(TYPE_ROOT, i18n.t("There isn't any blog")); + registerEmptyMessagesNotLogged(TYPE_BLOG, i18n.t("This blog hasn't any post")); } } Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -57,8 +57,10 @@ private void registerIcons() { registerContentTypeIcon(TYPE_ROOM, res.groupChat()); - registerEmptyMessages(TYPE_ROOM, i18n.tWithNT("See the archive of old conversations" - + TextUtils.IN_DEVELOPMENT_P, "with Brackets")); + final String emptyMsg = i18n.tWithNT("See the archive of old conversations" + + TextUtils.IN_DEVELOPMENT_P, "with Brackets"); + registerEmptyMessages(TYPE_ROOM, emptyMsg); + registerEmptyMessagesNotLogged(TYPE_ROOM, emptyMsg); } } Modified: trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/core/client/cnt/FoldableContentPresenter.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -19,8 +19,6 @@ */ package cc.kune.core.client.cnt; -import org.waveprotocol.box.webclient.client.HistorySupport; - import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.notify.NotifyUser; import cc.kune.core.client.services.FileDownloadUtils; @@ -39,156 +37,153 @@ import com.google.inject.Provider; -public abstract class FoldableContentPresenter extends AbstractContentPresenter implements FoldableContent { +public abstract class FoldableContentPresenter extends AbstractContentPresenter implements + FoldableContent { - private final GuiActionDescCollection actionRegistry; - private final Provider<FileDownloadUtils> downloadProvider; - private final I18nTranslationService i18n; - private final Provider<MediaUtils> mediaUtils; - protected final Session session; - private final ActionContentToolbar toolbar; - private final String toolName; - private String uploadType; - private String waveType; + private final GuiActionDescCollection actionRegistry; + private final Provider<FileDownloadUtils> downloadProvider; + private final I18nTranslationService i18n; + private final Provider<MediaUtils> mediaUtils; + protected final Session session; + private final ActionContentToolbar toolbar; + private final String toolName; + private String uploadType; + private String waveType; - public FoldableContentPresenter(final String toolName, final StateManager stateManager, final Session session, - final ActionContentToolbar toolbar, final GuiActionDescCollection actionRegistry, - final Provider<FileDownloadUtils> downloadProvider, final I18nTranslationService i18n, - final Provider<MediaUtils> mediaUtils) { - this.toolName = toolName; - this.session = session; - this.toolbar = toolbar; - this.actionRegistry = actionRegistry; - this.downloadProvider = downloadProvider; - this.i18n = i18n; - this.mediaUtils = mediaUtils; - stateManager.onStateChanged(true, new StateChangedHandler() { - @Override - public void onStateChanged(final StateChangedEvent event) { - setState(event.getState()); - } - }); - } + public FoldableContentPresenter(final String toolName, final StateManager stateManager, + final Session session, final ActionContentToolbar toolbar, + final GuiActionDescCollection actionRegistry, final Provider<FileDownloadUtils> downloadProvider, + final I18nTranslationService i18n, final Provider<MediaUtils> mediaUtils) { + this.toolName = toolName; + this.session = session; + this.toolbar = toolbar; + this.actionRegistry = actionRegistry; + this.downloadProvider = downloadProvider; + this.i18n = i18n; + this.mediaUtils = mediaUtils; + stateManager.onStateChanged(true, new StateChangedHandler() { + @Override + public void onStateChanged(final StateChangedEvent event) { + setState(event.getState()); + } + }); + } - private String getContentBody(final StateContentDTO state) { - final String contentBody = state.getContent(); - return contentBody; - } + private String getContentBody(final StateContentDTO state) { + final String contentBody = state.getContent(); + return contentBody; + } - public String getToolName() { - return toolName; - } + public String getToolName() { + return toolName; + } - public String getUploadType() { - return uploadType; - } + public String getUploadType() { + return uploadType; + } - public String getWaveType() { - return waveType; - } + public String getWaveType() { + return waveType; + } - @Override - public void refreshState() { - setState(session.getContentState()); + @Override + public void refreshState() { + setState(session.getContentState()); + } + + protected void setContent(final StateContentDTO state) { + final String typeId = state.getTypeId(); + NotifyUser.info(typeId); + if (typeId.equals(getUploadType())) { + setUploadedContent(state); + } else if (typeId.equals(getWaveType())) { + setNormalContent(state); + // setWaveContent(state.getContent()); + } else { + setNormalContent(state); } + view.attach(); + } - protected void setContent(final StateContentDTO state) { - final String typeId = state.getTypeId(); - NotifyUser.info(typeId); - if (typeId.equals(getUploadType())) { - setUploadedContent(state); - } else if (typeId.equals(getWaveType())) { - setNormalContent(state); - // setWaveContent(state.getContent()); - } else { - setNormalContent(state); - } - view.attach(); + private void setNormalContent(final StateContentDTO state) { + final String contentBody = getContentBody(state); + if (contentBody == null || contentBody.length() == 0) { + if (state.getContentRights().isEditable()) { + view.setInfoMessage(i18n.t("There is no text in this page. Feel free to edit this page")); + } else { + view.setInfoMessage(i18n.t("There is no text in this page")); + } + } else { + view.setRawContent(contentBody); } + } - private void setNormalContent(final StateContentDTO state) { - final String contentBody = getContentBody(state); - if (contentBody == null || contentBody.length() == 0) { - if (state.getContentRights().isEditable()) { - view.setInfoMessage(i18n.t("There is no text in this page. Feel free to edit this page")); - } else { - view.setInfoMessage(i18n.t("There is no text in this page")); - } + protected void setState(final StateAbstractDTO state) { + toolbar.detach(); + if (state instanceof StateContainerDTO) { + final StateContainerDTO stateCntCtx = (StateContainerDTO) state; + if (stateCntCtx.getToolName().equals(toolName)) { + // This tool + if (stateCntCtx instanceof StateContentDTO) { + setState((StateContentDTO) stateCntCtx); } else { - view.setRawContent(contentBody); + setState(stateCntCtx); } + } } + } - protected void setState(final StateAbstractDTO state) { - toolbar.detach(); - if (state instanceof StateContainerDTO) { - final StateContainerDTO stateCntCtx = (StateContainerDTO) state; - if (stateCntCtx.getToolName().equals(toolName)) { - // This tool - if (stateCntCtx instanceof StateContentDTO) { - setState((StateContentDTO) stateCntCtx); - } else { - setState(stateCntCtx); - } - } - } - } + protected void setState(final StateContainerDTO state) { + setToolbar(actionRegistry); + attach(); + } - protected void setState(final StateContainerDTO state) { - setToolbar(actionRegistry); - attach(); - } + protected void setState(final StateContentDTO state) { + setToolbar(actionRegistry); + attach(); + } - protected void setState(final StateContentDTO state) { - setToolbar(actionRegistry); - attach(); - } + private void setToolbar(final GuiActionDescCollection collection) { + // toolbar.disableMenusAndClearButtons(); + toolbar.addAll(collection); + toolbar.attach(); + } - private void setToolbar(final GuiActionDescCollection collection) { - // toolbar.disableMenusAndClearButtons(); - toolbar.addAll(collection); - toolbar.attach(); + private void setUploadedContent(final StateContentDTO state) { + final String contentBody = state.getContent(); + final StateToken token = state.getStateToken(); + final BasicMimeTypeDTO mimeType = state.getMimeType(); + if (mimeType != null) { + final FileDownloadUtils fileDownloadUtils = downloadProvider.get(); + if (mimeType.isImage()) { + view.showImage(fileDownloadUtils.getImageUrl(token), + fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), false); + } else if (mimeType.isPdf()) { + view.showImage(fileDownloadUtils.getImageUrl(token), + fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), true); + } else if (mimeType.isMp3()) { + view.setRawContent(mediaUtils.get().getMp3Embed(token)); + } else if (mimeType.isOgg()) { + view.setRawContent(mediaUtils.get().getOggEmbed(token)); + } else if (mimeType.isFlv()) { + view.setRawContent(mediaUtils.get().getFlvEmbed(token)); + } else if (mimeType.isAvi()) { + view.setRawContent(mediaUtils.get().getAviEmbed(token)); + } else if (mimeType.isText()) { + view.setContent(contentBody, true); + } else { + view.setNoPreview(); + } + } else { + view.setNoPreview(); } + } - private void setUploadedContent(final StateContentDTO state) { - final String contentBody = state.getContent(); - final StateToken token = state.getStateToken(); - final BasicMimeTypeDTO mimeType = state.getMimeType(); - if (mimeType != null) { - final FileDownloadUtils fileDownloadUtils = downloadProvider.get(); - if (mimeType.isImage()) { - view.showImage(fileDownloadUtils.getImageUrl(token), - fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), false); - } else if (mimeType.isPdf()) { - view.showImage(fileDownloadUtils.getImageUrl(token), - fileDownloadUtils.getImageResizedUrl(token, ImageSize.sized), true); - } else if (mimeType.isMp3()) { - view.setRawContent(mediaUtils.get().getMp3Embed(token)); - } else if (mimeType.isOgg()) { - view.setRawContent(mediaUtils.get().getOggEmbed(token)); - } else if (mimeType.isFlv()) { - view.setRawContent(mediaUtils.get().getFlvEmbed(token)); - } else if (mimeType.isAvi()) { - view.setRawContent(mediaUtils.get().getAviEmbed(token)); - } else if (mimeType.isText()) { - view.setContent(contentBody, true); - } else { - view.setNoPreview(); - } - } else { - view.setNoPreview(); - } - } + public void setUploadType(final String uploadType) { + this.uploadType = uploadType; + } - public void setUploadType(final String uploadType) { - this.uploadType = uploadType; - } - - private void setWaveContent(final String id) { - view.setEditableWaveContent(HistorySupport.waveRefFromHistoryToken(id), false); - } - - public void setWaveType(final String waveType) { - this.waveType = waveType; - } + public void setWaveType(final String waveType) { + this.waveType = waveType; + } } Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPanel.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -21,6 +21,7 @@ import cc.kune.common.client.notify.NotifyLevel; import cc.kune.common.client.notify.NotifyLevelImages; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.common.client.ui.dialogs.BasicTopDialog; import cc.kune.common.client.ui.dialogs.BasicTopDialog.Builder; @@ -145,15 +146,9 @@ publicDescField.setValidationDelay(1000); form.add(publicDescField); - tag1 = new TextField<String>(); - tag1.setTabIndex(4); - tag1.setFieldLabel(i18n.t("Group tags")); - tag1.setName(TAGS_FIELD); - tag1.setWidth(DefaultForm.BIG_FIELD_WIDTH); - tag1.setAllowBlank(false); - tag1.setTitle(i18n.t("type some keyword that define your group")); - tag1.setValidationDelay(1000); - form.add(tag1); + form.add(createTagField(tag1)); + // form.add(createTagField(tag2)); + // form.add(createTagField(tag3)); final FieldSet groupTypeFieldSet = new FieldSet(); groupTypeFieldSet.setHeading(i18n.t("Group type")); @@ -197,6 +192,18 @@ return form; } + private TextField<String> createTagField(TextField<String> tag) { + tag = new TextField<String>(); + tag.setTabIndex(4); + tag.setFieldLabel(i18n.t("Group tags")); + tag.setName(TAGS_FIELD); + tag.setWidth(DefaultForm.BIG_FIELD_WIDTH); + tag.setAllowBlank(false); + Tooltip.to(tag, i18n.t("type some keyword that define your group")); + tag.setValidationDelay(1000); + return tag; + } + @Override public void focusOnShorName() { shortNameField.focus(); Modified: trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/core/client/registry/ContentCapabilitiesRegistry.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -31,6 +31,7 @@ private final DropableRegistry dropable; private final EmailSubscribeAbleRegistry emailSubscribeAble; private final EmptyMessagesRegistry emptyMessagesRegistry; + private final EmptyMessagesRegistry emptyMessagesRegistryNotLogged; private final IconsRegistry iconsRegistry; private final LicensableRegistry licensable; private final NewMenusForTypeIdsRegistry newMenus; @@ -54,6 +55,7 @@ final RateableRegistry rateable, final TageableRegistry tageable, final RenamableRegistry renamable, final TranslatableRegistry translatable, final VersionableRegistry versionable, final EmptyMessagesRegistry emptyMessagesRegistry, + final EmptyMessagesRegistry emptyMessagesRegistryNotLogged, final XmppComentableRegistry xmppComentable, final XmppNotifyCapableRegistry xmppNotifyCapable, final ShowDeletedRegistry showDeleted) { this.authorable = authorableRegistry; @@ -73,6 +75,8 @@ this.translatable = translatable; this.versionable = versionable; this.emptyMessagesRegistry = emptyMessagesRegistry; + this.emptyMessagesRegistryNotLogged = emptyMessagesRegistryNotLogged; + this.xmppComentable = xmppComentable; this.xmppNotifyCapable = xmppNotifyCapable; this.showDeleted = showDeleted; @@ -114,6 +118,10 @@ return emptyMessagesRegistry; } + public EmptyMessagesRegistry getEmptyMessagesRegistryNotLogged() { + return emptyMessagesRegistryNotLogged; + } + public IconsRegistry getIconsRegistry() { return iconsRegistry; } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -41,7 +41,7 @@ private static final int SEARCH_TEXT_HEIGHT = 13; private static final int SEARCH_TEXT_WIDTH_BIG = 160; - private static final int SEARCH_TEXT_WIDTH_SMALL = 120; + private static final int SEARCH_TEXT_WIDTH_SMALL = 80; public static final String SITE_SEARCH_BUTTON = "kune-ssp-searchbt"; public static final String SITE_SEARCH_TEXTBOX = "kune-ssp-tbox"; private final PushButton searchButton; Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -26,8 +26,21 @@ public interface StateManager { + /** + * @param listener + * you can use this {@link BeforeActionListener} to intercept changes + * of state (for instance if you are editing and what to save, etc. + */ void addBeforeStateChangeListener(BeforeActionListener listener); + /** + * This permits to add custom #framents to urls and its associated actions + * + * @param token + * the url #fragment + * @param historyTokenCallback + * the action that will be executed when the previous url fragment + */ void addSiteToken(String token, HistoryTokenCallback historyTokenCallback); String getCurrentToken(); Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -35,6 +35,8 @@ public class DocsClientTool extends FoldableAbstractClientTool { + private static final String EMPTY_CREATE_SOME = "This folder is empty. You can create some document or folder here."; + @Inject public DocsClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { @@ -66,8 +68,10 @@ registerContentTypeIcon(TYPE_ROOT, navResources.folder()); registerContentTypeIcon(TYPE_DOCUMENT, navResources.page()); registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); - registerEmptyMessages(TYPE_FOLDER, i18n.t("This folder is empty")); - registerEmptyMessages(TYPE_ROOT, i18n.t("This folder is empty")); + registerEmptyMessagesNotLogged(TYPE_FOLDER, i18n.t(EMPTY)); + registerEmptyMessagesNotLogged(TYPE_ROOT, i18n.t(EMPTY)); + registerEmptyMessages(TYPE_FOLDER, i18n.t(EMPTY_CREATE_SOME)); + registerEmptyMessages(TYPE_ROOT, i18n.t(EMPTY_CREATE_SOME)); } } Modified: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -60,7 +60,8 @@ private void registerIcons() { registerContentTypeIcon(TYPE_ROOT, navResources.folder()); registerContentTypeIcon(TYPE_MEETING, navResources.calendar()); - registerEmptyMessages(TYPE_ROOT, i18n.t("There isn't any meeting")); + registerEmptyMessages(TYPE_ROOT, i18n.t("There isn't any meeting, create one")); + registerEmptyMessagesNotLogged(TYPE_ROOT, i18n.t("There isn't any meeting")); } } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -31,6 +31,7 @@ public abstract class FoldableAbstractClientTool extends AbstractClientTool { + protected static final String EMPTY = "This folder is empty"; protected final ContentCapabilitiesRegistry contentCapabilitiesRegistry; protected final I18nTranslationService i18n; protected final NavResources navResources; @@ -87,6 +88,10 @@ contentCapabilitiesRegistry.getEmptyMessagesRegistry().register(contentTypeId, message); } + public void registerEmptyMessagesNotLogged(final String contentTypeId, final String message) { + contentCapabilitiesRegistry.getEmptyMessagesRegistryNotLogged().register(contentTypeId, message); + } + protected void registerLicensableTypes(final String... typeIds) { contentCapabilitiesRegistry.getLicensable().register(typeIds); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -124,13 +124,16 @@ final ToolSelectorItem tool = tools.get(oldTool); checkTool(tool); tool.setSelected(false); - tool.setToken(oldToken); + if (newToken != null && oldToken != null && newToken.getGroup().equals(oldToken.getGroup())) { + // only if we don't change of group + tool.setToken(oldToken); + } } if (TextUtils.notEmpty(newTool)) { final ToolSelectorItem tool = tools.get(newTool); checkTool(tool); tool.setSelected(true); - tool.setToken(newToken.copy().clearDocument().clearFolder()); + tool.setGroupShortName(newToken.getGroup()); } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -23,7 +23,6 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.ui.HasEditHandler; import cc.kune.common.client.ui.UiUtils; -import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.dnd.FolderViewerDropController; import cc.kune.core.client.dnd.KuneDragController; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; @@ -136,9 +135,8 @@ } @Override - public void showEmptyMsg(final String contentTypeId) { + public void showEmptyMsg(final String emptyMessage) { + emptyLabel.setText(emptyMessage); gsArmor.getDocContainer().add(emptyPanel); - final String msg = capabilitiesRegistry.getEmptyMessagesRegistry().getContentTypeIcon(contentTypeId); - emptyLabel.setText(TextUtils.empty(msg) ? i18n.t("This is empty.") : i18n.t(msg)); } } Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/ContentViewerPanel.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -30,12 +30,14 @@ import org.waveprotocol.wave.model.waveref.WaveRef; import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; +import cc.kune.common.client.actions.BeforeActionListener; import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection; import cc.kune.common.client.errors.UIException; import cc.kune.common.client.ui.HasEditHandler; import cc.kune.common.client.ui.UiUtils; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; @@ -97,7 +99,7 @@ @Inject public ContentViewerPanel(final GSpaceArmor wsArmor, final WaveClientProvider waveClient, final ContentCapabilitiesRegistry capabilitiesRegistry, final I18nTranslationService i18n, - final EventBus eventBus) { + final EventBus eventBus, final StateManager stateManager) { this.gsArmor = wsArmor; this.waveClientProv = waveClient; this.capabilitiesRegistry = capabilitiesRegistry; @@ -110,6 +112,15 @@ waveClear(); } }); + stateManager.addBeforeStateChangeListener(new BeforeActionListener() { + @Override + public boolean beforeAction() { + // This fix lot of problems when you are editing and move to other + // location (without stop editing) + waveClear(); + return true; + } + }); } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerPresenter.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -25,6 +25,7 @@ import cc.kune.common.client.ui.EditEvent; import cc.kune.common.client.ui.EditEvent.EditHandler; import cc.kune.common.client.ui.HasEditHandler; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.registry.IconsRegistry; @@ -97,7 +98,7 @@ void setSubheaderActions(GuiActionDescCollection actions); - void showEmptyMsg(String contentTypeId); + void showEmptyMsg(String message); } private final ActionRegistryByType actionsRegistry; @@ -140,7 +141,8 @@ final String name = content.getName(); final Object icon = mimeType != null ? getIcon(stateToken, typeId, mimeType) : getIcon(stateToken, typeId, status); - final String tooltip = getTooltip(stateToken, mimeType, capabilitiesRegistry.isDragable(typeId) && rights.isAdministrable()); + final String tooltip = getTooltip(stateToken, mimeType, capabilitiesRegistry.isDragable(typeId) + && rights.isAdministrable()); if (status.equals(ContentStatus.inTheDustbin) && (!capabilitiesRegistry.showDeleted(typeId) && !session.getShowDeletedContent())) { // Don't show @@ -176,7 +178,15 @@ private void createChildItems(final ContainerDTO container, final AccessRights containerRights) { if (container.getContents().size() + container.getChilds().size() == 0) { - getView().showEmptyMsg(container.getTypeId()); + String msg = null; + final String typeId = container.getTypeId(); + if (session.isLogged()) { + msg = capabilitiesRegistry.getEmptyMessagesRegistry().getContentTypeIcon(typeId); + } else { + msg = capabilitiesRegistry.getEmptyMessagesRegistryNotLogged().getContentTypeIcon(typeId); + } + final String emptyMessage = TextUtils.empty(msg) ? i18n.t("This is empty.") : i18n.t(msg); + getView().showEmptyMsg(emptyMessage); } else { // Folders for (final ContainerSimpleDTO childFolder : container.getChilds()) { Modified: trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -66,8 +66,12 @@ registerContentTypeIcon(TYPE_POST, navResources.email()); final String noWave = i18n.t("There is nothing posted yet. Post something"); final String noList = i18n.t("There isn't any list, create one"); + final String noWaveNotLogged = i18n.t("There is nothing posted yet"); + final String noListNotLogged = i18n.t("There isn't any list"); registerEmptyMessages(TYPE_ROOT, noList); registerEmptyMessages(TYPE_LIST, noWave); + registerEmptyMessagesNotLogged(TYPE_ROOT, noListNotLogged); + registerEmptyMessagesNotLogged(TYPE_LIST, noWaveNotLogged); // registerShowDeleted(); } Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -35,6 +35,8 @@ public class TasksClientTool extends FoldableAbstractClientTool { + private static final String NO_TASK = "There isn't any task"; + @Inject public TasksClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { @@ -66,9 +68,11 @@ registerContentTypeIcon(TYPE_FOLDER, navResources.taskfolder()); registerContentTypeIcon(TYPE_TASK, navResources.task()); registerContentTypeIcon(TYPE_TASK, ContentStatus.inTheDustbin, navResources.taskdone()); - final String noTask = i18n.t("There isn't any task, create one"); - registerEmptyMessages(TYPE_ROOT, noTask); - registerEmptyMessages(TYPE_FOLDER, noTask); + final String noTaskLogged = i18n.t(NO_TASK + ", create one"); + registerEmptyMessages(TYPE_ROOT, noTaskLogged); + registerEmptyMessages(TYPE_FOLDER, noTaskLogged); + registerEmptyMessagesNotLogged(TYPE_ROOT, NO_TASK); + registerEmptyMessagesNotLogged(TYPE_FOLDER, NO_TASK); registerShowDeleted(TYPE_FOLDER, TYPE_ROOT, TYPE_TASK); } Modified: trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/wave/client/KuneStagesProvider.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -36,11 +36,8 @@ import org.waveprotocol.wave.client.wavepanel.view.dom.ModelAsViewProvider; import org.waveprotocol.wave.client.wavepanel.view.dom.full.BlipQueueRenderer; import org.waveprotocol.wave.client.wavepanel.view.dom.full.DomRenderer; -import org.waveprotocol.wave.model.conversation.Conversation; -import org.waveprotocol.wave.model.conversation.ConversationBlip; import org.waveprotocol.wave.model.conversation.ConversationView; import org.waveprotocol.wave.model.id.IdGenerator; -import org.waveprotocol.wave.model.id.ModernIdSerialiser; import org.waveprotocol.wave.model.waveref.WaveRef; import com.google.gwt.dom.client.Element; @@ -124,7 +121,7 @@ @Override protected AsyncHolder<StageTwo> createStageTwoLoader(StageOne one) { return haltIfClosed(new StageTwoProvider( - this.one = one, waveRef.getWaveId(), channel, isNewWave, idGenerator, profiles) { + this.one = one, waveRef, channel, isNewWave, idGenerator, profiles) { // Kune patch @Override protected DomRenderer createRenderer() { @@ -193,33 +190,8 @@ } private void handleExistingWave(StageThree three) { - // If there's blip reference then focus on that blip. - String documentId = waveRef.getDocumentId(); - if (documentId != null) { - ModelAsViewProvider views = two.getModelAsViewProvider(); BlipQueueRenderer blipQueue = two.getBlipQueue(); - ConversationView wave = two.getConversations(); blipQueue.flush(); - // Find conversation - Conversation conversation; - if (waveRef.hasWaveletId()) { - String id = ModernIdSerialiser.INSTANCE.serialiseWaveletId(waveRef.getWaveletId()); - conversation = wave.getConversation(id); - } else { - // Unspecified wavelet means root. - conversation = wave.getRoot(); - } - if (conversation != null) { - // Find selected blip. - ConversationBlip blip = wave.getRoot().getBlip(documentId); - if (blip != null) { - BlipView blipUi = views.getBlipView(blip); - if (blipUi != null) { - two.getStageOne().getFocusFrame().focus(blipUi); - } - } - } - } } public void destroy() { Modified: trunk/src/main/java/cc/kune/wave/client/WebClient.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/wave/client/WebClient.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -28,6 +28,7 @@ import org.waveprotocol.box.webclient.client.ClientEvents; import org.waveprotocol.box.webclient.client.ClientIdGenerator; import org.waveprotocol.box.webclient.client.DebugMessagePanel; +import org.waveprotocol.box.webclient.client.HistoryProvider; import org.waveprotocol.box.webclient.client.HistorySupport; import org.waveprotocol.box.webclient.client.RemoteViewServiceMultiplexer; import org.waveprotocol.box.webclient.client.Session; @@ -183,6 +184,12 @@ final String message = stack.asString().replace("<br>", "\n"); REMOTE_LOG.severe(message); NotifyUser.logError(message); + NotifyUser.showProgress("Error in editor"); + new Timer() { + @Override + public void run() { + NotifyUser.hideProgress(); + }}.schedule(3000); } }); } @@ -285,7 +292,19 @@ //setupConnectionIndicator(); // Done in StateManager - HistorySupport.kuneInit(tokenMatcher, session); + HistorySupport.init(new HistoryProvider() { + @Override + public String getToken() { + final String currentToken = History.getToken(); + String waveToken = currentToken; + // FIXME what about preview? + if (tokenMatcher.isGroupToken(currentToken) || tokenMatcher.isHomeToken(currentToken)) { + waveToken = session.getContentState().getWaveRef(); + LOG.info("Kune URL: " + currentToken + " = " + waveToken); + } + return waveToken; + } + }); loginImpl(); Modified: trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -34,6 +34,8 @@ public class WikiClientTool extends FoldableAbstractClientTool { + private static final String EMPTY_FOLDER = "This folder is empty, create some wikipage or folder"; + @Inject public WikiClientTool(final I18nUITranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources) { @@ -65,8 +67,10 @@ registerContentTypeIcon(TYPE_ROOT, navResources.folder()); registerContentTypeIcon(TYPE_WIKIPAGE, navResources.wikipage()); registerUploadTypesAndMimes(TYPE_UPLOADEDFILE); - registerEmptyMessages(TYPE_FOLDER, i18n.t("This folder is empty")); - registerEmptyMessages(TYPE_ROOT, i18n.t("This wiki is empty")); + registerEmptyMessages(TYPE_FOLDER, i18n.t(EMPTY_FOLDER)); + registerEmptyMessages(TYPE_ROOT, i18n.t(EMPTY_FOLDER)); + registerEmptyMessagesNotLogged(TYPE_FOLDER, i18n.t("This folder is empty")); + registerEmptyMessagesNotLogged(TYPE_ROOT, i18n.t("This wiki is empty")); } } Deleted: trunk/src/main/java/org/waveprotocol/box/webclient/client/HistorySupport.java =================================================================== --- trunk/src/main/java/org/waveprotocol/box/webclient/client/HistorySupport.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/org/waveprotocol/box/webclient/client/HistorySupport.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -1,85 +0,0 @@ -// @formatter:off -/* - * Copyright 2010 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may not - * use this file except in compliance with the License. You may obtain a copy of - * the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations under - * the License. - */ - -package org.waveprotocol.box.webclient.client; - -import javax.annotation.Nullable; - -import org.waveprotocol.box.webclient.client.events.Log; -import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; -import org.waveprotocol.wave.model.waveref.WaveRef; -import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; - -import cc.kune.core.client.state.TokenMatcher; - -/** - * Contains the code to interface the history event mechanism with the client's - * event bus. At the moment, a history token encodes a wave id or wave ref. - */ -public class HistorySupport { - private static final Log LOG = Log.get(HistorySupport.class); - private static TokenMatcher tokenMatcher; - private static cc.kune.core.client.state.Session session; - public static void kuneInit(TokenMatcher tokenMatcher, cc.kune.core.client.state.Session session) { - HistorySupport.tokenMatcher = tokenMatcher; - HistorySupport.session = session; - } - public static void init() { -// History.addValueChangeHandler(new ValueChangeHandler<String>() { -// @Override -// public void onValueChange(ValueChangeEvent<String> event) { -// String encodedToken = event.getValue(); -// if (encodedToken == null || encodedToken.length() == 0) { -// return; -// } -// WaveRef waveRef = waveRefFromHistoryToken(encodedToken); -// if (waveRef == null) { -// LOG.info("History token contains invalid path: " + encodedToken); -// return; -// } -// LOG.info("Changing selected wave based on history event to " + waveRef.toString()); -// ClientEvents.get().fireEvent(new WaveSelectionEvent(waveRef)); -// } -// }); - } - - /** - * @param encodedToken token to parse into waveref - * @return null if cannot parse into valid waveRef - */ - @Nullable - public static WaveRef waveRefFromHistoryToken(String encodedToken) { - LOG.info("Encoded token: " + encodedToken); - String waveToken = encodedToken; - if (tokenMatcher.isGroupToken(encodedToken) || tokenMatcher.isHomeToken(encodedToken)) { - waveToken = session.getContentState().getWaveRef(); - LOG.info("Kune URL: " + encodedToken + " = " + waveToken); - } - try { - return GwtWaverefEncoder.decodeWaveRefFromPath(waveToken); - } catch (InvalidWaveRefException e) { - return null; - } - } - - public static String historyTokenFromWaveref(WaveRef ref) { - return GwtWaverefEncoder.encodeToUriPathSegment(ref); - } - - private HistorySupport() { - } -} Deleted: trunk/src/main/java/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java =================================================================== --- trunk/src/main/java/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java 2011-11-19 15:02:45 UTC (rev 1617) +++ trunk/src/main/java/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java 2011-11-23 14:33:50 UTC (rev 1618) @@ -1,610 +0,0 @@ -// @formatter:off -/** - * Copyright 2010 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -package org.waveprotocol.wave.client.wavepanel.impl.toolbar; - -import org.waveprotocol.box.webclient.client.HistorySupport; -import org.waveprotocol.wave.client.common.util.WaveRefConstants; -import org.waveprotocol.wave.client.doodad.link.Link; -import org.waveprotocol.wave.client.doodad.link.Link.InvalidLinkException; -import org.waveprotocol.wave.client.editor.Editor; -import org.waveprotocol.wave.client.editor.EditorContext; -import org.waveprotocol.wave.client.editor.EditorContextAdapter; -import org.waveprotocol.wave.client.editor.content.CMutableDocument; -import org.waveprotocol.wave.client.editor.content.ContentElement; -import org.waveprotocol.wave.client.editor.content.ContentNode; -import org.waveprotocol.wave.client.editor.content.misc.StyleAnnotationHandler; -import org.waveprotocol.wave.client.editor.content.paragraph.Paragraph; -import org.waveprotocol.wave.client.editor.content.paragraph.Paragraph.LineStyle; -import org.waveprotocol.wave.client.editor.toolbar.ButtonUpdater; -import org.waveprotocol.wave.client.editor.toolbar.ParagraphApplicationController; -import org.waveprotocol.wave.client.editor.toolbar.ParagraphTraversalController; -import org.waveprotocol.wave.client.editor.toolbar.TextSelectionController; -import org.waveprotocol.wave.client.editor.util.EditorAnnotationUtil; -import org.waveprotocol.wave.client.gadget.GadgetXmlUtil; -import org.waveprotocol.wave.client.wavepanel.impl.toolbar.attachment.AttachmentPopupWidget; -import org.waveprotocol.wave.client.wavepanel.impl.toolbar.gadget.GadgetSelectorWidget; -import org.waveprotocol.wave.client.wavepanel.view.AttachmentPopupView; -import org.waveprotocol.wave.client.wavepanel.view.AttachmentPopupView.Listener; -import org.waveprotocol.wave.client.widget.popup.UniversalPopup; -import org.waveprotocol.wave.client.widget.toolbar.SubmenuToolbarView; -import org.waveprotocol.wave.client.widget.toolbar.ToolbarButtonViewBuilder; -import org.waveprotocol.wave.client.widget.toolbar.ToolbarView; -import org.waveprotocol.wave.client.widget.toolbar.ToplevelToolbarWidget; -import org.waveprotocol.wave.client.widget.toolbar.buttons.ToolbarClickButton; -import org.waveprotocol.wave.client.widget.toolbar.buttons.ToolbarToggleButton; -import org.waveprotocol.wave.media.model.AttachmentIdGenerator; -import org.waveprotocol.wave.media.model.AttachmentIdGeneratorImpl; -import org.waveprotocol.wave.model.document.util.FocusedRange; -import org.waveprotocol.wave.model.document.util.LineContainers; -import org.waveprotocol.wave.model.document.util.Point; -import org.waveprotocol.wave.model.document.util.XmlStringBuilder; -import org.waveprotocol.wave.model.id.IdGenerator; -import org.waveprotocol.wave.model.wave.ParticipantId; -import org.waveprotocol.wave.model.waveref.WaveRef; -import org.waveprotocol.wave.util.escapers.GwtWaverefEncoder; - -import com.google.common.base.Preconditions; -import com.google.gwt.core.client.GWT; -import com.google.gwt.dom.client.Document; -import com.google.gwt.dom.client.Element; -import com.google.gwt.dom.client.Style.Unit; -import com.google.gwt.http.client.URL; -import com.google.gwt.user.client.History; -import com.google.gwt.user.client.Window; - -/** - * Attaches actions that can be performed in a Wave's "edit mode" to a toolbar. - * <p> - * Also constructs an initial set of such actions. - * - * @author kalman(a)google.com (Benjamin Kalman) - */ -public class EditToolbar { - - /** - * Container for an alignment. - */ - private static final class Alignment { - public final String description; - public final String iconCss; - public final LineStyle style; - public Alignment(final String description, final String iconCss, final LineStyle style) { - this.description = description; - this.iconCss = iconCss; - this.style = style; - } - } - - /** - * Handler for click buttons added with {@link EditToolbar#addClickButton}. - */ - public interface ClickHandler { - void onClicked(EditorContext context); - } - - /** - * Container for a font family. - */ - private static final class FontFamily { - public final String description; - public final String style; - public FontFamily(final String description, final String style) { - this.description = description; - this.style = style; - } - } - - private static <E> E[] asArray(final E... elements) { - return elements; - } - /** - * Attaches editor behaviour to a toolbar, adding all the edit buttons. - */ - public static EditToolbar create(final ParticipantId user, final IdGenerator idGenerator) { - final ToplevelToolbarWidget toolbarUi = new ToplevelToolbarWidget(); - final EditorToolbarResources.Css css = EditorToolbarResources.Loader.res.css(); - return new EditToolbar(css, toolbarUi, user, idGenerator); - } - private final AttachmentIdGenerator attachmentIdGenerator; - private final EditorToolbarResources.Css css; - - private final EditorContextAdapter editor = new EditorContextAdapter(null); - private final ToplevelToolbarWidget toolbarUi; - - private final ButtonUpdater updater = new ButtonUpdater(editor); - - private final ParticipantId user; - - private EditToolbar(final EditorToolbarResources.Css css, final ToplevelToolbarWidget toolbarUi, - final ParticipantId user, final IdGenerator idGenerator) { - this.css = css; - this.toolbarUi = toolbarUi; - this.user = user; - attachmentIdGenerator = new AttachmentIdGeneratorImpl(idGenerator); - } - - /** - * Adds a button to this toolbar. - */ - public void addClickButton(final String icon, final ClickHandler handler) { - final ToolbarClickButton.Listener uiHandler = new ToolbarClickButton.Listener() { - @Override - public void onClicked() { - handler.onClicked(editor); - } - }; - new ToolbarButtonViewBuilder().setIcon(icon).applyTo(toolbarUi.addClickButton(), uiHandler); - } - - private void createAlignButtons(final ToolbarView toolbar) { - final SubmenuToolbarView submenu = toolbar.addSubmenu(); - new ToolbarButtonViewBuilder() - .setIcon(css.alignDrop()) - .applyTo(submenu, null); - submenu.setShowDropdownArrow(false); // Icon already has dropdown arrow. - final ToolbarView group = submenu.addGroup(); - for (final Alignment alignment : asArray( - new Alignment("Left", css.alignLeft(), Paragraph.Alignment.LEFT), - new Alignment("Centre", css.alignCentre(), Paragraph.Alignment.CENTER), - new Alignment("Right", css.alignRight(), Paragraph.Alignment.RIGHT))) { - final ToolbarToggleButton b = group.addToggleButton(); - new ToolbarButtonViewBuilder() - .setText(alignment.description) - .setIcon(alignment.iconCss) - .applyTo(b, createParagraphApplicationController(b, alignment.style)); - } - } - - private void createBoldButton(final ToolbarView toolbar) { - final ToolbarToggleButton b = toolbar.addToggleButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.bold()) - .applyTo(b, createTextSelectionController(b, "fontWeight", "bold")); - } - - private void createClearFormattingButton(final ToolbarView toolbar) { - new ToolbarButtonViewBuilder() - .setIcon(css.clearFormatting()) - .applyTo(toolbar.addClickButton(), new ToolbarClickButton.Listener() { - @Override public void onClicked() { - EditorAnnotationUtil.clearAnnotationsOverSelection(editor, asArray( - StyleAnnotationHandler.key("backgroundColor"), - StyleAnnotationHandler.key("color"), - StyleAnnotationHandler.key("fontFamily"), - StyleAnnotationHandler.key("fontSize"), - StyleAnnotationHandler.key("fontStyle"), - StyleAnnotationHandler.key("fontWeight"), - StyleAnnotationHandler.key("textDecoration") - // NOTE: add more as required. - )); - createClearHeadingsListener().onClicked(); - } - }); - } - - private ToolbarClickButton.Listener createClearHeadingsListener() { - return new ParagraphTraversalController(editor, new ContentElement.Action() { - @Override public void execute(final ContentElement e) { - e.getMutableDoc().setElementAttribute(e, Paragraph.SUBTYPE_ATTR, null); - } - }); - } - - private void createFontFamilyButton(final ToolbarView toolbar) { - final SubmenuToolbarView submenu = toolbar.addSubmenu(); - new ToolbarButtonViewBuilder() - .setIcon(css.fontFamily()) - .applyTo(submenu, null); - submenu.setShowDropdownArrow(false); // Icon already has dropdown arrow. - createFontFamilyGroup(submenu.addGroup(), new FontFamily("Default", null)); - createFontFamilyGroup(submenu.addGroup(), - new FontFamily("Sans Serif", "sans-serif"), - new FontFamily("Serif", "serif"), - new FontFamily("Wide", "arial black,sans-serif"), - new FontFamily("Narrow", "arial narrow,sans-serif"), - new FontFamily("Fixed Width", "monospace")); - createFontFamilyGroup(submenu.addGroup(), - new FontFamily("Arial", "arial,helvetica,sans-serif"), - new FontFamily("Comic Sans MS", "comic sans ms,sans-serif"), - new FontFamily("Courier New", "courier new,monospace"), - new FontFamily("Garamond", "garamond,serif"), - new FontFamily("Georgia", "georgia,serif"), - new FontFamily("Tahoma", "tahoma,sans-serif"), - new FontFamily("Times New Roman", "times new roman,serif"), - new FontFamily("Trebuchet MS", "trebuchet ms,sans-serif"), - new FontFamily("Verdana", "verdana,sans-serif")); - } - - private Element createFontFamilyElement(final FontFamily family) { - final Element e = Document.get().createSpanElement(); - e.getStyle().setProperty("fontFamily", family.style); - e.setInnerText(family.description); - return e; - } - - private void createFontFamilyGroup(final ToolbarView toolbar, final FontFamily... families) { - for (final FontFamily family : families) { - final ToolbarToggleButton b = toolbar.addToggleButton(); - b.setVisualElement(createFontFamilyElement(family)); - b.setListener(createTextSelectionController(b, "fontFamily", family.style)); - } - } - - private void createFontSizeButton(final ToolbarView toolbar) { - final SubmenuToolbarView submenu = toolbar.addSubmenu(); - new ToolbarButtonViewBuilder() - .setIcon(css.fontSize()) - .applyTo(submenu, null); - submenu.setShowDropdownArrow(false); // Icon already has dropdown arrow. - // TODO(kalman): default text size option. - final ToolbarView group = submenu.addGroup(); - for (final int size : asArray(8, 9, 10, 11, 12, 14, 16, 18, 21, 24, 28, 32, 36, 42, 48, 56, 64, 72)) { - final ToolbarToggleButton b = group.addToggleButton(); - final double baseSize = 12.0; - b.setVisualElement(createFontSizeElement(baseSize, size)); - b.setListener(createTextSelectionController(b, "fontSize", (size / baseSize) + "em")); - } - } - - private Element createFontSizeElement(final double baseSize, final double size) { - final Element e = Document.get().createSpanElement(); - e.getStyle().setFontSize(size / baseSize, Unit.EM); - e.setInnerText(((int) size) + ""); - return e; - } - - private void createHeadingButton(final ToolbarView toolbar) { - final SubmenuToolbarView submenu = toolbar.addSubmenu(); - new ToolbarButtonViewBuilder() - .setIcon(css.heading()) - .applyTo(submenu, null); - submenu.setShowDropdownArrow(false); // Icon already has dropdown arrow. - final ToolbarClickButton defaultButton = submenu.addClickButton(); - new ToolbarButtonViewBuilder() - .setText("Default") - .applyTo(defaultButton, createClearHeadingsListener()); - final ToolbarView group = submenu.addGroup(); - for (final int level : asArray(1, 2, 3, 4)) { - final ToolbarToggleButton b = group.addToggleButton(); - b.setVisualElement(createHeadingElement(level)); - b.setListener(createParagraphApplicationController(b, Paragraph.regularStyle("h" + level))); - } - } - - private Element createHeadingElement(final int level) { - final Element e = Document.get().createElement("h" + level); - e.getStyle().setMarginTop(2, Unit.PX); - e.getStyle().setMarginBottom(2, Unit.PX); - e.setInnerText("Heading " + level); - return e; - } - - private void createIndentButton(final ToolbarView toolbar) { - final ToolbarClickButton b = toolbar.addClickButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.indent()) - .applyTo(b, new ParagraphTraversalController(editor, Paragraph.INDENTER)); - } - - private void createInsertAttachmentButton(final ToolbarView toolbar, final ParticipantId user) { - // Find the current wave id. - final String encodedToken = History.getToken(); - WaveRef waveRef = null; - if (encodedToken != null && !encodedToken.isEmpty()) { - waveRef = HistorySupport.waveRefFromHistoryToken(encodedToken); - } - // Kune workaround while we do a HistorySupport patch - if (waveRef == null) { - return; - } - Preconditions.checkState(waveRef != null); - final String waveRefToken = URL.encode(GwtWaverefEncoder.encodeToUriQueryString(waveRef)); - - new ToolbarButtonViewBuilder().setIcon(css.insertAttachment()).setTooltip("Insert attachment") - .applyTo(toolbar.addClickButton(), new ToolbarClickButton.Listener() { - @Override - public void onClicked() { - int tmpCursor = -1; - final FocusedRange focusedRange = editor.getSelectionHelper().getSelectionRange(); - if (focusedRange != null) { - tmpCursor = focusedRange.getFocus(); - } - final int cursorLoc = tmpCursor; - final AttachmentPopupView attachmentView = new AttachmentPopupWidget(); - attachmentView.init(new Listener() { - - @Override - public void onDone(final String encodedWaveRef, final String attachmentId, final String fullFileName) { - // Insert a file name linking to the attachment URL. - final int lastSlashPos = fullFileName.lastIndexOf("/"); - final int lastBackSlashPos = fullFileName.lastIndexOf("\\"); - String fileName = fullFileName; - if (lastSlashPos != -1) { - fileName = fullFileName.substring(lastSlashPos + 1, fullFileName.length()); - } else if (lastBackSlashPos != -1) { - fileName = fullFileName.substring(lastBackSlashPos + 1, fullFileName.length()); - } - final XmlStringBuilder xml = XmlStringBuilder.createFromXmlString(fileName); - int to = -1; - final int docSize = editor.getDocument().size(); - if (cursorLoc != -1) { - // Insert the attachment at the cursor location. - final CMutableDocument doc = editor.getDocument(); - final Point<ContentNode> point = doc.locate(cursorLoc); - doc.insertXml(point, xml); - } else { - LineContainers.appendLine(editor.getDocument(), xml); - } - // Calculate the link length for the attachment. - to = cursorLoc + editor.getDocument().size() - docSize; - final String linkValue = - GWT.getHostPageBaseURL() + "attachment/" + attachmentId + "?fileName=" - + fileName + "&waveRef=" + encodedWaveRef; - EditorAnnotationUtil.setAnnotationOverRange(editor.getDocument(), - editor.getCaretAnnotations(), Link.KEY, linkValue, cursorLoc, to); - // Store the attachment information as annotations to allow - // robots detect and process them. - EditorAnnotationUtil.setAnnotationOverRange(editor.getDocument(), - editor.getCaretAnnotations(), "attachment/id", attachmentId, cursorLoc, to); - EditorAnnotationUtil.setAnnotationOverRange(editor.getDocument(), - editor.getCaretAnnotations(), "attachment/fileName", fileName, cursorLoc, to); - } - - @Override - public void onHide() { - } - - @Override - public void onShow() { - } - }); - - attachmentView.setAttachmentId(attachmentIdGenerator.newAttachmentId()); - attachmentView.setWaveRef(waveRefToken); - attachmentView.show(); - } - }); -} - - private void createInsertGadgetButton(final ToolbarView toolbar, final ParticipantId user) { - new ToolbarButtonViewBuilder() - .setIcon(css.insertGadget()) - .applyTo(toolbar.addClickButton(), new ToolbarClickButton.Listener() { - @Override public void onClicked() { - final GadgetSelectorWidget selector = new GadgetSelectorWidget(); - selector.addFeaturedOptions(); - final UniversalPopup popup = selector.showInPopup(); - selector.setListener(new GadgetSelectorWidget.Listener() { - @Override public void onSelect(final String url) { - insertGadget(url); - popup.hide(); - } - }); - } - }); - } - - private void createInsertLinkButton(final ToolbarView toolbar) { - // TODO (Yuri Z.) use createTextSelectionController when the full - // link doodad is incorporated - new ToolbarButtonViewBuilder() - .setIcon(css.insertLink()) - .applyTo(toolbar.addClickButton(), new ToolbarClickButton.Listener() { - @Override public void onClicked() { - final FocusedRange range = editor.getSelectionHelper().getSelectionRange(); - if (range == null || range.isCollapsed()) { - Window.alert("Select some text to create a link."); - return; - } - final String rawLinkValue = - Window.prompt("Enter link: URL or Wave ID.", WaveRefConstants.WAVE_URI_PREFIX); - // user hit "ESC" or "cancel" - if (rawLinkValue == null) { - return; - } - try { - final String linkAnnotationValue = Link.normalizeLink(rawLinkValue); - EditorAnnotationUtil.setAnnotationOverSelection(editor, Link.KEY, - linkAnnotationValue); - } catch (final InvalidLinkException e) { - Window.alert(e.getLocalizedMessage()); - } - } - }); - } - - private void createItalicButton(final ToolbarView toolbar) { - final ToolbarToggleButton b = toolbar.addToggleButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.italic()) - .applyTo(b, createTextSelectionController(b, "fontStyle", "italic")); - } - - private void createOrderedListButton(final ToolbarView toolbar) { - final ToolbarToggleButton b = toolbar.addToggleButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.orderedlist()) - .applyTo(b, createParagraphApplicationController( - b, Paragraph.listStyle(Paragraph.LIST_STYLE_DECIMAL))); - } - - private void createOutdentButton(final ToolbarView toolbar) { - final ToolbarClickButton b = toolbar.addClickButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.outdent()) - .applyTo(b, new ParagraphTraversalController(editor, Paragraph.OUTDENTER)); - } - - private ToolbarToggleButton.Listener createParagraphApplicationController(final ToolbarToggleButton b, - final LineStyle style) { - return updater.add(new ParagraphApplicationController(b, editor, style)); - } - - private void createRemoveLinkButton(final ToolbarView toolbar) { - new ToolbarButtonViewBuilder() - .setIcon(css.removeLink()) - .applyTo(toolbar.addClickButton(), new ToolbarClickButton.Listener() { - @Override public void onClicked() { - if (editor.getSelectionHelper().getSelectionRange() != null) { - EditorAnnotationUtil.clearAnnotationsOverSelection(editor, Link.LINK_KEYS); - } - } - }); - } - - private void createStrikethroughButton(final ToolbarView toolbar) { - final ToolbarToggleButton b = toolbar.addToggleButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.strikethrough()) - .applyTo(b, createTextSelectionController(b, "textDecoration", "line-through")); - } - - private void createSubscriptButton(final ToolbarView toolbar) { - final ToolbarToggleButton b = toolbar.addToggleButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.subscript()) - .applyTo(b, createTextSelectionController(b, "verticalAlign", "sub")); - } - - private void createSuperscriptButton(final ToolbarView toolbar) { - final ToolbarToggleButton b = toolbar.addToggleButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.superscript()) - .applyTo(b, createTextSelectionController(b, "verticalAlign", "super")); - } - - private ToolbarToggleButton.Listener createTextSelectionController(final ToolbarToggleButton b, - final String styleName, final String value) { - return updater.add(new TextSelectionController(b, editor, - StyleAnnotationHandler.key(styleName), value)); - } - - private void createUnderlineButton(final ToolbarView toolbar) { - final ToolbarToggleButton b = toolbar.addToggleButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.underline()) - .applyTo(b, createTextSelectionController(b, "textDecoration", "underline")); - } - - private void createUnorderedListButton(final ToolbarView toolbar) { - final ToolbarToggleButton b = toolbar.addToggleButton(); - new ToolbarButtonViewBuilder() - .setIcon(css.unorderedlist()) - .applyTo(b, createParagraphApplicationController(b, Paragraph.listStyle(null))); - } - - /** - * Stops listening to editor changes. - * - * @throws IllegalStateException if this toolbar is not currently enabled - * @throws IllegalArgumentException if this toolbar is currently enabled for a - * different editor - */ - public void disable(final Editor editor) { - this.editor.checkEditor(editor); - // The above won't throw if we're not currently enabled, but it makes sure - // 'editor' is the same as the current editor, if any. So if 'editor' is - // null, it means we aren't enabled (the wrapped editor is null too). - Preconditions.checkState(editor != null); - editor.removeUpdateListener(updater); - this.editor.switchEditor(null); - } - - /** - * Starts listening to editor changes. - * - * @throws IllegalStateException if this toolbar is already enabled - * @throws IllegalArgumentException if the editor is <code>null</code> - */ - public void enable(final Editor editor) { - this.editor.checkEditor(null); - Preconditions.checkArgument(editor != null); - this.editor.switchEditor(editor); - editor.addUpdateListener(updater); - updater.updateButtonStates(); - } - - /** - * @return the {@link ToplevelToolbarWidget} backing this toolbar. - */ - public ToplevelToolbarWidget getWidget() { - return toolbarUi; - } - - /** Constructs the initial set of actions in the toolbar. */ - public void init() { - ToolbarView group = toolbarUi.addGroup(); - createBoldButton(group); - createItalicButton(group); - createUnderlineButton(group); - createStrikethroughButton(group); - - group = toolbarUi.addGroup(); - createSuperscriptButton(group); - createSubscriptButton(group); - - group = toolbarUi.addGroup(); - createFontSizeButton(group); - createFontFamilyButton(group); - createHeadingButton(group); - - group = toolbarUi.addGroup(); - createIndentButton(group); - createOutdentButton(group); - - group = toolbarUi.addGroup(); - createUnorderedListButton(group); - createOrderedListButton(group); - - group = toolbarUi.addGroup(); - createAlignButtons(group); - createClearFormattingButton(group); - - group = toolbarUi.addGroup(); - createInsertLinkButton(group); - createRemoveLinkButton(group); - - group = toolbarUi.addGroup(); - createInsertGadgetButton(group, user); - - group = toolbarUi.addGroup(); - createInsertAttachmentButton(group, user); - } - - private void insertGadget(final String url) { - int from = -1; - final FocusedRange focusedRange = editor.getSelectionHelper().getSelectionRange(); - if (focusedRange != null) { - from = focusedRange.getFocus(); - } - if (url != null && !url.isEmpty()) { - final XmlStringBuilder xml = GadgetXmlUtil.constructXml(url, "", user.getAddress()); - final CMutableDocument document = editor.getDocument(); - if (document == null) { - return; - } - if (from != -1) { - final Point<ContentNode> point = document.locate(from); - document.insertXml(point, xml); - } else { - LineContainers.appendLine(document, xml); - } - } - } -}

1 0

r1617 - in trunk: img img/icons src/main/java/cc/kune/core/public/images src/main/resources
by Vicente J. Ruiz Jurado 19 Nov '11

19 Nov '11

Author: vjrj_ Date: 2011-11-19 16:02:45 +0100 (Sat, 19 Nov 2011) New Revision: 1617 Added: trunk/img/icons/favicon-demo.ico trunk/img/icons/favicon-demo.png trunk/img/kune-icon16-low.png trunk/img/kune-logo-16px-low.png trunk/img/kune-old-logos.svg trunk/img/kunecc-logo-16px-low.png Modified: trunk/img/kune-logos.svg trunk/src/main/java/cc/kune/core/public/images/kune-logo-16px.png trunk/src/main/java/cc/kune/core/public/images/kune-logo-onover-16px.png trunk/src/main/resources/kune.properties Log: some more icons Added: trunk/img/icons/favicon-demo.ico =================================================================== (Binary files differ) Property changes on: trunk/img/icons/favicon-demo.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/icons/favicon-demo.png =================================================================== (Binary files differ) Property changes on: trunk/img/icons/favicon-demo.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/kune-icon16-low.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-icon16-low.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/img/kune-logo-16px-low.png =================================================================== (Binary files differ) Property changes on: trunk/img/kune-logo-16px-low.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/img/kune-logos.svg =================================================================== --- trunk/img/kune-logos.svg 2011-11-19 14:04:29 UTC (rev 1616) +++ trunk/img/kune-logos.svg 2011-11-19 15:02:45 UTC (rev 1617) @@ -42,26 +42,6 @@ <linearGradient inkscape:collect="always" xlink:href="#linearGradient2871" - id="linearGradient3948" - gradientUnits="userSpaceOnUse" - gradientTransform="translate(397.49281,-378.79137)" - x1="368.6329" - y1="835.74664" - x2="368.6329" - y2="932.62268" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2871" - id="linearGradient4012" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.997905,0,0,0.997905,-48.42866,-162.7847)" - x1="367.37344" - y1="805.51978" - x2="367.37344" - y2="882.24463" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2871" id="linearGradient4732" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.997905,0,0,0.997905,-48.42866,-162.7847)" @@ -69,16 +49,6 @@ y1="805.51978" x2="367.37344" y2="882.24463" /> - <linearGradient - inkscape:collect="always" - xlink:href="#linearGradient2871" - id="linearGradient3463" - gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.997905,0,0,0.997905,31.931984,-168.91892)" - x1="719.26416" - y1="813.12897" - x2="719.26416" - y2="918.47412" /> </defs> <sodipodi:namedview id="base" @@ -100,16 +70,7 @@ inkscape:guide-bbox="true" inkscape:guide-points="true" showgrid="false" - inkscape:window-maximized="0"> - <sodipodi:guide - orientation="0,1" - position="830.76137,26.355188" - id="guide3703" /> - <sodipodi:guide - orientation="0,1" - position="856.74146,-93.746373" - id="guide3723" /> - </sodipodi:namedview> + inkscape:window-maximized="0" /> <metadata id="metadata2536"> <rdf:RDF> @@ -118,7 +79,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> @@ -126,453 +87,105 @@ inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1"> - <rect - style="opacity:0.8;color:#000000;fill:#800000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.90017545;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="rect2349" - width="159.36984" - height="37.225075" - x="514.73108" - y="299.72684" /> - <text - xml:space="preserve" - style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - x="580.47711" - y="-60.562412" - id="text5978" - sodipodi:linespacing="100%"><tspan - sodipodi:role="line" - id="tspan5980" - x="580.47711" - y="-60.562412">kune</tspan></text> - <text - xml:space="preserve" - style="font-size:19.77380943px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" - x="580.11847" - y="-38.638554" - id="text5982" - sodipodi:linespacing="100%"><tspan - sodipodi:role="line" - id="tspan5984" - x="580.11847" - y="-38.638554">libre/free projects</tspan></text> <g - id="g5986" - transform="matrix(0.3688,0,0,0.3688,503.19517,-409.2698)"> + id="g3379"> <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 60.321717,411.99998 377.014613,0" - id="path5988" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.61203,788.60332 0,-377.01178" - id="path5990" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.86937,597.15755 377.0124,0" - id="path5992" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 437.45588,596.97447 0,-377.01491" - id="path5994" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 372.87905,411.27704 64.93441,0" - id="path5996" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> + inkscape:connector-curvature="0" + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path2585" + d="m 313.03242,91.723068 c -0.74303,0 -1.45723,0.003 -2.17391,0.0494 -0.0669,0.0136 -0.13033,0.0368 -0.19763,0.0494 -0.66715,0.12461 -1.32536,0.23087 -2.02569,0.24704 -0.097,0.0136 -0.19995,-0.0145 -0.29644,0 -5.71605,0.86055 -10.54554,3.34248 -14.42688,7.46047 -4.53271,4.787062 -6.81817,10.521822 -6.81818,17.193682 0,6.74672 2.28548,12.52044 6.81818,17.29249 4.90667,5.14604 11.2818,7.70749 19.12055,7.70751 4.15869,-2e-5 8.15681,-1.03328 11.95652,-3.11265 3.79965,-2.01951 7.10345,-4.87783 9.93083,-8.49802 l -8.54743,-4.74308 c -3.68005,4.90668 -8.20158,7.36166 -13.58695,7.36166 -3.73988,0 -7.0931,-1.21319 -9.98024,-3.60672 -2.93207,-2.39351 -4.39727,-5.30891 -4.39723,-8.79447 l 39.08102,0 0,-1.97629 c -4e-5,-8.45204 -2.86291,-15.22007 -8.54743,-20.306322 -4.78705,-4.23347 -10.0899,-6.32405 -15.90909,-6.32411 z m -181.71937,0.34585 0,18.922922 -6.62055,0 0,9.6838 6.62055,0 0,19.76285 10.07905,0 0,-19.76285 6.07708,0 12.40119,19.76285 11.95652,0 -16.6502,-25.09882 15.90909,-22.332022 -12.20356,0 -12.30237,17.984192 -5.18775,0 0,-18.922922 -10.07905,0 z m 123.66601,0 c -1.73503,0.30966 -3.35171,0.81366 -4.8419,1.58103 -2.5132,1.34638 -4.49729,3.12201 -5.97826,5.33597 l 0,-5.97827 -10.12846,0 0,47.430842 10.12846,0 0,-26.58103 c -10e-6,-3.79965 1.07224,-6.71507 3.21147,-8.79447 2.15413,-2.07932 4.88507,-3.11262 8.25098,-3.11265 3.56032,3e-5 6.34065,0.95537 8.3004,2.91502 1.95964,1.95972 2.91496,5.03102 2.91502,9.18973 l 0,26.3834 10.12846,0 0,-28.60672 c -5e-5,-5.8192 -1.77567,-10.62715 -5.33597,-14.426882 -2.67029,-2.84973 -5.76,-4.62351 -9.28854,-5.33597 l -7.36166,0 z m -76.77865,0.93873 0,27.470362 c -2e-5,6.43257 2.16853,11.63344 6.52173,15.61265 4.03904,3.73986 9.04189,5.63239 14.92095,5.63241 5.93886,-2e-5 10.91633,-1.89255 14.97036,-5.63241 4.35315,-3.97921 6.52169,-9.18008 6.52174,-15.61265 l 0,-27.470362 -10.12846,0 0,26.581032 c -5e-5,3.50052 -1.0723,6.34841 -3.21146,8.54743 -2.21404,2.27385 -4.906,3.40909 -8.15218,3.40909 -3.12654,2e-5 -5.83938,-1.15019 -8.05336,-3.40909 -2.19905,-2.27381 -3.2609,-5.10673 -3.26087,-8.54743 l 0,-26.581032 -10.12845,0 z m 133.54743,7.806332 c 3.306,5e-5 6.19285,0.92683 8.64624,2.7668 2.37851,1.88491 4.13014,4.63084 5.23716,8.25099 l -27.22332,0 c 0.79283,-3.48552 2.43792,-6.19246 4.8913,-8.15218 2.37853,-1.89981 5.18745,-2.86556 8.44862,-2.86561 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" /> + <g + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + transform="matrix(0.347343,0,0,0.346901,49.15684,-210.33683)" + id="g6020"> + <path + inkscape:connector-curvature="0" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6022" + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + <path + inkscape:connector-curvature="0" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6024" + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + <path + inkscape:connector-curvature="0" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6026" + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + <path + inkscape:connector-curvature="0" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6028" + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + <path + inkscape:connector-curvature="0" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path6030" + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" /> + </g> </g> - <path - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" - d="M 382.32888,356.181 C 381.58585,356.181 380.87165,356.18362 380.15497,356.23041 C 380.08806,356.24404 380.02464,356.26725 379.95734,356.27981 C 379.29019,356.40442 378.63198,356.51068 377.93165,356.52685 C 377.83464,356.54045 377.7317,356.51232 377.63521,356.52685 C 371.91916,357.3874 367.08967,359.86933 363.20833,363.98732 C 358.67562,368.77438 356.39016,374.50914 356.39015,381.181 C 356.39015,387.92772 358.67563,393.70144 363.20833,398.47349 C 368.115,403.61953 374.49013,406.18098 382.32888,406.181 C 386.48757,406.18098 390.48569,405.14772 394.2854,403.06835 C 398.08505,401.04884 401.38885,398.19052 404.21623,394.57033 L 395.6688,389.82725 C 391.98875,394.73393 387.46722,397.18891 382.08185,397.18891 C 378.34197,397.18891 374.98875,395.97572 372.10161,393.58219 C 369.16954,391.18868 367.70434,388.27328 367.70438,384.78772 L 406.7854,384.78772 L 406.7854,382.81143 C 406.78536,374.35939 403.92249,367.59136 398.23797,362.50511 C 393.45092,358.27164 388.14807,356.18106 382.32888,356.181 z M 200.60951,356.52685 L 200.60951,375.44977 L 193.98896,375.44977 L 193.98896,385.13357 L 200.60951,385.13357 L 200.60951,404.89642 L 210.68856,404.89642 L 210.68856,385.13357 L 216.76564,385.13357 L 229.16683,404.89642 L 241.12335,404.89642 L 224.47315,379.7976 L 240.38224,357.46558 L 228.17868,357.46558 L 215.87631,375.44977 L 210.68856,375.44977 L 210.68856,356.52685 L 200.60951,356.52685 z M 324.27552,356.52685 C 322.54049,356.83651 320.92381,357.34051 319.43362,358.10788 C 316.92042,359.45426 314.93633,361.22989 313.45536,363.44385 L 313.45536,357.46558 L 303.3269,357.46558 L 303.3269,404.89642 L 313.45536,404.89642 L 313.45536,378.31539 C 313.45535,374.51574 314.5276,371.60032 316.66683,369.52092 C 318.82096,367.4416 321.5519,366.4083 324.91781,366.40827 C 328.47813,366.4083 331.25846,367.36364 333.21821,369.32329 C 335.17785,371.28301 336.13317,374.35431 336.13323,378.51302 L 336.13323,404.89642 L 346.26169,404.89642 L 346.26169,376.2897 C 346.26164,370.4705 344.48602,365.66255 340.92572,361.86282 C 338.25543,359.01309 335.16572,357.23931 331.63718,356.52685 L 324.27552,356.52685 z M 247.49687,357.46558 L 247.49687,384.93594 C 247.49685,391.36851 249.6654,396.56938 254.0186,400.54859 C 258.05764,404.28845 263.06049,406.18098 268.93955,406.181 C 274.87841,406.18098 279.85588,404.28845 283.90991,400.54859 C 288.26306,396.56938 290.4316,391.36851 290.43165,384.93594 L 290.43165,357.46558 L 280.30319,357.46558 L 280.30319,384.04661 C 280.30314,387.54713 279.23089,390.39502 277.09173,392.59404 C 274.87769,394.86789 272.18573,396.00313 268.93955,396.00313 C 265.81301,396.00315 263.10017,394.85294 260.88619,392.59404 C 258.68714,390.32023 257.62529,387.48731 257.62532,384.04661 L 257.62532,357.46558 L 247.49687,357.46558 z M 381.0443,365.27191 C 384.3503,365.27196 387.23715,366.19874 389.69054,368.03871 C 392.06905,369.92362 393.82068,372.66955 394.9277,376.2897 L 367.70438,376.2897 C 368.49721,372.80418 370.1423,370.09724 372.59568,368.13752 C 374.97421,366.23771 377.78313,365.27196 381.0443,365.27191 z " - id="path2585" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854" /> <g - id="g6020" - transform="matrix(0.347343,0,0,0.346901,118.4533,54.1211)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854"> - <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 60.321717,411.99998 L 437.33633,411.99998" - id="path6022" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.61203,788.60332 L 252.61203,411.59154" - id="path6024" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.86937,597.15755 L 629.88177,597.15755" - id="path6026" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 437.45588,596.97447 L 437.45588,219.95956" - id="path6028" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 372.87905,411.27704 L 437.81346,411.27704" - id="path6030" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - </g> - <g id="g2513" - transform="matrix(0.222301,0,0,0.222015,155.9062,114.9246)" + transform="matrix(0.222301,0,0,0.222015,295.72407,-154.95451)" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-ico.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 60.321717,411.99998 L 437.33633,411.99998" - id="path2515" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.61203,788.60332 L 252.61203,411.59154" - id="path2517" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.86937,597.15755 L 629.88177,597.15755" - id="path2519" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 437.45588,596.97447 L 437.45588,219.95956" - id="path2521" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 372.87905,411.27704 L 437.81346,411.27704" - id="path2523" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - </g> - <path - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" - d="m 552.77406,438.40087 0,1.37027 479.12504,0 0,-1.37027 -479.12504,0 z" - id="path2924" - inkscape:connector-curvature="0" /> - <path - style="opacity:0.33000004;color:#000000;fill:url(#linearGradient3948);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" - d="m 552.77406,439.77114 0,24.90625 c 6.85756,0.14283 14.21977,0.35752 21.90625,0.71875 27.28416,1.28226 30.50723,17.35086 57.1875,24.96875 28.33349,8.08995 34.13703,4.08514 55.28102,1.56308 37.90101,-4.52084 94.3448,-37.27348 138.62522,-13.87558 24.48867,12.93989 49.90374,14.92134 81.46875,6.4375 33.47734,-8.9978 55.7377,-14.79726 94.0313,-19.28125 l 30.625,-0.625 0,-24.8125 -479.12504,0 z" - id="path1971" - sodipodi:nodetypes="ccssssscccc" - inkscape:connector-curvature="0" /> - <text - xml:space="preserve" - style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - x="626.30261" - y="471.10065" - id="text2887" - sodipodi:linespacing="100%"><tspan - sodipodi:role="line" - id="tspan2889" - x="626.30261" - y="471.10065">kune</tspan></text> - <text - xml:space="preserve" - style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" - x="675.48834" - y="496.96741" - id="text2891" - sodipodi:linespacing="100%"><tspan - sodipodi:role="line" - id="tspan2893" - x="675.48834" - y="496.96741">wiki</tspan></text> - <g - id="g2895" - transform="matrix(0.3688,0,0,0.3688,549.02077,122.39333)"> - <path style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" d="m 60.321717,411.99998 377.014613,0" - id="path2897" + id="path2515" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" inkscape:connector-curvature="0" /> <path style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" d="m 252.61203,788.60332 0,-377.01178" - id="path2899" + id="path2517" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" inkscape:connector-curvature="0" /> <path style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" d="m 252.86937,597.15755 377.0124,0" - id="path2901" + id="path2519" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" inkscape:connector-curvature="0" /> <path style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" d="m 437.45588,596.97447 0,-377.01491" - id="path2903" + id="path2521" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" inkscape:connector-curvature="0" /> <path style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" d="m 372.87905,411.27704 64.93441,0" - id="path2905" + id="path2523" transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" inkscape:connector-curvature="0" /> </g> <g - id="g4030" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-logo-wiki.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - transform="translate(466.14172,-123.62205)"> - <path - id="path2952" - d="m 105.53125,652.625 0,1.375 477.40625,0 0.0312,0 475.4063,0 2,0 475.4061,0 0.031,0 477.4063,0 0,-1.375 -477.4063,0 -0.031,0 -475.4061,0 -2,0 -475.4063,0 -0.0312,0 -477.40625,0 z" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" - inkscape:connector-curvature="0" /> - <path - id="path2954" - d="m 106.53125,654.0625 c 0,8.28469 0,16.55906 0,24.84375 19.50249,0.0392 40.64386,-0.0181 56.34375,13.5625 19.32389,13.20868 43.80356,22.48766 67.1875,15.34375 49.43557,-5.81055 98.66401,-27.10313 148.90625,-15.5625 31.08758,7.11366 62.83127,-0.56045 94.0625,-2.4375 27.88068,-4.6841 55.43721,-11.03125 84.25,-11.03125 9.81726,-10e-6 17.83424,0 25.65625,0 3e-5,0.0416 0,0.0834 0,0.125 19.50252,0.0392 40.64386,-0.0181 56.34375,13.5625 19.32385,13.20868 43.80356,22.48766 67.1875,15.34375 49.43553,-5.81055 98.66401,-27.10313 148.90625,-15.5625 31.08757,7.11366 62.83128,-0.56045 94.0625,-2.4375 27.8807,-4.6841 55.4372,-11.03125 84.25,-11.03125 9.829,-10e-6 17.8564,0 25.6875,0 0,0.0417 0,0.0833 0,0.125 19.5025,0.0392 40.6438,-0.0181 56.3438,13.5625 19.3239,13.20868 43.7723,22.48766 67.1562,15.34375 49.4357,-5.81055 98.664,-27.10313 148.9062,-15.5625 31.0877,7.11366 62.8626,-0.56045 94.0938,-2.4375 27.8806,-4.6841 55.4061,-11.03125 84.2188,-11.03125 9.8172,-10e-6 17.8655,0 25.6874,0 0,0.0416 0,0.0834 0,0.125 19.5025,0.0392 40.6439,-0.0181 56.3438,13.5625 19.3239,13.20868 43.7723,22.48766 67.1562,15.34375 49.4356,-5.81055 98.6641,-27.10313 148.9063,-15.5625 31.0877,7.11366 62.8625,-0.56045 94.0937,-2.4375 27.8807,-4.6841 55.406,-11.03125 84.2188,-11.03125 9.8291,-10e-6 17.8877,0 25.7188,0 l 0,-24.71875 c -158.8021,0 -317.6042,0 -476.4063,0 -0.01,0 -0.021,0 -0.031,0 -158.8021,0 -317.6041,0 -476.4062,0 -158.80198,0 -317.60416,0 -476.40625,0 -0.0104,0 -0.0208,0 -0.0312,0 -158.80205,0 -317.60415,0 -476.40625,0 z" - style="opacity:0.33000004;color:#000000;fill:url(#linearGradient4012);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" - inkscape:connector-curvature="0" /> - <g - transform="translate(0,178)" - id="g3971"> - <text - sodipodi:linespacing="100%" - id="text3951" - y="507.32114" - x="188.50735" - style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - xml:space="preserve"><tspan - y="507.32114" - x="188.50735" - id="tspan3953" - sodipodi:role="line">kune</tspan></text> - <text - sodipodi:linespacing="100%" - id="text3955" - y="533.18787" - x="237.69305" - style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" - xml:space="preserve"><tspan - y="533.18787" - x="237.69305" - id="tspan3957" - sodipodi:role="line">wiki</tspan></text> - <g - transform="matrix(0.3688,0,0,0.3688,111.2255,158.6138)" - id="g3959"> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3961" - d="m 60.321717,411.99998 377.014613,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3963" - d="m 252.61203,788.60332 0,-377.01178" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3965" - d="m 252.86937,597.15755 377.0124,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3967" - d="m 437.45588,596.97447 0,-377.01491" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3969" - d="m 372.87905,411.27704 64.93441,0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - </g> - </g> - </g> - <path - style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" - d="m 749.06429,646.48678 0,1.375 1.24999,0 0,-1.375 -1.24999,0 z" - id="path3441" - inkscape:connector-curvature="0" /> - <path - style="opacity:0.33000004;color:#000000;fill:url(#linearGradient3463);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" - d="m 749.06429,647.92428 0,52.9375 c 0.41302,0.12568 0.83553,0.2245 1.24999,0.34375 l 0,-53.28125 c -0.41667,0 -0.83332,0 -1.24999,0 z" - id="path3435" - inkscape:connector-curvature="0" /> - <g - id="g3451" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-wiki-logo.png" - inkscape:export-xdpi="240" - inkscape:export-ydpi="240" - transform="translate(448.03149,-129.13386)"> - <text - xml:space="preserve" - style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" - x="252.00264" - y="831.75439" - id="text4716" - sodipodi:linespacing="100%"><tspan - sodipodi:role="line" - id="tspan4718" - x="252.00264" - y="831.75439">wiki</tspan></text> - <g - id="g4720" - transform="matrix(0.3688,0,0,0.3688,110.9594,457.1803)"> - <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 60.321717,411.99998 377.014613,0" - id="path4722" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.61203,788.60332 0,-377.01178" - id="path4724" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.86937,597.15755 377.0124,0" - id="path4726" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 437.45588,596.97447 0,-377.01491" - id="path4728" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 372.87905,411.27704 64.93441,0" - id="path4730" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - </g> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-logo.png" - id="path4766" - d="m 278.7546,778.41609 c -0.35962,0 -0.70527,10e-4 -1.05214,0.0239 -0.0324,0.007 -0.0631,0.0178 -0.0956,0.0239 -0.32288,0.0603 -0.64145,0.11173 -0.98039,0.11955 -0.047,0.007 -0.0968,-0.007 -0.14348,0 -2.76645,0.4165 -5.10383,1.6177 -6.98231,3.61073 -2.19375,2.31684 -3.29986,5.09234 -3.29987,8.32139 0,3.26527 1.10613,6.05963 3.29987,8.36921 2.37472,2.49058 5.46015,3.73027 9.25396,3.73028 2.01272,-10e-6 3.94772,-0.50009 5.78671,-1.50646 1.83895,-0.9774 3.43792,-2.36077 4.80632,-4.11286 l -4.13679,-2.29556 c -1.78107,2.37473 -3.96939,3.56289 -6.5758,3.56289 -1.81003,0 -3.43292,-0.58716 -4.83023,-1.74558 -1.41907,-1.15841 -2.12819,-2.5694 -2.12817,-4.25634 l 18.91442,0 0,-0.95649 c -3e-5,-4.09062 -1.38559,-7.36621 -4.13678,-9.82785 -2.31685,-2.04891 -4.88331,-3.0607 -7.69968,-3.06074 z m -87.9485,0.16738 0,9.15832 -3.20421,0 0,4.68676 3.20421,0 0,9.56482 4.87806,0 0,-9.56482 2.94118,0 6.00192,9.56482 5.78672,0 -8.05836,-12.14732 7.69968,-10.80824 -5.90628,0 -5.95409,8.70398 -2.51077,0 0,-9.15832 -4.87806,0 z m 59.85184,0 c -0.83972,0.14988 -1.62215,0.39381 -2.34338,0.76519 -1.21633,0.65163 -2.1766,1.511 -2.89335,2.5825 l 0,-2.89335 -4.90197,0 0,22.95556 4.90197,0 0,-12.86468 c -1e-5,-1.83896 0.51894,-3.24996 1.55429,-4.25635 1.04255,-1.00634 2.36426,-1.50644 3.9933,-1.50645 1.72312,10e-6 3.06874,0.46238 4.01722,1.41081 0.94843,0.94846 1.41078,2.43491 1.41081,4.44764 l 0,12.76903 4.90197,0 0,-13.84507 c -2e-5,-2.81638 -0.85939,-5.14333 -2.5825,-6.98232 -1.29236,-1.37921 -2.78772,-2.23769 -4.49546,-2.58251 l -3.5629,0 z m -37.15931,0.45434 0,13.29509 c -1e-5,3.11324 1.04953,5.63035 3.15639,7.55621 1.95482,1.81002 4.37609,2.72596 7.22144,2.72597 2.87429,-1e-5 5.28328,-0.91595 7.24534,-2.72597 2.10684,-1.92586 3.15637,-4.44297 3.15639,-7.55621 l 0,-13.29509 -4.90196,0 0,12.86468 c -3e-5,1.69417 -0.51897,3.07249 -1.55428,4.13678 -1.07155,1.10049 -2.37441,1.64993 -3.94549,1.64993 -1.51319,10e-6 -2.82614,-0.55667 -3.89767,-1.64993 -1.06429,-1.10048 -1.57821,-2.47156 -1.57819,-4.13678 l 0,-12.86468 -4.90197,0 z m 64.63425,3.7781 c 1.60004,3e-5 2.99722,0.44857 4.18461,1.33908 1.15115,0.91225 1.9989,2.24123 2.53467,3.99331 l -13.17552,0 c 0.38371,-1.68692 1.1799,-2.99703 2.36729,-3.94549 1.15115,-0.91947 2.51061,-1.38687 4.08895,-1.3869 z" - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - inkscape:connector-curvature="0" /> - </g> - <g - id="g7182" - transform="matrix(0.64908,0,0,0.64908,234.5008,109.7477)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-arch-0.1.png" - inkscape:export-xdpi="240" - inkscape:export-ydpi="240"> - <g - transform="translate(-2.385332,4.770664)" - id="g7173"> - <g - transform="matrix(0.3688,0,0,0.3688,-188.5,-224.5906)" - id="g7361"> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path7363" - d="M 60.321717,411.99998 L 437.33633,411.99998" - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path7365" - d="M 252.61203,788.60332 L 252.61203,411.59154" - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path7367" - d="M 252.86937,597.15755 L 629.88177,597.15755" - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path7369" - d="M 437.45588,596.97447 L 437.45588,219.95956" - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path7371" - d="M 372.87905,411.27704 L 437.81346,411.27704" - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> - </g> - <path - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" - d="M -20.704789,96.645148 C -21.064409,96.645148 -21.410059,96.646418 -21.756929,96.669068 C -21.789299,96.675658 -21.819999,96.686888 -21.852569,96.692978 C -22.175449,96.753278 -22.494019,96.804708 -22.832959,96.812528 C -22.879919,96.819118 -22.929739,96.805498 -22.976439,96.812528 C -25.742889,97.229028 -28.080269,98.430228 -29.958749,100.42326 C -32.152499,102.7401 -33.258609,105.5156 -33.258619,108.74465 C -33.258619,112.00992 -32.152489,114.80428 -29.958749,117.11386 C -27.584029,119.60444 -24.498599,120.84413 -20.704789,120.84414 C -18.692069,120.84413 -16.757069,120.34405 -14.918079,119.33768 C -13.079129,118.36028 -11.480159,116.97691 -10.111759,115.22482 L -14.248549,112.92926 C -16.029619,115.30399 -18.217939,116.49215 -20.824349,116.49215 C -22.634379,116.49215 -24.257269,115.90499 -25.654579,114.74657 C -27.073649,113.58816 -27.782769,112.17717 -27.782749,110.49023 L -8.8683294,110.49023 L -8.8683294,109.53374 C -8.8683594,105.44312 -10.253919,102.16753 -13.005109,99.705888 C -15.321959,97.656978 -17.888419,96.645188 -20.704789,96.645148 z M -108.65329,96.812528 L -108.65329,105.97085 L -111.8575,105.97085 L -111.8575,110.65761 L -108.65329,110.65761 L -108.65329,120.22243 L -103.77523,120.22243 L -103.77523,110.65761 L -100.83405,110.65761 L -94.832129,120.22243 L -89.045409,120.22243 L -97.103769,108.07511 L -89.404089,97.266868 L -95.310369,97.266868 L -101.26446,105.97085 L -103.77523,105.97085 L -103.77523,96.812528 L -108.65329,96.812528 z M -48.801449,96.812528 C -49.641169,96.962408 -50.423599,97.206338 -51.144829,97.577718 C -52.361159,98.229348 -53.321429,99.088718 -54.038179,100.16022 L -54.038179,97.266868 L -58.940149,97.266868 L -58.940149,120.22243 L -54.038179,120.22243 L -54.038179,107.35775 C -54.038189,105.51879 -53.519239,104.10779 -52.483889,103.1014 C -51.441339,102.09506 -50.119629,101.59496 -48.490589,101.59495 C -46.767469,101.59496 -45.421849,102.05733 -44.473369,103.00576 C -43.524939,103.95422 -43.062589,105.44067 -43.062559,107.4534 L -43.062559,120.22243 L -38.160589,120.22243 L -38.160589,106.37736 C -38.160609,103.56098 -39.019979,101.23403 -40.743089,99.395038 C -42.035449,98.015828 -43.530809,97.157348 -45.238549,96.812528 L -48.801449,96.812528 z M -85.960759,97.266868 L -85.960759,110.56196 C -85.960769,113.6752 -84.911229,116.19231 -82.804369,118.11817 C -80.849549,119.92819 -78.428279,120.84413 -75.582929,120.84414 C -72.708639,120.84413 -70.299649,119.92819 -68.337589,118.11817 C -66.230749,116.19231 -65.181219,113.6752 -65.181199,110.56196 L -65.181199,97.266868 L -70.083159,97.266868 L -70.083159,110.13155 C -70.083189,111.82572 -70.602129,113.20404 -71.637439,114.26833 C -72.708989,115.36882 -74.011849,115.91826 -75.582929,115.91826 C -77.096119,115.91827 -78.409069,115.36159 -79.480599,114.26833 C -80.544889,113.16785 -81.058809,111.79677 -81.058789,110.13155 L -81.058789,97.266868 L -85.960759,97.266868 z M -21.326509,101.04497 C -19.726469,101.045 -18.329289,101.49354 -17.141899,102.38405 C -15.990749,103.2963 -15.142999,104.62528 -14.607229,106.37736 L -27.782749,106.37736 C -27.399039,104.69044 -26.602849,103.38033 -25.415459,102.43187 C -24.264309,101.5124 -22.904849,101.045 -21.326509,101.04497 z " - id="path7373" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-logo.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - </g> - <text - sodipodi:linespacing="100%" - id="text7149" - y="141.60875" - x="-112.3018" - style="font-size:13.38996029px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" - xml:space="preserve"><tspan - y="141.60875" - x="-112.3018" - id="tspan7151" - sodipodi:role="line">libre/free projects</tspan><tspan - y="154.99871" - x="-112.3018" - sodipodi:role="line" - id="tspan7153">collaborative platform</tspan></text> - </g> - <path - style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" - d="m 534.71867,-50.683034 c 13.10776,0 20.07822,-17.26687 31.80216,-23.12884 8.50357,-4.25178 7.22776,-4.55156 7.22776,7.22777 0,12.16878 3.22229,11.56442 15.90108,11.56442 14.06901,0 21.33969,-15.55749 30.3566,-24.5744 1.44555,-1.44555 2.8911,-2.8911 4.33665,-4.33665 3.37296,-3.37296 5.34879,10.11886 10.11887,10.11886 3.23235,0 5.78221,-2.8911 8.67332,-4.33665 6.36456,-3.18228 -1.44556,15.29454 -1.44556,26.01994 0,12.08823 17.52352,34.60482 28.91105,28.91105 6.8192,-3.4096 20.76228,-19.66643 24.57439,-26.01994 1.93624,-3.22707 3.46439,8.67331 7.22777,8.67331 6.73945,0 19.19511,-11.96735 23.12884,-15.90108" - id="path7380" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" - d="m 541.94643,-56.465244 c 1.92741,0 1.92741,0 0,0 -50.89658,0 47.26681,-8.67331 57.8221,-8.67331 31.67799,0 60.65977,-4.33666 91.06981,-4.33666 14.91033,0 11.71735,4.33666 1.44555,4.33666" - id="path8267" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" - d="m 569.41193,-52.128584 c 31.38008,0 76.40201,0 112.75309,0 21.60008,0 49.77558,3.10004 66.49541,8.67332" - id="path8269" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" - d="m 543.39199,-36.227504 c 1.9274,0 1.9274,0 0,0 -22.72854,0 37.05835,0 54.93099,0 26.98365,0 53.96729,0 80.95094,0 0.48185,0 0.9637,0 1.44555,0" - id="path8271" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" - d="m 528.93646,-82.485184 c 9.03201,0 24.56249,-4.33666 39.02992,-4.33666 22.17227,0 57.79361,3.59964 76.61428,13.00997 3.24867,1.62434 4.09367,0.81874 7.22776,1.44556" - id="path8273" - inkscape:connector-curvature="0" /> - <g id="g5064" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-ydpi="90" + transform="translate(-64.205696,-71.812627)"> <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" id="path5050" - d="M 206.0077,119.17481 C 205.76991,119.17481 205.54137,119.17568 205.31203,119.19062 C 205.29064,119.19501 205.27034,119.20243 205.24879,119.20643 C 205.0353,119.24634 204.82469,119.28034 204.60059,119.28548 C 204.56951,119.28987 204.5366,119.28083 204.50573,119.28548 C 202.67658,119.56085 201.13114,120.35507 199.88911,121.67284 C 198.43868,123.2047 197.70733,125.03981 197.70733,127.17481 C 197.70733,129.33374 198.43868,131.1813 199.88911,132.70839 C 201.45924,134.35508 203.49928,135.17475 206.0077,135.17475 C 207.33847,135.17475 208.61786,134.8441 209.83374,134.17874 C 211.04962,133.5325 212.10686,132.61781 213.01164,131.45938 L 210.27646,129.9416 C 209.09881,131.51173 207.65196,132.29729 205.92865,132.29729 C 204.73189,132.29729 203.65884,131.90909 202.73495,131.14319 C 201.79671,130.37723 201.32784,129.4443 201.32784,128.32897 L 213.83374,128.32897 L 213.83374,127.69653 C 213.83374,124.99189 212.91759,122.82613 211.09856,121.19855 C 209.56671,119.8438 207.86983,119.17481 206.0077,119.17481 z M 147.85769,119.28548 L 147.85769,125.34078 L 145.73909,125.34078 L 145.73909,128.43963 L 147.85769,128.43963 L 147.85769,134.7637 L 151.08296,134.7637 L 151.08296,128.43963 L 153.0276,128.43963 L 156.99598,134.7637 L 160.82207,134.7637 L 155.49401,126.73209 L 160.58492,119.58586 L 156.67978,119.58586 L 152.74302,125.34078 L 151.08296,125.34078 L 151.08296,119.28548 L 147.85769,119.28548 z M 187.43069,119.28548 C 186.87546,119.38456 186.35813,119.54585 185.88129,119.79144 C 185.07706,120.22226 184.44213,120.79048 183.96822,121.49894 L 183.96822,119.58586 L 180.72714,119.58586 L 180.72714,134.7637 L 183.96822,134.7637 L 183.96822,126.2578 C 183.96822,125.04192 184.31132,124.10899 184.9959,123.44358 C 185.68524,122.77822 186.5591,122.44757 187.63622,122.44751 C 188.77548,122.44757 189.66521,122.75326 190.29234,123.38034 C 190.91942,124.00747 191.22511,124.99027 191.22511,126.32103 L 191.22511,134.7637 L 194.46624,134.7637 L 194.46624,125.6096 C 194.46619,123.74742 193.89802,122.20891 192.7587,120.99298 C 191.90422,120.08111 190.91552,119.51348 189.78638,119.28548 L 187.43069,119.28548 z M 162.86156,119.58586 L 162.86156,128.37639 C 162.86156,130.43479 163.55551,132.09907 164.94854,133.3724 C 166.24103,134.56916 167.84192,135.17475 169.72321,135.17475 C 171.62367,135.17475 173.21643,134.56916 174.51374,133.3724 C 175.90672,132.09907 176.60067,130.43479 176.60067,128.37639 L 176.60067,119.58586 L 173.35959,119.58586 L 173.35959,128.09177 C 173.35953,129.21192 173.01643,130.12325 172.33191,130.82694 C 171.6234,131.55456 170.76199,131.91786 169.72321,131.91786 C 168.72271,131.91786 167.85464,131.5498 167.14613,130.82694 C 166.44244,130.09932 166.10264,129.19281 166.1027,128.09177 L 166.1027,119.58586 L 162.86156,119.58586 z M 205.5966,122.08389 C 206.65454,122.08389 207.57832,122.38049 208.36339,122.96929 C 209.12453,123.57243 209.68506,124.45111 210.03932,125.6096 L 201.32784,125.6096 C 201.58155,124.49421 202.10798,123.62798 202.89304,123.00091 C 203.65418,122.39294 204.55306,122.08389 205.5966,122.08389 z " - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" /> + d="m 206.0077,119.17481 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.0791 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> <g inkscape:export-ydpi="90" inkscape:export-xdpi="90" @@ -582,28 +195,33 @@ <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5054" - d="M 60.321717,411.99998 L 437.33633,411.99998" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5056" - d="M 252.61203,788.60332 L 252.61203,411.59154" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5058" - d="M 252.86937,597.15755 L 629.88177,597.15755" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5060" - d="M 437.45588,596.97447 L 437.45588,219.95956" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path5062" - d="M 372.87905,411.27704 L 437.81346,411.27704" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> </g> </g> <g @@ -639,331 +257,44 @@ transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> </g> <g - id="g2285" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/logo-kune-wiki-16.png" - inkscape:export-xdpi="90" inkscape:export-ydpi="90" - transform="translate(-7.8740157,-70.07874)"> - <g - transform="translate(404.1233,229.24298)" - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" - id="g2264"> - <path - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - d="m 206.0077,119.17481 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.0791 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" - id="path2267" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - inkscape:connector-curvature="0" /> - <g - id="g2269" - transform="matrix(0.1111494,0,0,0.111008,121.5678,22.515968)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 60.321717,411.99998 377.014613,0" - id="path2271" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.61203,788.60332 0,-377.01178" - id="path2273" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.86937,597.15755 377.0124,0" - id="path2275" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 437.45588,596.97447 0,-377.01491" - id="path2277" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 372.87905,411.27704 64.93441,0" - id="path2279" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - </g> - </g> - <text - sodipodi:linespacing="100%" - id="text2281" - y="364.09836" - x="624.35651" - style="font-size:22.95481682px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" - xml:space="preserve"><tspan - y="364.09836" - x="624.35651" - id="tspan2283" - sodipodi:role="line">wiki</tspan></text> - </g> - <g - id="g2338" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/logo-kune-wiki-16-white.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - transform="translate(-7.8740157,-70.07874)"> - <path - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Emblem" - d="m 612.45757,378.19846 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.079 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" - id="path2301" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px-white.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - inkscape:connector-curvature="0" /> - <g - style="fill:#ffffff;stroke:#ffffff" - id="g2303" - transform="matrix(0.1111494,0,0,0.111008,528.01767,281.53962)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px-white.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 60.321717,411.99998 377.014613,0" - id="path2305" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.61203,788.60332 0,-377.01178" - id="path2307" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.86937,597.15755 377.0124,0" - id="path2309" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 437.45588,596.97447 0,-377.01491" - id="path2311" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 372.87905,411.27704 64.93441,0" - id="path2313" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - inkscape:connector-curvature="0" /> - </g> - <text - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px-white.png" - xml:space="preserve" - style="font-size:22.95481682px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Emblem" - x="626.68304" - y="393.87903" - id="text2315" - sodipodi:linespacing="100%"><tspan - sodipodi:role="line" - id="tspan2317" - x="626.68304" - y="393.87903">wiki</tspan></text> - </g> - <g - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-icon16.png" - transform="matrix(0.1111494,0,0,0.111008,278.24359,22.515968)" + transform="matrix(0.1111494,0,0,0.111008,214.3621,-49.296659)" id="g22118"> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path22120" - d="M 60.321717,411.99998 L 437.33633,411.99998" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path22122" - d="M 252.61203,788.60332 L 252.61203,411.59154" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path22124" - d="M 252.86937,597.15755 L 629.88177,597.15755" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path22126" - d="M 437.45588,596.97447 L 437.45588,219.95956" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path22128" - d="M 372.87905,411.27704 L 437.81346,411.27704" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> </g> <text xml:space="preserve" - style="font-size:18.13397598px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:100%;writing-mode:lr-tb;text-anchor:end;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem;-inkscape-font-specification:Emblem" - x="1402.142" - y="623.64624" - id="text2703" - sodipodi:linespacing="100%"><tspan - sodipodi:role="line" - x="1402.142" - y="623.64624" - id="tspan2709">a web infrastructure to encourage collaboration,</tspan><tspan - sodipodi:role="line" - x="1402.142" - y="641.78021" - id="tspan2727">content sharing & free culture</tspan></text> - <text - xml:space="preserve" - style="font-size:17.27686882px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:100%;writing-mode:lr-tb;text-anchor:end;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem" - x="620.35358" - y="901.5686" - id="text2729" - sodipodi:linespacing="100%"><tspan - sodipodi:role="line" - x="625.28021" - y="901.5686" - id="tspan2731">a web infrastructure </tspan><tspan - sodipodi:role="line" - x="620.35358" - y="918.84546" - id="tspan2735">to encourage collaboration,</tspan><tspan - sodipodi:role="line" - x="620.35358" - y="936.12231" - id="tspan2733">content sharing & free culture</tspan></text> - <g - id="g2607" - transform="matrix(0.548749,0,0,0.548749,826.55453,617.44152)"> - <g - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-without-text.png" - transform="matrix(0.8405688,0,0,0.8394991,295.36384,-621.12129)" - id="g2531"> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2533" - d="m 60.321717,411.99998 377.014613,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2535" - d="m 252.61203,788.60332 0,-377.01178" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2537" - d="m 252.86937,597.15755 377.0124,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2539" - d="m 437.45588,596.97447 0,-377.01491" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2541" - d="m 372.87905,411.27704 64.93441,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - </g> - <text - transform="matrix(0.9080422,0.4188786,-0.4188786,0.9080422,0,0)" - sodipodi:linespacing="125%" - id="text2549" - y="36.545521" - x="426.55963" - style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - xml:space="preserve"><tspan - y="36.545521" - x="426.55963" - id="tspan2553" - sodipodi:role="line"><tspan - id="tspan2557" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#808080;fill-opacity:1;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif">α</tspan><tspan - id="tspan2555" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#808080;fill-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan><tspan - id="tspan2559" - style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> - </g> - <g - id="g2620" - transform="translate(448.03149,-129.13386)"> - <g - inkscape:export-ydpi="44.62801" - inkscape:export-xdpi="44.62801" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" - transform="matrix(0.8405688,0,0,0.8394991,313.86353,2.43708)" - id="g2561"> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2563" - d="m 60.321717,411.99998 377.014613,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2565" - d="m 252.61203,788.60332 0,-377.01178" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2567" - d="m 252.86937,597.15755 377.0124,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2569" - d="m 437.45588,596.97447 0,-377.01491" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2571" - d="m 372.87905,411.27704 64.93441,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - </g> - <text - inkscape:export-ydpi="44.62801" - inkscape:export-xdpi="44.62801" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" - transform="matrix(0.8825152,0.4702838,-0.4702838,0.8825152,0,0)" - sodipodi:linespacing="125%" - id="text2573" - y="532.55298" - x="724.52563" - style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - xml:space="preserve"><tspan - y="532.55298" - x="724.52563" - id="tspan2575" - sodipodi:role="line"><tspan - id="tspan2577" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif">α</tspan><tspan - id="tspan2579" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan><tspan - id="tspan2581" - style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> - </g> - <text - xml:space="preserve" style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" x="-181" y="223.36218" @@ -973,77 +304,11 @@ x="-181" y="223.36218" /></text> <g - id="g2615" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" - transform="translate(278.21243,-323.45767)"> - <rect - y="1007.8605" - x="829.13959" - height="56.250996" - width="56.250996" - id="rect2613" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3.74900579;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" /> - <g - inkscape:export-ydpi="44.62801" - inkscape:export-xdpi="44.62801" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" - transform="matrix(0.2048309,0,0,0.2045702,832.13264,838.40225)" - id="g2559"> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2561" - d="m 60.321717,411.99998 377.014613,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2564" - d="m 252.61203,788.60332 0,-377.01178" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2566" - d="m 252.86937,597.15755 377.0124,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2568" - d="m 437.45588,596.97447 0,-377.01491" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path2570" - d="m 372.87905,411.27704 64.93441,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - </g> - <text - sodipodi:linespacing="125%" - id="text2593" - y="1062.1919" - x="826.17133" - style="font-size:21.96050453px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" - xml:space="preserve"><tspan - y="1062.1919" - x="826.17133" - id="tspan2597" - sodipodi:role="line"><tspan - id="tspan2599" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#4d4d4d;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif">α</tspan><tspan - id="tspan2601" - style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#999999;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan></tspan></text> - </g> - <g id="g3983" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/logo-big-home-kunecc.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - transform="translate(-804.7244,-186.61417)"> + transform="translate(-507.76378,-776.04724)"> <g transform="translate(-0.07178157,0.14078373)" id="g3779"> @@ -1119,7 +384,7 @@ </g> <g id="g3969" - transform="matrix(0.31973654,0,0,0.31973654,-129.13654,581.85124)" + transform="matrix(0.31973654,0,0,0.31973654,157.58786,23.465415)" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -1201,7 +466,7 @@ inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/logo-big-home-kunecc.png" id="g3240" - transform="translate(-464.7244,43.385828)"> + transform="translate(-501.85491,-552.0904)"> <g id="g3242" transform="translate(-0.07178157,0.14078373)"> @@ -1279,7 +544,7 @@ inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px.png" - transform="matrix(0.31973654,0,0,0.31973654,-147.24678,536.33943)" + transform="matrix(0.31973654,0,0,0.31973654,157.58786,-7.1498137)" id="g3289" style="opacity:0.4"> <g @@ -1355,5 +620,101 @@ x="1218.1743" y="1115.0084">.</tspan></text> </g> + <path + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path4027" + d="m 540.73739,394.36244 c -0.23757,0 -0.46593,0 -0.69507,0.0157 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0157 -0.21332,0.0398 -0.42377,0.0738 -0.64769,0.079 -0.031,0.004 -0.0639,-0.004 -0.0948,0 -1.82763,0.27516 -3.3718,1.06872 -4.6128,2.38539 -1.44928,1.53061 -2.18002,3.36421 -2.18003,5.49746 0,2.15716 0.73076,4.00323 2.18003,5.52904 1.56884,1.64537 3.6072,2.46437 6.11353,2.46437 1.32969,0 2.60803,-0.33038 3.82294,-0.99524 1.21489,-0.64571 2.27123,-1.55961 3.17525,-2.71712 l -2.73293,-1.51655 c -1.17664,1.56885 -2.62234,2.35381 -4.34424,2.35381 -1.19578,0 -2.26792,-0.38791 -3.19105,-1.1532 -0.93749,-0.76529 -1.40597,-1.69745 -1.40595,-2.81192 l 12.49563,0 0,-0.63189 c -2e-5,-2.70242 -0.91538,-4.86643 -2.73293,-6.49267 -1.53059,-1.35361 -3.22611,-2.02201 -5.08672,-2.02205 z m -58.10232,0.1106 0,6.05034 -2.11683,0 0,3.09626 2.11683,0 0,6.31889 3.22264,0 0,-6.31889 1.94307,0 3.96511,6.31889 3.82294,0 -5.32368,-8.025 5.08672,-7.14036 -3.90193,0 -3.93351,5.75021 -1.65872,0 0,-6.05034 -3.22264,0 z m 39.54054,0 c -0.55475,0.099 -1.07166,0.26013 -1.54813,0.5055 -0.80356,0.43049 -1.43795,0.99822 -1.91147,1.70611 l 0,-1.91148 -3.23844,0 0,15.16536 3.23844,0 0,-8.49891 c 0,-1.21491 0.34284,-2.14707 1.02683,-2.81193 0.68875,-0.66483 1.56193,-0.99521 2.63814,-0.99521 1.13836,0 2.02734,0.30544 2.65394,0.93203 0.62657,0.62659 0.93202,1.6086 0.93204,2.93829 l 0,8.43573 3.23844,0 0,-9.1466 c -2e-5,-1.86062 -0.56775,-3.39791 -1.70611,-4.61281 -0.85379,-0.91115 -1.84168,-1.4783 -2.96988,-1.70612 l -2.3538,0 z m -24.54894,0.30013 0,8.78326 c 0,2.05674 0.69336,3.71966 2.08524,4.99195 1.29143,1.19578 2.89102,1.80089 4.77077,1.80089 1.89887,0 3.49035,-0.60511 4.78657,-1.80089 1.39186,-1.27229 2.08523,-2.93521 2.08524,-4.99195 l 0,-8.78326 -3.23844,0 0,8.49892 c -10e-6,1.11924 -0.34285,2.02982 -1.02682,2.73292 -0.70791,0.72704 -1.56863,1.09001 -2.60655,1.09001 -0.99967,0 -1.86706,-0.36776 -2.57495,-1.09001 -0.70312,-0.72702 -1.04263,-1.6328 -1.04262,-2.73292 l 0,-8.49892 -3.23844,0 z m 42.7,2.49596 c 1.05705,3e-5 1.98008,0.29633 2.76452,0.88465 0.76049,0.60267 1.32055,1.48067 1.67451,2.63815 l -8.70429,0 c 0.25349,-1.11445 0.77949,-1.97997 1.56392,-2.60656 0.76051,-0.60744 1.65862,-0.91621 2.70134,-0.91624 z" + style="font-size:58.13353347999999698px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffb380;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffb380;fill-opacity:1;fill-rule:nonzero;stroke:#ffb380;stroke-width:3.27822374999999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 463.63912,396.0015 10.08478,5.13809" + id="path4031" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffb380;fill-opacity:1;fill-rule:nonzero;stroke:#ffb380;stroke-width:3.27822303999999987;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 463.64367,408.68306 5.1446,-10.07187" + id="path4033" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffb380;fill-opacity:1;fill-rule:nonzero;stroke:#ffb380;stroke-width:3.27822328000000018;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 466.26297,403.57209 10.08473,5.13807" + id="path4035" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffb380;fill-opacity:1;fill-rule:nonzero;stroke:#ffb380;stroke-width:3.27822279999999999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 471.20299,406.08282 5.14464,-10.07196" + id="path4037" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffb380;fill-opacity:1;fill-rule:nonzero;stroke:#ffb380;stroke-width:3.27822207999999993;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 472.00959,400.24183 1.73694,0.88495" + id="path4039" /> + <text + sodipodi:linespacing="100%" + id="text4041" + y="410.0621" + x="-575.18512" + style="font-size:18.84624671999999990px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffb380;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="410.0621" + x="-575.18512" + id="tspan4043" + sodipodi:role="line">cc</tspan></text> + <text + sodipodi:linespacing="100%" + id="text4045" + y="409.97437" + x="547.0827" + style="font-size:27.86952591000000012px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffb380;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve"><tspan + y="409.97437" + x="547.0827" + id="tspan4047" + sodipodi:role="line">.</tspan></text> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:6.56184626;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 310.28092,221.64319 20.18632,10.28458" + id="path4075" + inkscape:connector-curvature="0" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/favicon-demo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:6.56184483;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 317.09446,248.14419 -3.31109,-22.39451" + id="path4077" + inkscape:connector-curvature="0" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/favicon-demo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:6.5618453;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 336.82067,243.66957 -22.38916,-3.46113" + id="path4079" + inkscape:connector-curvature="0" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/favicon-demo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:6.56184435;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 325.43393,241.82879 10.27241,-20.17336" + id="path4081" + inkscape:connector-curvature="0" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/favicon-demo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:6.56184292;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 327.03578,230.13078 3.47675,1.77134" + id="path4083" + inkscape:connector-curvature="0" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/favicon-demo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> </g> </svg> Added: trunk/img/kune-old-logos.svg =================================================================== --- trunk/img/kune-old-logos.svg (rev 0) +++ trunk/img/kune-old-logos.svg 2011-11-19 15:02:45 UTC (rev 1617) @@ -0,0 +1,1359 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="210mm" + height="297mm" + id="svg2531" + sodipodi:version="0.32" + inkscape:version="0.48.2 r9819" + sodipodi:docname="kune-logos.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.1"> + <defs + id="defs2533"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective2515" /> + <linearGradient + inkscape:collect="always" + id="linearGradient2871"> + <stop + style="stop-color:#f95;stop-opacity:1;" + offset="0" + id="stop2873" /> + <stop + style="stop-color:#f95;stop-opacity:0;" + offset="1" + id="stop2875" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2871" + id="linearGradient3948" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(397.49281,-378.79137)" + x1="368.6329" + y1="835.74664" + x2="368.6329" + y2="932.62268" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2871" + id="linearGradient4012" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.997905,0,0,0.997905,-48.42866,-162.7847)" + x1="367.37344" + y1="805.51978" + x2="367.37344" + y2="882.24463" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2871" + id="linearGradient4732" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.997905,0,0,0.997905,-48.42866,-162.7847)" + x1="367.37344" + y1="805.51978" + x2="367.37344" + y2="882.24463" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient2871" + id="linearGradient3463" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.997905,0,0,0.997905,31.931984,-168.91892)" + x1="719.26416" + y1="813.12897" + x2="719.26416" + y2="918.47412" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.27" + inkscape:cx="372.04724" + inkscape:cy="400.19684" + inkscape:document-units="px" + inkscape:current-layer="layer1" + inkscape:window-width="1078" + inkscape:window-height="1867" + inkscape:window-x="0" + inkscape:window-y="24" + showguides="true" + inkscape:guide-bbox="true" + inkscape:guide-points="true" + showgrid="false" + inkscape:window-maximized="0"> + <sodipodi:guide + orientation="0,1" + position="830.76137,26.355188" + id="guide3703" /> + <sodipodi:guide + orientation="0,1" + position="856.74146,-93.746373" + id="guide3723" /> + </sodipodi:namedview> + <metadata + id="metadata2536"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Capa 1" + inkscape:groupmode="layer" + id="layer1"> + <rect + style="opacity:0.8;color:#000000;fill:#800000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.90017545;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="rect2349" + width="159.36984" + height="37.225075" + x="514.73108" + y="299.72684" /> + <text + xml:space="preserve" + style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + x="580.47711" + y="-60.562412" + id="text5978" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan5980" + x="580.47711" + y="-60.562412">kune</tspan></text> + <text + xml:space="preserve" + style="font-size:19.77380943px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" + x="580.11847" + y="-38.638554" + id="text5982" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan5984" + x="580.11847" + y="-38.638554">libre/free projects</tspan></text> + <g + id="g5986" + transform="matrix(0.3688,0,0,0.3688,503.19517,-409.2698)"> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path5988" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path5990" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path5992" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path5994" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path5996" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + </g> + <path + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" + d="M 382.32888,356.181 C 381.58585,356.181 380.87165,356.18362 380.15497,356.23041 C 380.08806,356.24404 380.02464,356.26725 379.95734,356.27981 C 379.29019,356.40442 378.63198,356.51068 377.93165,356.52685 C 377.83464,356.54045 377.7317,356.51232 377.63521,356.52685 C 371.91916,357.3874 367.08967,359.86933 363.20833,363.98732 C 358.67562,368.77438 356.39016,374.50914 356.39015,381.181 C 356.39015,387.92772 358.67563,393.70144 363.20833,398.47349 C 368.115,403.61953 374.49013,406.18098 382.32888,406.181 C 386.48757,406.18098 390.48569,405.14772 394.2854,403.06835 C 398.08505,401.04884 401.38885,398.19052 404.21623,394.57033 L 395.6688,389.82725 C 391.98875,394.73393 387.46722,397.18891 382.08185,397.18891 C 378.34197,397.18891 374.98875,395.97572 372.10161,393.58219 C 369.16954,391.18868 367.70434,388.27328 367.70438,384.78772 L 406.7854,384.78772 L 406.7854,382.81143 C 406.78536,374.35939 403.92249,367.59136 398.23797,362.50511 C 393.45092,358.27164 388.14807,356.18106 382.32888,356.181 z M 200.60951,356.52685 L 200.60951,375.44977 L 193.98896,375.44977 L 193.98896,385.13357 L 200.60951,385.13357 L 200.60951,404.89642 L 210.68856,404.89642 L 210.68856,385.13357 L 216.76564,385.13357 L 229.16683,404.89642 L 241.12335,404.89642 L 224.47315,379.7976 L 240.38224,357.46558 L 228.17868,357.46558 L 215.87631,375.44977 L 210.68856,375.44977 L 210.68856,356.52685 L 200.60951,356.52685 z M 324.27552,356.52685 C 322.54049,356.83651 320.92381,357.34051 319.43362,358.10788 C 316.92042,359.45426 314.93633,361.22989 313.45536,363.44385 L 313.45536,357.46558 L 303.3269,357.46558 L 303.3269,404.89642 L 313.45536,404.89642 L 313.45536,378.31539 C 313.45535,374.51574 314.5276,371.60032 316.66683,369.52092 C 318.82096,367.4416 321.5519,366.4083 324.91781,366.40827 C 328.47813,366.4083 331.25846,367.36364 333.21821,369.32329 C 335.17785,371.28301 336.13317,374.35431 336.13323,378.51302 L 336.13323,404.89642 L 346.26169,404.89642 L 346.26169,376.2897 C 346.26164,370.4705 344.48602,365.66255 340.92572,361.86282 C 338.25543,359.01309 335.16572,357.23931 331.63718,356.52685 L 324.27552,356.52685 z M 247.49687,357.46558 L 247.49687,384.93594 C 247.49685,391.36851 249.6654,396.56938 254.0186,400.54859 C 258.05764,404.28845 263.06049,406.18098 268.93955,406.181 C 274.87841,406.18098 279.85588,404.28845 283.90991,400.54859 C 288.26306,396.56938 290.4316,391.36851 290.43165,384.93594 L 290.43165,357.46558 L 280.30319,357.46558 L 280.30319,384.04661 C 280.30314,387.54713 279.23089,390.39502 277.09173,392.59404 C 274.87769,394.86789 272.18573,396.00313 268.93955,396.00313 C 265.81301,396.00315 263.10017,394.85294 260.88619,392.59404 C 258.68714,390.32023 257.62529,387.48731 257.62532,384.04661 L 257.62532,357.46558 L 247.49687,357.46558 z M 381.0443,365.27191 C 384.3503,365.27196 387.23715,366.19874 389.69054,368.03871 C 392.06905,369.92362 393.82068,372.66955 394.9277,376.2897 L 367.70438,376.2897 C 368.49721,372.80418 370.1423,370.09724 372.59568,368.13752 C 374.97421,366.23771 377.78313,365.27196 381.0443,365.27191 z " + id="path2585" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g6020" + transform="matrix(0.347343,0,0,0.346901,118.4533,54.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 60.321717,411.99998 L 437.33633,411.99998" + id="path6022" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 252.61203,788.60332 L 252.61203,411.59154" + id="path6024" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 252.86937,597.15755 L 629.88177,597.15755" + id="path6026" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 437.45588,596.97447 L 437.45588,219.95956" + id="path6028" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 372.87905,411.27704 L 437.81346,411.27704" + id="path6030" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + <g + id="g2513" + transform="matrix(0.222301,0,0,0.222015,155.9062,114.9246)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-ico.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 60.321717,411.99998 L 437.33633,411.99998" + id="path2515" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 252.61203,788.60332 L 252.61203,411.59154" + id="path2517" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 252.86937,597.15755 L 629.88177,597.15755" + id="path2519" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 437.45588,596.97447 L 437.45588,219.95956" + id="path2521" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 372.87905,411.27704 L 437.81346,411.27704" + id="path2523" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + <path + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + d="m 552.77406,438.40087 0,1.37027 479.12504,0 0,-1.37027 -479.12504,0 z" + id="path2924" + inkscape:connector-curvature="0" /> + <path + style="opacity:0.33000004;color:#000000;fill:url(#linearGradient3948);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + d="m 552.77406,439.77114 0,24.90625 c 6.85756,0.14283 14.21977,0.35752 21.90625,0.71875 27.28416,1.28226 30.50723,17.35086 57.1875,24.96875 28.33349,8.08995 34.13703,4.08514 55.28102,1.56308 37.90101,-4.52084 94.3448,-37.27348 138.62522,-13.87558 24.48867,12.93989 49.90374,14.92134 81.46875,6.4375 33.47734,-8.9978 55.7377,-14.79726 94.0313,-19.28125 l 30.625,-0.625 0,-24.8125 -479.12504,0 z" + id="path1971" + sodipodi:nodetypes="ccssssscccc" + inkscape:connector-curvature="0" /> + <text + xml:space="preserve" + style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + x="626.30261" + y="471.10065" + id="text2887" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan2889" + x="626.30261" + y="471.10065">kune</tspan></text> + <text + xml:space="preserve" + style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" + x="675.48834" + y="496.96741" + id="text2891" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan2893" + x="675.48834" + y="496.96741">wiki</tspan></text> + <g + id="g2895" + transform="matrix(0.3688,0,0,0.3688,549.02077,122.39333)"> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path2897" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path2899" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path2901" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path2903" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path2905" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + </g> + <g + id="g4030" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-logo-wiki.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + transform="translate(466.14172,-123.62205)"> + <path + id="path2952" + d="m 105.53125,652.625 0,1.375 477.40625,0 0.0312,0 475.4063,0 2,0 475.4061,0 0.031,0 477.4063,0 0,-1.375 -477.4063,0 -0.031,0 -475.4061,0 -2,0 -475.4063,0 -0.0312,0 -477.40625,0 z" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + inkscape:connector-curvature="0" /> + <path + id="path2954" + d="m 106.53125,654.0625 c 0,8.28469 0,16.55906 0,24.84375 19.50249,0.0392 40.64386,-0.0181 56.34375,13.5625 19.32389,13.20868 43.80356,22.48766 67.1875,15.34375 49.43557,-5.81055 98.66401,-27.10313 148.90625,-15.5625 31.08758,7.11366 62.83127,-0.56045 94.0625,-2.4375 27.88068,-4.6841 55.43721,-11.03125 84.25,-11.03125 9.81726,-10e-6 17.83424,0 25.65625,0 3e-5,0.0416 0,0.0834 0,0.125 19.50252,0.0392 40.64386,-0.0181 56.34375,13.5625 19.32385,13.20868 43.80356,22.48766 67.1875,15.34375 49.43553,-5.81055 98.66401,-27.10313 148.90625,-15.5625 31.08757,7.11366 62.83128,-0.56045 94.0625,-2.4375 27.8807,-4.6841 55.4372,-11.03125 84.25,-11.03125 9.829,-10e-6 17.8564,0 25.6875,0 0,0.0417 0,0.0833 0,0.125 19.5025,0.0392 40.6438,-0.0181 56.3438,13.5625 19.3239,13.20868 43.7723,22.48766 67.1562,15.34375 49.4357,-5.81055 98.664,-27.10313 148.9062,-15.5625 31.0877,7.11366 62.8626,-0.56045 94.0938,-2.4375 27.8806,-4.6841 55.4061,-11.03125 84.2188,-11.03125 9.8172,-10e-6 17.8655,0 25.6874,0 0,0.0416 0,0.0834 0,0.125 19.5025,0.0392 40.6439,-0.0181 56.3438,13.5625 19.3239,13.20868 43.7723,22.48766 67.1562,15.34375 49.4356,-5.81055 98.6641,-27.10313 148.9063,-15.5625 31.0877,7.11366 62.8625,-0.56045 94.0937,-2.4375 27.8807,-4.6841 55.406,-11.03125 84.2188,-11.03125 9.8291,-10e-6 17.8877,0 25.7188,0 l 0,-24.71875 c -158.8021,0 -317.6042,0 -476.4063,0 -0.01,0 -0.021,0 -0.031,0 -158.8021,0 -317.6041,0 -476.4062,0 -158.80198,0 -317.60416,0 -476.40625,0 -0.0104,0 -0.0208,0 -0.0312,0 -158.80205,0 -317.60415,0 -476.40625,0 z" + style="opacity:0.33000004;color:#000000;fill:url(#linearGradient4012);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + inkscape:connector-curvature="0" /> + <g + transform="translate(0,178)" + id="g3971"> + <text + sodipodi:linespacing="100%" + id="text3951" + y="507.32114" + x="188.50735" + style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve"><tspan + y="507.32114" + x="188.50735" + id="tspan3953" + sodipodi:role="line">kune</tspan></text> + <text + sodipodi:linespacing="100%" + id="text3955" + y="533.18787" + x="237.69305" + style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve"><tspan + y="533.18787" + x="237.69305" + id="tspan3957" + sodipodi:role="line">wiki</tspan></text> + <g + transform="matrix(0.3688,0,0,0.3688,111.2255,158.6138)" + id="g3959"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3961" + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3963" + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3965" + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3967" + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3969" + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + </g> + </g> + <path + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + d="m 749.06429,646.48678 0,1.375 1.24999,0 0,-1.375 -1.24999,0 z" + id="path3441" + inkscape:connector-curvature="0" /> + <path + style="opacity:0.33000004;color:#000000;fill:url(#linearGradient3463);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + d="m 749.06429,647.92428 0,52.9375 c 0.41302,0.12568 0.83553,0.2245 1.24999,0.34375 l 0,-53.28125 c -0.41667,0 -0.83332,0 -1.24999,0 z" + id="path3435" + inkscape:connector-curvature="0" /> + <g + id="g3451" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-wiki-logo.png" + inkscape:export-xdpi="240" + inkscape:export-ydpi="240" + transform="translate(448.03149,-129.13386)"> + <text + xml:space="preserve" + style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" + x="252.00264" + y="831.75439" + id="text4716" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan4718" + x="252.00264" + y="831.75439">wiki</tspan></text> + <g + id="g4720" + transform="matrix(0.3688,0,0,0.3688,110.9594,457.1803)"> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path4722" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path4724" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path4726" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path4728" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path4730" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + </g> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-logo.png" + id="path4766" + d="m 278.7546,778.41609 c -0.35962,0 -0.70527,10e-4 -1.05214,0.0239 -0.0324,0.007 -0.0631,0.0178 -0.0956,0.0239 -0.32288,0.0603 -0.64145,0.11173 -0.98039,0.11955 -0.047,0.007 -0.0968,-0.007 -0.14348,0 -2.76645,0.4165 -5.10383,1.6177 -6.98231,3.61073 -2.19375,2.31684 -3.29986,5.09234 -3.29987,8.32139 0,3.26527 1.10613,6.05963 3.29987,8.36921 2.37472,2.49058 5.46015,3.73027 9.25396,3.73028 2.01272,-10e-6 3.94772,-0.50009 5.78671,-1.50646 1.83895,-0.9774 3.43792,-2.36077 4.80632,-4.11286 l -4.13679,-2.29556 c -1.78107,2.37473 -3.96939,3.56289 -6.5758,3.56289 -1.81003,0 -3.43292,-0.58716 -4.83023,-1.74558 -1.41907,-1.15841 -2.12819,-2.5694 -2.12817,-4.25634 l 18.91442,0 0,-0.95649 c -3e-5,-4.09062 -1.38559,-7.36621 -4.13678,-9.82785 -2.31685,-2.04891 -4.88331,-3.0607 -7.69968,-3.06074 z m -87.9485,0.16738 0,9.15832 -3.20421,0 0,4.68676 3.20421,0 0,9.56482 4.87806,0 0,-9.56482 2.94118,0 6.00192,9.56482 5.78672,0 -8.05836,-12.14732 7.69968,-10.80824 -5.90628,0 -5.95409,8.70398 -2.51077,0 0,-9.15832 -4.87806,0 z m 59.85184,0 c -0.83972,0.14988 -1.62215,0.39381 -2.34338,0.76519 -1.21633,0.65163 -2.1766,1.511 -2.89335,2.5825 l 0,-2.89335 -4.90197,0 0,22.95556 4.90197,0 0,-12.86468 c -1e-5,-1.83896 0.51894,-3.24996 1.55429,-4.25635 1.04255,-1.00634 2.36426,-1.50644 3.9933,-1.50645 1.72312,10e-6 3.06874,0.46238 4.01722,1.41081 0.94843,0.94846 1.41078,2.43491 1.41081,4.44764 l 0,12.76903 4.90197,0 0,-13.84507 c -2e-5,-2.81638 -0.85939,-5.14333 -2.5825,-6.98232 -1.29236,-1.37921 -2.78772,-2.23769 -4.49546,-2.58251 l -3.5629,0 z m -37.15931,0.45434 0,13.29509 c -1e-5,3.11324 1.04953,5.63035 3.15639,7.55621 1.95482,1.81002 4.37609,2.72596 7.22144,2.72597 2.87429,-1e-5 5.28328,-0.91595 7.24534,-2.72597 2.10684,-1.92586 3.15637,-4.44297 3.15639,-7.55621 l 0,-13.29509 -4.90196,0 0,12.86468 c -3e-5,1.69417 -0.51897,3.07249 -1.55428,4.13678 -1.07155,1.10049 -2.37441,1.64993 -3.94549,1.64993 -1.51319,10e-6 -2.82614,-0.55667 -3.89767,-1.64993 -1.06429,-1.10048 -1.57821,-2.47156 -1.57819,-4.13678 l 0,-12.86468 -4.90197,0 z m 64.63425,3.7781 c 1.60004,3e-5 2.99722,0.44857 4.18461,1.33908 1.15115,0.91225 1.9989,2.24123 2.53467,3.99331 l -13.17552,0 c 0.38371,-1.68692 1.1799,-2.99703 2.36729,-3.94549 1.15115,-0.91947 2.51061,-1.38687 4.08895,-1.3869 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + </g> + <g + id="g7182" + transform="matrix(0.64908,0,0,0.64908,234.5008,109.7477)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-arch-0.1.png" + inkscape:export-xdpi="240" + inkscape:export-ydpi="240"> + <g + transform="translate(-2.385332,4.770664)" + id="g7173"> + <g + transform="matrix(0.3688,0,0,0.3688,-188.5,-224.5906)" + id="g7361"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path7363" + d="M 60.321717,411.99998 L 437.33633,411.99998" + style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path7365" + d="M 252.61203,788.60332 L 252.61203,411.59154" + style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path7367" + d="M 252.86937,597.15755 L 629.88177,597.15755" + style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path7369" + d="M 437.45588,596.97447 L 437.45588,219.95956" + style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path7371" + d="M 372.87905,411.27704 L 437.81346,411.27704" + style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + </g> + <path + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" + d="M -20.704789,96.645148 C -21.064409,96.645148 -21.410059,96.646418 -21.756929,96.669068 C -21.789299,96.675658 -21.819999,96.686888 -21.852569,96.692978 C -22.175449,96.753278 -22.494019,96.804708 -22.832959,96.812528 C -22.879919,96.819118 -22.929739,96.805498 -22.976439,96.812528 C -25.742889,97.229028 -28.080269,98.430228 -29.958749,100.42326 C -32.152499,102.7401 -33.258609,105.5156 -33.258619,108.74465 C -33.258619,112.00992 -32.152489,114.80428 -29.958749,117.11386 C -27.584029,119.60444 -24.498599,120.84413 -20.704789,120.84414 C -18.692069,120.84413 -16.757069,120.34405 -14.918079,119.33768 C -13.079129,118.36028 -11.480159,116.97691 -10.111759,115.22482 L -14.248549,112.92926 C -16.029619,115.30399 -18.217939,116.49215 -20.824349,116.49215 C -22.634379,116.49215 -24.257269,115.90499 -25.654579,114.74657 C -27.073649,113.58816 -27.782769,112.17717 -27.782749,110.49023 L -8.8683294,110.49023 L -8.8683294,109.53374 C -8.8683594,105.44312 -10.253919,102.16753 -13.005109,99.705888 C -15.321959,97.656978 -17.888419,96.645188 -20.704789,96.645148 z M -108.65329,96.812528 L -108.65329,105.97085 L -111.8575,105.97085 L -111.8575,110.65761 L -108.65329,110.65761 L -108.65329,120.22243 L -103.77523,120.22243 L -103.77523,110.65761 L -100.83405,110.65761 L -94.832129,120.22243 L -89.045409,120.22243 L -97.103769,108.07511 L -89.404089,97.266868 L -95.310369,97.266868 L -101.26446,105.97085 L -103.77523,105.97085 L -103.77523,96.812528 L -108.65329,96.812528 z M -48.801449,96.812528 C -49.641169,96.962408 -50.423599,97.206338 -51.144829,97.577718 C -52.361159,98.229348 -53.321429,99.088718 -54.038179,100.16022 L -54.038179,97.266868 L -58.940149,97.266868 L -58.940149,120.22243 L -54.038179,120.22243 L -54.038179,107.35775 C -54.038189,105.51879 -53.519239,104.10779 -52.483889,103.1014 C -51.441339,102.09506 -50.119629,101.59496 -48.490589,101.59495 C -46.767469,101.59496 -45.421849,102.05733 -44.473369,103.00576 C -43.524939,103.95422 -43.062589,105.44067 -43.062559,107.4534 L -43.062559,120.22243 L -38.160589,120.22243 L -38.160589,106.37736 C -38.160609,103.56098 -39.019979,101.23403 -40.743089,99.395038 C -42.035449,98.015828 -43.530809,97.157348 -45.238549,96.812528 L -48.801449,96.812528 z M -85.960759,97.266868 L -85.960759,110.56196 C -85.960769,113.6752 -84.911229,116.19231 -82.804369,118.11817 C -80.849549,119.92819 -78.428279,120.84413 -75.582929,120.84414 C -72.708639,120.84413 -70.299649,119.92819 -68.337589,118.11817 C -66.230749,116.19231 -65.181219,113.6752 -65.181199,110.56196 L -65.181199,97.266868 L -70.083159,97.266868 L -70.083159,110.13155 C -70.083189,111.82572 -70.602129,113.20404 -71.637439,114.26833 C -72.708989,115.36882 -74.011849,115.91826 -75.582929,115.91826 C -77.096119,115.91827 -78.409069,115.36159 -79.480599,114.26833 C -80.544889,113.16785 -81.058809,111.79677 -81.058789,110.13155 L -81.058789,97.266868 L -85.960759,97.266868 z M -21.326509,101.04497 C -19.726469,101.045 -18.329289,101.49354 -17.141899,102.38405 C -15.990749,103.2963 -15.142999,104.62528 -14.607229,106.37736 L -27.782749,106.37736 C -27.399039,104.69044 -26.602849,103.38033 -25.415459,102.43187 C -24.264309,101.5124 -22.904849,101.045 -21.326509,101.04497 z " + id="path7373" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-logo.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + </g> + <text + sodipodi:linespacing="100%" + id="text7149" + y="141.60875" + x="-112.3018" + style="font-size:13.38996029px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" + xml:space="preserve"><tspan + y="141.60875" + x="-112.3018" + id="tspan7151" + sodipodi:role="line">libre/free projects</tspan><tspan + y="154.99871" + x="-112.3018" + sodipodi:role="line" + id="tspan7153">collaborative platform</tspan></text> + </g> + <path + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 534.71867,-50.683034 c 13.10776,0 20.07822,-17.26687 31.80216,-23.12884 8.50357,-4.25178 7.22776,-4.55156 7.22776,7.22777 0,12.16878 3.22229,11.56442 15.90108,11.56442 14.06901,0 21.33969,-15.55749 30.3566,-24.5744 1.44555,-1.44555 2.8911,-2.8911 4.33665,-4.33665 3.37296,-3.37296 5.34879,10.11886 10.11887,10.11886 3.23235,0 5.78221,-2.8911 8.67332,-4.33665 6.36456,-3.18228 -1.44556,15.29454 -1.44556,26.01994 0,12.08823 17.52352,34.60482 28.91105,28.91105 6.8192,-3.4096 20.76228,-19.66643 24.57439,-26.01994 1.93624,-3.22707 3.46439,8.67331 7.22777,8.67331 6.73945,0 19.19511,-11.96735 23.12884,-15.90108" + id="path7380" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 541.94643,-56.465244 c 1.92741,0 1.92741,0 0,0 -50.89658,0 47.26681,-8.67331 57.8221,-8.67331 31.67799,0 60.65977,-4.33666 91.06981,-4.33666 14.91033,0 11.71735,4.33666 1.44555,4.33666" + id="path8267" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 569.41193,-52.128584 c 31.38008,0 76.40201,0 112.75309,0 21.60008,0 49.77558,3.10004 66.49541,8.67332" + id="path8269" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 543.39199,-36.227504 c 1.9274,0 1.9274,0 0,0 -22.72854,0 37.05835,0 54.93099,0 26.98365,0 53.96729,0 80.95094,0 0.48185,0 0.9637,0 1.44555,0" + id="path8271" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 528.93646,-82.485184 c 9.03201,0 24.56249,-4.33666 39.02992,-4.33666 22.17227,0 57.79361,3.59964 76.61428,13.00997 3.24867,1.62434 4.09367,0.81874 7.22776,1.44556" + id="path8273" + inkscape:connector-curvature="0" /> + <g + id="g5064" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" + id="path5050" + d="M 206.0077,119.17481 C 205.76991,119.17481 205.54137,119.17568 205.31203,119.19062 C 205.29064,119.19501 205.27034,119.20243 205.24879,119.20643 C 205.0353,119.24634 204.82469,119.28034 204.60059,119.28548 C 204.56951,119.28987 204.5366,119.28083 204.50573,119.28548 C 202.67658,119.56085 201.13114,120.35507 199.88911,121.67284 C 198.43868,123.2047 197.70733,125.03981 197.70733,127.17481 C 197.70733,129.33374 198.43868,131.1813 199.88911,132.70839 C 201.45924,134.35508 203.49928,135.17475 206.0077,135.17475 C 207.33847,135.17475 208.61786,134.8441 209.83374,134.17874 C 211.04962,133.5325 212.10686,132.61781 213.01164,131.45938 L 210.27646,129.9416 C 209.09881,131.51173 207.65196,132.29729 205.92865,132.29729 C 204.73189,132.29729 203.65884,131.90909 202.73495,131.14319 C 201.79671,130.37723 201.32784,129.4443 201.32784,128.32897 L 213.83374,128.32897 L 213.83374,127.69653 C 213.83374,124.99189 212.91759,122.82613 211.09856,121.19855 C 209.56671,119.8438 207.86983,119.17481 206.0077,119.17481 z M 147.85769,119.28548 L 147.85769,125.34078 L 145.73909,125.34078 L 145.73909,128.43963 L 147.85769,128.43963 L 147.85769,134.7637 L 151.08296,134.7637 L 151.08296,128.43963 L 153.0276,128.43963 L 156.99598,134.7637 L 160.82207,134.7637 L 155.49401,126.73209 L 160.58492,119.58586 L 156.67978,119.58586 L 152.74302,125.34078 L 151.08296,125.34078 L 151.08296,119.28548 L 147.85769,119.28548 z M 187.43069,119.28548 C 186.87546,119.38456 186.35813,119.54585 185.88129,119.79144 C 185.07706,120.22226 184.44213,120.79048 183.96822,121.49894 L 183.96822,119.58586 L 180.72714,119.58586 L 180.72714,134.7637 L 183.96822,134.7637 L 183.96822,126.2578 C 183.96822,125.04192 184.31132,124.10899 184.9959,123.44358 C 185.68524,122.77822 186.5591,122.44757 187.63622,122.44751 C 188.77548,122.44757 189.66521,122.75326 190.29234,123.38034 C 190.91942,124.00747 191.22511,124.99027 191.22511,126.32103 L 191.22511,134.7637 L 194.46624,134.7637 L 194.46624,125.6096 C 194.46619,123.74742 193.89802,122.20891 192.7587,120.99298 C 191.90422,120.08111 190.91552,119.51348 189.78638,119.28548 L 187.43069,119.28548 z M 162.86156,119.58586 L 162.86156,128.37639 C 162.86156,130.43479 163.55551,132.09907 164.94854,133.3724 C 166.24103,134.56916 167.84192,135.17475 169.72321,135.17475 C 171.62367,135.17475 173.21643,134.56916 174.51374,133.3724 C 175.90672,132.09907 176.60067,130.43479 176.60067,128.37639 L 176.60067,119.58586 L 173.35959,119.58586 L 173.35959,128.09177 C 173.35953,129.21192 173.01643,130.12325 172.33191,130.82694 C 171.6234,131.55456 170.76199,131.91786 169.72321,131.91786 C 168.72271,131.91786 167.85464,131.5498 167.14613,130.82694 C 166.44244,130.09932 166.10264,129.19281 166.1027,128.09177 L 166.1027,119.58586 L 162.86156,119.58586 z M 205.5966,122.08389 C 206.65454,122.08389 207.57832,122.38049 208.36339,122.96929 C 209.12453,123.57243 209.68506,124.45111 210.03932,125.6096 L 201.32784,125.6096 C 201.58155,124.49421 202.10798,123.62798 202.89304,123.00091 C 203.65418,122.39294 204.55306,122.08389 205.5966,122.08389 z " + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" /> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" + transform="matrix(0.1111494,0,0,0.111008,121.5678,22.515968)" + id="g5052"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path5054" + d="M 60.321717,411.99998 L 437.33633,411.99998" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path5056" + d="M 252.61203,788.60332 L 252.61203,411.59154" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path5058" + d="M 252.86937,597.15755 L 629.88177,597.15755" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path5060" + d="M 437.45588,596.97447 L 437.45588,219.95956" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path5062" + d="M 372.87905,411.27704 L 437.81346,411.27704" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + </g> + </g> + <g + id="g2258" + transform="matrix(1.3893674,0,0,1.3875994,418.58885,-1165.2477)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-without-text.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 60.321717,411.99998 L 437.33633,411.99998" + id="path2260" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 252.61203,788.60332 L 252.61203,411.59154" + id="path2262" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 252.86937,597.15755 L 629.88177,597.15755" + id="path2264" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 437.45588,596.97447 L 437.45588,219.95956" + id="path2266" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" + d="M 372.87905,411.27704 L 437.81346,411.27704" + id="path2268" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + <g + id="g2285" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/logo-kune-wiki-16.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + transform="translate(-7.8740157,-70.07874)"> + <g + transform="translate(404.1233,229.24298)" + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" + id="g2264"> + <path + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 206.0077,119.17481 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.0791 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" + id="path2267" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + inkscape:connector-curvature="0" /> + <g + id="g2269" + transform="matrix(0.1111494,0,0,0.111008,121.5678,22.515968)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path2271" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path2273" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path2275" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path2277" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path2279" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text2281" + y="364.09836" + x="624.35651" + style="font-size:22.95481682px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve"><tspan + y="364.09836" + x="624.35651" + id="tspan2283" + sodipodi:role="line">wiki</tspan></text> + </g> + <g + id="g2338" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/logo-kune-wiki-16-white.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + transform="translate(-7.8740157,-70.07874)"> + <path + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 612.45757,378.19846 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.079 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" + id="path2301" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px-white.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + inkscape:connector-curvature="0" /> + <g + style="fill:#ffffff;stroke:#ffffff" + id="g2303" + transform="matrix(0.1111494,0,0,0.111008,528.01767,281.53962)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px-white.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path2305" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path2307" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path2309" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path2311" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path2313" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> + </g> + <text + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px-white.png" + xml:space="preserve" + style="font-size:22.95481682px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Emblem" + x="626.68304" + y="393.87903" + id="text2315" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan2317" + x="626.68304" + y="393.87903">wiki</tspan></text> + </g> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-icon16.png" + transform="matrix(0.1111494,0,0,0.111008,278.24359,22.515968)" + id="g22118"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path22120" + d="M 60.321717,411.99998 L 437.33633,411.99998" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path22122" + d="M 252.61203,788.60332 L 252.61203,411.59154" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path22124" + d="M 252.86937,597.15755 L 629.88177,597.15755" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path22126" + d="M 437.45588,596.97447 L 437.45588,219.95956" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path22128" + d="M 372.87905,411.27704 L 437.81346,411.27704" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + </g> + <text + xml:space="preserve" + style="font-size:18.13397598px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:100%;writing-mode:lr-tb;text-anchor:end;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem;-inkscape-font-specification:Emblem" + x="1402.142" + y="623.64624" + id="text2703" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + x="1402.142" + y="623.64624" + id="tspan2709">a web infrastructure to encourage collaboration,</tspan><tspan + sodipodi:role="line" + x="1402.142" + y="641.78021" + id="tspan2727">content sharing & free culture</tspan></text> + <text + xml:space="preserve" + style="font-size:17.27686882px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:100%;writing-mode:lr-tb;text-anchor:end;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem" + x="620.35358" + y="901.5686" + id="text2729" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + x="625.28021" + y="901.5686" + id="tspan2731">a web infrastructure </tspan><tspan + sodipodi:role="line" + x="620.35358" + y="918.84546" + id="tspan2735">to encourage collaboration,</tspan><tspan + sodipodi:role="line" + x="620.35358" + y="936.12231" + id="tspan2733">content sharing & free culture</tspan></text> + <g + id="g2607" + transform="matrix(0.548749,0,0,0.548749,826.55453,617.44152)"> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-without-text.png" + transform="matrix(0.8405688,0,0,0.8394991,295.36384,-621.12129)" + id="g2531"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2533" + d="m 60.321717,411.99998 377.014613,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2535" + d="m 252.61203,788.60332 0,-377.01178" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2537" + d="m 252.86937,597.15755 377.0124,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2539" + d="m 437.45588,596.97447 0,-377.01491" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2541" + d="m 372.87905,411.27704 64.93441,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + <text + transform="matrix(0.9080422,0.4188786,-0.4188786,0.9080422,0,0)" + sodipodi:linespacing="125%" + id="text2549" + y="36.545521" + x="426.55963" + style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + xml:space="preserve"><tspan + y="36.545521" + x="426.55963" + id="tspan2553" + sodipodi:role="line"><tspan + id="tspan2557" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#808080;fill-opacity:1;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif">α</tspan><tspan + id="tspan2555" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#808080;fill-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan><tspan + id="tspan2559" + style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> + </g> + <g + id="g2620" + transform="translate(448.03149,-129.13386)"> + <g + inkscape:export-ydpi="44.62801" + inkscape:export-xdpi="44.62801" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" + transform="matrix(0.8405688,0,0,0.8394991,313.86353,2.43708)" + id="g2561"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2563" + d="m 60.321717,411.99998 377.014613,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2565" + d="m 252.61203,788.60332 0,-377.01178" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2567" + d="m 252.86937,597.15755 377.0124,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2569" + d="m 437.45588,596.97447 0,-377.01491" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2571" + d="m 372.87905,411.27704 64.93441,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + <text + inkscape:export-ydpi="44.62801" + inkscape:export-xdpi="44.62801" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" + transform="matrix(0.8825152,0.4702838,-0.4702838,0.8825152,0,0)" + sodipodi:linespacing="125%" + id="text2573" + y="532.55298" + x="724.52563" + style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + xml:space="preserve"><tspan + y="532.55298" + x="724.52563" + id="tspan2575" + sodipodi:role="line"><tspan + id="tspan2577" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif">α</tspan><tspan + id="tspan2579" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan><tspan + id="tspan2581" + style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> + </g> + <text + xml:space="preserve" + style="font-size:40px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" + x="-181" + y="223.36218" + id="text2583"><tspan + sodipodi:role="line" + id="tspan2585" + x="-181" + y="223.36218" /></text> + <g + id="g2615" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + transform="translate(278.21243,-323.45767)"> + <rect + y="1007.8605" + x="829.13959" + height="56.250996" + width="56.250996" + id="rect2613" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3.74900579;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" /> + <g + inkscape:export-ydpi="44.62801" + inkscape:export-xdpi="44.62801" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" + transform="matrix(0.2048309,0,0,0.2045702,832.13264,838.40225)" + id="g2559"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2561" + d="m 60.321717,411.99998 377.014613,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2564" + d="m 252.61203,788.60332 0,-377.01178" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2566" + d="m 252.86937,597.15755 377.0124,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2568" + d="m 437.45588,596.97447 0,-377.01491" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path2570" + d="m 372.87905,411.27704 64.93441,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + <text + sodipodi:linespacing="125%" + id="text2593" + y="1062.1919" + x="826.17133" + style="font-size:21.96050453px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + xml:space="preserve"><tspan + y="1062.1919" + x="826.17133" + id="tspan2597" + sodipodi:role="line"><tspan + id="tspan2599" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#4d4d4d;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Serif">α</tspan><tspan + id="tspan2601" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#999999;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan></tspan></text> + </g> + <g + id="g3983" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/logo-big-home-kunecc.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + transform="translate(-804.7244,-186.61417)"> + <g + transform="translate(-0.07178157,0.14078373)" + id="g3779"> + <path + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path3743" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + <g + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + id="g3745"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3747" + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3749" + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3751" + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3753" + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3755" + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + </g> + <text + transform="scale(-1,1)" + xml:space="preserve" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + x="-925.99481" + y="1145.4236" + id="text3757" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3759" + x="-925.99481" + y="1145.4236">cc</tspan></text> + <text + xml:space="preserve" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + x="838.10248" + y="1145.1492" + id="text3941" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3943" + x="838.10248" + y="1145.1492">.</tspan></text> + </g> + <g + id="g3969" + transform="matrix(0.31973654,0,0,0.31973654,-129.13654,581.85124)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <g + transform="translate(380,-30)" + id="g3945"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + id="path3947" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3949" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3951" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3953" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3955" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3957" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3959" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text3961" + y="1115.2828" + x="-1306.0667" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1115.2828" + x="-1306.0667" + id="tspan3963" + sodipodi:role="line">cc</tspan></text> + <text + sodipodi:linespacing="100%" + id="text3965" + y="1115.0084" + x="1218.1743" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve"><tspan + y="1115.0084" + x="1218.1743" + id="tspan3967" + sodipodi:role="line">.</tspan></text> + </g> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/logo-big-home-kunecc.png" + id="g3240" + transform="translate(-464.7244,43.385828)"> + <g + id="g3242" + transform="translate(-0.07178157,0.14078373)"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + id="path3244" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3246" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3248" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3250" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3252" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3254" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3256" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text3258" + y="1145.4236" + x="-925.99481" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1145.4236" + x="-925.99481" + id="tspan3260" + sodipodi:role="line">cc</tspan></text> + <text + sodipodi:linespacing="100%" + id="text3262" + y="1145.1492" + x="838.10248" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve"><tspan + y="1145.1492" + x="838.10248" + id="tspan3264" + sodipodi:role="line">.</tspan></text> + </g> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px.png" + transform="matrix(0.31973654,0,0,0.31973654,-147.24678,536.33943)" + id="g3289" + style="opacity:0.4"> + <g + id="g3291" + transform="translate(380,-30)"> + <path + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path3293" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + <g + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + id="g3295"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3297" + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3299" + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3301" + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3303" + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3305" + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + </g> + <text + transform="scale(-1,1)" + xml:space="preserve" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + x="-1306.0667" + y="1115.2828" + id="text3307" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3309" + x="-1306.0667" + y="1115.2828">cc</tspan></text> + <text + xml:space="preserve" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + x="1218.1743" + y="1115.0084" + id="text3311" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3313" + x="1218.1743" + y="1115.0084">.</tspan></text> + </g> + </g> +</svg> Added: trunk/img/kunecc-logo-16px-low.png =================================================================== (Binary files differ) Property changes on: trunk/img/kunecc-logo-16px-low.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/public/images/kune-logo-16px.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/core/public/images/kune-logo-onover-16px.png =================================================================== (Binary files differ) Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-11-19 14:04:29 UTC (rev 1616) +++ trunk/src/main/resources/kune.properties 2011-11-19 15:02:45 UTC (rev 1617) @@ -4,9 +4,10 @@ kune.siteurl = http://localhost:8080 -kune.sitelogourl = ws/images/kune-logo-onover-16px.png -kune.sitelogourl.onover = ws/images/kune-logo-16px.png +kune.sitelogourl = ws/images/kune-logo-16px.png +kune.sitelogourl.onover = ws/images/kune-logo-onover-16px.png + # Every kune site have a group with this name: # This group will be created in the first execution of kune. # NOTE: if you change this value later, the group must exist because if not kune will try to initialize the database at start. Also, if you rename the name of this group from the preferences of the user interface, you will have to change the values here accordinly.

1 0

r1616 - trunk/src/main/resources
by Vicente J. Ruiz Jurado 19 Nov '11

19 Nov '11

Author: vjrj_ Date: 2011-11-19 15:04:29 +0100 (Sat, 19 Nov 2011) New Revision: 1616 Modified: trunk/src/main/resources/kune.properties Log: admin, not reserved Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-11-19 13:15:24 UTC (rev 1615) +++ trunk/src/main/resources/kune.properties 2011-11-19 14:04:29 UTC (rev 1616) @@ -56,7 +56,7 @@ ### Other params # Reserved words to avoid it's use in the client side for user and group names (see client tokens used in SiteTokens) -kune.server.names.reservedwords = root,adm,kune,fuck,about,home,newgroup,preview,register,signin,translate,inbox,sub,admin,www,ftp,pop,pop3,smtp,mail,wave +kune.server.names.reservedwords = root,adm,kune,fuck,about,home,newgroup,preview,register,signin,translate,inbox,sub,www,ftp,pop,pop3,smtp,mail,wave # If defined create a copy of this wave as welcome to new users # kune.site.welcomewave = w+rtackLTkDCA

1 0

19 Nov '11

Author: vjrj_ Date: 2011-11-19 14:15:24 +0100 (Sat, 19 Nov 2011) New Revision: 1615 Added: trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java Removed: trunk/src/main/java/cc/kune/chat/client/actions/conditions/ trunk/src/main/java/org/ourproject/kune/gallery/ trunk/src/main/java/org/waveprotocol/box/server/rpc/ trunk/src/test/java/cc/kune/selenium/spaces/SpacesPageObject.java Modified: trunk/.classpath trunk/pom.xml trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/client/state/ToolChangedEvent.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java trunk/src/main/resources/TestConstants_en.properties trunk/src/main/resources/TestConstants_es.properties trunk/src/test/java/cc/kune/core/client/state/StateManagerDefaultTest.java trunk/src/test/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenterTest.java trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java trunk/src/test/java/cc/kune/selenium/SeleniumModule.java trunk/src/test/java/cc/kune/selenium/login/RegisterSeleniumTests.java trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java Log: CLOSED - # 162: Add [siteprojectprefix] to lists and posts title names http://kune.ourproject.org/issues/ticket/162 Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/.classpath 2011-11-19 13:15:24 UTC (rev 1615) @@ -43,7 +43,7 @@ <classpathentry kind="var" path="M2_REPO/com/calclab/emite/emite-proxy/0.1/emite-proxy-0.1.jar"/> <classpathentry kind="var" path="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3.jar" sourcepath="M2_REPO/net/sf/ezmorph/ezmorph/1.0.3/ezmorph-1.0.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/freemarker/freemarker/2.3.8/freemarker-2.3.8.jar"/> - <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/r09/guava-r09.jar" sourcepath="M2_REPO/com/google/guava/guava/r09/guava-r09-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1.jar" sourcepath="M2_REPO/com/google/guava/guava/10.0.1/guava-10.0.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/guava/guava-gwt/r09/guava-gwt-r09.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/inject/guice/3.0/guice-3.0.jar" sourcepath="M2_REPO/com/google/inject/guice/3.0/guice-3.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/com/google/inject/extensions/guice-assisted-inject/2.0/guice-assisted-inject-2.0.jar"/> @@ -95,6 +95,7 @@ <classpathentry kind="var" path="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15.jar" sourcepath="M2_REPO/net/sf/json-lib/json-lib/2.1/json-lib-2.1-jdk15-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2.jar" sourcepath="M2_REPO/org/jsoup/jsoup/1.2.2/jsoup-1.2.2-sources.jar"/> <classpathentry kind="var" path="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47.jar" sourcepath="M2_REPO/net/sourceforge/findbugs/jsr-305/v0r47/jsr-305-v0r47-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/com/google/code/findbugs/jsr305/1.3.9/jsr305-1.3.9.jar"/> <classpathentry kind="var" path="M2_REPO/org/hibernate/jtidy/r8-20060801/jtidy-r8-20060801.jar"/> <classpathentry kind="var" path="M2_REPO/org/jukito/jukito/1.0/jukito-1.0.jar" sourcepath="M2_REPO/org/jukito/jukito/1.0/jukito-1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/> @@ -121,16 +122,16 @@ <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.5/proto-msg-0.3.5.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.8.0/selenium-android-driver-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.8.0/selenium-android-driver-2.8.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-api/2.8.0/selenium-api-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-api/2.8.0/selenium-api-2.8.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.8.0/selenium-chrome-driver-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.8.0/selenium-chrome-driver-2.8.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.8.0/selenium-firefox-driver-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.8.0/selenium-firefox-driver-2.8.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.8.0/selenium-htmlunit-driver-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.8.0/selenium-htmlunit-driver-2.8.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.8.0/selenium-ie-driver-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.8.0/selenium-ie-driver-2.8.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-iphone-driver/2.8.0/selenium-iphone-driver-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-iphone-driver/2.8.0/selenium-iphone-driver-2.8.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-java/2.8.0/selenium-java-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-java/2.8.0/selenium-java-2.8.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-remote-driver/2.8.0/selenium-remote-driver-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-remote-driver/2.8.0/selenium-remote-driver-2.8.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-support/2.8.0/selenium-support-2.8.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-support/2.8.0/selenium-support-2.8.0-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"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-api/2.12.0/selenium-api-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.12.0/selenium-chrome-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-chrome-driver/2.12.0/selenium-chrome-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.12.0/selenium-firefox-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-firefox-driver/2.12.0/selenium-firefox-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.12.0/selenium-htmlunit-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-htmlunit-driver/2.12.0/selenium-htmlunit-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.12.0/selenium-ie-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-ie-driver/2.12.0/selenium-ie-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-iphone-driver/2.12.0/selenium-iphone-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-iphone-driver/2.12.0/selenium-iphone-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-java/2.12.0/selenium-java-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-java/2.12.0/selenium-java-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-remote-driver/2.12.0/selenium-remote-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-remote-driver/2.12.0/selenium-remote-driver-2.12.0-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-support/2.12.0/selenium-support-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-support/2.12.0/selenium-support-2.12.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/xalan/serializer/2.7.1/serializer-2.7.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.1/slf4j-api-1.6.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.1/slf4j-log4j12-1.6.1-sources.jar"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/pom.xml 2011-11-19 13:15:24 UTC (rev 1615) @@ -489,7 +489,7 @@ <dependency> <groupId>org.seleniumhq.selenium</groupId> <artifactId>selenium-java</artifactId> - <version>2.8.0</version> + <version>2.12.0</version> <exclusions> <exclusion> <groupId>com.google.collections</groupId> Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -205,24 +205,20 @@ } private void showWelcolmeDialog() { - NotifyUser.info( - i18n.t("Welcome"), - i18n.t( - "Thanks for joining [%s]. " - + "Now you can actively participate in [%s]. " - + "You can also use your personal space to publish contents. " - + "Note: your email is not verified, please follow the instructions you will receive by email.", - siteCommonName, siteCommonName), Register.WELCOME_ID, true); + NotifyUser.info(i18n.t("Welcome"), i18n.t("Thanks for joining [%s]. " + + "Now you can actively participate in [%s]. " + + "You can also use your personal space to publish contents. ", + // + + // "Note: your email is not verified, please follow the instructions you will receive by email.", + siteCommonName, siteCommonName), Register.WELCOME_ID, true); } private void showWelcolmeDialogNoHomepage() { - NotifyUser.info( - i18n.t("Welcome"), - i18n.t( - "Thanks for joining [%s]. " - + "Now you can actively participate in [%s]. " - + "Note: your email is not verified, please follow the instructions you will receive by email.", - siteCommonName, siteCommonName), Register.WELCOME_ID, true); + NotifyUser.info(i18n.t("Welcome"), i18n.t("Thanks for joining [%s]. " + + "Now you can actively participate in [%s]. ", + // + + // "Note: your email is not verified, please follow the instructions you will receive by email.", + siteCommonName, siteCommonName), Register.WELCOME_ID, true); } }; userServiceProvider.get().createUser(user, wantHomepage, callback); Modified: trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/core/client/notify/confirm/UserConfirmPanel.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -34,9 +34,9 @@ import com.gwtplatform.mvp.client.ViewImpl; public class UserConfirmPanel extends ViewImpl implements UserConfirmView { - private static final String CANCEL_ID = "k-conf-dial"; - private static final String DIALOG_ID = "k-conf-dial-nok"; - private static final String OK_ID = "k-conf-dial-ok"; + public static final String CANCEL_ID = "k-conf-dial"; + public static final String DIALOG_ID = "k-conf-dial-nok"; + public static final String OK_ID = "k-conf-dial-ok"; private HandlerRegistration acceptHandler; private final HTML askLabel; private HandlerRegistration cancelHandler; Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/EntitySearchPanel.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -38,7 +38,6 @@ public abstract class EntitySearchPanel { public static final String DIALOG_ID = "entity-search-panel-diag"; - public static final String ENTITY_SEARCH_TEXTBOX = "kune-ssp-tbox"; public static final String OK_ID = "entity-search-panel-ok-id"; private static final int SEARCH_TEXT_HEIGHT = 13; private static final int SEARCH_TEXT_WIDTH_BIG = 160; @@ -68,14 +67,14 @@ searchTextBox.setValue(""); } - private void create() { + private void create(final String id) { dialog.getTitleText().setText( i18n.t(searchOnlyUsers ? "Type the name of the user and select him/her:" : "Type the name of the user or group and select it:"), i18n.getDirection()); - final MultivalueSuggestBox multivalueSBox = SearchBoxFactory.create(i18n, searchOnlyUsers, callback); + final MultivalueSuggestBox multivalueSBox = SearchBoxFactory.create(i18n, searchOnlyUsers, id, + callback); suggestBox = multivalueSBox.getSuggestBox(); searchTextBox = suggestBox.getTextBox(); - searchTextBox.ensureDebugId(ENTITY_SEARCH_TEXTBOX); dialog.getInnerPanel().add(multivalueSBox); setTextSearchSmallImpl(); } @@ -92,10 +91,11 @@ return searchTextBox; } - public void init(final OnEntitySelectedInSearch callback, final boolean searchOnlyUsers) { + public void init(final boolean searchOnlyUsers, final String id, + final OnEntitySelectedInSearch callback) { this.callback = callback; this.searchOnlyUsers = searchOnlyUsers; - create(); + create(id); } public void selectSearchText() { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SearchBoxFactory.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -26,11 +26,12 @@ import com.google.gwt.i18n.client.HasDirection.Direction; import com.google.gwt.user.client.ui.SuggestBox; import com.google.gwt.user.client.ui.SuggestOracle.Suggestion; +import com.google.gwt.user.client.ui.TextBoxBase; public class SearchBoxFactory { public static MultivalueSuggestBox create(final I18nUITranslationService i18n, - final boolean searchOnlyUsers, final OnEntitySelectedInSearch callback) { + final boolean searchOnlyUsers, final String id, final OnEntitySelectedInSearch callback) { final MultivalueSuggestBox multivalueSBox = new MultivalueSuggestBox( searchOnlyUsers ? SearcherConstants.USER_DATA_PROXY_URL : SearcherConstants.GROUP_DATA_PROXY_URL, false, new OnExactMatch() { @@ -57,13 +58,16 @@ } }; }; + final String siteCommonName = i18n.getSiteCommonName(); final SuggestBox suggestBox = multivalueSBox.getSuggestBox(); Tooltip.to( suggestBox, searchOnlyUsers ? i18n.t("Type something to search for users in [%s]", siteCommonName) : i18n.t( "Type something to search for users and groups in [%s]", siteCommonName)); - suggestBox.getTextBox().setDirection(i18n.isRTL() ? Direction.RTL : Direction.LTR); + final TextBoxBase textBox = suggestBox.getTextBox(); + textBox.setDirection(i18n.isRTL() ? Direction.RTL : Direction.LTR); + textBox.ensureDebugId(id); return multivalueSBox; } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/core/client/sitebar/search/SitebarSearchPanel.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -43,7 +43,6 @@ private static final int SEARCH_TEXT_WIDTH_BIG = 160; private static final int SEARCH_TEXT_WIDTH_SMALL = 120; public static final String SITE_SEARCH_BUTTON = "kune-ssp-searchbt"; - public static final String SITE_SEARCH_TEXTBOX = "kune-ssp-tbox"; private final PushButton searchButton; private final TextBoxBase searchTextBox; @@ -55,7 +54,7 @@ searchButton = new PushButton(new Image(img.kuneSearchIco()), new Image(img.kuneSearchIcoPush())); searchButton.ensureDebugId(SITE_SEARCH_BUTTON); final MultivalueSuggestBox multivalueSBox = SearchBoxFactory.create(i18n, false, - new OnEntitySelectedInSearch() { + SITE_SEARCH_TEXTBOX, new OnEntitySelectedInSearch() { @Override public void onSeleted(final String shortName) { stateManager.gotoHistoryToken(shortName); @@ -63,7 +62,6 @@ }); suggestBox = multivalueSBox.getSuggestBox(); searchTextBox = suggestBox.getTextBox(); - searchTextBox.ensureDebugId(SITE_SEARCH_TEXTBOX); searchTextBox.addStyleName("k-fr"); searchTextBox.addStyleName("k-sitebarsearch"); searchTextBox.addStyleName("k-fr"); Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddEntityToThisGroupAction.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -39,6 +39,7 @@ public class AddEntityToThisGroupAction extends SNRolAction { + public static final String ADD_NEW_MEMBER_TEXTBOX = "kune-add-newMember-tbox"; private final AddMemberSearchPanel searchPanel; @Inject @@ -52,37 +53,37 @@ putValue(NAME, i18n.t("Add new member")); putValue(Action.SMALL_ICON, res.add()); putValue(Action.STYLES, "k-sn-join"); - searchPanel.init(new OnEntitySelectedInSearch() { - @Override - public void onSeleted(final String shortName) { - NotifyUser.askConfirmation( - i18n.t("Are you sure?"), - i18n.t("Do you want to add '[%s]' as a member of '[%s]'?", shortName, - session.getCurrentGroupShortName()), new SimpleResponseCallback() { - @Override - public void onCancel() { - } + searchPanel.init(// In the future, with this to false, we'll be add groups + // to groups! + true, ADD_NEW_MEMBER_TEXTBOX, new OnEntitySelectedInSearch() { + @Override + public void onSeleted(final String shortName) { + NotifyUser.askConfirmation( + i18n.t("Are you sure?"), + i18n.t("Do you want to add '[%s]' as a member of '[%s]'?", shortName, + session.getCurrentGroupShortName()), new SimpleResponseCallback() { + @Override + public void onCancel() { + } - @Override - public void onSuccess() { - NotifyUser.showProgress(); - snServiceProvider.get().addCollabMember(session.getUserHash(), - session.getCurrentStateToken(), shortName, - new AsyncCallbackSimple<SocialNetworkDataDTO>() { - @Override - public void onSuccess(final SocialNetworkDataDTO result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Member added as collaborator")); - stateManager.setSocialNetwork(result); - } - }); - } - }); - } + @Override + public void onSuccess() { + NotifyUser.showProgress(); + snServiceProvider.get().addCollabMember(session.getUserHash(), + session.getCurrentStateToken(), shortName, + new AsyncCallbackSimple<SocialNetworkDataDTO>() { + @Override + public void onSuccess(final SocialNetworkDataDTO result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Member added as collaborator")); + stateManager.setSocialNetwork(result); + } + }); + } + }); + } - }, - // In the future, with this to false, we'll be add groups to groups! - true); + }); } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/AddNewBuddiesAction.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -33,6 +33,7 @@ import com.google.inject.Inject; public class AddNewBuddiesAction extends AbstractExtendedAction { + public static final String ADD_NEW_BUDDIES_TEXTBOX = "kune-add-newbuddies-tbox"; private final EntitySearchPanel searchPanel; @@ -42,7 +43,7 @@ this.searchPanel = searchPanel; putValue(Action.NAME, i18n.t("Add a new buddy")); putValue(Action.SMALL_ICON, res.addGreen()); - searchPanel.init(new OnEntitySelectedInSearch() { + searchPanel.init(true, ADD_NEW_BUDDIES_TEXTBOX, new OnEntitySelectedInSearch() { @Override public void onSeleted(final String shortName) { NotifyUser.askConfirmation(i18n.t("Are you sure?"), @@ -59,7 +60,7 @@ } }); } - }, true); + }); } @Override Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -55,7 +55,6 @@ private final EventBus eventBus; private final HistoryWrapper history; private StateToken previousGroupToken; - private final StateToken previousToken; /** * When a historyChanged is interrupted (for instance because you are editing * something), the new history token is stored here @@ -75,7 +74,6 @@ this.session = session; this.history = history; this.previousGroupToken = null; - this.previousToken = null; this.resumedHistoryToken = null; tokenMatcher.init(GwtWaverefEncoder.INSTANCE); this.siteTokens = siteTokens; @@ -126,7 +124,7 @@ final String newTokenTool = newState.getStateToken().getTool(); final String newToolName = newTokenTool == null ? "" : newTokenTool; if (startingUp() || previousToolName == null || !previousToolName.equals(newToolName)) { - ToolChangedEvent.fire(eventBus, previousToolName, newToolName); + ToolChangedEvent.fire(eventBus, previousGroupToken, newState.getStateToken()); } } @@ -233,8 +231,7 @@ eventBus.addHandler(ToolChangedEvent.getType(), handler); final StateAbstractDTO currentState = session.getCurrentState(); if (fireNow && currentState != null) { - handler.onToolChanged(new ToolChangedEvent(getPreviousTool(), - currentState.getStateToken().getTool())); + handler.onToolChanged(new ToolChangedEvent(previousGroupToken, currentState.getStateToken())); } } Modified: trunk/src/main/java/cc/kune/core/client/state/ToolChangedEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ToolChangedEvent.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/core/client/state/ToolChangedEvent.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -19,12 +19,14 @@ */ package cc.kune.core.client.state; +import cc.kune.core.shared.domain.utils.StateToken; + import com.google.gwt.event.shared.EventHandler; import com.google.gwt.event.shared.GwtEvent; import com.google.gwt.event.shared.HandlerRegistration; import com.google.gwt.event.shared.HasHandlers; -public class ToolChangedEvent extends GwtEvent<ToolChangedEvent.ToolChangedHandler> { +public class ToolChangedEvent extends GwtEvent<ToolChangedEvent.ToolChangedHandler> { public interface HasToolChangedHandlers extends HasHandlers { HandlerRegistration addToolChangedHandler(ToolChangedHandler handler); @@ -36,80 +38,93 @@ private static final Type<ToolChangedHandler> TYPE = new Type<ToolChangedHandler>(); - public static void fire(HasHandlers source, java.lang.String previousTool, java.lang.String newTool) { - source.fireEvent(new ToolChangedEvent(previousTool, newTool)); + public static void fire(final HasHandlers source, final StateToken previousToken, + final StateToken newToken) { + source.fireEvent(new ToolChangedEvent(previousToken, newToken)); } public static Type<ToolChangedHandler> getType() { return TYPE; } - java.lang.String previousTool; - java.lang.String newTool; + private StateToken newToken; + private StateToken previousToken; - public ToolChangedEvent(java.lang.String previousTool, java.lang.String newTool) { - this.previousTool = previousTool; - this.newTool = newTool; - } - protected ToolChangedEvent() { // Possibly for serialization. } - @Override - public Type<ToolChangedHandler> getAssociatedType() { - return TYPE; + public ToolChangedEvent(final StateToken previousToken, final StateToken newToken) { + this.previousToken = previousToken; + this.newToken = newToken; } - public java.lang.String getPreviousTool() { - return previousTool; - } - - public java.lang.String getNewTool() { - return newTool; - } - @Override - protected void dispatch(ToolChangedHandler handler) { + protected void dispatch(final ToolChangedHandler handler) { handler.onToolChanged(this); } @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null) + public boolean equals(final Object obj) { + if (this == obj) { + return true; + } + if (obj == null) { + return false; + } + if (getClass() != obj.getClass()) { + return false; + } + final ToolChangedEvent other = (ToolChangedEvent) obj; + if (newToken == null) { + if (other.newToken != null) { return false; - if (getClass() != obj.getClass()) - return false; - ToolChangedEvent other = (ToolChangedEvent) obj; - if (previousTool == null) { - if (other.previousTool != null) - return false; - } else if (!previousTool.equals(other.previousTool)) + } + } else if (!newToken.equals(other.newToken)) { return false; - if (newTool == null) { - if (other.newTool != null) + } + if (previousToken == null) { + if (other.previousToken != null) { return false; - } else if (!newTool.equals(other.newTool)) + } + } else if (!previousToken.equals(other.previousToken)) { return false; + } return true; } @Override + public Type<ToolChangedHandler> getAssociatedType() { + return TYPE; + } + + public StateToken getNewToken() { + return newToken; + } + + public java.lang.String getNewTool() { + return newToken != null ? newToken.getTool() : null; + } + + public StateToken getPreviousToken() { + return previousToken; + } + + public java.lang.String getPreviousTool() { + return previousToken != null ? previousToken.getTool() : null; + } + + @Override public int hashCode() { - int hashCode = 23; - hashCode = (hashCode * 37) + (previousTool == null ? 1 : previousTool.hashCode()); - hashCode = (hashCode * 37) + (newTool == null ? 1 : newTool.hashCode()); - return hashCode; + final int prime = 31; + int result = 1; + result = prime * result + ((newToken == null) ? 0 : newToken.hashCode()); + result = prime * result + ((previousToken == null) ? 0 : previousToken.hashCode()); + return result; } @Override public String toString() { - return "ToolChangedEvent[" - + previousTool - + "," - + newTool - + "]"; + return "ToolChangedEvent[" + getPreviousTool() + "," + getNewTool() + "]"; } } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -24,6 +24,7 @@ import cc.kune.common.client.errors.UIException; import cc.kune.common.client.log.Log; +import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.state.GroupChangedEvent; import cc.kune.core.client.state.GroupChangedEvent.GroupChangedHandler; import cc.kune.core.client.state.StateChangedEvent; @@ -83,18 +84,10 @@ stateManager.onToolChanged(false, new ToolChangedHandler() { @Override public void onToolChanged(final ToolChangedEvent event) { - ToolSelectorPresenter.this.onToolChanged(event.getPreviousTool(), event.getNewTool()); + ToolSelectorPresenter.this.onToolChanged(event.getPreviousTool(), event.getNewTool(), + event.getPreviousToken(), event.getNewToken()); } }); - stateManager.onStateChanged(true, new StateChangedHandler() { - @Override - public void onStateChanged(final StateChangedEvent event) { - final StateToken token = event.getState().getStateToken(); - if (token.hasAll() || token.hasGroupToolAndFolder()) { - tools.get(token.getTool()).setToken(token); - } - } - }); } @Override @@ -124,17 +117,20 @@ } } - void onToolChanged(final String oldTool, final String newTool) { + void onToolChanged(final String oldTool, final String newTool, final StateToken oldToken, + final StateToken newToken) { Log.debug("Registered tools: " + tools.keySet().toString()); - if (oldTool != null && !oldTool.equals("")) { + if (TextUtils.notEmpty(oldTool)) { final ToolSelectorItem tool = tools.get(oldTool); checkTool(tool); tool.setSelected(false); + tool.setToken(oldToken); } - if (!newTool.equals("")) { + if (TextUtils.notEmpty(newTool)) { final ToolSelectorItem tool = tools.get(newTool); checkTool(tool); tool.setSelected(true); + tool.setToken(newToken.copy().clearDocument().clearFolder()); } } Modified: trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java =================================================================== --- trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -55,18 +55,28 @@ this.contentManager = contentManager; } + private String composeListName(final StateToken parentToken, final String listname) { + // FIXME In the future use tabs here + return parentToken.getGroup() + "-" + listname; + } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator, actionLevel = ActionLevel.container) @Transactional public StateContainerDTO createList(final String userHash, final StateToken parentToken, - final String title, final String description, final boolean isPublic) { - final StateContainerDTO result = contentRPC.addFolder(userHash, parentToken, title, - ListsConstants.TYPE_LIST); + final String listaName, final String description, final boolean isPublic) { + final StateContainerDTO result = contentRPC.addFolder(userHash, parentToken, + composeListName(parentToken, listaName), ListsConstants.TYPE_LIST); // Not public list, don't permit subscriptions neither view posts return contentRPC.getState(setContainerAcl(result.getStateToken(), isPublic)); } + private Container getContainer(final StateToken token) { + final Container container = contentManager.find(ContentUtils.parseId(token.getFolder())); + return container; + } + private Group getUserGroup() { return userSessionManager.getUser().getUserGroup(); } @@ -75,14 +85,17 @@ @Authenticated @Authorizated(accessRolRequired = AccessRol.Viewer, actionLevel = ActionLevel.container) @Transactional - public StateContentDTO newPost(final String userHash, final StateToken parentToken, final String title) { - final StateContentDTO content = contentRPC.addContent(userHash, parentToken, title, - ListsConstants.TYPE_POST); + public StateContentDTO newPost(final String userHash, final StateToken parentToken, + final String postTitle) { + final Container container = getContainer(parentToken); + final StateContentDTO content = contentRPC.addContent(userHash, parentToken, + "[" + container.getName() + "] " + postTitle, ListsConstants.TYPE_POST); + // FIXME In the future use tabs here return content; } private Container setContainerAcl(final StateToken token, final boolean isPublic) { - final Container container = contentManager.find(ContentUtils.parseId(token.getFolder())); + final Container container = getContainer(token); final AccessLists acl = new AccessLists(); acl.getAdmins().setMode(GroupListMode.NORMAL); acl.getAdmins().add(getUserGroup()); @@ -102,7 +115,7 @@ } private Container setPublicAcl(final StateToken token, final boolean isPublic) { - final Container container = contentManager.find(ContentUtils.parseId(token.getFolder())); + final Container container = getContainer(token); final AccessLists acl = container.getAccessLists(); setViewersAcl(isPublic, acl); contentManager.setAccessList(container, acl); @@ -120,7 +133,7 @@ @Transactional public StateContainerDTO subscribeToList(final String userHash, final StateToken token, final Boolean subscribe) { - final Container container = contentManager.find(ContentUtils.parseId(token.getFolder())); + final Container container = getContainer(token); final AccessLists acl = container.getAccessLists(); if (subscribe) { if (!acl.getAdmins().includes(getUserGroup()) Modified: trunk/src/main/resources/TestConstants_en.properties =================================================================== --- trunk/src/main/resources/TestConstants_en.properties 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/resources/TestConstants_en.properties 2011-11-19 13:15:24 UTC (rev 1615) @@ -36,4 +36,6 @@ janeDoe = Jane Doe janeexampleOrg = jane(a)example.org thankYou = Thank you -andYesFeedbackWelcome = and yes, feedback welcome \ No newline at end of file +andYesFeedbackWelcome = and yes, feedback welcome +yourPersonalPublicSpace = Your personal public space +hereYouCanHaveYourBlogEtc = here you can have your blog, etc \ No newline at end of file Modified: trunk/src/main/resources/TestConstants_es.properties =================================================================== --- trunk/src/main/resources/TestConstants_es.properties 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/main/resources/TestConstants_es.properties 2011-11-19 13:15:24 UTC (rev 1615) @@ -30,4 +30,6 @@ janeDoe = Ruth Mengana janeexampleOrg = ruth(a)example.org thankYou = Gracias -andYesFeedbackWelcome = y s�, tu feedback es muy bienvenido \ No newline at end of file +andYesFeedbackWelcome = y s�, tu feedback es muy bienvenido +yourPersonalPublicSpace = Tu espacio p�blico personal +hereYouCanHaveYourBlogEtc = aqu� puedes tener tu blog, etc \ No newline at end of file Modified: trunk/src/test/java/cc/kune/core/client/state/StateManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/client/state/StateManagerDefaultTest.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/test/java/cc/kune/core/client/state/StateManagerDefaultTest.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -43,6 +43,10 @@ public class StateManagerDefaultTest { + private static final StateToken EMPTY_TOKEN = null; + private static final StateToken GROUP1_TOOL1 = new StateToken("group1.tool1"); + private static final StateToken GROUP1_TOOL2 = new StateToken("group1.tool2"); + private static final StateToken GROUP2_TOOL1 = new StateToken("group2.tool1"); private static final String HASH = "someUserHash"; private BeforeActionListener beforeChangeListener1; private BeforeActionListener beforeChangeListener2; @@ -134,9 +138,10 @@ new GroupChangedEvent("", "group2")); Mockito.verify(groupChangeHandler, Mockito.times(1)).onGroupChanged( new GroupChangedEvent("group2", "group1")); - Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged(new ToolChangedEvent("", "tool1")); Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged( - new ToolChangedEvent("tool1", "tool2")); + new ToolChangedEvent(EMPTY_TOKEN, GROUP2_TOOL1)); + Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged( + new ToolChangedEvent(GROUP2_TOOL1, GROUP1_TOOL2)); } @Test @@ -156,7 +161,8 @@ new GroupChangedEvent("", "group1")); Mockito.verify(groupChangeHandler, Mockito.times(1)).onGroupChanged( new GroupChangedEvent("group1", "group2")); - Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged(new ToolChangedEvent("", "tool1")); + Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged( + new ToolChangedEvent(null, GROUP1_TOOL1)); } @@ -171,9 +177,10 @@ (ToolChangedEvent) Mockito.anyObject()); Mockito.verify(groupChangeHandler, Mockito.times(1)).onGroupChanged( new GroupChangedEvent("", "group1")); - Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged(new ToolChangedEvent("", "tool1")); Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged( - new ToolChangedEvent("tool1", "tool2")); + new ToolChangedEvent(EMPTY_TOKEN, GROUP1_TOOL1)); + Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged( + new ToolChangedEvent(GROUP1_TOOL1, GROUP1_TOOL2)); } @Test @@ -187,8 +194,10 @@ (ToolChangedEvent) Mockito.anyObject()); Mockito.verify(groupChangeHandler, Mockito.times(1)).onGroupChanged( new GroupChangedEvent("", "group1")); - Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged(new ToolChangedEvent("", "tool1")); - Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged(new ToolChangedEvent("tool1", "")); + Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged( + new ToolChangedEvent(EMPTY_TOKEN, GROUP1_TOOL1)); + Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged( + new ToolChangedEvent(GROUP1_TOOL1, new StateToken("group1"))); } @Test @@ -202,7 +211,8 @@ (ToolChangedEvent) Mockito.anyObject()); Mockito.verify(groupChangeHandler, Mockito.times(1)).onGroupChanged( new GroupChangedEvent("", "group1")); - Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged(new ToolChangedEvent("", "tool1")); + Mockito.verify(toolChangeHandler, Mockito.times(1)).onToolChanged( + new ToolChangedEvent(EMPTY_TOKEN, GROUP1_TOOL1)); } private String confBeforeStateChangeListeners(final boolean value, final boolean value2) { Modified: trunk/src/test/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenterTest.java =================================================================== --- trunk/src/test/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenterTest.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/test/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenterTest.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -25,105 +25,106 @@ import cc.kune.core.client.state.EventBusTester; import cc.kune.core.client.state.StateManager; -import cc.kune.gspace.client.tool.selector.ToolSelectorItem; -import cc.kune.gspace.client.tool.selector.ToolSelectorPresenter; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.gspace.client.tool.selector.ToolSelectorPresenter.ToolSelectorProxy; import cc.kune.gspace.client.tool.selector.ToolSelectorPresenter.ToolSelectorView; public class ToolSelectorPresenterTest { - private static final String GROUP1_NAME = "group1"; - private static final String TOOL1_NAME = "tool1"; - private static final String TOOL2_NAME = "tool2"; - private ToolSelectorPresenter toolSelector; - private ToolSelectorItem toolSelectorItem1; - private ToolSelectorItem toolSelectorItem2; + private static final String GROUP1_NAME = "group1"; + private static final StateToken GROUP1_TOOL1 = new StateToken("group1.tool1"); + private static final StateToken GROUP1_TOOL2 = new StateToken("group1.tool2"); + private static final String TOOL1_NAME = "tool1"; + private static final String TOOL2_NAME = "tool2"; + private ToolSelectorPresenter toolSelector; + private ToolSelectorItem toolSelectorItem1; + private ToolSelectorItem toolSelectorItem2; - @Test - public void addFirstToolMustNotSelect() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - Mockito.verify(toolSelectorItem1).setSelected(false); - } + @Test + public void addFirstToolMustNotSelect() { + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + Mockito.verify(toolSelectorItem1).setSelected(false); + } - @Test(expected = RuntimeException.class) - public void addToolWithoutNameMustGiveException() { - toolSelector.addTool(toolSelectorItem1); - } + @Test(expected = RuntimeException.class) + public void addToolWithoutNameMustGiveException() { + toolSelector.addTool(toolSelectorItem1); + } - @Test - public void addTwoToolsMustSelectNothing() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - toolSelector.addTool(toolSelectorItem2); - Mockito.verify(toolSelectorItem1).setSelected(false); - Mockito.verify(toolSelectorItem2).setSelected(false); - } + @Test + public void addTwoToolsMustSelectNothing() { + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItem2); + Mockito.verify(toolSelectorItem1).setSelected(false); + Mockito.verify(toolSelectorItem2).setSelected(false); + } - @Test(expected = RuntimeException.class) - public void addTwoToolsWithSameNameMustGiveException() { - setToolNames(); - final ToolSelectorItem toolSelectorItemCopy = Mockito.mock(ToolSelectorItem.class); - Mockito.when(toolSelectorItemCopy.getShortName()).thenReturn(TOOL1_NAME); - toolSelector.addTool(toolSelectorItem1); - toolSelector.addTool(toolSelectorItemCopy); - } + @Test(expected = RuntimeException.class) + public void addTwoToolsWithSameNameMustGiveException() { + setToolNames(); + final ToolSelectorItem toolSelectorItemCopy = Mockito.mock(ToolSelectorItem.class); + Mockito.when(toolSelectorItemCopy.getShortName()).thenReturn(TOOL1_NAME); + toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItemCopy); + } - @Before - public void begin() { - final StateManager stateManager = Mockito.mock(StateManager.class); - // final WsThemeManager themePresenter = - // Mockito.mock(WsThemeManager.class); - toolSelector = new ToolSelectorPresenter(new EventBusTester(), Mockito.mock(ToolSelectorView.class), - Mockito.mock(ToolSelectorProxy.class), stateManager); - toolSelectorItem1 = Mockito.mock(ToolSelectorItem.class); - toolSelectorItem2 = Mockito.mock(ToolSelectorItem.class); - } + @Before + public void begin() { + final StateManager stateManager = Mockito.mock(StateManager.class); + // final WsThemeManager themePresenter = + // Mockito.mock(WsThemeManager.class); + toolSelector = new ToolSelectorPresenter(new EventBusTester(), Mockito.mock(ToolSelectorView.class), + Mockito.mock(ToolSelectorProxy.class), stateManager); + toolSelectorItem1 = Mockito.mock(ToolSelectorItem.class); + toolSelectorItem2 = Mockito.mock(ToolSelectorItem.class); + } - @Test - public void setStateFirstMustSelect() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - toolSelector.onToolChanged("", TOOL1_NAME); - Mockito.verify(toolSelectorItem1, Mockito.times(1)).setSelected(false); - Mockito.verify(toolSelectorItem1, Mockito.times(1)).setSelected(true); - } + @Test + public void setStateFirstMustSelect() { + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + toolSelector.onToolChanged("", TOOL1_NAME, null, GROUP1_TOOL1); + Mockito.verify(toolSelectorItem1, Mockito.times(1)).setSelected(false); + Mockito.verify(toolSelectorItem1, Mockito.times(1)).setSelected(true); + } - @Test - public void setStateWithADifferentGroupMustSetLink() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - toolSelector.addTool(toolSelectorItem2); - toolSelector.onGroupChanged(GROUP1_NAME); - Mockito.verify(toolSelectorItem1, Mockito.times(1)).setGroupShortName(GROUP1_NAME); - Mockito.verify(toolSelectorItem2, Mockito.times(1)).setGroupShortName(GROUP1_NAME); - } + @Test + public void setStateWithADifferentGroupMustSetLink() { + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItem2); + toolSelector.onGroupChanged(GROUP1_NAME); + Mockito.verify(toolSelectorItem1, Mockito.times(1)).setGroupShortName(GROUP1_NAME); + Mockito.verify(toolSelectorItem2, Mockito.times(1)).setGroupShortName(GROUP1_NAME); + } - @Test - public void setStateWithADifferentToolNameMustSelectAndUnSelectTheOlder() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - toolSelector.addTool(toolSelectorItem2); - toolSelector.onToolChanged(TOOL1_NAME, TOOL2_NAME); - Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(false); - Mockito.verify(toolSelectorItem1, Mockito.times(2)).setSelected(false); - Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(true); - } + @Test + public void setStateWithADifferentToolNameMustSelectAndUnSelectTheOlder() { + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItem2); + toolSelector.onToolChanged(TOOL1_NAME, TOOL2_NAME, GROUP1_TOOL1, GROUP1_TOOL2); + Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(false); + Mockito.verify(toolSelectorItem1, Mockito.times(2)).setSelected(false); + Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(true); + } - @Test - public void setStateWithNoToolNameMustUnSelectTheOlder() { - setToolNames(); - toolSelector.addTool(toolSelectorItem1); - toolSelector.addTool(toolSelectorItem2); - toolSelector.onToolChanged(TOOL1_NAME, ""); - Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(false); - Mockito.verify(toolSelectorItem1, Mockito.times(2)).setSelected(false); - Mockito.verify(toolSelectorItem2, Mockito.never()).setSelected(true); - } + @Test + public void setStateWithNoToolNameMustUnSelectTheOlder() { + setToolNames(); + toolSelector.addTool(toolSelectorItem1); + toolSelector.addTool(toolSelectorItem2); + toolSelector.onToolChanged(TOOL1_NAME, "", GROUP1_TOOL1, null); + Mockito.verify(toolSelectorItem2, Mockito.times(1)).setSelected(false); + Mockito.verify(toolSelectorItem1, Mockito.times(2)).setSelected(false); + Mockito.verify(toolSelectorItem2, Mockito.never()).setSelected(true); + } - public void setToolNames() { - Mockito.when(toolSelectorItem1.getShortName()).thenReturn(TOOL1_NAME); - Mockito.when(toolSelectorItem2.getShortName()).thenReturn(TOOL2_NAME); - } + public void setToolNames() { + Mockito.when(toolSelectorItem1.getShortName()).thenReturn(TOOL1_NAME); + Mockito.when(toolSelectorItem2.getShortName()).thenReturn(TOOL2_NAME); + } } Modified: trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/test/java/cc/kune/selenium/KuneSeleniumDefaults.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -26,7 +26,8 @@ import org.apache.commons.logging.LogFactory; import org.openqa.selenium.Alert; import org.openqa.selenium.By; -import org.openqa.selenium.JavascriptExecutor; +import org.openqa.selenium.Dimension; +import org.openqa.selenium.Point; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; import org.openqa.selenium.support.PageFactory; @@ -47,7 +48,7 @@ import cc.kune.selenium.login.RegisterPageObject; import cc.kune.selenium.spaces.GroupSpacePageObject; import cc.kune.selenium.spaces.HomeSpacePageObject; -import cc.kune.selenium.spaces.SpacesPageObject; +import cc.kune.selenium.spaces.SitePageObject; import cc.kune.selenium.spaces.UserSpacePageObject; import com.google.inject.Guice; @@ -68,7 +69,7 @@ protected LoginPageObject login; private final ResourceBundle messages; protected RegisterPageObject register; - protected final SpacesPageObject spaces; + protected final SitePageObject site; protected UserSpacePageObject userSpace; private final WebDriver webdriver; @@ -95,7 +96,7 @@ login = injector.getInstance(LoginPageObject.class); register = injector.getInstance(RegisterPageObject.class); entityHeader = injector.getInstance(EntityHeaderPageObject.class); - spaces = injector.getInstance(SpacesPageObject.class); + site = injector.getInstance(SitePageObject.class); chat = injector.getInstance(ChatPageObject.class); homeSpace = injector.getInstance(HomeSpacePageObject.class); userSpace = injector.getInstance(UserSpacePageObject.class); @@ -105,7 +106,7 @@ PageFactory.initElements(locator, login); PageFactory.initElements(locator, register); PageFactory.initElements(locator, entityHeader); - PageFactory.initElements(locator, spaces); + PageFactory.initElements(locator, site); PageFactory.initElements(locator, chat); PageFactory.initElements(locator, homeSpace); PageFactory.initElements(locator, userSpace); @@ -124,8 +125,8 @@ @BeforeSuite public void beforeSuite() { + resize(); home(); - resize(); SeleniumUtils.initCursor(webdriver); SeleniumUtils.showCursor(webdriver); SeleniumUtils.showCursor(webdriver, login.getAnonMsg()); @@ -202,8 +203,11 @@ // 1024,769 // 840,770 // 806,707 - final JavascriptExecutor js = (JavascriptExecutor) webdriver; - js.executeScript("window.resizeTo(806,707); window.moveTo(0,0);"); + webdriver.manage().window().setPosition(new Point(0, 0)); + webdriver.manage().window().setSize(new Dimension(806, 707)); + // Before we were using: + // final JavascriptExecutor js = (JavascriptExecutor) webdriver; + // js.executeScript("window.resizeTo(806,707); window.moveTo(0,0);"); } public void showCursor(final int x, final int y) { Modified: trunk/src/test/java/cc/kune/selenium/SeleniumModule.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumModule.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/test/java/cc/kune/selenium/SeleniumModule.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -38,7 +38,7 @@ import cc.kune.selenium.general.EntityHeaderPageObject; import cc.kune.selenium.login.LoginPageObject; import cc.kune.selenium.login.RegisterPageObject; -import cc.kune.selenium.spaces.SpacesPageObject; +import cc.kune.selenium.spaces.SitePageObject; import com.google.inject.Singleton; @@ -69,7 +69,7 @@ bind(RegisterPageObject.class).in(Singleton.class); bind(EntityHeaderPageObject.class).in(Singleton.class); bind(ChatPageObject.class).in(Singleton.class); - bind(SpacesPageObject.class).in(Singleton.class); + bind(SitePageObject.class).in(Singleton.class); final ResourceBundle english = ResourceBundle.getBundle("TestConstants", Locale.ENGLISH); final ResourceBundle spanish = ResourceBundle.getBundle("TestConstants", new Locale("es")); Modified: trunk/src/test/java/cc/kune/selenium/login/RegisterSeleniumTests.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/login/RegisterSeleniumTests.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/test/java/cc/kune/selenium/login/RegisterSeleniumTests.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -86,9 +86,14 @@ // group space showTitleSlide(t("Your personal public space"), t("here you can have your blog, etc")); - spaces.groupBtn().click(); + site.groupBtn().click(); groupSpace.addBuddieBtn().click(); - groupSpace.searchEntitiesTextBox().sendKeys("admin\n"); + groupSpace.addNewBuddieTextBox.click(); + groupSpace.addNewBuddieTextBox.sendKeys("admin"); + groupSpace.addNewBuddieTextBox.sendKeys(Keys.ARROW_DOWN); + sleep(500); + groupSpace.firstFromSuggestionBox.click(); + site.confirmationOk.click(); groupSpace.searchEntitiesOk().click(); groupSpace.firstAvatarOfGroup().click(); sleep(2000); @@ -112,7 +117,7 @@ chat.getSend(jids).click(); showMsg(t("And you can chat event while going back/forward with your browser")); - spaces.homeBtn().click(); + site.homeBtn().click(); sleep(2000); chat.getTalkBox(jids).sendKeys(t("la la la")); chat.getSend(jids).click(); @@ -135,5 +140,4 @@ showTitleSlide(t("Thank you"), t("and yes, feedback welcome")); } - } Modified: trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -23,6 +23,8 @@ import org.openqa.selenium.support.FindBy; import cc.kune.core.client.sitebar.search.EntitySearchPanel; +import cc.kune.core.client.sn.actions.AddEntityToThisGroupAction; +import cc.kune.core.client.sn.actions.AddNewBuddiesAction; import cc.kune.core.client.sn.actions.registry.UserSNConfActions; import cc.kune.selenium.PageObject; import cc.kune.selenium.SeleniumConstants; @@ -31,6 +33,10 @@ @FindBy(id = SeleniumConstants.GWTDEV + UserSNConfActions.ADD_BUDDIE_BTN) private WebElement addBuddieBtn; + @FindBy(id = SeleniumConstants.GWTDEV + AddNewBuddiesAction.ADD_NEW_BUDDIES_TEXTBOX) + public WebElement addNewBuddieTextBox; + @FindBy(id = SeleniumConstants.GWTDEV + AddEntityToThisGroupAction.ADD_NEW_MEMBER_TEXTBOX) + public WebElement addNewMemberTextBox; @FindBy(xpath = "//div[2]/div/div[3]/div/span") private WebElement blogTool; @FindBy(xpath = "//div[2]/div/div[4]/div/span") @@ -41,12 +47,12 @@ private WebElement eventTool; @FindBy(xpath = "//td/img") private WebElement firstAvatarOfGroup; + @FindBy(xpath = "//td[2]/div/div/table/tbody/tr/td") + public WebElement firstFromSuggestionBox; @FindBy(xpath = "//div[2]/div/div[5]/div/span") private WebElement listTool; @FindBy(id = SeleniumConstants.GWTDEV + EntitySearchPanel.OK_ID) private WebElement searchEntitiesOk; - @FindBy(id = SeleniumConstants.GWTDEV + EntitySearchPanel.ENTITY_SEARCH_TEXTBOX) - private WebElement searchEntitiesTextBox; @FindBy(xpath = "//div[3]/div/button") private WebElement socialNetOptions; @FindBy(xpath = "//div[2]/div/div[7]/div/span") @@ -86,10 +92,6 @@ return searchEntitiesOk; } - public WebElement searchEntitiesTextBox() { - return searchEntitiesTextBox; - } - public WebElement socialNetOptions() { return socialNetOptions; } Copied: trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java (from rev 1611, trunk/src/test/java/cc/kune/selenium/spaces/SpacesPageObject.java) =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java (rev 0) +++ trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -0,0 +1,75 @@ +/* + * + * 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.selenium.spaces; + +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +import cc.kune.core.client.notify.confirm.UserConfirmPanel; +import cc.kune.core.client.sitebar.search.SitebarSearchPanel; +import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; +import cc.kune.selenium.PageObject; +import cc.kune.selenium.SeleniumConstants; + +public class SitePageObject extends PageObject { + + @FindBy(id = SeleniumConstants.GWTDEV + UserConfirmPanel.CANCEL_ID) + public WebElement confirmationCancel; + @FindBy(id = SeleniumConstants.GWTDEV + UserConfirmPanel.OK_ID) + public WebElement confirmationOk; + @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.GROUP_SPACE_ID) + protected WebElement groupSpaceBtn; + @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.HOME_SPACE_ID) + protected WebElement homeSpaceBtn; + @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.PUBLIC_SPACE_ID) + protected WebElement publicSpaceBtn; + @FindBy(id = SeleniumConstants.GWTDEV + SitebarSearchPanel.SITE_SEARCH_TEXTBOX) + public WebElement searchTextBox; + @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.USER_SPACE_ID) + protected WebElement userSpaceBtn; + + public SitePageObject() { + } + + public WebElement getConfirmationCancel() { + return confirmationCancel; + } + + public WebElement getConfirmationOk() { + return confirmationOk; + } + + public WebElement groupBtn() { + return groupSpaceBtn; + } + + public WebElement homeBtn() { + return homeSpaceBtn; + } + + public WebElement publicBtn() { + return publicSpaceBtn; + } + + public WebElement userBtn() { + return userSpaceBtn; + } + +} Deleted: trunk/src/test/java/cc/kune/selenium/spaces/SpacesPageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/SpacesPageObject.java 2011-11-17 14:28:14 UTC (rev 1614) +++ trunk/src/test/java/cc/kune/selenium/spaces/SpacesPageObject.java 2011-11-19 13:15:24 UTC (rev 1615) @@ -1,59 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.selenium.spaces; - -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.FindBy; - -import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; -import cc.kune.selenium.PageObject; -import cc.kune.selenium.SeleniumConstants; - -public class SpacesPageObject extends PageObject { - - @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.GROUP_SPACE_ID) - protected WebElement groupSpaceBtn; - @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.HOME_SPACE_ID) - protected WebElement homeSpaceBtn; - @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.PUBLIC_SPACE_ID) - protected WebElement publicSpaceBtn; - @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.USER_SPACE_ID) - protected WebElement userSpaceBtn; - - public SpacesPageObject() { - } - - public WebElement groupBtn() { - return groupSpaceBtn; - } - - public WebElement homeBtn() { - return homeSpaceBtn; - } - - public WebElement publicBtn() { - return publicSpaceBtn; - } - - public WebElement userBtn() { - return userSpaceBtn; - } - -}

1 0

r1614 - trunk/src/main/resources
by Vicente J. Ruiz Jurado 17 Nov '11

17 Nov '11

Author: vjrj_ Date: 2011-11-17 15:28:14 +0100 (Thu, 17 Nov 2011) New Revision: 1614 Modified: trunk/src/main/resources/kune.properties Log: unix file format in properties Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-11-17 14:25:43 UTC (rev 1613) +++ trunk/src/main/resources/kune.properties 2011-11-17 14:28:14 UTC (rev 1614) @@ -1,147 +1,147 @@ -### kune.properties - -### general site config - -kune.siteurl = http://localhost:8080 - -kune.sitelogourl = ws/images/kune-logo-onover-16px.png -kune.sitelogourl.onover = ws/images/kune-logo-16px.png - -# Every kune site have a group with this name: -# This group will be created in the first execution of kune. -# NOTE: if you change this value later, the group must exist because if not kune will try to initialize the database at start. Also, if you rename the name of this group from the preferences of the user interface, you will have to change the values here accordinly. - -kune.default.site.name = Site Administration -kune.default.site.shortName = site -kune.site.domain = localhost - -# In the server side 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" -# ws.html has a similar value for UI client -kune.default.site.commonname = this site - -# Email -kune.site.smtp.host = localhost -kune.site.smtp.defaultfrom = noreply@localhost -# If we should avoid the use of smtp (use only for avoid emails during development) -kune.site.smtp.skip = true - -### licenses - -kune.default.license = by-sa-v3.0 -# Current CC version, see license table and shortname field (for instance by-sa-v3.0) -kune.currentccversion = v3.0 - -### Superuser of a kune installation (is member of site group) - -kune.admin.name = Site Administrator -kune.admin.shortName = admin -kune.admin.email = admin(a)localhost.localdomain -kune.admin.password = easyeasy - -kune.chat.httpbase = /http-bind/ -kune.chat.domain = localhost -kune.chat.roomHost = rooms.localhost - -### Feedback system -kune.feedback.enabled = true -# List of participants to give feedback, comma-separated -kune.feedback.to = admin - -# Translation -# Currently, we only manage the translations of the proper kune sofware from our demo, so in other kune sites we disable the translator -kune.ui-translator.enabled = true - -### Other params - -# Reserved words to avoid it's use in the client side for user and group names (see client tokens used in SiteTokens) -kune.server.names.reservedwords = root,adm,kune,fuck,about,home,newgroup,preview,register,signin,translate,inbox,sub,admin,www,ftp,pop,pop3,smtp,mail,wave - -# If defined create a copy of this wave as welcome to new users -# kune.site.welcomewave = w+rtackLTkDCA -kune.site.welcomewave = - -# which tools are available in this site by users -kune.tools.userSiteAvailableTools = docs,blogs,wiki,tasks,barters -# From these which tools are enabled for users after registration -# Possible values: -# kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks,barters -kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks -# WARNING: be sure that all tools in userRegisEnabledTools are included in userSiteAvailableTools - -# which tools are available in this site by groups -kune.tools.groupSiteAvailableTools = docs,blogs,wiki,tasks,events,lists,chats -# From these which tools are enabled for groups after registration -# Possible values (don't enable chats on initialization/install, do later) -# kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,chats -kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,lists -# WARNING: be sure that all tools in groupRegisEnabledTools are included in groupSiteAvailableTools - -kune.client.useContentCache = false - -### Workspace enabled themes - -# This names are also the name of the items in the theme menu and there are translated -kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink,highcontrast,whiteblack,blackwhite,transparent,eurosur -kune.wsthemes.default = default -kune.wsthemes.blackwhite.backgrounds = #000, #000, #808080, #000, #000, #e3dbdb, #FFF, #000 -kune.wsthemes.blackwhite.colors = #FFF, #FFF, #000, #FFF, #FFF, #000, #000, #FFF -kune.wsthemes.blue.backgrounds = #8cbaff, #87aade, #5280c5, #528ce2, #c5dcff, #528ce2, #FFF, #c9d8f0 -kune.wsthemes.blue.colors = #FFF, #FFF, #FFF, #FFF, #0044aa, #FFF, #0044aa, #0044aa -kune.wsthemes.camp.backgrounds = #e7cc5f, #a49e87, #3c3c3c, #dcbc3a, #f6f1de, #4f472b, #FFF, #fff8dc -kune.wsthemes.camp.colors = #151515, #151515, #fecc00, #151515, #000000, #f3c401, #151515, #151515 -kune.wsthemes.default.backgrounds = #deaa87, #d99e76, #ce7f4b, #d99e76, #f6e7dd, #d99e76, #FFF, #f8eee7 -kune.wsthemes.default.colors = #FFF,#FFF,#FFF,#FFF,#552200,#FFF,#a05a2c,#a05a2c -kune.wsthemes.eurosur.backgrounds = #b8d0e1, #dfe9f1, #181870, #e0eaf2, #dfe9f1,#b8d0e1, #FFF, #dfe9f1 -kune.wsthemes.eurosur.colors = #181870,#181870,#FFF,#181870,#181870,#181870,#181870,#181870 -kune.wsthemes.green.backgrounds = #abde88, #bfe7a6, #5a8141, #749b5a, #d5efc3, #749b5a, #FFF, #eaf7e1 -kune.wsthemes.green.colors = #225500, #225500, #FFF, #FFF, #17280b, #FFF, #225500, #225500 -kune.wsthemes.grey.backgrounds = #cfcfcf, #b7b7b7, #565656, #868686, #ededed, #6e6e6e, #FFF, #e7e7e7 -kune.wsthemes.grey.colors = #4d4d4d, #4d4d4d, #FFF, #FFF, #000, #FFF, #4d4d4d, #4d4d4d -kune.wsthemes.highcontrast.backgrounds = #0c1f3d, #162d50, #000000, #0c2855, #162d50, #000000, #FFF, #162d50 -kune.wsthemes.highcontrast.colors = #FFF, #FFF, #FFF, #FFF, #FFF, #FFF, #000, #FFF -kune.wsthemes.pink.backgrounds = #e49db9, #edbdd0, #b15278, #e777a4, #ffddf8, #d25b8b, #FFF, #f6dee8 -kune.wsthemes.pink.colors = #FFF, #FFF, #FFF, #FFF, #2b0022, #FFF, #800066, #800066 -kune.wsthemes.purple.backgrounds = #ddaee9, #f4c6ff, #9753aa, #db79f4, #f4e4f8, #b852d2, #FFF, #f9e3ff -kune.wsthemes.purple.colors = #FFF, #FFF, #FFF, #FFF, #6d0c87, #FFF, #6d0c87, #6d0c87 -kune.wsthemes.red.backgrounds = #ec3a3a, #d35f5f, #9f0000, #c52b2b, #ffe0e0, #ec3a3a, #FFF, #f7e1e1 -kune.wsthemes.red.colors = #FFF, #FFF, #FFF, #FFF, #a02c2c, #FFF, #a02c2c, #a02c2c -kune.wsthemes.redblack.backgrounds = #a14242, #b96363, #424242, #a14242, #ffe0e0, #a14242, #FFF, #f7e1e1 -kune.wsthemes.redblack.colors = #FFF, #FFF, #FFF, #FFF, #800000, #FFF, #800000, #800000 -kune.wsthemes.sahara.backgrounds = #e8bc9e, #eac9b3, #d59367, #eac9b3, #f7ece4, #e0ae8d, #FFF, #f7ece4 -kune.wsthemes.sahara.colors = #502d16, #502d16, #552200, #502d16, #502d16, #784421, #d45500, #d45500 -kune.wsthemes.transparent.backgrounds = transparent, transparent, #e3dbdb, transparent, transparent, #e3dbdb, transparent, transparent -kune.wsthemes.transparent.colors = #000, #000, #000, #000, #000, #000, #000, #000 -kune.wsthemes.whiteblack.backgrounds = #FFF, #FFF, #e3dbdb, #FFF, #FFF, #e3dbdb, #FFF, #FFF -kune.wsthemes.whiteblack.colors = #000, #000, #000, #000, #000, #000, #000, #000 - -### Uploads - -kune.upload.location = /var/lib/kune/uploads/ -kune.upload.maxfilesizeinmegas = 10 -kune.upload.maxfilesizeinks = 10000000 -# to test in development phase, you can use values as 50 -kune.upload.delayfortest = 0 - -### Gallery options -kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav - -# Images are resized to thumbsize pixels and later cropped (centered) to cropsize -# (integer values) -kune.images.resizewidth = 400 -kune.images.thumbsize = 100 -kune.images.cropsize = 85 -kune.images.iconsize = 16 - -### Media options - -# The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_URL### tag) -kune.media.flvembededobject = <object width="400" height="300" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> -kune.media.mp3embededobject = <object width="350" height="24" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"audio":{"url":"http://flowplayer.org/swf/flowplayer.audio.swf"},"controls":{"time":true,"volume":true,"fullscreen":false}}}' /> <param name="wmode" value="opaque"> </object> -kune.media.oggembededobject = <applet code="com.fluendo.player.Cortado.class" archive="/kune/others/cortado.jar" width="352" height="288"> <param name="url" value="###DOC_URL###"/> <param name="local" value="false"/> <param name="showStatus" value="show"/> <param name="keepAspect" value="true"/> <param name="autoPlay" value="false"/> <param name="video" value="true"/> <param name="audio" value="true"/> <param name="bufferSize" value="200"/> </applet> -kune.media.aviembededobject = <object data="###DOC_URL###" type="video/msvideo" /> - -### More info about properties -# http://en.wikipedia.org/wiki/.properties -# http://java.sun.com/javase/6/docs/api/java/util/Properties.html#load(java.i… +### kune.properties + +### general site config + +kune.siteurl = http://localhost:8080 + +kune.sitelogourl = ws/images/kune-logo-onover-16px.png +kune.sitelogourl.onover = ws/images/kune-logo-16px.png + +# Every kune site have a group with this name: +# This group will be created in the first execution of kune. +# NOTE: if you change this value later, the group must exist because if not kune will try to initialize the database at start. Also, if you rename the name of this group from the preferences of the user interface, you will have to change the values here accordinly. + +kune.default.site.name = Site Administration +kune.default.site.shortName = site +kune.site.domain = localhost + +# In the server side 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" +# ws.html has a similar value for UI client +kune.default.site.commonname = this site + +# Email +kune.site.smtp.host = localhost +kune.site.smtp.defaultfrom = noreply@localhost +# If we should avoid the use of smtp (use only for avoid emails during development) +kune.site.smtp.skip = true + +### licenses + +kune.default.license = by-sa-v3.0 +# Current CC version, see license table and shortname field (for instance by-sa-v3.0) +kune.currentccversion = v3.0 + +### Superuser of a kune installation (is member of site group) + +kune.admin.name = Site Administrator +kune.admin.shortName = admin +kune.admin.email = admin(a)localhost.localdomain +kune.admin.password = easyeasy + +kune.chat.httpbase = /http-bind/ +kune.chat.domain = localhost +kune.chat.roomHost = rooms.localhost + +### Feedback system +kune.feedback.enabled = true +# List of participants to give feedback, comma-separated +kune.feedback.to = admin + +# Translation +# Currently, we only manage the translations of the proper kune sofware from our demo, so in other kune sites we disable the translator +kune.ui-translator.enabled = true + +### Other params + +# Reserved words to avoid it's use in the client side for user and group names (see client tokens used in SiteTokens) +kune.server.names.reservedwords = root,adm,kune,fuck,about,home,newgroup,preview,register,signin,translate,inbox,sub,admin,www,ftp,pop,pop3,smtp,mail,wave + +# If defined create a copy of this wave as welcome to new users +# kune.site.welcomewave = w+rtackLTkDCA +kune.site.welcomewave = + +# which tools are available in this site by users +kune.tools.userSiteAvailableTools = docs,blogs,wiki,tasks,barters +# From these which tools are enabled for users after registration +# Possible values: +# kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks,barters +kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks +# WARNING: be sure that all tools in userRegisEnabledTools are included in userSiteAvailableTools + +# which tools are available in this site by groups +kune.tools.groupSiteAvailableTools = docs,blogs,wiki,tasks,events,lists,chats +# From these which tools are enabled for groups after registration +# Possible values (don't enable chats on initialization/install, do later) +# kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,chats +kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,lists +# WARNING: be sure that all tools in groupRegisEnabledTools are included in groupSiteAvailableTools + +kune.client.useContentCache = false + +### Workspace enabled themes + +# This names are also the name of the items in the theme menu and there are translated +kune.wsthemes = default,green,purple,grey,red,sahara,blue,redblack,camp,pink,highcontrast,whiteblack,blackwhite,transparent,eurosur +kune.wsthemes.default = default +kune.wsthemes.blackwhite.backgrounds = #000, #000, #808080, #000, #000, #e3dbdb, #FFF, #000 +kune.wsthemes.blackwhite.colors = #FFF, #FFF, #000, #FFF, #FFF, #000, #000, #FFF +kune.wsthemes.blue.backgrounds = #8cbaff, #87aade, #5280c5, #528ce2, #c5dcff, #528ce2, #FFF, #c9d8f0 +kune.wsthemes.blue.colors = #FFF, #FFF, #FFF, #FFF, #0044aa, #FFF, #0044aa, #0044aa +kune.wsthemes.camp.backgrounds = #e7cc5f, #a49e87, #3c3c3c, #dcbc3a, #f6f1de, #4f472b, #FFF, #fff8dc +kune.wsthemes.camp.colors = #151515, #151515, #fecc00, #151515, #000000, #f3c401, #151515, #151515 +kune.wsthemes.default.backgrounds = #deaa87, #d99e76, #ce7f4b, #d99e76, #f6e7dd, #d99e76, #FFF, #f8eee7 +kune.wsthemes.default.colors = #FFF,#FFF,#FFF,#FFF,#552200,#FFF,#a05a2c,#a05a2c +kune.wsthemes.eurosur.backgrounds = #b8d0e1, #dfe9f1, #181870, #e0eaf2, #dfe9f1,#b8d0e1, #FFF, #dfe9f1 +kune.wsthemes.eurosur.colors = #181870,#181870,#FFF,#181870,#181870,#181870,#181870,#181870 +kune.wsthemes.green.backgrounds = #abde88, #bfe7a6, #5a8141, #749b5a, #d5efc3, #749b5a, #FFF, #eaf7e1 +kune.wsthemes.green.colors = #225500, #225500, #FFF, #FFF, #17280b, #FFF, #225500, #225500 +kune.wsthemes.grey.backgrounds = #cfcfcf, #b7b7b7, #565656, #868686, #ededed, #6e6e6e, #FFF, #e7e7e7 +kune.wsthemes.grey.colors = #4d4d4d, #4d4d4d, #FFF, #FFF, #000, #FFF, #4d4d4d, #4d4d4d +kune.wsthemes.highcontrast.backgrounds = #0c1f3d, #162d50, #000000, #0c2855, #162d50, #000000, #FFF, #162d50 +kune.wsthemes.highcontrast.colors = #FFF, #FFF, #FFF, #FFF, #FFF, #FFF, #000, #FFF +kune.wsthemes.pink.backgrounds = #e49db9, #edbdd0, #b15278, #e777a4, #ffddf8, #d25b8b, #FFF, #f6dee8 +kune.wsthemes.pink.colors = #FFF, #FFF, #FFF, #FFF, #2b0022, #FFF, #800066, #800066 +kune.wsthemes.purple.backgrounds = #ddaee9, #f4c6ff, #9753aa, #db79f4, #f4e4f8, #b852d2, #FFF, #f9e3ff +kune.wsthemes.purple.colors = #FFF, #FFF, #FFF, #FFF, #6d0c87, #FFF, #6d0c87, #6d0c87 +kune.wsthemes.red.backgrounds = #ec3a3a, #d35f5f, #9f0000, #c52b2b, #ffe0e0, #ec3a3a, #FFF, #f7e1e1 +kune.wsthemes.red.colors = #FFF, #FFF, #FFF, #FFF, #a02c2c, #FFF, #a02c2c, #a02c2c +kune.wsthemes.redblack.backgrounds = #a14242, #b96363, #424242, #a14242, #ffe0e0, #a14242, #FFF, #f7e1e1 +kune.wsthemes.redblack.colors = #FFF, #FFF, #FFF, #FFF, #800000, #FFF, #800000, #800000 +kune.wsthemes.sahara.backgrounds = #e8bc9e, #eac9b3, #d59367, #eac9b3, #f7ece4, #e0ae8d, #FFF, #f7ece4 +kune.wsthemes.sahara.colors = #502d16, #502d16, #552200, #502d16, #502d16, #784421, #d45500, #d45500 +kune.wsthemes.transparent.backgrounds = transparent, transparent, #e3dbdb, transparent, transparent, #e3dbdb, transparent, transparent +kune.wsthemes.transparent.colors = #000, #000, #000, #000, #000, #000, #000, #000 +kune.wsthemes.whiteblack.backgrounds = #FFF, #FFF, #e3dbdb, #FFF, #FFF, #e3dbdb, #FFF, #FFF +kune.wsthemes.whiteblack.colors = #000, #000, #000, #000, #000, #000, #000, #000 + +### Uploads + +kune.upload.location = /var/lib/kune/uploads/ +kune.upload.maxfilesizeinmegas = 10 +kune.upload.maxfilesizeinks = 10000000 +# to test in development phase, you can use values as 50 +kune.upload.delayfortest = 0 + +### Gallery options +kune.upload.gallerypermittedextensions = jpg,jpeg,png,gif,bmp,svg,avi,mpg,mpeg,ogg,mov,tif,tiff,mp3,wav + +# Images are resized to thumbsize pixels and later cropped (centered) to cropsize +# (integer values) +kune.images.resizewidth = 400 +kune.images.thumbsize = 100 +kune.images.cropsize = 85 +kune.images.iconsize = 16 + +### Media options + +# The code used to play local embeded videos/audios. Change this with other player/code (include a ###DOC_URL### tag) +kune.media.flvembededobject = <object width="400" height="300" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"controls":{"time":true,"volume":false,"fullscreen":true}}}' /> <param name="wmode" value="opaque"> </object> +kune.media.mp3embededobject = <object width="350" height="24" data="http://flowplayer.org/swf/flowplayer-3.1.0.swf" type="application/x-shockwave-flash"> <param name="movie" value="http://flowplayer.org/swf/flowplayer-3.1.0.swf" /> <param name="allowfullscreen" value="true" /> <param name="allowscriptaccess" value="always" /> <param name="flashvars" value='config={"clip":{"url":"###DOC_URL###", "autoPlay": false, "autoBuffering": false },"canvas":{"backgroundColor":"#CC6633"},"plugins":{"audio":{"url":"http://flowplayer.org/swf/flowplayer.audio.swf"},"controls":{"time":true,"volume":true,"fullscreen":false}}}' /> <param name="wmode" value="opaque"> </object> +kune.media.oggembededobject = <applet code="com.fluendo.player.Cortado.class" archive="/kune/others/cortado.jar" width="352" height="288"> <param name="url" value="###DOC_URL###"/> <param name="local" value="false"/> <param name="showStatus" value="show"/> <param name="keepAspect" value="true"/> <param name="autoPlay" value="false"/> <param name="video" value="true"/> <param name="audio" value="true"/> <param name="bufferSize" value="200"/> </applet> +kune.media.aviembededobject = <object data="###DOC_URL###" type="video/msvideo" /> + +### More info about properties +# http://en.wikipedia.org/wiki/.properties +# http://java.sun.com/javase/6/docs/api/java/util/Properties.html#load(java.i…

1 0

r1613 - in trunk: img src/main/java/cc/kune/client src/main/java/cc/kune/core/client src/main/java/cc/kune/core/client/sitebar src/main/java/cc/kune/core/client/sitebar/logo src/main/java/cc/kune/core/public/images src/main/java/cc/kune/core/server src/main/java/cc/kune/core/server/properties src/main/java/cc/kune/core/server/rpc src/main/java/cc/kune/core/shared/dto src/main/java/cc/kune/wave/client src/main/resources
by Vicente J. Ruiz Jurado 17 Nov '11

17 Nov '11

Author: vjrj_ Date: 2011-11-17 15:25:43 +0100 (Thu, 17 Nov 2011) New Revision: 1613 Added: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogo.java trunk/src/main/java/cc/kune/core/public/images/kune-logo-onover-16px.png Removed: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoUiHandlers.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.ui.xml Modified: trunk/img/kune-logos.svg trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/server/InitData.java trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java trunk/src/main/resources/kune.properties Log: CLOSED - # 161: Reduce Sitebar Logo http://kune.ourproject.org/issues/ticket/161 CLOSED - # 159: When Drag&Drop or Renaming, clear Content Cache http://kune.ourproject.org/issues/ticket/159 Modified: trunk/img/kune-logos.svg =================================================================== --- trunk/img/kune-logos.svg 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/img/kune-logos.svg 2011-11-17 14:25:43 UTC (rev 1613) @@ -44,7 +44,7 @@ xlink:href="#linearGradient2871" id="linearGradient3948" gradientUnits="userSpaceOnUse" - gradientTransform="translate(-40.30246,-342.5709)" + gradientTransform="translate(397.49281,-378.79137)" x1="368.6329" y1="835.74664" x2="368.6329" @@ -74,7 +74,7 @@ xlink:href="#linearGradient2871" id="linearGradient3463" gradientUnits="userSpaceOnUse" - gradientTransform="matrix(0.997905,0,0,0.997905,-416.0995,-39.78506)" + gradientTransform="matrix(0.997905,0,0,0.997905,31.931984,-168.91892)" x1="719.26416" y1="813.12897" x2="719.26416" @@ -87,15 +87,15 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1" - inkscape:cx="875.92904" - inkscape:cy="-80.17421" + inkscape:zoom="1.27" + inkscape:cx="372.04724" + inkscape:cy="526.18109" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1078" - inkscape:window-height="729" + inkscape:window-height="1867" inkscape:window-x="0" - inkscape:window-y="25" + inkscape:window-y="24" showguides="true" inkscape:guide-bbox="true" inkscape:guide-points="true" @@ -118,7 +118,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> @@ -127,62 +127,67 @@ inkscape:groupmode="layer" id="layer1"> <rect - style="opacity:0.8;color:#000000;fill:#800000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.90017545;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + style="opacity:0.8;color:#000000;fill:#800000;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.90017545;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="rect2349" width="159.36984" height="37.225075" - x="522.6051" - y="369.80557" /> + x="514.73108" + y="299.72684" /> <text xml:space="preserve" - style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" - x="194.65031" - y="257.54782" + style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + x="580.47711" + y="-60.562412" id="text5978" sodipodi:linespacing="100%"><tspan sodipodi:role="line" id="tspan5980" - x="194.65031" - y="257.54782">kune</tspan></text> + x="580.47711" + y="-60.562412">kune</tspan></text> <text xml:space="preserve" - style="font-size:19.77380943px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" - x="194.29167" - y="279.47168" + style="font-size:19.77380943px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" + x="580.11847" + y="-38.638554" id="text5982" sodipodi:linespacing="100%"><tspan sodipodi:role="line" id="tspan5984" - x="194.29167" - y="279.47168">libre/free projects</tspan></text> + x="580.11847" + y="-38.638554">libre/free projects</tspan></text> <g id="g5986" - transform="matrix(0.3688,0,0,0.3688,117.3684,-91.15957)"> + transform="matrix(0.3688,0,0,0.3688,503.19517,-409.2698)"> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 60.321717,411.99998 L 437.33633,411.99998" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" id="path5988" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.61203,788.60332 L 252.61203,411.59154" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" id="path5990" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.86937,597.15755 L 629.88177,597.15755" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" id="path5992" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 437.45588,596.97447 L 437.45588,219.95956" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" id="path5994" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 372.87905,411.27704 L 437.81346,411.27704" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" id="path5996" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> </g> <path style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" @@ -256,78 +261,88 @@ transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> </g> <path - style="color:black;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 114.97879,474.62134 L 114.97879,475.99161 L 594.10379,475.99161 L 594.10379,474.62134 L 114.97879,474.62134 z " - id="path2924" /> + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + d="m 552.77406,438.40087 0,1.37027 479.12504,0 0,-1.37027 -479.12504,0 z" + id="path2924" + inkscape:connector-curvature="0" /> <path - style="opacity:0.33000004;color:black;fill:url(#linearGradient3948);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 114.97879,475.99161 L 114.97879,500.89786 C 121.83635,501.04069 129.19856,501.25538 136.88504,501.61661 C 164.1692,502.89887 167.39227,518.96747 194.07254,526.58536 C 222.40603,534.67531 228.20957,530.6705 249.35356,528.14844 C 287.25457,523.6276 343.69837,490.87496 387.97879,514.27286 C 412.46746,527.21275 437.88253,529.1942 469.44754,520.71036 C 502.92488,511.71256 525.18524,505.9131 563.47879,501.42911 L 594.10379,500.80411 L 594.10379,475.99161 L 114.97879,475.99161 z " + style="opacity:0.33000004;color:#000000;fill:url(#linearGradient3948);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + d="m 552.77406,439.77114 0,24.90625 c 6.85756,0.14283 14.21977,0.35752 21.90625,0.71875 27.28416,1.28226 30.50723,17.35086 57.1875,24.96875 28.33349,8.08995 34.13703,4.08514 55.28102,1.56308 37.90101,-4.52084 94.3448,-37.27348 138.62522,-13.87558 24.48867,12.93989 49.90374,14.92134 81.46875,6.4375 33.47734,-8.9978 55.7377,-14.79726 94.0313,-19.28125 l 30.625,-0.625 0,-24.8125 -479.12504,0 z" id="path1971" - sodipodi:nodetypes="ccssssscccc" /> + sodipodi:nodetypes="ccssssscccc" + inkscape:connector-curvature="0" /> <text xml:space="preserve" - style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" - x="188.50735" - y="507.32114" + style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + x="626.30261" + y="471.10065" id="text2887" sodipodi:linespacing="100%"><tspan sodipodi:role="line" id="tspan2889" - x="188.50735" - y="507.32114">kune</tspan></text> + x="626.30261" + y="471.10065">kune</tspan></text> <text xml:space="preserve" - style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" - x="237.69305" - y="533.18787" + style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" + x="675.48834" + y="496.96741" id="text2891" sodipodi:linespacing="100%"><tspan sodipodi:role="line" id="tspan2893" - x="237.69305" - y="533.18787">wiki</tspan></text> + x="675.48834" + y="496.96741">wiki</tspan></text> <g id="g2895" - transform="matrix(0.3688,0,0,0.3688,111.2255,158.6138)"> + transform="matrix(0.3688,0,0,0.3688,549.02077,122.39333)"> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 60.321717,411.99998 L 437.33633,411.99998" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" id="path2897" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.61203,788.60332 L 252.61203,411.59154" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" id="path2899" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.86937,597.15755 L 629.88177,597.15755" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" id="path2901" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 437.45588,596.97447 L 437.45588,219.95956" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" id="path2903" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 372.87905,411.27704 L 437.81346,411.27704" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" id="path2905" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> </g> <g id="g4030" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-logo-wiki.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-ydpi="90" + transform="translate(466.14172,-123.62205)"> <path id="path2952" - d="M 105.53125 652.625 L 105.53125 654 L 582.9375 654 L 582.96875 654 L 1058.375 654 L 1060.375 654 L 1535.7812 654 L 1535.8125 654 L 2013.2188 654 L 2013.2188 652.625 L 1535.8125 652.625 L 1535.7812 652.625 L 1060.375 652.625 L 1058.375 652.625 L 582.96875 652.625 L 582.9375 652.625 L 105.53125 652.625 z " - style="color:black;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + d="m 105.53125,652.625 0,1.375 477.40625,0 0.0312,0 475.4063,0 2,0 475.4061,0 0.031,0 477.4063,0 0,-1.375 -477.4063,0 -0.031,0 -475.4061,0 -2,0 -475.4063,0 -0.0312,0 -477.40625,0 z" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + inkscape:connector-curvature="0" /> <path id="path2954" - d="M 106.53125 654.0625 C 106.53125 662.34719 106.53125 670.62156 106.53125 678.90625 C 126.03374 678.94549 147.17511 678.88813 162.875 692.46875 C 182.19889 705.67743 206.67856 714.95641 230.0625 707.8125 C 279.49807 702.00195 328.72651 680.70937 378.96875 692.25 C 410.05633 699.36366 441.80002 691.68955 473.03125 689.8125 C 500.91193 685.1284 528.46846 678.78125 557.28125 678.78125 C 567.09851 678.78124 575.11549 678.78125 582.9375 678.78125 C 582.93753 678.82281 582.9375 678.86466 582.9375 678.90625 C 602.44002 678.94549 623.58136 678.88813 639.28125 692.46875 C 658.6051 705.67743 683.08481 714.95641 706.46875 707.8125 C 755.90428 702.00195 805.13276 680.70937 855.375 692.25 C 886.46257 699.36366 918.20628 691.68955 949.4375 689.8125 C 977.3182 685.1284 1004.8747 678.78125 1033.6875 678.78125 C 1043.5165 678.78124 1051.5439 678.78125 1059.375 678.78125 C 1059.375 678.82293 1059.375 678.86457 1059.375 678.90625 C 1078.8775 678.94549 1100.0188 678.88813 1115.7188 692.46875 C 1135.0427 705.67743 1159.4911 714.95641 1182.875 707.8125 C 1232.3107 702.00195 1281.539 680.70937 1331.7812 692.25 C 1362.8689 699.36366 1394.6438 691.68955 1425.875 689.8125 C 1453.7556 685.1284 1481.2811 678.78125 1510.0938 678.78125 C 1519.911 678.78124 1527.9593 678.78125 1535.7812 678.78125 C 1535.7812 678.82281 1535.7812 678.86466 1535.7812 678.90625 C 1555.2837 678.94549 1576.4251 678.88813 1592.125 692.46875 C 1611.4489 705.67743 1635.8973 714.95641 1659.2812 707.8125 C 1708.7168 702.00195 1757.9453 680.70937 1808.1875 692.25 C 1839.2752 699.36366 1871.05 691.68955 1902.2812 689.8125 C 1930.1619 685.1284 1957.6872 678.78125 1986.5 678.78125 C 1996.3291 678.78124 2004.3877 678.78125 2012.2188 678.78125 L 2012.2188 654.0625 C 1853.4167 654.0625 1694.6146 654.0625 1535.8125 654.0625 C 1535.8021 654.0625 1535.7917 654.0625 1535.7812 654.0625 C 1376.9791 654.0625 1218.1771 654.0625 1059.375 654.0625 C 900.57302 654.0625 741.77084 654.0625 582.96875 654.0625 C 582.95832 654.0625 582.9479 654.0625 582.9375 654.0625 C 424.13545 654.0625 265.33335 654.0625 106.53125 654.0625 z " - style="opacity:0.33000004;color:black;fill:url(#linearGradient4012);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" /> + d="m 106.53125,654.0625 c 0,8.28469 0,16.55906 0,24.84375 19.50249,0.0392 40.64386,-0.0181 56.34375,13.5625 19.32389,13.20868 43.80356,22.48766 67.1875,15.34375 49.43557,-5.81055 98.66401,-27.10313 148.90625,-15.5625 31.08758,7.11366 62.83127,-0.56045 94.0625,-2.4375 27.88068,-4.6841 55.43721,-11.03125 84.25,-11.03125 9.81726,-10e-6 17.83424,0 25.65625,0 3e-5,0.0416 0,0.0834 0,0.125 19.50252,0.0392 40.64386,-0.0181 56.34375,13.5625 19.32385,13.20868 43.80356,22.48766 67.1875,15.34375 49.43553,-5.81055 98.66401,-27.10313 148.90625,-15.5625 31.08757,7.11366 62.83128,-0.56045 94.0625,-2.4375 27.8807,-4.6841 55.4372,-11.03125 84.25,-11.03125 9.829,-10e-6 17.8564,0 25.6875,0 0,0.0417 0,0.0833 0,0.125 19.5025,0.0392 40.6438,-0.0181 56.3438,13.5625 19.3239,13.20868 43.7723,22.48766 67.1562,15.34375 49.4357,-5.81055 98.664,-27.10313 148.9062,-15.5625 31.0877,7.11366 62.8626,-0.56045 94.0938,-2.4375 27.8806,-4.6841 55.4061,-11.03125 84.2188,-11.03125 9.8172,-10e-6 17.8655,0 25.6874,0 0,0.0416 0,0.0834 0,0.125 19.5025,0.0392 40.6439,-0.0181 56.3438,13.5625 19.3239,13.20868 43.7723,22.48766 67.1562,15.34375 49.4356,-5.81055 98.6641,-27.10313 148.9063,-15.5625 31.0877,7.11366 62.8625,-0.56045 94.0937,-2.4375 27.8807,-4.6841 55.406,-11.03125 84.2188,-11.03125 9.8291,-10e-6 17.8877,0 25.7188,0 l 0,-24.71875 c -158.8021,0 -317.6042,0 -476.4063,0 -0.01,0 -0.021,0 -0.031,0 -158.8021,0 -317.6041,0 -476.4062,0 -158.80198,0 -317.60416,0 -476.40625,0 -0.0104,0 -0.0208,0 -0.0312,0 -158.80205,0 -317.60415,0 -476.40625,0 z" + style="opacity:0.33000004;color:#000000;fill:url(#linearGradient4012);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + inkscape:connector-curvature="0" /> <g transform="translate(0,178)" id="g3971"> @@ -336,7 +351,7 @@ id="text3951" y="507.32114" x="188.50735" - style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" + style="font-size:37.67004013px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" xml:space="preserve"><tspan y="507.32114" x="188.50735" @@ -347,7 +362,7 @@ id="text3955" y="533.18787" x="237.69305" - style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" + style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" xml:space="preserve"><tspan y="533.18787" x="237.69305" @@ -359,47 +374,55 @@ <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3961" - d="M 60.321717,411.99998 L 437.33633,411.99998" - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3963" - d="M 252.61203,788.60332 L 252.61203,411.59154" - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3965" - d="M 252.86937,597.15755 L 629.88177,597.15755" - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3967" - d="M 437.45588,596.97447 L 437.45588,219.95956" - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path3969" - d="M 372.87905,411.27704 L 437.81346,411.27704" - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> </g> </g> </g> <path - style="color:black;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 301.0328,775.62064 L 301.0328,776.99564 L 302.2828,776.99564 L 302.2828,775.62064 L 301.0328,775.62064 z " - id="path3441" /> + style="color:#000000;fill:#dd8a3d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + d="m 749.06429,646.48678 0,1.375 1.24999,0 0,-1.375 -1.24999,0 z" + id="path3441" + inkscape:connector-curvature="0" /> <path - style="opacity:0.33000004;color:black;fill:url(#linearGradient3463);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 301.0328,777.05814 L 301.0328,829.99564 C 301.44582,830.12132 301.86834,830.22014 302.2828,830.33939 L 302.2828,777.05814 C 301.86613,777.05814 301.44947,777.05814 301.0328,777.05814 z " - id="path3435" /> + style="opacity:0.33000004;color:#000000;fill:url(#linearGradient3463);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1pt;marker:none;visibility:visible;display:inline;overflow:visible" + d="m 749.06429,647.92428 0,52.9375 c 0.41302,0.12568 0.83553,0.2245 1.24999,0.34375 l 0,-53.28125 c -0.41667,0 -0.83332,0 -1.24999,0 z" + id="path3435" + inkscape:connector-curvature="0" /> <g id="g3451" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-wiki-logo.png" inkscape:export-xdpi="240" - inkscape:export-ydpi="240"> + inkscape:export-ydpi="240" + transform="translate(448.03149,-129.13386)"> <text xml:space="preserve" - style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" + style="font-size:23.88307381px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" x="252.00264" y="831.75439" id="text4716" @@ -412,38 +435,44 @@ id="g4720" transform="matrix(0.3688,0,0,0.3688,110.9594,457.1803)"> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 60.321717,411.99998 L 437.33633,411.99998" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" id="path4722" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.61203,788.60332 L 252.61203,411.59154" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" id="path4724" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.86937,597.15755 L 629.88177,597.15755" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" id="path4726" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:white;fill-opacity:1;fill-rule:nonzero;stroke:#c63;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 437.45588,596.97447 L 437.45588,219.95956" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" id="path4728" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:black;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 372.87905,411.27704 L 437.81346,411.27704" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" id="path4730" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> </g> <path inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/documentos/fsm-virtual/kune-logo.png" id="path4766" - d="M 278.7546,778.41609 C 278.39498,778.41609 278.04933,778.41736 277.70246,778.44001 C 277.67009,778.4466 277.63939,778.45783 277.60682,778.46392 C 277.28394,778.52422 276.96537,778.57565 276.62643,778.58347 C 276.57947,778.59006 276.52965,778.57644 276.48295,778.58347 C 273.7165,778.99997 271.37912,780.20117 269.50064,782.1942 C 267.30689,784.51104 266.20078,787.28654 266.20077,790.51559 C 266.20077,793.78086 267.3069,796.57522 269.50064,798.8848 C 271.87536,801.37538 274.96079,802.61507 278.7546,802.61508 C 280.76732,802.61507 282.70232,802.11499 284.54131,801.10862 C 286.38026,800.13122 287.97923,798.74785 289.34763,796.99576 L 285.21084,794.7002 C 283.42977,797.07493 281.24145,798.26309 278.63504,798.26309 C 276.82501,798.26309 275.20212,797.67593 273.80481,796.51751 C 272.38574,795.3591 271.67662,793.94811 271.67664,792.26117 L 290.59106,792.26117 L 290.59106,791.30468 C 290.59103,787.21406 289.20547,783.93847 286.45428,781.47683 C 284.13743,779.42792 281.57097,778.41613 278.7546,778.41609 z M 190.8061,778.58347 L 190.8061,787.74179 L 187.60189,787.74179 L 187.60189,792.42855 L 190.8061,792.42855 L 190.8061,801.99337 L 195.68416,801.99337 L 195.68416,792.42855 L 198.62534,792.42855 L 204.62726,801.99337 L 210.41398,801.99337 L 202.35562,789.84605 L 210.0553,779.03781 L 204.14902,779.03781 L 198.19493,787.74179 L 195.68416,787.74179 L 195.68416,778.58347 L 190.8061,778.58347 z M 250.65794,778.58347 C 249.81822,778.73335 249.03579,778.97728 248.31456,779.34866 C 247.09823,780.00029 246.13796,780.85966 245.42121,781.93116 L 245.42121,779.03781 L 240.51924,779.03781 L 240.51924,801.99337 L 245.42121,801.99337 L 245.42121,789.12869 C 245.4212,787.28973 245.94015,785.87873 246.9755,784.87234 C 248.01805,783.866 249.33976,783.3659 250.9688,783.36589 C 252.69192,783.3659 254.03754,783.82827 254.98602,784.7767 C 255.93445,785.72516 256.3968,787.21161 256.39683,789.22434 L 256.39683,801.99337 L 261.2988,801.99337 L 261.2988,788.1483 C 261.29878,785.33192 260.43941,783.00497 258.7163,781.16598 C 257.42394,779.78677 255.92858,778.92829 254.22084,778.58347 L 250.65794,778.58347 z M 213.49863,779.03781 L 213.49863,792.3329 C 213.49862,795.44614 214.54816,797.96325 216.65502,799.88911 C 218.60984,801.69913 221.03111,802.61507 223.87646,802.61508 C 226.75075,802.61507 229.15974,801.69913 231.1218,799.88911 C 233.22864,797.96325 234.27817,795.44614 234.27819,792.3329 L 234.27819,779.03781 L 229.37623,779.03781 L 229.37623,791.90249 C 229.3762,793.59666 228.85726,794.97498 227.82195,796.03927 C 226.7504,797.13976 225.44754,797.6892 223.87646,797.6892 C 222.36327,797.68921 221.05032,797.13253 219.97879,796.03927 C 218.9145,794.93879 218.40058,793.56771 218.4006,791.90249 L 218.4006,779.03781 L 213.49863,779.03781 z M 278.13288,782.81591 C 279.73292,782.81594 281.1301,783.26448 282.31749,784.15499 C 283.46864,785.06724 284.31639,786.39622 284.85216,788.1483 L 271.67664,788.1483 C 272.06035,786.46138 272.85654,785.15127 274.04393,784.20281 C 275.19508,783.28334 276.55454,782.81594 278.13288,782.81591 z " - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" /> + d="m 278.7546,778.41609 c -0.35962,0 -0.70527,10e-4 -1.05214,0.0239 -0.0324,0.007 -0.0631,0.0178 -0.0956,0.0239 -0.32288,0.0603 -0.64145,0.11173 -0.98039,0.11955 -0.047,0.007 -0.0968,-0.007 -0.14348,0 -2.76645,0.4165 -5.10383,1.6177 -6.98231,3.61073 -2.19375,2.31684 -3.29986,5.09234 -3.29987,8.32139 0,3.26527 1.10613,6.05963 3.29987,8.36921 2.37472,2.49058 5.46015,3.73027 9.25396,3.73028 2.01272,-10e-6 3.94772,-0.50009 5.78671,-1.50646 1.83895,-0.9774 3.43792,-2.36077 4.80632,-4.11286 l -4.13679,-2.29556 c -1.78107,2.37473 -3.96939,3.56289 -6.5758,3.56289 -1.81003,0 -3.43292,-0.58716 -4.83023,-1.74558 -1.41907,-1.15841 -2.12819,-2.5694 -2.12817,-4.25634 l 18.91442,0 0,-0.95649 c -3e-5,-4.09062 -1.38559,-7.36621 -4.13678,-9.82785 -2.31685,-2.04891 -4.88331,-3.0607 -7.69968,-3.06074 z m -87.9485,0.16738 0,9.15832 -3.20421,0 0,4.68676 3.20421,0 0,9.56482 4.87806,0 0,-9.56482 2.94118,0 6.00192,9.56482 5.78672,0 -8.05836,-12.14732 7.69968,-10.80824 -5.90628,0 -5.95409,8.70398 -2.51077,0 0,-9.15832 -4.87806,0 z m 59.85184,0 c -0.83972,0.14988 -1.62215,0.39381 -2.34338,0.76519 -1.21633,0.65163 -2.1766,1.511 -2.89335,2.5825 l 0,-2.89335 -4.90197,0 0,22.95556 4.90197,0 0,-12.86468 c -1e-5,-1.83896 0.51894,-3.24996 1.55429,-4.25635 1.04255,-1.00634 2.36426,-1.50644 3.9933,-1.50645 1.72312,10e-6 3.06874,0.46238 4.01722,1.41081 0.94843,0.94846 1.41078,2.43491 1.41081,4.44764 l 0,12.76903 4.90197,0 0,-13.84507 c -2e-5,-2.81638 -0.85939,-5.14333 -2.5825,-6.98232 -1.29236,-1.37921 -2.78772,-2.23769 -4.49546,-2.58251 l -3.5629,0 z m -37.15931,0.45434 0,13.29509 c -1e-5,3.11324 1.04953,5.63035 3.15639,7.55621 1.95482,1.81002 4.37609,2.72596 7.22144,2.72597 2.87429,-1e-5 5.28328,-0.91595 7.24534,-2.72597 2.10684,-1.92586 3.15637,-4.44297 3.15639,-7.55621 l 0,-13.29509 -4.90196,0 0,12.86468 c -3e-5,1.69417 -0.51897,3.07249 -1.55428,4.13678 -1.07155,1.10049 -2.37441,1.64993 -3.94549,1.64993 -1.51319,10e-6 -2.82614,-0.55667 -3.89767,-1.64993 -1.06429,-1.10048 -1.57821,-2.47156 -1.57819,-4.13678 l 0,-12.86468 -4.90197,0 z m 64.63425,3.7781 c 1.60004,3e-5 2.99722,0.44857 4.18461,1.33908 1.15115,0.91225 1.9989,2.24123 2.53467,3.99331 l -13.17552,0 c 0.38371,-1.68692 1.1799,-2.99703 2.36729,-3.94549 1.15115,-0.91947 2.51061,-1.38687 4.08895,-1.3869 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> </g> <g id="g7182" @@ -508,25 +537,30 @@ id="tspan7153">collaborative platform</tspan></text> </g> <path - style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#dc5f01;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 148.8919,267.4272 C 161.99966,267.4272 168.97012,250.16033 180.69406,244.29836 C 189.19763,240.04658 187.92182,239.7468 187.92182,251.52613 C 187.92182,263.69491 191.14411,263.09055 203.8229,263.09055 C 217.89191,263.09055 225.16259,247.53306 234.1795,238.51615 C 235.62505,237.0706 237.0706,235.62505 238.51615,234.1795 C 241.88911,230.80654 243.86494,244.29836 248.63502,244.29836 C 251.86737,244.29836 254.41723,241.40726 257.30834,239.96171 C 263.6729,236.77943 255.86278,255.25625 255.86278,265.98165 C 255.86278,278.06988 273.3863,300.58647 284.77383,294.8927 C 291.59303,291.4831 305.53611,275.22627 309.34822,268.87276 C 311.28446,265.64569 312.81261,277.54607 316.57599,277.54607 C 323.31544,277.54607 335.7711,265.57872 339.70483,261.64499" - id="path7380" /> + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 534.71867,-50.683034 c 13.10776,0 20.07822,-17.26687 31.80216,-23.12884 8.50357,-4.25178 7.22776,-4.55156 7.22776,7.22777 0,12.16878 3.22229,11.56442 15.90108,11.56442 14.06901,0 21.33969,-15.55749 30.3566,-24.5744 1.44555,-1.44555 2.8911,-2.8911 4.33665,-4.33665 3.37296,-3.37296 5.34879,10.11886 10.11887,10.11886 3.23235,0 5.78221,-2.8911 8.67332,-4.33665 6.36456,-3.18228 -1.44556,15.29454 -1.44556,26.01994 0,12.08823 17.52352,34.60482 28.91105,28.91105 6.8192,-3.4096 20.76228,-19.66643 24.57439,-26.01994 1.93624,-3.22707 3.46439,8.67331 7.22777,8.67331 6.73945,0 19.19511,-11.96735 23.12884,-15.90108" + id="path7380" + inkscape:connector-curvature="0" /> <path - style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#dc5f01;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 156.11966,261.64499 C 158.04707,261.64499 158.04707,261.64499 156.11966,261.64499 C 105.22308,261.64499 203.38647,252.97168 213.94176,252.97168 C 245.61975,252.97168 274.60153,248.63502 305.01157,248.63502 C 319.9219,248.63502 316.72892,252.97168 306.45712,252.97168" - id="path8267" /> + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 541.94643,-56.465244 c 1.92741,0 1.92741,0 0,0 -50.89658,0 47.26681,-8.67331 57.8221,-8.67331 31.67799,0 60.65977,-4.33666 91.06981,-4.33666 14.91033,0 11.71735,4.33666 1.44555,4.33666" + id="path8267" + inkscape:connector-curvature="0" /> <path - style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#dc5f01;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 183.58516,265.98165 C 214.96524,265.98165 259.98717,265.98165 296.33825,265.98165 C 317.93833,265.98165 346.11383,269.08169 362.83366,274.65497" - id="path8269" /> + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 569.41193,-52.128584 c 31.38008,0 76.40201,0 112.75309,0 21.60008,0 49.77558,3.10004 66.49541,8.67332" + id="path8269" + inkscape:connector-curvature="0" /> <path - style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#dc5f01;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 157.56522,281.88273 C 159.49262,281.88273 159.49262,281.88273 157.56522,281.88273 C 134.83668,281.88273 194.62357,281.88273 212.49621,281.88273 C 239.47986,281.88273 266.4635,281.88273 293.44715,281.88273 C 293.929,281.88273 294.41085,281.88273 294.8927,281.88273" - id="path8271" /> + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 543.39199,-36.227504 c 1.9274,0 1.9274,0 0,0 -22.72854,0 37.05835,0 54.93099,0 26.98365,0 53.96729,0 80.95094,0 0.48185,0 0.9637,0 1.44555,0" + id="path8271" + inkscape:connector-curvature="0" /> <path - style="opacity:1;color:black;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#dc5f01;stroke-width:1.99999976;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" - d="M 143.10969,235.62505 C 152.1417,235.62505 167.67218,231.28839 182.13961,231.28839 C 204.31188,231.28839 239.93322,234.88803 258.75389,244.29836 C 262.00256,245.9227 262.84756,245.1171 265.98165,245.74392" - id="path8273" /> + style="color:#000000;fill:none;stroke:#dc5f01;stroke-width:1.99999976;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" + d="m 528.93646,-82.485184 c 9.03201,0 24.56249,-4.33666 39.02992,-4.33666 22.17227,0 57.79361,3.59964 76.61428,13.00997 3.24867,1.62434 4.09367,0.81874 7.22776,1.44556" + id="path8273" + inkscape:connector-curvature="0" /> <g id="g5064" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" @@ -608,7 +642,8 @@ id="g2285" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/logo-kune-wiki-16.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-ydpi="90" + transform="translate(-7.8740157,-70.07874)"> <g transform="translate(404.1233,229.24298)" inkscape:export-ydpi="90" @@ -616,12 +651,13 @@ inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" id="g2264"> <path - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" - d="M 206.0077,119.17481 C 205.76991,119.17481 205.54137,119.17568 205.31203,119.19062 C 205.29064,119.19501 205.27034,119.20243 205.24879,119.20643 C 205.0353,119.24634 204.82469,119.28034 204.60059,119.28548 C 204.56951,119.28987 204.5366,119.28083 204.50573,119.28548 C 202.67658,119.56085 201.13114,120.35507 199.88911,121.67284 C 198.43868,123.2047 197.70733,125.03981 197.70733,127.17481 C 197.70733,129.33374 198.43868,131.1813 199.88911,132.70839 C 201.45924,134.35508 203.49928,135.17475 206.0077,135.17475 C 207.33847,135.17475 208.61786,134.8441 209.83374,134.17874 C 211.04962,133.5325 212.10686,132.61781 213.01164,131.45938 L 210.27646,129.9416 C 209.09881,131.51173 207.65196,132.29729 205.92865,132.29729 C 204.73189,132.29729 203.65884,131.90909 202.73495,131.14319 C 201.79671,130.37723 201.32784,129.4443 201.32784,128.32897 L 213.83374,128.32897 L 213.83374,127.69653 C 213.83374,124.99189 212.91759,122.82613 211.09856,121.19855 C 209.56671,119.8438 207.86983,119.17481 206.0077,119.17481 z M 147.85769,119.28548 L 147.85769,125.34078 L 145.73909,125.34078 L 145.73909,128.43963 L 147.85769,128.43963 L 147.85769,134.7637 L 151.08296,134.7637 L 151.08296,128.43963 L 153.0276,128.43963 L 156.99598,134.7637 L 160.82207,134.7637 L 155.49401,126.73209 L 160.58492,119.58586 L 156.67978,119.58586 L 152.74302,125.34078 L 151.08296,125.34078 L 151.08296,119.28548 L 147.85769,119.28548 z M 187.43069,119.28548 C 186.87546,119.38456 186.35813,119.54585 185.88129,119.79144 C 185.07706,120.22226 184.44213,120.79048 183.96822,121.49894 L 183.96822,119.58586 L 180.72714,119.58586 L 180.72714,134.7637 L 183.96822,134.7637 L 183.96822,126.2578 C 183.96822,125.04192 184.31132,124.10899 184.9959,123.44358 C 185.68524,122.77822 186.5591,122.44757 187.63622,122.44751 C 188.77548,122.44757 189.66521,122.75326 190.29234,123.38034 C 190.91942,124.00747 191.22511,124.99027 191.22511,126.32103 L 191.22511,134.7637 L 194.46624,134.7637 L 194.46624,125.6096 C 194.46619,123.74742 193.89802,122.20891 192.7587,120.99298 C 191.90422,120.08111 190.91552,119.51348 189.78638,119.28548 L 187.43069,119.28548 z M 162.86156,119.58586 L 162.86156,128.37639 C 162.86156,130.43479 163.55551,132.09907 164.94854,133.3724 C 166.24103,134.56916 167.84192,135.17475 169.72321,135.17475 C 171.62367,135.17475 173.21643,134.56916 174.51374,133.3724 C 175.90672,132.09907 176.60067,130.43479 176.60067,128.37639 L 176.60067,119.58586 L 173.35959,119.58586 L 173.35959,128.09177 C 173.35953,129.21192 173.01643,130.12325 172.33191,130.82694 C 171.6234,131.55456 170.76199,131.91786 169.72321,131.91786 C 168.72271,131.91786 167.85464,131.5498 167.14613,130.82694 C 166.44244,130.09932 166.10264,129.19281 166.1027,128.09177 L 166.1027,119.58586 L 162.86156,119.58586 z M 205.5966,122.08389 C 206.65454,122.08389 207.57832,122.38049 208.36339,122.96929 C 209.12453,123.57243 209.68506,124.45111 210.03932,125.6096 L 201.32784,125.6096 C 201.58155,124.49421 202.10798,123.62798 202.89304,123.00091 C 203.65418,122.39294 204.55306,122.08389 205.5966,122.08389 z " + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 206.0077,119.17481 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.0791 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" id="path2267" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-ydpi="90" + inkscape:connector-curvature="0" /> <g id="g2269" transform="matrix(0.1111494,0,0,0.111008,121.5678,22.515968)" @@ -629,30 +665,35 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 60.321717,411.99998 L 437.33633,411.99998" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" id="path2271" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.61203,788.60332 L 252.61203,411.59154" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" id="path2273" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.86937,597.15755 L 629.88177,597.15755" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" id="path2275" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 437.45588,596.97447 L 437.45588,219.95956" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" id="path2277" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 372.87905,411.27704 L 437.81346,411.27704" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" id="path2279" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> </g> </g> <text @@ -660,7 +701,7 @@ id="text2281" y="364.09836" x="624.35651" - style="font-size:22.95481682px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" + style="font-size:22.95481682px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem" xml:space="preserve"><tspan y="364.09836" x="624.35651" @@ -671,14 +712,16 @@ id="g2338" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/logo-kune-wiki-16-white.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-ydpi="90" + transform="translate(-7.8740157,-70.07874)"> <path - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" - d="M 612.45757,378.19846 C 612.21978,378.19846 611.99124,378.19933 611.7619,378.21427 C 611.74051,378.21866 611.72021,378.22608 611.69866,378.23008 C 611.48517,378.26999 611.27456,378.30399 611.05046,378.30913 C 611.01938,378.31352 610.98647,378.30448 610.9556,378.30913 C 609.12645,378.5845 607.58101,379.37872 606.33898,380.69649 C 604.88855,382.22835 604.1572,384.06346 604.1572,386.19846 C 604.1572,388.35739 604.88855,390.20495 606.33898,391.73204 C 607.90911,393.37873 609.94915,394.1984 612.45757,394.1984 C 613.78834,394.1984 615.06773,393.86775 616.28361,393.20239 C 617.49949,392.55615 618.55673,391.64146 619.46151,390.48303 L 616.72633,388.96525 C 615.54868,390.53538 614.10183,391.32094 612.37852,391.32094 C 611.18176,391.32094 610.10871,390.93274 609.18482,390.16684 C 608.24658,389.40088 607.77771,388.46795 607.77771,387.35262 L 620.28361,387.35262 L 620.28361,386.72018 C 620.28361,384.01554 619.36746,381.84978 617.54843,380.2222 C 616.01658,378.86745 614.3197,378.19846 612.45757,378.19846 z M 554.30756,378.30913 L 554.30756,384.36443 L 552.18896,384.36443 L 552.18896,387.46328 L 554.30756,387.46328 L 554.30756,393.78735 L 557.53283,393.78735 L 557.53283,387.46328 L 559.47747,387.46328 L 563.44585,393.78735 L 567.27194,393.78735 L 561.94388,385.75574 L 567.03479,378.60951 L 563.12965,378.60951 L 559.19289,384.36443 L 557.53283,384.36443 L 557.53283,378.30913 L 554.30756,378.30913 z M 593.88056,378.30913 C 593.32533,378.40821 592.808,378.5695 592.33116,378.81509 C 591.52693,379.24591 590.892,379.81413 590.41809,380.52259 L 590.41809,378.60951 L 587.17701,378.60951 L 587.17701,393.78735 L 590.41809,393.78735 L 590.41809,385.28145 C 590.41809,384.06557 590.76119,383.13264 591.44577,382.46723 C 592.13511,381.80187 593.00897,381.47122 594.08609,381.47116 C 595.22535,381.47122 596.11508,381.77691 596.74221,382.40399 C 597.36929,383.03112 597.67498,384.01392 597.67498,385.34468 L 597.67498,393.78735 L 600.91611,393.78735 L 600.91611,384.63325 C 600.91606,382.77107 600.34789,381.23256 599.20857,380.01663 C 598.35409,379.10476 597.36539,378.53713 596.23625,378.30913 L 593.88056,378.30913 z M 569.31143,378.60951 L 569.31143,387.40004 C 569.31143,389.45844 570.00538,391.12272 571.39841,392.39605 C 572.6909,393.59281 574.29179,394.1984 576.17308,394.1984 C 578.07354,394.1984 579.6663,393.59281 580.96361,392.39605 C 582.35659,391.12272 583.05054,389.45844 583.05054,387.40004 L 583.05054,378.60951 L 579.80946,378.60951 L 579.80946,387.11542 C 579.8094,388.23557 579.4663,389.1469 578.78178,389.85059 C 578.07327,390.57821 577.21186,390.94151 576.17308,390.94151 C 575.17258,390.94151 574.30451,390.57345 573.596,389.85059 C 572.89231,389.12297 572.55251,388.21646 572.55257,387.11542 L 572.55257,378.60951 L 569.31143,378.60951 z M 612.04647,381.10754 C 613.10441,381.10754 614.02819,381.40414 614.81326,381.99294 C 615.5744,382.59608 616.13493,383.47476 616.48919,384.63325 L 607.77771,384.63325 C 608.03142,383.51786 608.55785,382.65163 609.34291,382.02456 C 610.10405,381.41659 611.00293,381.10754 612.04647,381.10754 z " + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 612.45757,378.19846 c -0.23779,0 -0.46633,8.7e-4 -0.69567,0.0158 -0.0214,0.004 -0.0417,0.0118 -0.0632,0.0158 -0.21349,0.0399 -0.4241,0.0739 -0.6482,0.079 -0.0311,0.004 -0.064,-0.005 -0.0949,0 -1.82915,0.27537 -3.37459,1.06959 -4.61662,2.38736 -1.45043,1.53186 -2.18178,3.36697 -2.18178,5.50197 0,2.15893 0.73135,4.00649 2.18178,5.53358 1.57013,1.64669 3.61017,2.46636 6.11859,2.46636 1.33077,0 2.61016,-0.33065 3.82604,-0.99601 1.21588,-0.64624 2.27312,-1.56093 3.1779,-2.71936 l -2.73518,-1.51778 c -1.17765,1.57013 -2.6245,2.35569 -4.34781,2.35569 -1.19676,0 -2.26981,-0.3882 -3.1937,-1.1541 -0.93824,-0.76596 -1.40711,-1.69889 -1.40711,-2.81422 l 12.5059,0 0,-0.63244 c 0,-2.70464 -0.91615,-4.8704 -2.73518,-6.49798 -1.53185,-1.35475 -3.22873,-2.02374 -5.09086,-2.02374 z m -58.15001,0.11067 0,6.0553 -2.1186,0 0,3.09885 2.1186,0 0,6.32407 3.22527,0 0,-6.32407 1.94464,0 3.96838,6.32407 3.82609,0 -5.32806,-8.03161 5.09091,-7.14623 -3.90514,0 -3.93676,5.75492 -1.66006,0 0,-6.0553 -3.22527,0 z m 39.573,0 c -0.55523,0.0991 -1.07256,0.26037 -1.5494,0.50596 -0.80423,0.43082 -1.43916,0.99904 -1.91307,1.7075 l 0,-1.91308 -3.24108,0 0,15.17784 3.24108,0 0,-8.5059 c 0,-1.21588 0.3431,-2.14881 1.02768,-2.81422 0.68934,-0.66536 1.5632,-0.99601 2.64032,-0.99607 1.13926,6e-5 2.02899,0.30575 2.65612,0.93283 0.62708,0.62713 0.93277,1.60993 0.93277,2.94069 l 0,8.44267 3.24113,0 0,-9.1541 c -5e-5,-1.86218 -0.56822,-3.40069 -1.70754,-4.61662 -0.85448,-0.91187 -1.84318,-1.4795 -2.97232,-1.7075 l -2.35569,0 z m -24.56913,0.30038 0,8.79053 c 0,2.0584 0.69395,3.72268 2.08698,4.99601 1.29249,1.19676 2.89338,1.80235 4.77467,1.80235 1.90046,0 3.49322,-0.60559 4.79053,-1.80235 1.39298,-1.27333 2.08693,-2.93761 2.08693,-4.99601 l 0,-8.79053 -3.24108,0 0,8.50591 c -6e-5,1.12015 -0.34316,2.03148 -1.02768,2.73517 -0.70851,0.72762 -1.56992,1.09092 -2.6087,1.09092 -1.0005,0 -1.86857,-0.36806 -2.57708,-1.09092 -0.70369,-0.72762 -1.04349,-1.63413 -1.04343,-2.73517 l 0,-8.50591 -3.24114,0 z m 42.73504,2.49803 c 1.05794,0 1.98172,0.2966 2.76679,0.8854 0.76114,0.60314 1.32167,1.48182 1.67593,2.64031 l -8.71148,0 c 0.25371,-1.11539 0.78014,-1.98162 1.5652,-2.60869 0.76114,-0.60797 1.66002,-0.91702 2.70356,-0.91702 z" id="path2301" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px-white.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> + inkscape:export-ydpi="90" + inkscape:connector-curvature="0" /> <g style="fill:#ffffff;stroke:#ffffff" id="g2303" @@ -687,37 +730,42 @@ inkscape:export-xdpi="90" inkscape:export-ydpi="90"> <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 60.321717,411.99998 L 437.33633,411.99998" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" id="path2305" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.61203,788.60332 L 252.61203,411.59154" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" id="path2307" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 252.86937,597.15755 L 629.88177,597.15755" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" id="path2309" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 437.45588,596.97447 L 437.45588,219.95956" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" id="path2311" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> <path - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" - d="M 372.87905,411.27704 L 437.81346,411.27704" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" id="path2313" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + inkscape:connector-curvature="0" /> </g> <text inkscape:export-ydpi="90" inkscape:export-xdpi="90" inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/kune-logo-16px-white.png" xml:space="preserve" - style="font-size:22.95481682px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem" + style="font-size:22.95481682px;font-style:italic;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Emblem" x="626.68304" y="393.87903" id="text2315" @@ -759,65 +807,20 @@ d="M 372.87905,411.27704 L 437.81346,411.27704" style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> </g> - <path - inkscape:connector-curvature="0" - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - d="m 245.82057,974.99995 c -0.74303,0 -1.45723,0.003 -2.17391,0.0494 -0.0669,0.0136 -0.13033,0.0368 -0.19763,0.0494 -0.66715,0.12461 -1.32536,0.23087 -2.02569,0.24704 -0.097,0.0136 -0.19995,-0.0145 -0.29644,0 -5.71605,0.86055 -10.54554,3.34248 -14.42688,7.46047 -4.53271,4.78706 -6.81817,10.52182 -6.81818,17.19368 0,6.74676 2.28548,12.52046 6.81818,17.29246 4.90667,5.1461 11.2818,7.7075 19.12055,7.7076 4.15869,-10e-5 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6068 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7944 l 39.08102,0 0,-1.9763 c -4e-5,-8.45207 -2.86291,-15.2201 -8.54743,-20.30635 -4.78705,-4.23347 -10.0899,-6.32405 -15.90909,-6.32411 z m -181.719366,0.34585 0,18.92292 -6.62055,0 0,9.68378 6.62055,0 0,19.7629 10.07905,0 0,-19.7629 6.07708,0 12.40119,19.7629 11.956516,0 -16.650196,-25.09885 15.909086,-22.33202 -12.203556,0 -12.30237,17.98419 -5.18775,0 0,-18.92292 -10.07905,0 z m 123.666006,0 c -1.73503,0.30966 -3.35171,0.81366 -4.8419,1.58103 -2.5132,1.34638 -4.49729,3.12201 -5.97826,5.33597 l 0,-5.97827 -10.12846,0 0,47.43087 10.12846,0 0,-26.58106 c -1e-5,-3.79965 1.07224,-6.71507 3.21147,-8.79447 2.15413,-2.07932 4.88507,-3.11262 8.25098,-3.11265 3.56032,3e-5 6.34065,0.95537 8.3004,2.91502 1.95964,1.95972 2.91496,5.03102 2.91502,9.18973 l 0,26.38343 10.12846,0 0,-28.60675 c -5e-5,-5.8192 -1.77567,-10.62715 -5.33597,-14.42688 -2.67029,-2.84973 -5.76,-4.62351 -9.28854,-5.33597 l -7.36166,0 z m -76.77865,0.93873 0,27.47037 c -2e-5,6.4326 2.16853,11.6334 6.52173,15.6127 4.03904,3.7398 9.04189,5.6323 14.92095,5.6324 5.93886,-10e-5 10.91633,-1.8926 14.97036,-5.6324 4.35315,-3.9793 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.47037 -10.12846,0 0,26.58107 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2738 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.58107 -10.12845,0 z m 133.54743,7.80633 c 3.306,5e-5 6.19285,0.92683 8.64624,2.7668 2.37851,1.88491 4.13014,4.63084 5.23716,8.25099 l -27.22332,0 c 0.79283,-3.48552 2.43792,-6.19246 4.8913,-8.15218 2.37853,-1.89981 5.18745,-2.86556 8.44862,-2.86561 z" - id="path2689" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854" /> - <g - id="g2691" - transform="matrix(0.347343,0,0,0.346901,262.945,672.94005)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854"> - <path - inkscape:connector-curvature="0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 60.321717,411.99998 377.014613,0" - id="path2693" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.61203,788.60332 0,-377.01178" - id="path2695" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.86937,597.15755 377.0124,0" - id="path2697" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 437.45588,596.97447 0,-377.01491" - id="path2699" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 372.87905,411.27704 64.93441,0" - id="path2701" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - </g> <text xml:space="preserve" - style="font-size:18.13397598px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:100%;writing-mode:lr-tb;text-anchor:end;fill:#dd8a3d;fill-opacity:1;stroke:none;stroke-width:1pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem" - x="954.11047" - y="752.78009" + style="font-size:18.13397598px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:end;line-height:100%;writing-mode:lr-tb;text-anchor:end;fill:#dd8a3d;fill-opacity:1;stroke:none;font-family:Emblem;-inkscape-font-specification:Emblem" + x="1402.142" + y="623.64624" id="text2703" sodipodi:linespacing="100%"><tspan sodipodi:role="line" - x="954.11047" - y="752.78009" + x="1402.142" + y="623.64624" id="tspan2709">a web infrastructure to encourage collaboration,</tspan><tspan sodipodi:role="line" - x="954.11047" - y="770.91406" + x="1402.142" + y="641.78021" id="tspan2727">content sharing & free culture</tspan></text> <text xml:space="preserve" @@ -840,7 +843,7 @@ id="tspan2733">content sharing & free culture</tspan></text> <g id="g2607" - transform="matrix(0.548749,0,0,0.548749,378.52305,746.57538)"> + transform="matrix(0.548749,0,0,0.548749,826.55453,617.44152)"> <g inkscape:export-ydpi="90" inkscape:export-xdpi="90" @@ -850,28 +853,33 @@ <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2533" - d="M 60.321717,411.99998 L 437.33633,411.99998" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 60.321717,411.99998 377.014613,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2535" - d="M 252.61203,788.60332 L 252.61203,411.59154" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.61203,788.60332 0,-377.01178" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2537" - d="M 252.86937,597.15755 L 629.88177,597.15755" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.86937,597.15755 377.0124,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2539" - d="M 437.45588,596.97447 L 437.45588,219.95956" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 437.45588,596.97447 0,-377.01491" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2541" - d="M 372.87905,411.27704 L 437.81346,411.27704" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 372.87905,411.27704 64.93441,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> </g> <text transform="matrix(0.9080422,0.4188786,-0.4188786,0.9080422,0,0)" @@ -879,7 +887,7 @@ id="text2549" y="36.545521" x="426.55963" - style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" xml:space="preserve"><tspan y="36.545521" x="426.55963" @@ -890,10 +898,11 @@ id="tspan2555" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#808080;fill-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan><tspan id="tspan2559" - style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> + style="font-size:16.88012505px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> </g> <g - id="g2620"> + id="g2620" + transform="translate(448.03149,-129.13386)"> <g inkscape:export-ydpi="44.62801" inkscape:export-xdpi="44.62801" @@ -903,28 +912,33 @@ <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2563" - d="M 60.321717,411.99998 L 437.33633,411.99998" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 60.321717,411.99998 377.014613,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2565" - d="M 252.61203,788.60332 L 252.61203,411.59154" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.61203,788.60332 0,-377.01178" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2567" - d="M 252.86937,597.15755 L 629.88177,597.15755" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.86937,597.15755 377.0124,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2569" - d="M 437.45588,596.97447 L 437.45588,219.95956" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 437.45588,596.97447 0,-377.01491" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2571" - d="M 372.87905,411.27704 L 437.81346,411.27704" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 372.87905,411.27704 64.93441,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> </g> <text inkscape:export-ydpi="44.62801" @@ -935,7 +949,7 @@ id="text2573" y="532.55298" x="724.52563" - style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" xml:space="preserve"><tspan y="532.55298" x="724.52563" @@ -946,7 +960,7 @@ id="tspan2579" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ffffff;fill-opacity:1;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan><tspan id="tspan2581" - style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> + style="font-size:30.13441849px;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Serif;-inkscape-font-specification:Bitstream Vera Sans" /></tspan></text> </g> <text xml:space="preserve" @@ -963,14 +977,14 @@ inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-alpha60.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" - transform="translate(-169.81905,-194.32381)"> + transform="translate(278.21243,-323.45767)"> <rect y="1007.8605" x="829.13959" height="56.250996" width="56.250996" id="rect2613" - style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3.74900579;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:3.74900579;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" /> <g inkscape:export-ydpi="44.62801" inkscape:export-xdpi="44.62801" @@ -980,35 +994,40 @@ <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2561" - d="M 60.321717,411.99998 L 437.33633,411.99998" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 60.321717,411.99998 377.014613,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2564" - d="M 252.61203,788.60332 L 252.61203,411.59154" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.61203,788.60332 0,-377.01178" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2566" - d="M 252.86937,597.15755 L 629.88177,597.15755" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 252.86937,597.15755 377.0124,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2568" - d="M 437.45588,596.97447 L 437.45588,219.95956" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 437.45588,596.97447 0,-377.01491" + style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> <path transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" id="path2570" - d="M 372.87905,411.27704 L 437.81346,411.27704" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block" /> + d="m 372.87905,411.27704 64.93441,0" + style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> </g> <text sodipodi:linespacing="125%" id="text2593" y="1062.1919" x="826.17133" - style="font-size:21.96050453px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" + style="font-size:21.96050453px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#808080;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans" xml:space="preserve"><tspan y="1062.1919" x="826.17133" @@ -1019,266 +1038,12 @@ id="tspan2601" style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#999999;font-family:Emblem;-inkscape-font-specification:Emblem">lpha</tspan></tspan></text> </g> - <text - sodipodi:linespacing="100%" - id="text3654" - y="1023.4772" - x="-438.89853" - style="font-size:91.92100525px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" - xml:space="preserve" - transform="scale(-1,1)"><tspan - y="1023.4772" - x="-438.89853" - id="tspan3656" - sodipodi:role="line">cc</tspan></text> - <path - inkscape:export-ydpi="399.59854" - inkscape:export-xdpi="399.59854" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - id="path3705" - d="m 245.82057,1095 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1247 -1.32536,0.2309 -2.02569,0.2471 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8605 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.787 -6.81817,10.5218 -6.81818,17.1936 0,6.7468 2.28548,12.5205 6.81818,17.2925 4.90667,5.1461 11.2818,7.7075 19.12055,7.7076 4.15869,-10e-5 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6068 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7944 l 39.08102,0 0,-1.9763 c -4e-5,-8.4521 -2.86291,-15.2201 -8.54743,-20.3064 -4.78705,-4.2334 -10.0899,-6.324 -15.90909,-6.3241 z m -181.719366,0.3458 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7629 10.07905,0 0,-19.7629 6.07708,0 12.40119,19.7629 11.956516,0 -16.650196,-25.0989 15.909086,-22.332 -12.203556,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.666006,0 c -1.73503,0.3097 -3.35171,0.8137 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4309 10.12846,0 0,-26.5811 c -1e-5,-3.7996 1.07224,-6.715 3.21147,-8.7944 2.15413,-2.0794 4.88507,-3.1126 8.25098,-3.1127 3.56032,10e-5 6.34065,0.9554 8.3004,2.915 1.95964,1.9598 2.91496,5.0311 2.91502,9.1898 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8193 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8498 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4704 c -2e-5,6.4326 2.16853,11.6334 6.52173,15.6127 4.03904,3.7398 9.04189,5.6323 14.92095,5.6324 5.93886,-10e-5 10.91633,-1.8926 14.97036,-5.6324 4.35315,-3.9793 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4704 -10.12846,0 0,26.5811 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2738 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.5811 -10.12845,0 z m 133.54743,7.8064 c 3.306,0 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6308 5.23716,8.2509 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1924 4.8913,-8.1521 2.37853,-1.8998 5.18745,-2.8656 8.44862,-2.8656 z" - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - inkscape:connector-curvature="0" /> <g - inkscape:export-ydpi="399.59854" - inkscape:export-xdpi="399.59854" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - transform="matrix(0.347343,0,0,0.346901,262.945,792.94005)" - id="g3707"> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3709" - d="m 60.321717,411.99998 377.014613,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3711" - d="m 252.61203,788.60332 0,-377.01178" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3713" - d="m 252.86937,597.15755 377.0124,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3715" - d="m 437.45588,596.97447 0,-377.01491" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - <path - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" - id="path3717" - d="m 372.87905,411.27704 64.93441,0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - inkscape:connector-curvature="0" /> - </g> - <text - transform="scale(-1,1)" - xml:space="preserve" - style="font-size:66.18188477px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" - x="-412.51364" - y="1143.8353" - id="text3719" - sodipodi:linespacing="100%"><tspan - sodipodi:role="line" - id="tspan3721" - x="-412.51364" - y="1143.8353">cc</tspan></text> - <path - inkscape:connector-curvature="0" - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - d="m 117.74846,1199.0003 c -0.23776,0 -0.4663,0 -0.69564,0.016 -0.0214,0 -0.0417,0.012 -0.0632,0.016 -0.21348,0.04 -0.42411,0.074 -0.64821,0.079 -0.031,0 -0.064,-0 -0.0949,0 -1.8291,0.2753 -3.37452,1.0696 -4.61653,2.3873 -1.45044,1.5318 -2.18177,3.3669 -2.18178,5.5019 0,2.1589 0.73134,4.0065 2.18178,5.5335 1.57011,1.6467 3.61012,2.4663 6.11848,2.4664 1.33076,-10e-5 2.61014,-0.3307 3.82603,-0.9961 1.21587,-0.6462 2.27307,-1.5608 3.17781,-2.7193 l -2.73513,-1.5178 c -1.1776,1.5702 -2.62446,2.3558 -4.34776,2.3558 -1.19674,0 -2.26975,-0.3883 -3.19362,-1.1542 -0.93825,-0.7659 -1.40711,-1.6988 -1.40709,-2.8142 l 12.50572,0 0,-0.6324 c -1e-5,-2.7046 -0.91611,-4.8703 -2.73513,-6.4979 -1.53183,-1.3547 -3.22872,-2.0237 -5.09083,-2.0237 z m -58.149264,0.1106 0,6.0552 -2.118542,0 0,3.0988 2.118542,0 0,6.324 3.225244,0 0,-6.324 1.944635,0 3.968317,6.324 3.826024,0 -5.327977,-8.0315 5.090826,-7.1461 -3.905076,0 -3.936695,5.7548 -1.660054,0 0,-6.0552 -3.225244,0 z m 39.572489,0 c -0.555201,0.099 -1.07253,0.2604 -1.549383,0.5059 -0.804211,0.4309 -1.43911,0.999 -1.913013,1.7075 l 0,-1.913 -3.241055,0 0,15.1776 3.241055,0 0,-8.5058 c -3e-6,-1.2158 0.343111,-2.1487 1.027654,-2.8141 0.689311,-0.6654 1.563197,-0.9961 2.640271,-0.9961 1.139286,0 2.028976,0.3057 2.656086,0.9328 0.62707,0.6271 0.93277,1.6099 0.93279,2.9407 l 0,8.4425 3.24106,0 0,-9.154 c -2e-5,-1.8621 -0.56821,-3.4006 -1.70749,-4.6165 -0.85448,-0.9119 -1.84317,-1.4795 -2.97228,-1.7075 l -2.355695,0 z m -24.568775,0.3004 0,8.7904 c -6e-6,2.0584 0.693918,3.7226 2.08692,4.996 1.292472,1.1967 2.893359,1.8023 4.774628,1.8023 1.900405,0 3.493169,-0.6056 4.790438,-1.8023 1.392986,-1.2734 2.086908,-2.9376 2.086924,-4.996 l 0,-8.7904 -3.241056,0 0,8.5058 c -1.6e-5,1.1201 -0.34313,2.0315 -1.02765,2.7351 -0.708482,0.7276 -1.569895,1.0909 -2.608656,1.0909 -1.000477,0 -1.868572,-0.368 -2.577034,-1.0909 -0.703685,-0.7276 -1.043471,-1.6341 -1.043462,-2.7351 l 0,-8.5058 -3.241052,0 z m 42.73449,2.498 c 1.05791,0 1.98168,0.2966 2.76676,0.8854 0.76111,0.6031 1.32162,1.4818 1.67586,2.6402 l -8.71132,0 c 0.2537,-1.1153 0.78012,-1.9815 1.56519,-2.6086 0.76112,-0.608 1.65996,-0.917 2.70351,-0.917 z" - id="path3725" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854" /> - <g - id="g3727" - transform="matrix(0.11114798,0,0,0.11100654,123.22819,1102.3426)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854"> - <path - inkscape:connector-curvature="0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 60.321717,411.99998 377.014613,0" - id="path3729" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.61203,788.60332 0,-377.01178" - id="path3731" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.86937,597.15755 377.0124,0" - id="path3733" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 437.45588,596.97447 0,-377.01491" - id="path3735" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 372.87905,411.27704 64.93441,0" - id="path3737" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - </g> - <text - sodipodi:linespacing="100%" - id="text3739" - y="1214.6273" - x="-171.08939" - style="font-size:21.17786407px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" - xml:space="preserve" - transform="scale(-1,1)"><tspan - y="1214.6273" - x="-171.08939" - id="tspan3741" - sodipodi:role="line">cc</tspan></text> - <g - id="g3808" - transform="translate(-124,22)"> - <g - transform="matrix(0.31999488,0,0,0.31999488,389.01174,869.40895)" - id="g3788"> - <path - inkscape:connector-curvature="0" - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" - id="path3790" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854" /> - <g - id="g3792" - transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854"> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 60.321717,411.99998 377.014613,0" - id="path3794" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.61203,788.60332 0,-377.01178" - id="path3796" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.86937,597.15755 377.0124,0" - id="path3798" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 437.45588,596.97447 0,-377.01491" - id="path3800" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 372.87905,411.27704 64.93441,0" - id="path3802" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - </g> - </g> - <text - sodipodi:linespacing="100%" - id="text3804" - y="1231.8833" - x="-677.91302" - style="font-size:14.34666634px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" - xml:space="preserve" - transform="scale(-1,1)"><tspan - y="1231.8833" - x="-677.91302" - id="tspan3806" - sodipodi:role="line">cc</tspan></text> - </g> - <g - id="g3844" - transform="translate(0,140)"> - <g - id="g3846"> - <path - inkscape:connector-curvature="0" - style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" - d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" - id="path3848" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854" /> - <g - id="g3850" - transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" - inkscape:export-xdpi="399.59854" - inkscape:export-ydpi="399.59854"> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 60.321717,411.99998 377.014613,0" - id="path3852" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.61203,788.60332 0,-377.01178" - id="path3854" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 252.86937,597.15755 377.0124,0" - id="path3856" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 437.45588,596.97447 0,-377.01491" - id="path3858" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - <path - inkscape:connector-curvature="0" - style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" - d="m 372.87905,411.27704 64.93441,0" - id="path3860" - transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> - </g> - </g> - <text - sodipodi:linespacing="100%" - id="text3862" - y="1132.7504" - x="-902.83093" - style="font-size:44.83404922px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" - xml:space="preserve" - transform="scale(-1,1)"><tspan - y="1132.7504" - x="-902.83093" - id="tspan3864" - sodipodi:role="line">cc</tspan></text> - </g> - <g id="g3983" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/logo-big-home-kunecc.png" inkscape:export-xdpi="90" - inkscape:export-ydpi="90"> + inkscape:export-ydpi="90" + transform="translate(-804.7244,-186.61417)"> <g transform="translate(-0.07178157,0.14078373)" id="g3779"> @@ -1354,7 +1119,7 @@ </g> <g id="g3969" - transform="matrix(0.31973654,0,0,0.31973654,675.58786,768.46541)" + transform="matrix(0.31973654,0,0,0.31973654,-129.13654,581.85124)" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90"> @@ -1431,5 +1196,164 @@ id="tspan3967" sodipodi:role="line">.</tspan></text> </g> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/logo-big-home-kunecc.png" + id="g3240" + transform="translate(-464.7244,43.385828)"> + <g + id="g3242" + transform="translate(-0.07178157,0.14078373)"> + <path + inkscape:connector-curvature="0" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + id="path3244" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854" /> + <g + id="g3246" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + inkscape:export-xdpi="399.59854" + inkscape:export-ydpi="399.59854"> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 60.321717,411.99998 377.014613,0" + id="path3248" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.61203,788.60332 0,-377.01178" + id="path3250" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 252.86937,597.15755 377.0124,0" + id="path3252" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 437.45588,596.97447 0,-377.01491" + id="path3254" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + <path + inkscape:connector-curvature="0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + d="m 372.87905,411.27704 64.93441,0" + id="path3256" + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" /> + </g> + </g> + <text + sodipodi:linespacing="100%" + id="text3258" + y="1145.4236" + x="-925.99481" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve" + transform="scale(-1,1)"><tspan + y="1145.4236" + x="-925.99481" + id="tspan3260" + sodipodi:role="line">cc</tspan></text> + <text + sodipodi:linespacing="100%" + id="text3262" + y="1145.1492" + x="838.10248" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + xml:space="preserve"><tspan + y="1145.1492" + x="838.10248" + id="tspan3264" + sodipodi:role="line">.</tspan></text> + </g> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kunecc-logo-16px.png" + transform="matrix(0.31973654,0,0,0.31973654,-147.24678,536.33943)" + id="g3289" + style="opacity:0.4"> + <g + id="g3291" + transform="translate(380,-30)"> + <path + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + id="path3293" + d="m 818.32888,1096.181 c -0.74303,0 -1.45723,0 -2.17391,0.049 -0.0669,0.014 -0.13033,0.037 -0.19763,0.049 -0.66715,0.1246 -1.32536,0.2309 -2.02569,0.247 -0.097,0.014 -0.19995,-0.014 -0.29644,0 -5.71605,0.8606 -10.54554,3.3425 -14.42688,7.4605 -4.53271,4.7871 -6.81817,10.5218 -6.81818,17.1937 0,6.7467 2.28548,12.5204 6.81818,17.2925 4.90667,5.146 11.2818,7.7075 19.12055,7.7075 4.15869,0 8.15681,-1.0333 11.95652,-3.1127 3.79965,-2.0195 7.10345,-4.8778 9.93083,-8.498 l -8.54743,-4.7431 c -3.68005,4.9067 -8.20158,7.3617 -13.58695,7.3617 -3.73988,0 -7.0931,-1.2132 -9.98024,-3.6067 -2.93207,-2.3935 -4.39727,-5.3089 -4.39723,-8.7945 l 39.08102,0 0,-1.9763 c -4e-5,-8.452 -2.86291,-15.2201 -8.54743,-20.3063 -4.78705,-4.2335 -10.0899,-6.324 -15.90909,-6.3241 z m -181.71937,0.3459 0,18.9229 -6.62055,0 0,9.6838 6.62055,0 0,19.7628 10.07905,0 0,-19.7628 6.07708,0 12.40119,19.7628 11.95652,0 -16.6502,-25.0988 15.90909,-22.332 -12.20356,0 -12.30237,17.9842 -5.18775,0 0,-18.9229 -10.07905,0 z m 123.66601,0 c -1.73503,0.3096 -3.35171,0.8136 -4.8419,1.581 -2.5132,1.3464 -4.49729,3.122 -5.97826,5.336 l 0,-5.9783 -10.12846,0 0,47.4308 10.12846,0 0,-26.581 c -1e-5,-3.7997 1.07224,-6.7151 3.21147,-8.7945 2.15413,-2.0793 4.88507,-3.1126 8.25098,-3.1126 3.56032,0 6.34065,0.9553 8.3004,2.915 1.95964,1.9597 2.91496,5.031 2.91502,9.1897 l 0,26.3834 10.12846,0 0,-28.6067 c -5e-5,-5.8192 -1.77567,-10.6272 -5.33597,-14.4269 -2.67029,-2.8497 -5.76,-4.6235 -9.28854,-5.336 l -7.36166,0 z m -76.77865,0.9387 0,27.4703 c -2e-5,6.4326 2.16853,11.6335 6.52173,15.6127 4.03904,3.7399 9.04189,5.6324 14.92095,5.6324 5.93886,0 10.91633,-1.8925 14.97036,-5.6324 4.35315,-3.9792 6.52169,-9.1801 6.52174,-15.6127 l 0,-27.4703 -10.12846,0 0,26.581 c -5e-5,3.5005 -1.0723,6.3484 -3.21146,8.5474 -2.21404,2.2739 -4.906,3.4091 -8.15218,3.4091 -3.12654,0 -5.83938,-1.1502 -8.05336,-3.4091 -2.19905,-2.2738 -3.2609,-5.1067 -3.26087,-8.5474 l 0,-26.581 -10.12845,0 z m 133.54743,7.8063 c 3.306,10e-5 6.19285,0.9268 8.64624,2.7668 2.37851,1.8849 4.13014,4.6309 5.23716,8.251 l -27.22332,0 c 0.79283,-3.4855 2.43792,-6.1925 4.8913,-8.1522 2.37853,-1.8998 5.18745,-2.8655 8.44862,-2.8656 z" + style="font-size:58.13353348px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#a56941;fill-opacity:1;stroke:none;font-family:Emblem" + inkscape:connector-curvature="0" /> + <g + inkscape:export-ydpi="399.59854" + inkscape:export-xdpi="399.59854" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/kune-logo-1200.png" + transform="matrix(0.347343,0,0,0.346901,554.4533,794.1211)" + id="g3295"> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3297" + d="m 60.321717,411.99998 377.014613,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23953247;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3299" + d="m 252.61203,788.60332 0,-377.01178" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffdb6b;stroke-width:109.23950958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3301" + d="m 252.86937,597.15755 377.0124,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#69312f;stroke-width:109.23951721;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3303" + d="m 437.45588,596.97447 0,-377.01491" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#cc6633;stroke-width:109.23950195;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + <path + transform="matrix(0.240856,0.12287,-0.12287,0.240856,101.5762,778.871)" + id="path3305" + d="m 372.87905,411.27704 64.93441,0" + style="color:#000000;fill:#69312f;fill-opacity:1;fill-rule:nonzero;stroke:#dd8a3d;stroke-width:109.23947906;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:block" + inkscape:connector-curvature="0" /> + </g> + </g> + <text + transform="scale(-1,1)" + xml:space="preserve" + style="font-size:58.94304657px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#69312f;fill-opacity:1;stroke:none;font-family:Emblem" + x="-1306.0667" + y="1115.2828" + id="text3307" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3309" + x="-1306.0667" + y="1115.2828">cc</tspan></text> + <text + xml:space="preserve" + style="font-size:87.16403198px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#cc6633;fill-opacity:1;stroke:none;font-family:Emblem" + x="1218.1743" + y="1115.0084" + id="text3311" + sodipodi:linespacing="100%"><tspan + sodipodi:role="line" + id="tspan3313" + x="1218.1743" + y="1115.0084">.</tspan></text> + </g> </g> </svg> Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -87,7 +87,7 @@ ginjector.getTasksParts(); ginjector.getWikiParts(); - ginjector.getSiteLogoPresenter(); + ginjector.getSiteLogo(); ginjector.getChatClient(); ginjector.getCoreParts(); ginjector.getGSpaceParts(); Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -41,7 +41,7 @@ import cc.kune.core.client.notify.msgs.UserNotifierPresenter; import cc.kune.core.client.notify.spiner.SpinerPresenter; import cc.kune.core.client.sitebar.SitebarActionsPresenter; -import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; +import cc.kune.core.client.sitebar.logo.SiteLogo; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; import cc.kune.core.client.sn.GroupSNPresenter; import cc.kune.core.client.sn.UserSNPresenter; @@ -140,7 +140,7 @@ AsyncProvider<SitebarActionsPresenter> getSitebarActionsPresenter(); - AsyncProvider<SiteLogoPresenter> getSiteLogoPresenter(); + SiteLogo getSiteLogo(); SiteTokenListeners getSiteTokenListeners(); Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -75,8 +75,7 @@ import cc.kune.core.client.sitebar.SitebarSignInLink; import cc.kune.core.client.sitebar.SitebarSignOutLink; import cc.kune.core.client.sitebar.SitebarSignOutLink.BeforeSignOut; -import cc.kune.core.client.sitebar.logo.SiteLogoPresenter; -import cc.kune.core.client.sitebar.logo.SiteLogoViewImpl; +import cc.kune.core.client.sitebar.logo.SiteLogo; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPanel; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter; import cc.kune.core.client.sn.GroupSNPanel; @@ -159,8 +158,7 @@ UserNotifierViewImpl.class, UserNotifierProxy.class); bindPresenter(SpaceSelectorPresenter.class, SpaceSelectorPresenter.SpaceSelectorView.class, SpaceSelectorPanel.class, SpaceSelectorPresenter.SpaceSelectorProxy.class); - bindPresenter(SiteLogoPresenter.class, SiteLogoPresenter.SiteLogoView.class, SiteLogoViewImpl.class, - SiteLogoPresenter.SiteLogoProxy.class); + s(SiteLogo.class); bindPresenter(SitebarActionsPresenter.class, SitebarActionsPresenter.SitebarActionsView.class, SitebarActionsPanel.class, SitebarActionsPresenter.SitebarActionsProxy.class); bind(SitebarActions.class).to(SitebarActionsPresenter.class).in(Singleton.class); Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPanel.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ui.ActionSimplePanel; import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.core.client.sitebar.SitebarActionsPresenter.SitebarActionsView; +import cc.kune.core.client.sitebar.logo.SiteLogo; import cc.kune.core.shared.i18n.I18nTranslationService; import cc.kune.gspace.client.GSpaceArmor; @@ -32,50 +33,51 @@ public class SitebarActionsPanel extends ViewImpl implements SitebarActionsView { - private final Provider<AboutKuneDialog> aboutPanel; - private final ErrorsDialog errorPanel; - private final ActionSimplePanel toolbarLeft; - private final ActionSimplePanel toolbarRight; + private final Provider<AboutKuneDialog> aboutPanel; + private final ErrorsDialog errorPanel; + private final ActionSimplePanel toolbarLeft; + private final ActionSimplePanel toolbarRight; - @Inject - public SitebarActionsPanel(final GSpaceArmor armor, final ActionSimplePanel toolbarRight, - final ActionSimplePanel toolbarLeft, final I18nTranslationService i18n, - final Provider<AboutKuneDialog> aboutPanel, final ErrorsDialog errorPanel) { - this.toolbarRight = toolbarRight; - this.toolbarLeft = toolbarLeft; - this.aboutPanel = aboutPanel; - this.errorPanel = errorPanel; - toolbarRight.addStyleName("k-sitebar"); - toolbarRight.addStyleName("k-floatright"); - toolbarLeft.addStyleName("k-sitebar"); - toolbarLeft.addStyleName("k-floatleft"); - armor.getSitebar().add(toolbarLeft); - armor.getSitebar().add(toolbarRight); - } + @Inject + public SitebarActionsPanel(final GSpaceArmor armor, final ActionSimplePanel toolbarRight, + final ActionSimplePanel toolbarLeft, final I18nTranslationService i18n, + final Provider<AboutKuneDialog> aboutPanel, final ErrorsDialog errorPanel, final SiteLogo siteLogo) { + this.toolbarRight = toolbarRight; + this.toolbarLeft = toolbarLeft; + this.aboutPanel = aboutPanel; + this.errorPanel = errorPanel; + toolbarRight.addStyleName("k-sitebar"); + toolbarRight.addStyleName("k-floatright"); + toolbarLeft.addStyleName("k-sitebar"); + toolbarLeft.addStyleName("k-floatleft"); + armor.getSitebar().add(toolbarLeft); + armor.getSitebar().add(siteLogo); + armor.getSitebar().add(toolbarRight); + } - @Override - public Widget asWidget() { - return toolbarRight; - } + @Override + public Widget asWidget() { + return toolbarRight; + } - @Override - public IsActionExtensible getLeftBar() { - return toolbarLeft; - } + @Override + public IsActionExtensible getLeftBar() { + return toolbarLeft; + } - @Override - public IsActionExtensible getRightBar() { - return toolbarRight; - } + @Override + public IsActionExtensible getRightBar() { + return toolbarRight; + } - @Override - public void showAboutDialog() { - aboutPanel.get().showCentered(); - } + @Override + public void showAboutDialog() { + aboutPanel.get().showCentered(); + } - @Override - public void showErrorDialog() { - errorPanel.showCentered(); - } + @Override + public void showErrorDialog() { + errorPanel.showCentered(); + } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -23,7 +23,6 @@ import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.gxtui.AbstractGxtMenuGui; import cc.kune.common.client.actions.ui.IsActionExtensible; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; @@ -126,7 +125,8 @@ OPTIONS_MENU.putValue(Action.NAME, i18n.t("More")); OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowdownsitebar()); OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); - OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, AbstractGxtMenuGui.MenuPosition.bl); + // OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, + // AbstractGxtMenuGui.MenuPosition.bl); final AbstractExtendedAction bugsAction = new AbstractExtendedAction() { @Override Copied: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogo.java (from rev 1611, trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogo.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogo.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -0,0 +1,70 @@ +/* + * + * 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.sitebar.logo; + +import cc.kune.common.client.tooltip.Tooltip; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.SiteTokens; +import cc.kune.core.client.state.StateManager; + +import com.google.gwt.event.dom.client.ClickEvent; +import com.google.gwt.event.dom.client.ClickHandler; +import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Image; +import com.google.gwt.user.client.ui.PushButton; +import com.google.inject.Inject; + +public class SiteLogo extends Composite { + + private final PushButton btn; + private final Image logo; + private final Image logoOnOver; + + @Inject + public SiteLogo(final Session session, final StateManager stateManager, + final I18nUITranslationService i18n) { + logo = new Image(); + logoOnOver = new Image(); + + btn = new PushButton(logo, new ClickHandler() { + @Override + public void onClick(final ClickEvent event) { + stateManager.gotoHistoryToken(SiteTokens.HOME); + } + }); + btn.setStyleName("k-sitebar-logo"); + btn.addStyleName("k-fr"); + btn.addStyleName("k-pointer"); + session.onAppStart(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + logo.setUrl(event.getInitData().getSiteLogoUrl()); + logoOnOver.setUrl(event.getInitData().getSiteLogoUrlOnOver()); + } + }); + btn.getUpHoveringFace().setImage(logoOnOver); + initWidget(btn); + Tooltip.to(btn, i18n.t("Home page of [%s]", i18n.getSiteCommonName())); + } + +} Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoPresenter.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -1,71 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.sitebar.logo; - -import cc.kune.core.client.init.AppStartEvent; -import cc.kune.core.client.state.SiteTokens; -import cc.kune.core.client.state.StateManager; - -import com.google.gwt.event.shared.EventBus; -import com.google.inject.Inject; -import com.gwtplatform.mvp.client.HasUiHandlers; -import com.gwtplatform.mvp.client.Presenter; -import com.gwtplatform.mvp.client.View; -import com.gwtplatform.mvp.client.annotations.ProxyCodeSplit; -import com.gwtplatform.mvp.client.annotations.ProxyEvent; -import com.gwtplatform.mvp.client.proxy.Proxy; -import com.gwtplatform.mvp.client.proxy.RevealRootContentEvent; - -public class SiteLogoPresenter extends Presenter<SiteLogoPresenter.SiteLogoView, SiteLogoPresenter.SiteLogoProxy> - implements SiteLogoUiHandlers { - - @ProxyCodeSplit - public interface SiteLogoProxy extends Proxy<SiteLogoPresenter> { - } - - public interface SiteLogoView extends View, HasUiHandlers<SiteLogoUiHandlers> { - void setSiteLogoUrl(String siteLogoUrl); - } - - private final StateManager stateManager; - - @Inject - public SiteLogoPresenter(final EventBus eventBus, final SiteLogoView view, final SiteLogoProxy proxy, - final StateManager stateManager) { - super(eventBus, view, proxy); - this.stateManager = stateManager; - getView().setUiHandlers(this); - } - - @ProxyEvent - public void onAppStart(final AppStartEvent event) { - getView().setSiteLogoUrl(event.getInitData().getSiteLogoUrl()); - } - - @Override - public void onClick() { - stateManager.gotoHistoryToken(SiteTokens.HOME); - } - - @Override - protected void revealInParent() { - RevealRootContentEvent.fire(this, this); - } -} \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoUiHandlers.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoUiHandlers.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoUiHandlers.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -1,26 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.sitebar.logo; - -import com.gwtplatform.mvp.client.UiHandlers; - -public interface SiteLogoUiHandlers extends UiHandlers { - void onClick(); -} \ No newline at end of file Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -1,66 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.core.client.sitebar.logo; - -import cc.kune.core.client.sitebar.logo.SiteLogoPresenter.SiteLogoView; -import cc.kune.gspace.client.GSpaceArmor; - -import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; -import com.google.gwt.uibinder.client.UiBinder; -import com.google.gwt.uibinder.client.UiField; -import com.google.gwt.uibinder.client.UiHandler; -import com.google.gwt.user.client.ui.Image; -import com.google.gwt.user.client.ui.Widget; -import com.google.inject.Inject; -import com.gwtplatform.mvp.client.ViewWithUiHandlers; - -public class SiteLogoViewImpl extends ViewWithUiHandlers<SiteLogoUiHandlers> implements SiteLogoView { - - interface SiteLogoViewImplUiBinder extends UiBinder<Widget, SiteLogoViewImpl> { - } - - private static SiteLogoViewImplUiBinder uiBinder = GWT.create(SiteLogoViewImplUiBinder.class); - - @UiField - Image logo; - - @Inject - public SiteLogoViewImpl(final GSpaceArmor armor) { - armor.getSitebar().insert(uiBinder.createAndBindUi(this), 0); - } - - @Override - public Widget asWidget() { - return logo; - } - - @UiHandler("logo") - void onLogoClick(final ClickEvent event) { - if (getUiHandlers() != null) { - getUiHandlers().onClick(); - } - } - - @Override - public void setSiteLogoUrl(final String siteLogoUrl) { - logo.setUrl(siteLogoUrl); - } -} Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.ui.xml 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/client/sitebar/logo/SiteLogoViewImpl.ui.xml 2011-11-17 14:25:43 UTC (rev 1613) @@ -1,10 +0,0 @@ -<!DOCTYPE ui:UiBinder SYSTEM "http://dl.google.com/gwt/DTD/xhtml.ent"> -<ui:UiBinder xmlns:ui="urn:ui:com.google.gwt.uibinder" - xmlns:g="urn:import:com.google.gwt.user.client.ui"> - <ui:style> - .important { - font-weight: bold; - } - </ui:style> - <g:Image ui:field="logo" addStyleNames="k-sitebar-logo k-floatright k-pointer" /> -</ui:UiBinder> \ No newline at end of file Added: trunk/src/main/java/cc/kune/core/public/images/kune-logo-onover-16px.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/java/cc/kune/core/public/images/kune-logo-onover-16px.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/src/main/java/cc/kune/core/server/InitData.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/InitData.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/server/InitData.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -60,6 +60,7 @@ private String siteCommonName; private String siteDomain; private String siteLogoUrl; + private String siteLogoUrlOnOver; private String siteShortName; private String siteUrl; private String[] timezones; @@ -173,6 +174,10 @@ return siteLogoUrl; } + public String getSiteLogoUrlOnOver() { + return siteLogoUrlOnOver; + } + public String getSiteShortName() { return siteShortName; } @@ -310,6 +315,10 @@ this.siteLogoUrl = siteLogoUrl; } + public void setSiteLogoUrlOnOver(final String siteLogoUrlOnOver) { + this.siteLogoUrlOnOver = siteLogoUrlOnOver; + } + public void setSiteShortName(final String siteShortName) { this.siteShortName = siteShortName; } Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -48,6 +48,7 @@ String SITE_GROUP_AVAILABLE_TOOLS = "kune.tools.groupSiteAvailableTools"; String SITE_GROUP_REGIST_ENABLED_TOOLS = "kune.tools.groupRegisEnabledTools"; String SITE_LOGO_URL = "kune.sitelogourl"; + String SITE_LOGO_URL_ONOVER = "kune.sitelogourl.onover"; String SITE_NAME = "kune.default.site.name"; String SITE_SHORTNAME = "kune.default.site.shortName"; String SITE_SMTP_DEFAULT_FROM = "kune.site.smtp.defaultfrom"; Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -133,6 +133,7 @@ data.setCurrentCCversion(this.kuneProperties.get(KuneProperties.CURRENT_CC_VERSION)); data.setDefaultWsTheme(this.kuneProperties.get(KuneProperties.WS_THEMES_DEF)); data.setSiteLogoUrl(kuneProperties.get(KuneProperties.SITE_LOGO_URL)); + data.setSiteLogoUrlOnOver(kuneProperties.get(KuneProperties.SITE_LOGO_URL_ONOVER)); data.setGalleryPermittedExtensions(kuneProperties.get(KuneProperties.UPLOAD_GALLERY_PERMITTED_EXTS)); data.setMaxFileSizeInMb(kuneProperties.get(KuneProperties.UPLOAD_MAX_FILE_SIZE)); data.setUserTools(serverToolRegistry.getToolsAvailableForUsers()); Modified: trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -52,6 +52,7 @@ private ReservedWordsRegistryDTO reservedWords; private String siteDomain; private String siteLogoUrl; + private String siteLogoUrlOnOver; private String siteShortName; private String siteUrl; private String[] timezones; @@ -164,6 +165,10 @@ return siteLogoUrl; } + public String getSiteLogoUrlOnOver() { + return siteLogoUrlOnOver; + } + public String getSiteShortName() { return siteShortName; } @@ -301,6 +306,10 @@ this.siteLogoUrl = siteLogoUrl; } + public void setSiteLogoUrlOnOver(final String siteLogoUrlOnOver) { + this.siteLogoUrlOnOver = siteLogoUrlOnOver; + } + public void setSiteShortName(final String siteShortName) { this.siteShortName = siteShortName; } Modified: trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java =================================================================== --- trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/java/cc/kune/wave/client/WaveStatusIndicator.java 2011-11-17 14:25:43 UTC (rev 1613) @@ -43,10 +43,12 @@ @Inject public WaveStatusAction(final Session session, final I18nTranslationService i18n) { super(session, true); + setVisible(false); ClientEvents.get().addNetworkStatusEventHandler(new NetworkStatusEventHandler() { private void goOnline() { putValue(Action.NAME, ""); // i18n.t("Online")); putValue(AbstractAction.STYLES, "k-sitebar-wave-status, k-sitebar-wave-status-online"); + setVisible(false); NotifyUser.hideProgress(); } @@ -67,6 +69,7 @@ case RECONNECTING: putValue(Action.NAME, i18n.t("Offline")); putValue(AbstractAction.STYLES, "k-sitebar-wave-status, k-sitebar-wave-status-offline"); + setVisible(true); break; } } Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-11-17 00:24:07 UTC (rev 1612) +++ trunk/src/main/resources/kune.properties 2011-11-17 14:25:43 UTC (rev 1613) @@ -4,7 +4,8 @@ kune.siteurl = http://localhost:8080 -kune.sitelogourl = ws/images/kune-logo-16px.png +kune.sitelogourl = ws/images/kune-logo-onover-16px.png +kune.sitelogourl.onover = ws/images/kune-logo-16px.png # Every kune site have a group with this name: # This group will be created in the first execution of kune. @@ -55,7 +56,7 @@ ### Other params # Reserved words to avoid it's use in the client side for user and group names (see client tokens used in SiteTokens) -kune.server.names.reservedwords = root,adm,kune,fuck,about,home,newgroup,preview,register,signin,translate,inbox,sub +kune.server.names.reservedwords = root,adm,kune,fuck,about,home,newgroup,preview,register,signin,translate,inbox,sub,admin,www,ftp,pop,pop3,smtp,mail,wave # If defined create a copy of this wave as welcome to new users # kune.site.welcomewave = w+rtackLTkDCA

1 0

r1612 - in trunk: . src/main/java/cc/kune/hspace/client
by Vicente J. Ruiz Jurado 17 Nov '11

17 Nov '11

Author: vjrj_ Date: 2011-11-17 01:24:07 +0100 (Thu, 17 Nov 2011) New Revision: 1612 Added: trunk/.apt_generated/ Modified: trunk/ trunk/INSTALL trunk/README trunk/TROUBLESHOOT trunk/pom.xml trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml Log: Documentation improved thanks to the feedback of @superbranch Property changes on: trunk ___________________________________________________________________ Name: svn:ignore - pmd-eclipse.log .pmd www-test screenlog.0 client public target target-local Main-compile .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat gwt-out synccss.sh .externalToolBuilders .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt .jdee_sources .jdee_classpath prj.el .factorypath .apt_generated target.old _accounts _certificates _deltas logs test-output .recommenders _sessions chromedriver.log kune-screencast* + pmd-eclipse.log .pmd www-test screenlog.0 client public target target-local Main-compile .settings .gwt-cache repository derby.log star-yellow-grey.png run.sh tomcat gwt-out synccss.sh .externalToolBuilders .wtpmodules www testRepository kune-OLD-jcr KuneApp.launch KuneApp NOSERVER.launch old_src org.ourproject.kune.app.Kune org.ourproject.kune.iml org.ourproject.kune.ipr org.ourproject.kune.iws nbproject hibernate.reveng.xml .gwt-tmp target-eclipse .checkstyle .classpath-bien pom.xml.* .gwt .jdee_sources .jdee_classpath prj.el .factorypath target.old _accounts _certificates _deltas logs test-output .recommenders _sessions chromedriver.log kune-screencast* Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2011-11-16 18:54:28 UTC (rev 1611) +++ trunk/INSTALL 2011-11-17 00:24:07 UTC (rev 1612) @@ -87,6 +87,10 @@ sudo chown yourUser:yourUser /var/lib/kune/lucene/kune_dev/indexes sudo chown yourUser:yourUser /var/lib/kune/lucene/kune_test/indexes + But in general you can do it recursively with: + + sudo chown -R yourUser:yourUser /var/lib/kune/ + ====Aditional info for W$ users==== Not verified: In case you are using windows as dev platform you only have to create a couple of folders anywhere you like and then specify them in persistence.xml, as follows: @@ -147,7 +151,7 @@ ===Connecting to the server=== -Open your browser and connect to http://localhost:8888/ws/ +Open your browser and connect to http://localhost:8888/ ==Production environment instructions== Modified: trunk/README =================================================================== --- trunk/README 2011-11-16 18:54:28 UTC (rev 1611) +++ trunk/README 2011-11-17 00:24:07 UTC (rev 1612) @@ -1 +1,25 @@ -See INSTALL file for instructions += README of KUNE = + +See the INSTALL file for instructions of how to run Kune. Please follow closely. + +See the DEV-GUIDE for developers information and guidelines. + +See the TROUBLESHOOT file in you have problems with the installation or the development. + +See the CREDITS COPYRIGHT for legal info and author/contributors. + +and for BUGS for inform about problems/feedback etc. + +== Adapting Kune to your site == + +Adapt as much as possible to your needs this files: + +- src/main/resources/kune.properties +- src/main/resources/wave-server.properties +- src/main/resources/log4j.properties +- src/main/webapp/ws.html + +The last one is the home that you get at start-up and have some configurations also. You can change the html inside to your needs but follow the commentaries and try not to remove important parts that make kune to start. + +Note: Remember that if you change this files in some point, you have to make 'mvn compile' so are copied to the target directoy. + Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2011-11-16 18:54:28 UTC (rev 1611) +++ trunk/TROUBLESHOOT 2011-11-17 00:24:07 UTC (rev 1612) @@ -65,6 +65,14 @@ http://code.google.com/p/gwt-examples/wiki/gwtEclipseFaqs about how to fix it in your system. +== If you change some .properties or configuration files in src directory == + +Be sure to do mvn compile (that copy them to the target directory) + +== If the client get: Error fetching initial data from Kune server == + +Probably the client code is outdated from the server code (or viceversa). Try to get both codes in sync compiling it. + == Mysql: Caused by: java.sql.SQLException: Access denied for user 'kune'@'localhost' (using password: YES) == Check that the password you have use in the database creation it's the same like the src/main/resources/META-INF/persistence.xml. If it's wrong maybe you have to remove the mysql user (DROP USER) and repeat the GRANT sentences of the INSTALL. @@ -97,6 +105,15 @@ #general_log = 1 in /etc/mysql/my.cnf +== If during initialization (first start) you get a 'Account already exists' == + +If you stopped the first initialization and the server init is half started you will get something like: + +Caused by: cc.kune.core.client.errors.UserRegistrationException: +Account already exists + +trying to run kune and creating the DB. So better remove the first account of wave and related /var/lib/kune/_* + == Eclipse & GWT == If you have some tests with error like "can not be found in source packages. Check the inheritance chain from your module; it may not be inheriting a required module or a module may not be adding its source path entries properly" and you have installed GWTDesigner, uncheck "client classpath": http://code.google.com/webtoolkit/tools/gwtdesigner/preferences/gwt/prefere… @@ -118,8 +135,17 @@ Compile in PRETTY mode and edit target/kune-VERSION/ws/ws.nocache.js and look for 'unflattenKeylistIntoAnswers' to see a permutation list. See: https://groups.google.com/group/google-web-toolkit/browse_thread/thread/ec7… -=== Outbound variable M2_REPO === +If you want to compile less permutations (only for dev or testing), comment some locale and user.agent in src/main/java/cc/kune/Kune.gwt.xml +== Outbound variable M2_REPO == + Set M2_REPO to eclipse in Preferences > Java > Build Path > Classpath Variable (normally to /home/youruser/.m2/repository/) -=== +== Error generating CoreResources == + +[INFO] Computing all possible rebind results for 'cc.kune.core.client.resources.CoreResources' [INFO] Rebinding cc.kune.core.client.resources.CoreResources [INFO] Invoking generator com.google.gwt.resources.rebind.context.StaticClientBundleGenerator [INFO] [ERROR] Generator 'com.google.gwt.resources.rebind.context.StaticClientBundleGenerator' threw an exception while rebinding 'cc.kune.cor + [INFO] at com.google.gwt.dev.util.Util.computeStrongName(Util.java:170) [INFO] at com.google.gwt.dev.util.Util.computeStrongName(Util.java:145) [INFO] at com.google.gwt.resources.rebind.context.StaticResourceContext.deploy(StaticResourceContext.java:61) + +http://code.google.com/p/google-web-toolkit/issues/detail?id=6103 + +The gwt compiler is trying to create a sprite sheet, an image with all the icons all together (to minimize calls from client to server) but cannot open all the files. This happens normally when ulimit is not setted. See: "Too many files open" above. Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-16 18:54:28 UTC (rev 1611) +++ trunk/pom.xml 2011-11-17 00:24:07 UTC (rev 1612) @@ -1025,7 +1025,7 @@  <noServer>true</noServer> <gwtVersion>${gwt.version}</gwtVersion> - <runTarget>/ws/ws.html?log_level=DEBUG</runTarget> + <runTarget>/ws.html?log_level=DEBUG</runTarget> <hostedWebapp>${project.build.directory}/${project.build.finalName} </hostedWebapp> <modules> Modified: trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml 2011-11-16 18:54:28 UTC (rev 1611) +++ trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml 2011-11-17 00:24:07 UTC (rev 1612) @@ -6,7 +6,7 @@ <g:FlowPanel styleName="k-home-group-stats-item">  <g:Image ui:field="icon" width="22px" height="22px" styleName="k-home-group-cnt-icon" - url="images/clear.png" /> + url="ws/images/clear.png" /> <g:Hyperlink ui:field="link" styleName="k-home-group-cnt-link" /> </g:FlowPanel> </ui:UiBinder> \ No newline at end of file

1 0

r1611 - trunk
by Vicente J. Ruiz Jurado 16 Nov '11

16 Nov '11

Author: vjrj_ Date: 2011-11-16 19:54:28 +0100 (Wed, 16 Nov 2011) New Revision: 1611 Modified: trunk/TROUBLESHOOT Log: Doc fix Modified: trunk/TROUBLESHOOT =================================================================== --- trunk/TROUBLESHOOT 2011-11-16 13:18:31 UTC (rev 1610) +++ trunk/TROUBLESHOOT 2011-11-16 18:54:28 UTC (rev 1611) @@ -73,6 +73,30 @@ If you have this problem with openfire it's not enough to change the password in openfire.xml because probably it's already stored in the ofProperty openfire table and you need to change the password there. +== Other mysql errors == + +If you get this warning, probably you have connection problems between kune and your database: + +WARNING: Multiple Servlet injectors detected. This is a warning indicating that you have more than one GuiceFilter running in your web application. If this is deliberate, you may safely ignore this message. If this is NOT deliberate however, your application may not work as expected. + +A check list: +- these files should be the same: + diff src/main/resources/META-INF/persistence.xml target/kune-0.1.0-SNAPSHOT/WEB-INF/classes/META-INF/persistence.xml +if not "mvn compile -Dliquibase.should.run=false" +- the persistence-unit you use, that is hardcoded (by now) in +src/main/java/cc/kune/core/server/KuneRackModule.java +(...) + public KuneRackModule() { + this("production", "/ws", null); + } +(...) +find that name in persistence.xml (we are using production, but can be other). The db user/password configured in persistence.xml for that name should be the same to that one you used in the GRANT sentence of mysql database creation. + +To debug mysql logs, you can uncomment: +#general_log_file = /var/log/mysql/mysql.log +#general_log = 1 +in /etc/mysql/my.cnf + == Eclipse & GWT == If you have some tests with error like "can not be found in source packages. Check the inheritance chain from your module; it may not be inheriting a required module or a module may not be adding its source path entries properly" and you have installed GWTDesigner, uncheck "client classpath": http://code.google.com/webtoolkit/tools/gwtdesigner/preferences/gwt/prefere…

1 0

16 Nov '11

Author: vjrj_ Date: 2011-11-16 14:18:31 +0100 (Wed, 16 Nov 2011) New Revision: 1610 Modified: trunk/INSTALL trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java trunk/src/main/java/cc/kune/core/client/state/ContentCache.java trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java trunk/src/main/java/cc/kune/core/client/state/StateManager.java trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java trunk/src/main/java/cc/kune/core/server/InitData.java trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java trunk/src/main/resources/META-INF/persistence.xml trunk/src/main/resources/kune.properties Log: CLOSED - # 159: When Drag&Drop or Renaming, clear Content Cache http://kune.ourproject.org/issues/ticket/159 Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/INSTALL 2011-11-16 13:18:31 UTC (rev 1610) @@ -71,7 +71,7 @@ # (in the trunk directory) mvn compile -Dliquibase.should.run=false && mvn gwt:compile -NOTE: If you change these db passwords after compiling, you have to repeat the "mvn compile" because if not, probably you are using a old persistence.xml. See TROUBLESHOOT for more details. +NOTE: If you change the previous db passwords after this compiling, you have to repeat the "mvn compile" because if not, probably you will use an old persistence.xml. See TROUBLESHOOT for more details. ===Configure upload directory=== @@ -155,26 +155,6 @@ mvn package an executable target/kune-VERSION.one-jar.jar is generated in target directory. -===Apache proxy=== - -You can configure your Apache with this kind of virtual host -<VirtualHost *:80> - ServerName youkune.example.com - - ProxyRequests Off - <Proxy *> - Order deny,allow - Allow from all - </Proxy> - - ProxyPass / http://localhost:8080/ - ProxyPassReverse / http://localhost:8080/ - <Location /> - Order allow,deny - Allow from all - </Location> -</VirtualHost> - ==Appendix A: Configuration of Openfire xmpp server== Install openfire in your system: http://www.igniterealtime.org/downloads/index.jsp @@ -218,6 +198,11 @@ In Server > Server Settings > HTTP Binding, enable "HTTP Bind Settings" and set the port to 5280. Check that port is not used by other service in your machine (we use 5280 as default, but if you want to use other change it your web.xml accordly) +Because users are managed from the database of kune, we recommend to set: +In Server > Server Settings > Registration & Login > Inband Account Registration > Disabled +In Server > Server Settings > Registration & Login > Change Password > Disabled +so this will not conflict with kune users management. + Edit the openfire.xml in a terminal: * In debian (with a .deb installation) you can to edit the configuration in /etc/openfire directory. * In Mac: /usr/local/openfire/conf @@ -285,6 +270,11 @@ ==Appendix B: Apache configuration sample== +WARNING: This should not work with current wave's websocket. Consider use nginx (that support websocket better) instead. +http://serverfault.com/questions/290121/configuring-apache2-to-proxy-websocket + +You can configure your Apache with this kind of virtual host + Enable this modules: a2enmod expires a2enmod proxy Modified: trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/chat/client/actions/NewRoomBtn.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -32,6 +32,7 @@ import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -89,12 +90,13 @@ if (diag.isValid()) { NotifyUser.showProgressProcessing(); final String groupShortName = session.getCurrentState().getGroup().getShortName(); - contentService.get().addRoom(session.getUserHash(), - session.getContainerState().getRootContainer().getStateToken(), + final StateToken parentToken = session.getContainerState().getRootContainer().getStateToken(); + contentService.get().addRoom(session.getUserHash(), parentToken, groupShortName + "-" + diag.getTextFieldValue(), new AsyncCallbackSimple<StateContainerDTO>() { @Override public void onSuccess(final StateContainerDTO state) { + stateManager.removeCache(parentToken); stateManager.setRetrievedStateAndGo(state); NotifyUser.hideProgress(); NotifyUser.info(i18n.t("Chatroom created")); Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/NewGadgetAction.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -26,8 +26,10 @@ import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.state.ContentCache; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -67,12 +69,14 @@ @Override public void actionPerformed(final ActionEvent event) { - contentService.get().addNewContentWithGadget(session.getUserHash(), session.getCurrentStateToken(), - gadgetName, typeId, i18n.t(title), i18n.t(body), new AsyncCallbackSimple<StateContentDTO>() { + final StateToken parentToken = session.getCurrentStateToken(); + contentService.get().addNewContentWithGadget(session.getUserHash(), parentToken, gadgetName, typeId, + i18n.t(title), i18n.t(body), new AsyncCallbackSimple<StateContentDTO>() { @Override public void onSuccess(final StateContentDTO result) { NotifyUser.info(i18n.t("'[%s]' created succesfully", i18n.t(title)), i18n.t(CoreMessages.GADGETS_EXPERIMENTAL)); + stateManager.removeCache(parentToken); stateManager.setRetrievedStateAndGo(result); contentViewer.blinkTitle(); } Modified: trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/client/actions/xml/XMLActionsParser.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -58,13 +58,9 @@ private final ContentViewerPresenter contentViewer; private final ErrorHandler errHandler; private final I18nTranslationService i18n; - private final NewMenusForTypeIdsRegistry newMenusRegistry; - private final Session session; - private final StateManager stateManager; - private final HashMap<String, SubMenuDescriptor> submenus; @Inject Modified: trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/client/dnd/FolderViewerDropController.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -23,6 +23,7 @@ import cc.kune.common.client.utils.TextUtils; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.state.ContentCache; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; @@ -49,6 +50,7 @@ */ public class FolderViewerDropController implements DropTarget { + private final ContentCache contentCache; private final ContentServiceAsync contentService; private final KuneDragController dragController; private SimpleDropController dropController; @@ -61,13 +63,14 @@ @Inject public FolderViewerDropController(final KuneDragController dragController, final ContentServiceAsync contentService, final Session session, final StateManager stateManager, - final ErrorHandler erroHandler, final I18nTranslationService i18n) { + final ErrorHandler erroHandler, final I18nTranslationService i18n, final ContentCache contentCache) { this.dragController = dragController; this.contentService = contentService; this.session = session; this.stateManager = stateManager; this.erroHandler = erroHandler; this.i18n = i18n; + this.contentCache = contentCache; } @Override @@ -84,8 +87,9 @@ if (target != null) { final StateToken destToken = (StateToken) target; widget.removeFromParent(); - contentService.moveContent(session.getUserHash(), ((FolderItemWidget) widget).getToken(), - destToken, new AsyncCallback<StateContainerDTO>() { + final StateToken tokenToMove = ((FolderItemWidget) widget).getToken(); + contentService.moveContent(session.getUserHash(), tokenToMove, destToken, + new AsyncCallback<StateContainerDTO>() { @Override public void onFailure(final Throwable caught) { erroHandler.process(caught); @@ -96,6 +100,8 @@ @Override public void onSuccess(final StateContainerDTO result) { NotifyUser.hideProgress(); + contentCache.remove(tokenToMove); + contentCache.remove(destToken); } }); } else { Modified: trunk/src/main/java/cc/kune/core/client/state/ContentCache.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentCache.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/client/state/ContentCache.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -28,10 +28,10 @@ void cache(StateToken token, StateAbstractDTO content); - void clearCacheOfGroup(String group); + void removeCacheOfGroup(String group); void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback); - void removeContent(StateToken token); + void remove(StateToken token); } Modified: trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/client/state/ContentCacheDefault.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -22,6 +22,8 @@ import java.util.HashMap; import java.util.Map; +import cc.kune.core.client.init.AppStartEvent; +import cc.kune.core.client.init.AppStartEvent.AppStartHandler; import cc.kune.core.client.notify.spiner.ProgressShowEvent; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; @@ -36,7 +38,7 @@ private final Map<StateToken, StateAbstractDTO> cacheMap; private final EventBus eventBus; private final ContentServiceAsync server; - private final boolean useCache; + private boolean useCache = false; @Inject public ContentCacheDefault(final ContentServiceAsync server, final EventBus eventBus, @@ -44,7 +46,14 @@ this.server = server; this.eventBus = eventBus; this.cacheMap = new HashMap<StateToken, StateAbstractDTO>(); - // Don't use while we don't check changes in the server + // Better, don't use while we don't check changes in the server (by others) + // and we do server pub/sub + session.onAppStart(true, new AppStartHandler() { + @Override + public void onAppStart(final AppStartEvent event) { + useCache = event.getInitData().useClientContentCache(); + } + }); useCache = true; session.onUserSignInOrSignOut(false, new UserSignInOrSignOutHandler() { @Override @@ -62,15 +71,6 @@ } } - @Override - public void clearCacheOfGroup(final String group) { - for (final StateToken entry : cacheMap.keySet()) { - if (entry.getGroup().equals(group)) { - cacheMap.remove(entry); - } - } - } - private StateAbstractDTO getCached(final StateToken newState) { assert newState != null; return useCache ? cacheMap.get(newState) : null; @@ -91,8 +91,17 @@ } @Override - public void removeContent(final StateToken token) { + public void remove(final StateToken token) { cacheMap.remove(token); } + @Override + public void removeCacheOfGroup(final String group) { + for (final StateToken entry : cacheMap.keySet()) { + if (entry.getGroup().equals(group)) { + cacheMap.put(entry, null); + } + } + } + } Modified: trunk/src/main/java/cc/kune/core/client/state/StateManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/client/state/StateManager.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -64,6 +64,10 @@ void removeBeforeStateChangeListener(BeforeActionListener listener); + void removeCache(StateToken parentToken); + + void removeCacheOfGroup(String group); + void removeSiteToken(String token); void restorePreviousToken(); Modified: trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/client/state/StateManagerDefault.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -101,7 +101,7 @@ onSocialNetworkChanged(false, new SocialNetworkChangedHandler() { @Override public void onSocialNetworkChanged(final SocialNetworkChangedEvent event) { - contentCache.clearCacheOfGroup(event.getState().getStateToken().getGroup()); + contentCache.removeCacheOfGroup(event.getState().getStateToken().getGroup()); } }); } @@ -194,7 +194,7 @@ @Override public void gotoStateToken(final StateToken token, final boolean useCache) { if (!useCache) { - contentCache.removeContent(token); + contentCache.remove(token); } gotoStateToken(token); } @@ -367,7 +367,7 @@ if (currentStateToken == null) { processCurrentHistoryToken(); } else { - contentCache.removeContent(currentStateToken); + contentCache.remove(currentStateToken); getContent(currentStateToken); } } @@ -378,6 +378,16 @@ } @Override + public void removeCache(final StateToken parentToken) { + contentCache.remove(parentToken); + } + + @Override + public void removeCacheOfGroup(final String group) { + contentCache.removeCacheOfGroup(group); + } + + @Override public void removeSiteToken(final String token) { siteTokens.remove(token); } Modified: trunk/src/main/java/cc/kune/core/server/InitData.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/InitData.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/server/InitData.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -64,6 +64,7 @@ private String siteUrl; private String[] timezones; private boolean translatorEnabled; + private boolean useClientContentCache; private UserInfo userInfo; private List<ToolSimple> userTools; @@ -325,6 +326,10 @@ this.translatorEnabled = translatorEnabled; } + public void setUseClientContentCache(final boolean useClientContentCache) { + this.useClientContentCache = useClientContentCache; + } + public void setUserInfo(final UserInfo currentUserInfo) { this.userInfo = currentUserInfo; } @@ -333,4 +338,8 @@ this.userTools = userTools; } + public boolean useClientContentCache() { + return useClientContentCache; + } + } Modified: trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/server/properties/KuneProperties.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -62,6 +62,7 @@ String UPLOAD_LOCATION = "kune.upload.location"; String UPLOAD_MAX_FILE_SIZE = "kune.upload.maxfilesizeinmegas"; String UPLOAD_MAX_FILE_SIZE_IN_KS = "kune.upload.maxfilesizeinks"; + String USE_CLIENT_CONTENT_CACHE = "kune.client.useContentCache"; String WELCOME_WAVE = "kune.site.welcomewave"; String WS_THEMES = "kune.wsthemes"; String WS_THEMES_DEF = "kune.wsthemes.default"; Modified: trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/server/rpc/SiteRPC.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -150,6 +150,7 @@ data.setSiteShortName(kuneProperties.get(KuneProperties.SITE_SHORTNAME)); data.setSiteCommonName(kuneProperties.get(KuneProperties.SITE_COMMON_NAME)); data.setTranslatorEnabled(kuneProperties.getBoolean(KuneProperties.UI_TRANSLATOR_ENABLED)); + data.setUseClientContentCache(kuneProperties.getBoolean(KuneProperties.USE_CLIENT_CONTENT_CACHE)); return data; } Modified: trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/core/shared/dto/InitDataDTO.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -56,6 +56,7 @@ private String siteUrl; private String[] timezones; private boolean translatorEnabled; + private boolean useClientContentCache; private UserInfoDTO userInfo; private List<ToolSimpleDTO> userTools; @@ -316,6 +317,10 @@ this.translatorEnabled = translatorEnabled; } + public void setUseClientContentCache(final boolean useClientContentCache) { + this.useClientContentCache = useClientContentCache; + } + public void setUserInfo(final UserInfoDTO currentUser) { this.userInfo = currentUser; } @@ -324,4 +329,8 @@ this.userTools = userTools; } + public boolean useClientContentCache() { + return useClientContentCache; + } + } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -25,9 +25,9 @@ import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.state.ContentCache; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.HasContent; import cc.kune.core.shared.dto.StateContainerDTO; @@ -42,7 +42,6 @@ public static class NewContainerAction extends RolAction { - private final ContentCache cache; private final Provider<ContentServiceAsync> contentService; private final FolderViewerPresenter folderViewer; private final I18nTranslationService i18n; @@ -52,13 +51,12 @@ @Inject public NewContainerAction(final Session session, final StateManager stateManager, final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService, - final ContentCache cache, final FolderViewerPresenter folderViewer) { + final FolderViewerPresenter folderViewer) { super(AccessRolDTO.Editor, true); this.session = session; this.stateManager = stateManager; this.i18n = i18n; this.contentService = contentService; - this.cache = cache; this.folderViewer = folderViewer; } @@ -67,18 +65,19 @@ NotifyUser.showProgressProcessing(); stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); final String newName = (String) getValue(NEW_NAME); - contentService.get().addFolder(session.getUserHash(), session.getCurrentStateToken(), newName, - (String) getValue(ID), new AsyncCallbackSimple<StateContainerDTO>() { + final StateToken parentToken = session.getCurrentStateToken(); + contentService.get().addFolder(session.getUserHash(), parentToken, newName, (String) getValue(ID), + new AsyncCallbackSimple<StateContainerDTO>() { @Override public void onSuccess(final StateContainerDTO state) { // contextNavigator.setEditOnNextStateChange(true); + stateManager.removeCache(parentToken); stateManager.setRetrievedStateAndGo(state); NotifyUser.hideProgress(); NotifyUser.info(i18n.tWithNT("[%s] created", "New folder created, for instance", newName)); folderViewer.highlightTitle(); } }); - cache.removeContent(session.getCurrentStateToken()); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -31,6 +31,7 @@ import cc.kune.core.client.state.ContentCache; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.HasContent; import cc.kune.core.shared.dto.StateContainerDTO; @@ -70,18 +71,20 @@ NotifyUser.showProgressProcessing(); stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); final String newName = (String) getValue(NEW_NAME); - contentService.get().addFolder(session.getUserHash(), session.getCurrentStateToken(), newName, - (String) getValue(ID), new AsyncCallbackSimple<StateContainerDTO>() { + final StateToken parentToken = session.getCurrentStateToken(); + contentService.get().addFolder(session.getUserHash(), parentToken, newName, (String) getValue(ID), + new AsyncCallbackSimple<StateContainerDTO>() { @Override public void onSuccess(final StateContainerDTO state) { // contextNavigator.setEditOnNextStateChange(true); + stateManager.removeCache(parentToken); stateManager.setRetrievedStateAndGo(state); NotifyUser.hideProgress(); NotifyUser.info(i18n.tWithNT("[%s] created", "New folder created, for instance", newName)); folderViewer.highlightTitle(); } }); - cache.removeContent(session.getCurrentStateToken()); + cache.remove(parentToken); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -24,9 +24,9 @@ import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.state.ContentCache; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; +import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; @@ -40,7 +40,6 @@ public static final String ID = "ctnnewid"; public static final String NEW_NAME = "ctnnewname"; - private final ContentCache cache; private final Provider<ContentServiceAsync> contentService; private final ContentViewerPresenter contentViewer; private final I18nTranslationService i18n; @@ -50,14 +49,13 @@ @Inject public NewContentAction(final Session session, final StateManager stateManager, final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService, - final ContentViewerPresenter contentViewerPresenter, final ContentCache cache) { + final ContentViewerPresenter contentViewerPresenter) { super(AccessRolDTO.Editor, true); this.session = session; this.stateManager = stateManager; this.i18n = i18n; this.contentService = contentService; this.contentViewer = contentViewerPresenter; - this.cache = cache; } @Override @@ -66,11 +64,12 @@ // stateManager.gotoStateToken(((HasContent) // session.getCurrentState()).getContainer().getStateToken()); final String newName = (String) getValue(NEW_NAME); - contentService.get().addContent(session.getUserHash(), - session.getCurrentStateToken().copy().clearDocument(), newName, (String) getValue(ID), + final StateToken parentToken = session.getCurrentStateToken().copy().clearDocument(); + contentService.get().addContent(session.getUserHash(), parentToken, newName, (String) getValue(ID), new AsyncCallbackSimple<StateContentDTO>() { @Override public void onSuccess(final StateContentDTO state) { + stateManager.removeCache(parentToken); stateManager.setRetrievedStateAndGo(state); NotifyUser.hideProgress(); // stateManager.refreshCurrentGroupState(); @@ -79,6 +78,5 @@ contentViewer.blinkTitle(); } }); - cache.removeContent(session.getCurrentStateToken()); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -25,9 +25,13 @@ import cc.kune.core.client.errors.NameNotPermittedException; import cc.kune.core.client.events.RenameContentEvent; import cc.kune.core.client.rpcservices.ContentServiceAsync; +import cc.kune.core.client.state.ContentCache; import cc.kune.core.client.state.Session; import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.ContainerDTO; import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.i18n.I18nTranslationService; import com.google.gwt.event.shared.EventBus; @@ -36,6 +40,7 @@ import com.google.inject.Provider; public class RenameAction { + private final ContentCache contentCache; private final Provider<ContentServiceAsync> contentService; private final ErrorHandler errorHandler; private final EventBus eventBus; @@ -44,12 +49,14 @@ @Inject public RenameAction(final I18nTranslationService i18n, final Session session, final EventBus eventBus, - final Provider<ContentServiceAsync> contentService, final ErrorHandler errorHandler) { + final Provider<ContentServiceAsync> contentService, final ErrorHandler errorHandler, + final ContentCache contentCache) { this.i18n = i18n; this.session = session; this.eventBus = eventBus; this.contentService = contentService; this.errorHandler = errorHandler; + this.contentCache = contentCache; } public void rename(final StateToken token, final String oldName, final String newName, @@ -79,6 +86,14 @@ session.setCurrentState(state); listener.onSuccess(token, state.getTitle()); RenameContentEvent.fire(eventBus, token, oldName, newName); + contentCache.remove(token); + // remove parent cache + if (state instanceof StateContentDTO) { + contentCache.remove(((StateContentDTO) state).getContainer().getStateToken()); + } else if (state instanceof StateContainerDTO) { + final ContainerDTO container = ((StateContainerDTO) state).getContainer(); + contentCache.remove(token.copy().setFolder(container.getParentFolderId())); + } } }; if (token.isComplete()) { Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/GroupOptGeneralPresenter.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -80,6 +80,7 @@ if (view.isValid()) { NotifyUser.showProgress(); final GroupDTO group = session.getCurrentState().getGroup(); + final String previousGroupName = group.getShortName(); final StateToken token = group.getStateToken().copy(); group.setShortName(groupView.getShortName()); group.setLongName(groupView.getLongName()); @@ -88,6 +89,7 @@ @Override public void onSuccess(final StateAbstractDTO result) { NotifyUser.hideProgress(); + stateManager.removeCacheOfGroup(previousGroupName); stateManager.setRetrievedStateAndGo(result); setState(); sendChangeEntityEvent(); Modified: trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java =================================================================== --- trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -20,6 +20,8 @@ package cc.kune.hspace.client; import com.google.gwt.core.client.GWT; +import com.google.gwt.core.client.Scheduler; +import com.google.gwt.core.client.Scheduler.ScheduledCommand; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.user.client.ui.Composite; @@ -45,7 +47,12 @@ } public void setValues(final String logoImageUrl, final String text, final String historyToken) { - icon.setUrl(logoImageUrl); + Scheduler.get().scheduleDeferred(new ScheduledCommand() { + @Override + public void execute() { + icon.setUrl(logoImageUrl); + } + }); link.setText(text); link.setTargetHistoryToken(historyToken); } Modified: trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml =================================================================== --- trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/hspace/client/GroupContentHomeLink.ui.xml 2011-11-16 13:18:31 UTC (rev 1610) @@ -4,6 +4,7 @@ <ui:style> </ui:style> <g:FlowPanel styleName="k-home-group-stats-item"> +  <g:Image ui:field="icon" width="22px" height="22px" styleName="k-home-group-cnt-icon" url="images/clear.png" /> <g:Hyperlink ui:field="link" styleName="k-home-group-cnt-link" /> Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -102,7 +102,7 @@ folderViewer.highlightTitle(); } }); - cache.removeContent(session.getCurrentStateToken()); + cache.remove(session.getCurrentStateToken()); } } }); Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListPostAction.java 2011-11-16 13:18:31 UTC (rev 1610) @@ -107,7 +107,7 @@ folderViewer.highlightTitle(); } }); - cache.removeContent(session.getCurrentStateToken()); + cache.remove(session.getCurrentStateToken()); } } }); Modified: trunk/src/main/resources/META-INF/persistence.xml =================================================================== --- trunk/src/main/resources/META-INF/persistence.xml 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/resources/META-INF/persistence.xml 2011-11-16 13:18:31 UTC (rev 1610) @@ -32,6 +32,7 @@ <class>cc.kune.domain.User</class> <properties> <property name="hibernate.archive.autodetection" value="class, hbm"/> +  <property name="hibernate.show_sql" value="false"/> <property name="hibernate.format_sql" value="false"/> <property name="use_sql_comments" value="true"/> @@ -90,6 +91,7 @@ <class>cc.kune.domain.User</class> <properties> <property name="hibernate.archive.autodetection" value="class, hbm"/> +  <property name="hibernate.show_sql" value="false"/> <property name="hibernate.format_sql" value="false"/> <property name="use_sql_comments" value="true"/> @@ -146,6 +148,7 @@ <class>cc.kune.domain.User</class> <properties> <property name="hibernate.archive.autodetection" value="class, hbm"/> +  <property name="hibernate.show_sql" value="false"/> <property name="hibernate.format_sql" value="false"/> <property name="use_sql_comments" value="false"/> @@ -197,6 +200,7 @@ <class>cc.kune.domain.ToolConfiguration</class> <class>cc.kune.domain.User</class> <properties> +  <property name="hibernate.show_sql" value="false"/> <property name="hibernate.format_sql" value="false"/> <property name="use_sql_comments" value="false"/> Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2011-11-16 10:40:13 UTC (rev 1609) +++ trunk/src/main/resources/kune.properties 2011-11-16 13:18:31 UTC (rev 1610) @@ -77,6 +77,8 @@ kune.tools.groupRegisEnabledTools = docs,blogs,wiki,tasks,events,lists # WARNING: be sure that all tools in groupRegisEnabledTools are included in groupSiteAvailableTools +kune.client.useContentCache = false + ### Workspace enabled themes # This names are also the name of the items in the theme menu and there are translated

1 0

r1609 - trunk/script
by Vicente J. Ruiz Jurado 16 Nov '11

16 Nov '11

Author: vjrj_ Date: 2011-11-16 11:40:13 +0100 (Wed, 16 Nov 2011) New Revision: 1609 Modified: trunk/script/mvn-vars.sh Log: mvn script fix Modified: trunk/script/mvn-vars.sh =================================================================== --- trunk/script/mvn-vars.sh 2011-11-16 10:13:38 UTC (rev 1608) +++ trunk/script/mvn-vars.sh 2011-11-16 10:40:13 UTC (rev 1609) @@ -1,3 +1 @@ -if [[ -n $M2_REPO ]] ; then - M2_REPO=~/.m2/repository -fi +M2_REPO=~/.m2/repository

1 0