kune-commits

Download

[email protected]

March 2012

2 participants
84 discussions

r1774 - in trunk/src: main/java/cc/kune/core/client main/java/cc/kune/core/client/auth main/java/cc/kune/core/server/rpc main/java/cc/kune/gspace/client/actions main/webapp test/java/cc/kune/selenium
by Vicente J. Ruiz Jurado 21 Mar '12

21 Mar '12

Author: vjrj_ Date: 2012-03-21 13:25:32 +0100 (Wed, 21 Mar 2012) New Revision: 1774 Added: trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManager.java trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java Removed: trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java trunk/src/main/webapp/ws.html trunk/src/test/java/cc/kune/selenium/SeleniumConf.java Log: Fix for remember login saved passwords (tranks to @sembrestels) Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -41,8 +41,8 @@ import cc.kune.core.client.auth.SignInPresenter; import cc.kune.core.client.auth.SignInPresenter.SignInView; import cc.kune.core.client.auth.UserFieldFactory; -import cc.kune.core.client.auth.UserPassAutocompleteManager; -import cc.kune.core.client.auth.UserPassAutocompleteManagerImpl; +import cc.kune.core.client.auth.LoginRememberManager; +import cc.kune.core.client.auth.LoginRememberManagerImpl; import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.cookies.CookiesManagerImpl; import cc.kune.core.client.dnd.KuneDragController; @@ -183,7 +183,7 @@ bindPresenter(SubtitlesManager.class, SubtitlesManager.SubtitlesView.class, SubtitlesWidget.class, SubtitlesManager.SubtitlesProxy.class); - bind(UserPassAutocompleteManager.class).to(UserPassAutocompleteManagerImpl.class).in(Singleton.class); + bind(LoginRememberManager.class).to(LoginRememberManagerImpl.class).in(Singleton.class); bind(SignIn.class).to(SignInPresenter.class).in(Singleton.class); bind(Register.class).to(RegisterPresenter.class).in(Singleton.class); bind(NewGroup.class).to(NewGroupPresenter.class).in(Singleton.class); Copied: trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManager.java (from rev 1747, trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManager.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManager.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -0,0 +1,34 @@ +/* + * + * 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.auth; + +public interface LoginRememberManager { + + void clickFormLogin(); + + String getNickOrEmail(); + + String getPassword(); + + void setNickOrEmail(String username); + + void setPassword(String password); + +} Copied: trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java (from rev 1747, trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/auth/LoginRememberManagerImpl.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -0,0 +1,67 @@ +/* + * + * 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.auth; + +import com.google.gwt.user.client.DOM; + +/** + * Remember user/pass implementation <a href= + * "http://stackoverflow.com/questions/1245174/is-it-possible-to-implement-cros…" + * >based in this</a> and <a href= + * "http://www.sencha.com/forum/showthread.php?72027-Auto-complete-login-form" + * >this</a>. + */ +public class LoginRememberManagerImpl implements LoginRememberManager { + + /** The login forms are in ws.html **/ + private static final String PASSWORD = "password"; + private static final String USERNAME = "username"; + private static final String VALUE = "value"; + + public static native String getElementValue(String domId) /*-{ + return $doc.getElementById(domId).value; + }-*/; + + @Override + public native void clickFormLogin() /*-{ + $doc.getElementById("login").submit(); + }-*/; + + @Override + public String getNickOrEmail() { + return getElementValue(USERNAME); + } + + @Override + public String getPassword() { + return getElementValue(PASSWORD); + } + + @Override + public void setNickOrEmail(final String username) { + DOM.getElementById(USERNAME).setAttribute(VALUE, username); + } + + @Override + public void setPassword(final String password) { + DOM.getElementById(PASSWORD).setAttribute(VALUE, password); + } + +} Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -94,8 +94,8 @@ public RegisterPresenter(final EventBus eventBus, final RegisterView view, final RegisterProxy proxy, final Session session, final StateManager stateManager, final I18nUITranslationService i18n, final Provider<UserServiceAsync> userServiceProvider, final Provider<SignIn> signInProvider, - final CookiesManager cookiesManager, final UserPassAutocompleteManager autocomplete) { - super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, autocomplete); + final CookiesManager cookiesManager, final LoginRememberManager loginRemember) { + super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, loginRemember); this.userServiceProvider = userServiceProvider; this.signInProvider = signInProvider; } Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInAbstractPresenter.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -36,7 +36,7 @@ public abstract class SignInAbstractPresenter<V extends View, Proxy_ extends Proxy<?>> extends Presenter<View, Proxy<?>> { - protected final UserPassAutocompleteManager autocomplete; + protected final LoginRememberManager loginRemember; protected final CookiesManager cookiesManager; private String gotoTokenOnCancel; protected final I18nUITranslationService i18n; @@ -45,13 +45,13 @@ public SignInAbstractPresenter(final EventBus eventBus, final View view, final Proxy<?> proxy, final Session session, final StateManager stateManager, final I18nUITranslationService i18n, - final CookiesManager cookiesManager, final UserPassAutocompleteManager autocomplete) { + final CookiesManager cookiesManager, final LoginRememberManager loginRemember) { super(eventBus, view, proxy); this.session = session; this.stateManager = stateManager; this.i18n = i18n; this.cookiesManager = cookiesManager; - this.autocomplete = autocomplete; + this.loginRemember = loginRemember; } public String getGotoTokenOnCancel() { @@ -113,9 +113,9 @@ } protected void saveAutocompleteLoginData(final String nickOrEmail, final String password) { - autocomplete.setNickOrEmail(nickOrEmail); - autocomplete.setPassword(password); - autocomplete.clickFormLogin(); + loginRemember.setNickOrEmail(nickOrEmail); + loginRemember.setPassword(password); + loginRemember.clickFormLogin(); } public void setGotoTokenOnCancel(final String gotoTokenOnCancel) { Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -26,10 +26,15 @@ import com.extjs.gxt.ui.client.event.Events; import com.extjs.gxt.ui.client.event.FieldEvent; import com.extjs.gxt.ui.client.event.Listener; +import com.extjs.gxt.ui.client.widget.ComponentHelper; import com.extjs.gxt.ui.client.widget.form.Field; import com.extjs.gxt.ui.client.widget.form.TextField; +import com.google.gwt.dom.client.Document; +import com.google.gwt.user.client.Element; +import com.google.gwt.user.client.ui.RootPanel; public class SignInForm extends DefaultForm { + private static final String LOGIN_ID = "loginrender"; public static final String PASSWORD_FIELD_ID = "kune-sif-psf"; public static final String USER_FIELD_ID = "kune-sif-nkf"; @@ -37,28 +42,56 @@ private final TextField<String> loginPassField; private OnAcceptCallback onAcceptCallback; + /** + * Remember user/pass implementation <a href= + * "http://stackoverflow.com/questions/1245174/is-it-possible-to-implement-cros…" + * >based in this</a> and <a href= + * "http://www.sencha.com/forum/showthread.php?72027-Auto-complete-login-form" + * >this</a>. + */ public SignInForm(final I18nTranslationService i18n) { super.addStyleName("kune-Margin-Large-trbl"); - - loginNickOrEmailField = new TextField<String>(); + loginNickOrEmailField = new TextField<String>() { + @Override + protected void onRender(final Element target, final int index) { + if (el() == null) { + setElement(Document.get().getElementById("usernamerender")); + } + super.onRender(target, index); + } + }; loginNickOrEmailField.setFieldLabel(i18n.t("Username")); loginNickOrEmailField.setName(USER_FIELD_ID); loginNickOrEmailField.setWidth(DEF_SMALL_FIELD_WIDTH); loginNickOrEmailField.setAllowBlank(false); - loginNickOrEmailField.setValidationDelay(1000); + loginNickOrEmailField.setValidationDelay(3000); loginNickOrEmailField.setId(USER_FIELD_ID); loginNickOrEmailField.setTabIndex(100); + loginNickOrEmailField.render(RootPanel.get(LOGIN_ID).getElement()); + ComponentHelper.doAttach(loginNickOrEmailField); super.add(loginNickOrEmailField); - loginPassField = new TextField<String>(); + loginPassField = new TextField<String>() { + @Override + protected void onRender(final Element target, final int index) { + if (el() == null) { + final String elementId = "passwordrender"; + setElement(Document.get().getElementById(elementId)); + } + super.onRender(target, index); + } + }; loginPassField.setFieldLabel(i18n.t("Password")); loginPassField.setName(PASSWORD_FIELD_ID); loginPassField.setWidth(DEF_MEDIUM_FIELD_WIDTH); loginPassField.setPassword(true); loginPassField.setAllowBlank(false); - loginPassField.setValidationDelay(1000); + loginPassField.setValidationDelay(3000); loginPassField.setId(PASSWORD_FIELD_ID); loginPassField.setTabIndex(101); + loginPassField.render(RootPanel.get(LOGIN_ID).getElement()); + ComponentHelper.doAttach(loginPassField); + loginPassField.addListener(Events.OnKeyPress, new Listener<FieldEvent>() { @Override public void handleEvent(final FieldEvent fe) { Modified: trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInPresenter.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -97,10 +97,10 @@ public SignInPresenter(final EventBus eventBus, final SignInView view, final SignInProxy proxy, final Session session, final StateManager stateManager, final I18nUITranslationService i18n, final UserServiceAsync userService, final Provider<Register> registerProvider, - final CookiesManager cookiesManager, final UserPassAutocompleteManager autocomplete, + final CookiesManager cookiesManager, final LoginRememberManager loginRemember, final TimerWrapper timeWrapper, final WaveClientSimpleAuthenticator waveClientAuthenticator, final Provider<AskForPasswordResetPanel> askPasswdReset) { - super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, autocomplete); + super(eventBus, view, proxy, session, stateManager, i18n, cookiesManager, loginRemember); this.eventBus = eventBus; this.userService = userService; this.registerProvider = registerProvider; @@ -258,8 +258,8 @@ timer.configure(new Executer() { @Override public void execute() { - final String savedLogin = autocomplete.getNickOrEmail(); - final String savedPasswd = autocomplete.getPassword(); + final String savedLogin = loginRemember.getNickOrEmail(); + final String savedPasswd = loginRemember.getPassword(); if (TextUtils.notEmpty(savedLogin)) { getView().setNickOrEmail(savedLogin); getView().setLoginPassword(savedPasswd); Deleted: trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManager.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -1,34 +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.auth; - -public interface UserPassAutocompleteManager { - - void clickFormLogin(); - - String getNickOrEmail(); - - String getPassword(); - - void setNickOrEmail(String username); - - void setPassword(String password); - -} Deleted: trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/core/client/auth/UserPassAutocompleteManagerImpl.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -1,62 +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.auth; - -import com.google.gwt.user.client.DOM; - -/** - * Implementation <a href= - * "http://stackoverflow.com/questions/1245174/is-it-possible-to-implement-cros…" - * >based in this</a> - */ -public class UserPassAutocompleteManagerImpl implements UserPassAutocompleteManager { - - private static final String VALUE = "value"; - - public static native String getElementValue(String domId) /*-{ - return $doc.getElementById(domId).value; - }-*/; - - @Override - public native void clickFormLogin() /*-{ - $doc.getElementById("login").click(); - }-*/; - - @Override - public String getNickOrEmail() { - return getElementValue("address"); - } - - @Override - public String getPassword() { - return getElementValue("password"); - } - - @Override - public void setNickOrEmail(final String username) { - DOM.getElementById("address").setAttribute(VALUE, username); - } - - @Override - public void setPassword(final String password) { - DOM.getElementById("password").setAttribute(VALUE, password); - } - -} Added: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java (rev 0) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPCMock.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -0,0 +1,219 @@ +package cc.kune.core.server.rpc; + +import java.util.Date; +import java.util.Map; + +import cc.kune.core.client.errors.DefaultException; +import cc.kune.core.client.rpcservices.ContentService; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.RateResult; +import cc.kune.core.shared.domain.TagCloudResult; +import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.ContentSimpleDTO; +import cc.kune.core.shared.dto.I18nLanguageDTO; +import cc.kune.core.shared.dto.SocialNetworkSubGroup; +import cc.kune.core.shared.dto.StateAbstractDTO; +import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.core.shared.dto.StateContentDTO; + +public class ContentRPCMock implements ContentService, RPC { + + private final StateContainerDTO containerMock; + private final StateContentDTO contentMock; + + public ContentRPCMock() { + containerMock = new StateContainerDTO(); + contentMock = new StateContentDTO(); + } + + @Override + public void addAuthor(final String userHash, final StateToken token, final String authorShortName) + throws DefaultException { + } + + @Override + public StateContentDTO addContent(final String user, final StateToken parentToken, final String name, + final String typeId) throws DefaultException { + return contentMock; + } + + @Override + public StateContainerDTO addFolder(final String hash, final StateToken parentToken, + final String typeId, final String title) throws DefaultException { + return containerMock; + } + + @Override + public void addGadgetToContent(final String userHash, final StateToken currentStateToken, + final String gadgetName) throws DefaultException { + } + + @Override + public StateContentDTO addNewContentWithGadget(final String userHash, + final StateToken currentStateToken, final String gadgetName, final String typeId, + final String title, final String body) throws DefaultException { + return contentMock; + } + + @Override + public StateContentDTO addNewContentWithGadgetAndState(final String userHash, + final StateToken currentStateToken, final String gadgetName, final String typeId, + final String tile, final String body, final Map<String, String> gadgetState) + throws DefaultException { + return contentMock; + } + + @Override + public Boolean addParticipant(final String userHash, final StateToken token, final String participant) + throws DefaultException { + return true; + } + + @Override + public Boolean addParticipants(final String userHash, final StateToken token, final String groupName, + final SocialNetworkSubGroup subGroup) throws DefaultException { + return true; + } + + @Override + public StateContainerDTO addRoom(final String user, final StateToken parentToken, final String name) + throws DefaultException { + return containerMock; + } + + @Override + public StateContentDTO copyContent(final String userHash, final StateToken parentToken, + final StateToken token) throws DefaultException { + return contentMock; + } + + @Override + public StateContainerDTO delContent(final String userHash, final StateToken token) + throws DefaultException { + return containerMock; + } + + @Override + public StateAbstractDTO getContent(final String userHash, final StateToken token) + throws DefaultException { + return contentMock; + } + + @Override + public TagCloudResult getSummaryTags(final String userHash, final StateToken groupToken) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public StateContainerDTO moveContent(final String userHash, final StateToken contentToken, + final StateToken newContainerToken) throws DefaultException { + return containerMock; + } + + @Override + public RateResult rateContent(final String userHash, final StateToken token, final Double value) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public void removeAuthor(final String userHash, final StateToken token, final String authorShortName) + throws DefaultException { + } + + @Override + public StateAbstractDTO renameContainer(final String userHash, final StateToken token, + final String newName) throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public StateAbstractDTO renameContent(final String userHash, final StateToken token, + final String newName) throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public void save(final String user, final StateToken token, final String content) + throws DefaultException { + } + + @Override + public String sendFeedback(final String userHash, final String title, final String body) { + return "#fixme"; + } + + @Override + public ContentSimpleDTO setAsDefaultContent(final String userHash, final StateToken token) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setGadgetProperties(final String userHash, final StateToken currentStateToken, + final String gadgetName, final Map<String, String> properties) throws DefaultException { + } + + @Override + public I18nLanguageDTO setLanguage(final String userHash, final StateToken token, + final String languageCode) throws DefaultException { + final I18nLanguageDTO lang = new I18nLanguageDTO(); + + return lang; + } + + @Override + public void setPublishedOn(final String userHash, final StateToken token, final Date date) + throws DefaultException { + // TODO Auto-generated method stub + + } + + @Override + public StateAbstractDTO setStatus(final String userHash, final StateToken stateToken, + final ContentStatus status) { + // TODO Auto-generated method stub + return null; + } + + @Override + public StateAbstractDTO setStatusAsAdmin(final String userHash, final StateToken stateToken, + final ContentStatus status) { + // TODO Auto-generated method stub + return null; + } + + @Override + public TagCloudResult setTags(final String userHash, final StateToken token, final String tags) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String writeTo(final String userHash, final StateToken token, final boolean onlyToAdmins) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String writeTo(final String userHash, final StateToken token, final boolean onlyToAdmins, + final String title, final String message) throws DefaultException { + // TODO Auto-generated method stub + return null; + } + + @Override + public String writeToParticipants(final String userHash, final StateToken token) + throws DefaultException { + // TODO Auto-generated method stub + return null; + } + +} Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -28,10 +28,8 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.inject.Inject; -import com.google.inject.Provider; public class DelContainerMenuItem extends MenuItemDescriptor { @@ -40,8 +38,7 @@ private final ContentServiceHelper contentService; @Inject - public DelContainerAction(final Provider<FolderViewerPresenter> presenter, - final ContentServiceHelper contentService) { + public DelContainerAction(final ContentServiceHelper contentService) { super(AccessRolDTO.Editor, true); this.contentService = contentService; } Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/main/webapp/ws.html 2012-03-21 12:25:32 UTC (rev 1774) @@ -300,13 +300,17 @@  <div class="banner" id="banner"></div> -  - <form method="post" action="javascript:void(0)" style="display: none"> - <input type="text" id="address" name="address" value="" /> <input - type="password" id="password" name="password" value="" /> <input - type="submit" value="Login" id="login" /> <input type="submit" - class="wiab le button" name="signIn" id="signIn" value="Sign in"> +  + <form id="loginrender" action="javascript:;" style="display: none;"> + <input type="text" id="usernamerender" name="usernamerender" + value="" /> <input type="password" id="passwordrender" + name="passwordrender" value="" /> </form> +  + <form id="login" action="javascript:;" style="display: none;"> + <input type="text" id="username" name="username" value="" /> <input + type="password" id="password" name="password" value="" /> + </form>  <noscript> <div Modified: trunk/src/test/java/cc/kune/selenium/SeleniumConf.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/SeleniumConf.java 2012-03-20 12:38:50 UTC (rev 1773) +++ trunk/src/test/java/cc/kune/selenium/SeleniumConf.java 2012-03-21 12:25:32 UTC (rev 1774) @@ -56,8 +56,8 @@ public static final Driver DRIVER = Driver.firefox; /* Configure this for use other lang, site, or driver */ - public static final Lang LANG = Lang.en; - public static final Site SITE = Site.kunecc; + public static final Lang LANG = Lang.es; + public static final Site SITE = Site.demo; public static final int TIMEOUT = 25; SeleniumConf() {

1 0

r1773 - in trunk/src/main/java/cc/kune: chat/client core/client/dnd core/client/errors core/client/rpcservices core/server/access core/server/content core/server/rpc core/shared/dto domain gspace/client/actions gspace/client/tool/selector tasks/client/actions trash/client
by Vicente J. Ruiz Jurado 20 Mar '12

20 Mar '12

Author: vjrj_ Date: 2012-03-20 13:38:50 +0100 (Tue, 20 Mar 2012) New Revision: 1773 Added: trunk/src/main/java/cc/kune/core/client/errors/CannotDeleteDefaultContentException.java trunk/src/main/java/cc/kune/core/client/errors/ContainerNotEmptyException.java trunk/src/main/java/cc/kune/tasks/client/actions/DelTaskMenuItem.java Modified: trunk/src/main/java/cc/kune/chat/client/ChatInstances.java trunk/src/main/java/cc/kune/core/client/dnd/FolderContainerDropController.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java trunk/src/main/java/cc/kune/core/server/access/FinderService.java trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java trunk/src/main/java/cc/kune/domain/Container.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.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/actions/SetAsHomePageMenuItem.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java trunk/src/main/java/cc/kune/trash/client/TrashClientTool.java Log: NEW - # 222: Create a trash folder icon and improve contents delete functionality http://kune.ourproject.org/issues/ticket/222 Modified: trunk/src/main/java/cc/kune/chat/client/ChatInstances.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatInstances.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/chat/client/ChatInstances.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -34,6 +34,7 @@ import com.calclab.suco.client.Suco; import com.google.inject.Provider; +@SuppressWarnings("deprecation") public class ChatInstances { public static class AvatarManagerProvider implements Provider<AvatarManager> { Modified: trunk/src/main/java/cc/kune/core/client/dnd/FolderContainerDropController.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/dnd/FolderContainerDropController.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/core/client/dnd/FolderContainerDropController.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -29,7 +29,9 @@ import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; import cc.kune.gspace.client.viewers.items.FolderItemWidget; +import cc.kune.trash.shared.TrashToolConstants; import com.allen_sauer.gwt.dnd.client.drop.SimpleDropController; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -64,36 +66,60 @@ this.contentCache = contentCache; } + private void move(final Widget widget, final StateToken destToken) { + widget.removeFromParent(); + 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); + stateManager.refreshCurrentState(); + NotifyUser.hideProgress(); + } + + @Override + public void onSuccess(final StateContainerDTO result) { + NotifyUser.hideProgress(); + contentCache.remove(tokenToMove); + contentCache.remove(destToken); + } + }); + } + + private void notImplemented() { + NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT)); + NotifyUser.hideProgress(); + } + @Override public void onDropAllowed(final Widget widget, final SimpleDropController dropController) { dropController.getDropTarget().removeStyleName("k-drop-allowed-hover"); if (widget instanceof FolderItemWidget) { NotifyUser.showProgress(i18n.t("Moving")); if (getTarget() != null) { - final StateToken destToken = (StateToken) getTarget(); - widget.removeFromParent(); - 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); - stateManager.refreshCurrentState(); - NotifyUser.hideProgress(); - } - - @Override - public void onSuccess(final StateContainerDTO result) { - NotifyUser.hideProgress(); - contentCache.remove(tokenToMove); - contentCache.remove(destToken); - } - }); + StateToken destToken; + if (getTarget() instanceof StateToken) { + destToken = (StateToken) getTarget(); + } else if (getTarget() instanceof ToolSelectorItemPanel) { + destToken = new StateToken(session.getCurrentGroupShortName(), + ((ToolSelectorItemPanel) getTarget()).getName()); + if (!destToken.getTool().equals(TrashToolConstants.NAME)) { + // By now only move to trash + notImplemented(); + return; + } + } else { + // No implemented + notImplemented(); + return; + } + move(widget, destToken); } else { - NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT)); - NotifyUser.hideProgress(); + notImplemented(); } + } else { + notImplemented(); } } - } Added: trunk/src/main/java/cc/kune/core/client/errors/CannotDeleteDefaultContentException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/CannotDeleteDefaultContentException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/CannotDeleteDefaultContentException.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -0,0 +1,30 @@ +/* + * + * 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.errors; + +/** + * The Class ContainerNotEmptyException throwed when people try to remove + * folders that not are empty + */ +public class CannotDeleteDefaultContentException extends DefaultException { + + private static final long serialVersionUID = -8266435530937045998L; + +} Added: trunk/src/main/java/cc/kune/core/client/errors/ContainerNotEmptyException.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ContainerNotEmptyException.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/errors/ContainerNotEmptyException.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -0,0 +1,30 @@ +/* + * + * 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.errors; + +/** + * The Class ContainerNotEmptyException throwed when people try to remove + * folders that not are empty + */ +public class ContainerNotEmptyException extends DefaultException { + + private static final long serialVersionUID = 2589365980768175735L; + +} Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -141,6 +141,14 @@ } else if (caught instanceof NameNotPermittedException) { logException(caught); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, i18n.t("This name is not permitted"))); + } else if (caught instanceof ContainerNotEmptyException) { + logException(caught); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("This is not empty"))); + } else if (caught instanceof CannotDeleteDefaultContentException) { + logException(caught); + eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, + i18n.t("This is the default content of the group, you cannot delete it. " + + "Please select other content as default group content before delete this"))); } else if (caught instanceof UnderDevelopmentException) { logException(caught); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.info, i18n.t(TextUtils.IN_DEVELOPMENT))); Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -4,11 +4,13 @@ import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.common.shared.i18n.I18nTranslationService; +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.SocialNetworkSubGroup; import cc.kune.core.shared.dto.StateContainerDTO; +import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -17,8 +19,10 @@ public class ContentServiceHelper { + private final ContentCache cache; private final Provider<ContentServiceAsync> contentService; private final EventBus eventBus; + private final FolderViewerPresenter folderViewer; private final I18nTranslationService i18n; private final Session session; private final StateManager stateManager; @@ -26,7 +30,9 @@ @Inject public ContentServiceHelper(final Session session, final I18nTranslationService i18n, final EventBus eventBus, final Provider<ContentServiceAsync> contentService, - final StateManager stateManager) { + final ContentCache cache, final FolderViewerPresenter folderViewer, final StateManager stateManager) { + this.cache = cache; + this.folderViewer = folderViewer; this.session = session; this.i18n = i18n; this.eventBus = eventBus; @@ -34,6 +40,26 @@ this.stateManager = stateManager; } + public void addContainer(final String id, final String newName) { + NotifyUser.showProgress(); + // stateManager.gotoStateToken(((HasContent) + // session.getCurrentState()).getContainer().getStateToken()); + final StateToken parentToken = session.getCurrentStateToken(); + contentService.get().addFolder(session.getUserHash(), parentToken, newName, id, + new AsyncCallbackSimple<StateContainerDTO>() { + @Override + public void onSuccess(final StateContainerDTO state) { + stateManager.removeCache(parentToken); + stateManager.setRetrievedStateAndGo(state); + NotifyUser.hideProgress(); + // NotifyUser.info(i18n.tWithNT("[%s] created", + // "New folder created, for instance", newName)); + folderViewer.highlightTitle(); + } + }); + cache.remove(parentToken); + } + public void addParticipants(final StateToken token, final SocialNetworkSubGroup subGroup) { contentService.get().addParticipants(session.getUserHash(), token, session.getCurrentGroupShortName(), subGroup, new AsyncCallback<Boolean>() { @@ -60,6 +86,14 @@ contentService.get().delContent(session.getUserHash(), token, new AsyncCallbackSimple<StateContainerDTO>() { @Override + public void onFailure(final Throwable caught) { + // Should we do something with + // ContainerNotEmptyException? + super.onFailure(caught); + NotifyUser.hideProgress(); + } + + @Override public void onSuccess(final StateContainerDTO state) { final StateToken parentToken = state.getStateToken(); if (session.getCurrentStateToken().equals(parentToken)) { Modified: trunk/src/main/java/cc/kune/core/server/access/FinderService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/access/FinderService.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/core/server/access/FinderService.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -19,6 +19,7 @@ */ package cc.kune.core.server.access; +import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.DefaultException; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Container; @@ -29,12 +30,18 @@ public interface FinderService { + Content findByRootOnGroup(String groupName, String toolName) throws DefaultException; + Container getContainer(Long folderId) throws DefaultException; + Container getContainer(String folderId); + Content getContent(Long contentId) throws DefaultException; Content getContent(StateToken token, Group defaultGroup) throws DefaultException; + Content getContent(String contentId) throws ContentNotFoundException; + Container getFolder(Long folderId) throws DefaultException; Rate getRate(User user, Content content); Modified: trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/core/server/access/FinderServiceDefault.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -29,6 +29,7 @@ import cc.kune.core.client.errors.ToolNotFoundException; import cc.kune.core.server.content.ContainerManager; import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.content.ContentUtils; import cc.kune.core.server.manager.GroupManager; import cc.kune.core.server.manager.RateManager; import cc.kune.core.shared.domain.utils.StateToken; @@ -97,7 +98,8 @@ } } - private Content findByRootOnGroup(final String groupName, final String toolName) + @Override + public Content findByRootOnGroup(final String groupName, final String toolName) throws DefaultException { try { final Group group = groupManager.findByShortName(groupName); @@ -132,6 +134,16 @@ } @Override + public Container getContainer(final Long folderId) throws DefaultException { + return getFolder(folderId); + } + + @Override + public Container getContainer(final String folderId) throws DefaultException { + return getContainer(ContentUtils.parseId(folderId)); + } + + @Override public Content getContent(final Long contentId) throws ContentNotFoundException { try { return contentManager.find(contentId); @@ -162,6 +174,11 @@ } @Override + public Content getContent(final String contentId) throws ContentNotFoundException { + return getContent(ContentUtils.parseId(contentId)); + } + + @Override public Container getFolder(final Long folderId) throws ContentNotFoundException { try { return containerManager.find(folderId); @@ -186,9 +203,4 @@ return rateManager.getRateByUsers(content); } - @Override - public Container getContainer(Long folderId) throws DefaultException { - return getFolder(folderId); - } - } Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -39,7 +39,7 @@ boolean hasTrashFolder(Group group); - void moveContainer(Container container, Container newContainer); + Container moveContainer(Container container, Container newContainer); Container renameFolder(Group group, Container container, String newName) throws DefaultException; Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -110,7 +110,7 @@ } @Override - public void moveContainer(final Container container, final Container newContainer) { + public Container moveContainer(final Container container, final Container newContainer) { if (newContainer.equals(container.getParent())) { throw new MoveOnSameContainerException(); } @@ -125,7 +125,8 @@ final Container oldContainer = container.getParent(); oldContainer.removeChild(container); newContainer.addChild(container); - persist(container); + container.setParent(newContainer); + return persist(container); } @Override Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -27,6 +27,8 @@ import cc.kune.chat.server.ChatManager; import cc.kune.core.client.errors.AccessViolationException; +import cc.kune.core.client.errors.CannotDeleteDefaultContentException; +import cc.kune.core.client.errors.ContainerNotEmptyException; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.ContentNotPermittedException; import cc.kune.core.client.errors.DefaultException; @@ -72,6 +74,7 @@ import cc.kune.domain.Content; import cc.kune.domain.Group; import cc.kune.domain.User; +import cc.kune.trash.shared.TrashToolConstants; import com.google.inject.Inject; @@ -253,21 +256,25 @@ @Override @Authenticated - @Authorizated(accessRolRequired = AccessRol.Administrator) + @Authorizated(actionLevel = ActionLevel.container, accessRolRequired = AccessRol.Editor) @KuneTransactional public StateContainerDTO delContent(final String userHash, final StateToken token) throws DefaultException { - final Long contentId = ContentUtils.parseId(token.getDocument()); - final Content content = finderService.getContent(contentId); - contentManager.setStatus(contentId, ContentStatus.inTheDustbin); - final Container previousParent = content.getContainer(); + final boolean isContent = token.hasAll(); + Container previousParent; + if (isContent) { + final Content content = setStatusInTheDustbin(token); + previousParent = content.getContainer(); + } else { + previousParent = finderService.getContainer(token.getFolder()); + } final Group group = previousParent.getOwner(); if (!containerManager.hasTrashFolder(group)) { groupManager.initTrash(group); } final Container trash = containerManager.getTrashFolder(group); - moveContent(userHash, token, trash.getStateToken()); - return getState(getCurrentUser(), previousParent); + return moveContent(userHash, token, trash.getStateToken()); + // return getState(getCurrentUser(), previousParent); } @Override @@ -395,24 +402,42 @@ public StateContainerDTO moveContent(final String userHash, final StateToken movedToken, final StateToken newContainerToken) throws DefaultException { final User user = getCurrentUser(); + final boolean toTrash = newContainerToken.getTool().equals(TrashToolConstants.NAME); + // Search the container id (because sometimes we get only #group.tool + // tokens) + final Long newContainerId = newContainerToken.hasGroupToolAndFolder() ? ContentUtils.parseId(newContainerToken.getFolder()) + : finderService.findByRootOnGroup(newContainerToken.getGroup(), newContainerToken.getTool()).getContainer().getId(); try { if (movedToken.isComplete()) { - final Content content = accessService.accessToContent( - ContentUtils.parseId(movedToken.getDocument()), user, AccessRol.Editor); - final Container newContainer = accessService.accessToContainer( - ContentUtils.parseId(newContainerToken.getFolder()), user, AccessRol.Editor); + final Long contentId = ContentUtils.parseId(movedToken.getDocument()); + final Content content = accessService.accessToContent(contentId, user, AccessRol.Editor); + + if (content.equals(content.getContainer().getOwner().getDefaultContent())) { + throw new CannotDeleteDefaultContentException(); + } + + final Container newContainer = accessService.accessToContainer(newContainerId, user, + AccessRol.Editor); + final Container oldContainer = content.getContainer(); + if (toTrash) { + // Remove operation + setStatusInTheDustbin(movedToken); + } contentManager.moveContent(content, newContainer); return getState(user, oldContainer); } else if (movedToken.hasGroupToolAndFolder()) { - // Folder to folder + // Folder to folder move final Container container = accessService.accessToContainer( ContentUtils.parseId(movedToken.getFolder()), user, AccessRol.Editor); - final Container newContainer = accessService.accessToContainer( - ContentUtils.parseId(newContainerToken.getFolder()), user, AccessRol.Editor); final Container oldParent = container.getParent(); + if (toTrash && !container.isLeaf()) { + throw new ContainerNotEmptyException(); + } + final Container newContainer = accessService.accessToContainer(newContainerId, user, + AccessRol.Editor); containerManager.moveContainer(container, newContainer); - return getState(user, oldParent); + return getState(user, finderService.getContainer(oldParent.getId())); } else { throw new ContentNotPermittedException(); } @@ -581,6 +606,13 @@ return getState(getCurrentUser(), content); } + private Content setStatusInTheDustbin(final StateToken token) { + final Long contentId = ContentUtils.parseId(token.getDocument()); + final Content content = finderService.getContent(contentId); + contentManager.setStatus(contentId, ContentStatus.inTheDustbin); + return content; + } + @Override @Authenticated @Authorizated(accessRolRequired = AccessRol.Editor, mustCheckMembership = false) Modified: trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/core/shared/dto/ContainerDTO.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -31,7 +31,7 @@ private List<ContentSimpleDTO> contents; private Long id; private String name; - private Long parentFolderId; + private StateToken parentToken; private StateToken stateToken; private String typeId; @@ -58,8 +58,8 @@ return name; } - public Long getParentFolderId() { - return parentFolderId; + public StateToken getParentToken() { + return parentToken; } public StateToken getStateToken() { @@ -71,7 +71,7 @@ } public boolean isRoot() { - return parentFolderId == null; + return parentToken == null; } public void setAbsolutePath(final ContainerSimpleDTO[] absolutePath) { @@ -94,8 +94,8 @@ this.name = name; } - public void setParentFolderId(final Long parentFolderId) { - this.parentFolderId = parentFolderId; + public void setParentToken(final StateToken parentToken) { + this.parentToken = parentToken; } public void setStateToken(final StateToken stateToken) { Modified: trunk/src/main/java/cc/kune/domain/Container.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Container.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/domain/Container.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -202,8 +202,8 @@ return parent; } - public Long getParentFolderId() { - return parent != null ? parent.getId() : null; + public StateToken getParentToken() { + return parent != null ? parent.getStateToken() : null; } @Override Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContainerMenuItem.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -21,21 +21,15 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.notify.ConfirmAskEvent; -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.SessionConstants; +import cc.kune.core.client.rpcservices.ContentServiceHelper; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.viewers.FolderViewerPresenter; -import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; import com.google.inject.Provider; @@ -43,39 +37,19 @@ public static class DelContainerAction extends RolAction { - private final Provider<ContentServiceAsync> contentService; - private final EventBus eventBus; - private final I18nTranslationService i18n; - private final Provider<FolderViewerPresenter> presenter; - private final SessionConstants session; - private final StateManager stateManager; + private final ContentServiceHelper contentService; @Inject - public DelContainerAction(final EventBus eventBus, final StateManager stateManager, - final SessionConstants session, final Provider<ContentServiceAsync> contentService, - final I18nTranslationService i18n, final Provider<FolderViewerPresenter> presenter) { - super(AccessRolDTO.Administrator, true); - this.eventBus = eventBus; - this.stateManager = stateManager; - this.session = session; + public DelContainerAction(final Provider<FolderViewerPresenter> presenter, + final ContentServiceHelper contentService) { + super(AccessRolDTO.Editor, true); this.contentService = contentService; - this.i18n = i18n; - this.presenter = presenter; } @Override public void actionPerformed(final ActionEvent event) { final StateToken token = ((AbstractContentSimpleDTO) event.getTarget()).getStateToken(); - ConfirmAskEvent.fire(eventBus, i18n.t("Please confirm"), - i18n.t("Are you sure you want this? It will be deleted with all its contents."), - i18n.t("Yes"), i18n.t("No"), null, null, new OnAcceptCallback() { - @Override - public void onSuccess() { - NotifyUser.showProgress(); - NotifyUser.info("Sorry, in development"); - NotifyUser.hideProgress(); - } - }); + contentService.delContent(token); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -38,7 +38,7 @@ @Inject public DelContentAction(final ContentServiceHelper contentService) { - super(AccessRolDTO.Administrator, true); + super(AccessRolDTO.Editor, true); this.contentService = contentService; } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/actions/GoParentContainerBtn.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -57,7 +57,7 @@ stateToken = ((StateContentDTO) state).getContainer().getStateToken(); } else { final ContainerDTO container = ((StateContainerDTO) state).getContainer(); - stateToken = container.getStateToken().copy().setFolder(container.getParentFolderId()); + stateToken = container.getParentToken(); } stateManager.gotoStateToken(stateToken); // NotifyUser.hideProgress(); Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerBtn.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -21,63 +21,29 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.client.rpcservices.ContentServiceHelper; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.HasContent; -import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.gwt.resources.client.ImageResource; import com.google.inject.Inject; -import com.google.inject.Provider; public class NewContainerBtn extends ButtonDescriptor { public static class NewContainerAction extends RolAction { - private final Provider<ContentServiceAsync> contentService; - private final FolderViewerPresenter folderViewer; - private final I18nTranslationService i18n; - private final Session session; - private final StateManager stateManager; + private final ContentServiceHelper contentService; @Inject - public NewContainerAction(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService, - final FolderViewerPresenter folderViewer) { + public NewContainerAction(final ContentServiceHelper contentService) { super(AccessRolDTO.Editor, true); - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; this.contentService = contentService; - this.folderViewer = folderViewer; } @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgress(); - stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); - final String newName = (String) getValue(NEW_NAME); - 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(); - } - }); + contentService.addContainer((String) getValue(ID), (String) getValue(NEW_NAME)); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContainerMenuItem.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -24,67 +24,29 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.notify.NotifyUser; import cc.kune.common.shared.i18n.I18nTranslationService; 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.client.rpcservices.ContentServiceHelper; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.HasContent; -import cc.kune.core.shared.dto.StateContainerDTO; -import cc.kune.gspace.client.viewers.FolderViewerPresenter; import com.google.gwt.resources.client.ImageResource; import com.google.inject.Inject; -import com.google.inject.Provider; public class NewContainerMenuItem extends MenuItemDescriptor { public static class NewContainerAction extends RolAction { - private final ContentCache cache; - private final Provider<ContentServiceAsync> contentService; - private final FolderViewerPresenter folderViewer; - private final I18nTranslationService i18n; - private final Session session; - private final StateManager stateManager; + private final ContentServiceHelper contentService; @Inject - public NewContainerAction(final Session session, final StateManager stateManager, - final I18nTranslationService i18n, final Provider<ContentServiceAsync> contentService, - final ContentCache cache, final FolderViewerPresenter folderViewer) { + public NewContainerAction(final ContentServiceHelper contentService) { super(AccessRolDTO.Editor, true); - this.session = session; - this.stateManager = stateManager; - this.i18n = i18n; this.contentService = contentService; - this.cache = cache; - this.folderViewer = folderViewer; } @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.showProgress(); - stateManager.gotoStateToken(((HasContent) session.getCurrentState()).getContainer().getStateToken()); - final String newName = (String) getValue(NEW_NAME); - 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.remove(parentToken); + contentService.addContainer((String) getValue(ID), (String) getValue(NEW_NAME)); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/actions/NewContentAction.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -74,7 +74,8 @@ NotifyUser.hideProgress(); // stateManager.refreshCurrentGroupState(); // contextNavigator.setEditOnNextStateChange(true); - NotifyUser.info(i18n.tWithNT("[%s] created", "New content created, for instance", newName)); + // NotifyUser.info(i18n.tWithNT("[%s] created", + // "New content created, for instance", newName)); contentViewer.blinkTitle(); } }); Modified: trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/actions/RenameAction.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -92,7 +92,7 @@ contentCache.remove(((StateContentDTO) state).getContainer().getStateToken()); } else if (state instanceof StateContainerDTO) { final ContainerDTO container = ((StateContainerDTO) state).getContainer(); - contentCache.remove(token.copy().setFolder(container.getParentFolderId())); + contentCache.remove(container.getParentToken()); } } }; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/actions/SetAsHomePageMenuItem.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -74,7 +74,7 @@ public SetAsHomePageMenuItem(final I18nTranslationService i18n, final SetAsHomePageAction action, final CoreResources res) { super(action); - this.withText(i18n.t("Delete")).withIcon(res.groupHome()).withText(i18n.t("Select as the homepage")); + this.withIcon(res.groupHome()).withText(i18n.t("Select as the homepage")); } } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPanel.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -60,8 +60,10 @@ InlineLabel label; @UiField FocusPanel self; + private final String shortName; public ToolSelectorItemPanel(final String shortName, final ImageResource icon) { + this.shortName = shortName; initWidget(uiBinder.createAndBindUi(this)); ensureDebugId(TOOL_ID_PREFIX + shortName); setVisibleImpl(false); @@ -92,6 +94,15 @@ return label; } + public String getName() { + return shortName; + } + + @Override + public Object getTarget() { + return this; + } + @UiHandler("self") void onSelfMouseOut(final MouseOutEvent event) { unfocus(); Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -36,6 +36,8 @@ HasText getLabel(); + Object getTarget(); + void setSelected(boolean selected); void setTooltip(String tooltip); @@ -44,12 +46,12 @@ } private final String longName; - private final AccessRolDTO visibleFoRol; private final String shortName; private StateToken token; private final ToolSelector toolSelector; private final String tooltip; private ToolSelectorItemView view; + private final AccessRolDTO visibleFoRol; public ToolSelectorItemPresenter(final String shortName, final String longName, final String tooltip, final AccessRolDTO visibleForRol, final ToolSelector toolSelector) { @@ -61,11 +63,6 @@ } @Override - public AccessRolDTO getVisibleForRol() { - return visibleFoRol; - } - - @Override public String getShortName() { return shortName; } @@ -75,6 +72,11 @@ return view; } + @Override + public AccessRolDTO getVisibleForRol() { + return visibleFoRol; + } + public void init(final ToolSelectorItemView view) { this.view = view; toolSelector.addTool(this); Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPanel.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -56,9 +56,9 @@ public void addItem(final ToolSelectorItemView item) { final Widget widget = item.asWidget(); flow.add(widget); - // dropControllerProv.get().init((InlineLabel) ((ToolSelectorItemPanel) - // widget).getLabel()); - dropControllerProv.get().init(((ToolSelectorItemPanel) widget).getFocusPanel()); + final FolderContainerDropController dropController = dropControllerProv.get(); + dropController.init(((ToolSelectorItemPanel) widget).getFocusPanel()); + dropController.setTarget(item.getTarget()); } @Override Added: trunk/src/main/java/cc/kune/tasks/client/actions/DelTaskMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/DelTaskMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/tasks/client/actions/DelTaskMenuItem.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -0,0 +1,34 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.tasks.client.actions; + +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.gspace.client.actions.DelContentMenuItem; + +import com.google.inject.Inject; + +public class DelTaskMenuItem extends DelContentMenuItem { + + @Inject + public DelTaskMenuItem(final I18nTranslationService i18n, final DelContentAction action, final CoreResources res) { + super(i18n, action, res); + } +} Modified: trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -70,6 +70,7 @@ final Provider<ContentViewerShareMenu> shareMenuContent, final Provider<ParticipateInContentBtn> participateBtn, final Provider<TutorialContainerBtn> tutorialBtn, + final Provider<DelTaskMenuItem> delContentMenuItem, final Provider<AddAllMembersToContentMenuItem> addAllMenuItem, final Provider<AddAdminMembersToContentMenuItem> addAdminMembersMenuItem, final Provider<AddCollabMembersToContentMenuItem> addCollabMembersMenuItem, @@ -110,6 +111,7 @@ actionsRegistry.addAction(ActionGroups.ITEM_MENU, marksAsNotDoneMenuItem, ContentStatus.inTheDustbin, TYPE_TASK); actionsRegistry.addAction(ActionGroups.ITEM_MENU, delFolderMenuItem, containersNoRoot); + actionsRegistry.addAction(ActionGroups.ITEM_MENU, delContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAllMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addAdminMembersMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, addCollabMembersMenuItem, contents); Modified: trunk/src/main/java/cc/kune/trash/client/TrashClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/trash/client/TrashClientTool.java 2012-03-18 22:30:59 UTC (rev 1772) +++ trunk/src/main/java/cc/kune/trash/client/TrashClientTool.java 2012-03-20 12:38:50 UTC (rev 1773) @@ -41,8 +41,8 @@ public TrashClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, final ContentCapabilitiesRegistry cntCapRegistry, final CoreResources res, final NavResources navResources) { - super(NAME, i18n.t(ROOT_NAME), "", res.trashWhite(), AccessRolDTO.Administrator, toolSelector, - cntCapRegistry, i18n, navResources); + super(NAME, i18n.t(ROOT_NAME), i18n.t("You can drop here contents to delete then"), + res.trashWhite(), AccessRolDTO.Editor, toolSelector, cntCapRegistry, i18n, navResources); this.res = res; // registerAclEditableTypes();

1 0

r1772 - trunk/src/main/java/cc/kune/chat/client
by Vicente J. Ruiz Jurado 18 Mar '12

18 Mar '12

Author: vjrj_ Date: 2012-03-18 23:30:59 +0100 (Sun, 18 Mar 2012) New Revision: 1772 Modified: trunk/src/main/java/cc/kune/chat/client/ChatInstances.java Log: NEW - # 222: Create a trash folder icon and improve contents delete functionality http://kune.ourproject.org/issues/ticket/222 Modified: trunk/src/main/java/cc/kune/chat/client/ChatInstances.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatInstances.java 2012-03-18 22:25:32 UTC (rev 1771) +++ trunk/src/main/java/cc/kune/chat/client/ChatInstances.java 2012-03-18 22:30:59 UTC (rev 1772) @@ -36,82 +36,82 @@ public class ChatInstances { - public class AvatarManagerProvider implements Provider<AvatarManager> { + public static class AvatarManagerProvider implements Provider<AvatarManager> { @Override public AvatarManager get() { return Suco.get(AvatarManager.class); } } - public class ChatManagerProvider implements Provider<ChatManager> { + public static class ChatManagerProvider implements Provider<ChatManager> { @Override public ChatManager get() { return Suco.get(ChatManager.class); } } - public class PresenceManagerProvider implements Provider<PresenceManager> { + public static class PresenceManagerProvider implements Provider<PresenceManager> { @Override public PresenceManager get() { return Suco.get(PresenceManager.class); } } - public class PrivateStorageManagerProvider implements Provider<PrivateStorageManager> { + public static class PrivateStorageManagerProvider implements Provider<PrivateStorageManager> { @Override public PrivateStorageManager get() { return Suco.get(PrivateStorageManager.class); } } - public class RoomManagerProvider implements Provider<RoomManager> { + public static class RoomManagerProvider implements Provider<RoomManager> { @Override public RoomManager get() { return Suco.get(RoomManager.class); } } - public class SASLManagerProvider implements Provider<SASLManager> { + public static class SASLManagerProvider implements Provider<SASLManager> { @Override public SASLManager get() { return Suco.get(SASLManager.class); } } - public class SessionReconnectProvider implements Provider<SessionReconnect> { + public static class SessionReconnectProvider implements Provider<SessionReconnect> { @Override public SessionReconnect get() { return Suco.get(SessionReconnect.class); } } - public class SubscriptionHandlerProvider implements Provider<SubscriptionHandler> { + public static class SubscriptionHandlerProvider implements Provider<SubscriptionHandler> { @Override public SubscriptionHandler get() { return Suco.get(SubscriptionHandler.class); } } - public class SubscriptionManagerProvider implements Provider<SubscriptionManager> { + public static class SubscriptionManagerProvider implements Provider<SubscriptionManager> { @Override public SubscriptionManager get() { return Suco.get(SubscriptionManager.class); } } - public class XmppConnectionProvider implements Provider<XmppConnection> { + public static class XmppConnectionProvider implements Provider<XmppConnection> { @Override public XmppConnection get() { return Suco.get(XmppConnection.class); } } - public class XmppRosterProvider implements Provider<XmppRoster> { + public static class XmppRosterProvider implements Provider<XmppRoster> { @Override public XmppRoster get() { return Suco.get(XmppRoster.class); } } - public class XmppSessionProvider implements Provider<XmppSession> { + public static class XmppSessionProvider implements Provider<XmppSession> { @Override public XmppSession get() { return Suco.get(XmppSession.class);

1 0

18 Mar '12

Author: vjrj_ Date: 2012-03-18 23:25:32 +0100 (Sun, 18 Mar 2012) New Revision: 1771 Added: trunk/src/main/java/cc/kune/trash/KuneTrash.gwt.xml trunk/src/main/java/cc/kune/trash/client/ trunk/src/main/java/cc/kune/trash/client/TrashClientTool.java trunk/src/main/java/cc/kune/trash/client/TrashGinModule.java trunk/src/main/java/cc/kune/trash/client/TrashGinjector.java trunk/src/main/java/cc/kune/trash/client/TrashParts.java trunk/src/main/java/cc/kune/trash/client/actions/ trunk/src/main/java/cc/kune/trash/client/actions/TrashClientActions.java trunk/src/main/resources/icons/trash-black.png trunk/src/main/resources/icons/trash-white.png Modified: trunk/img/icons/custom-iconic/trash.svg trunk/src/main/java/cc/kune/Kune.gwt.xml trunk/src/main/java/cc/kune/barters/KuneBarters.gwt.xml trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java trunk/src/main/java/cc/kune/blogs/KuneBlogs.gwt.xml 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/chat/client/actions/ChatSitebarActions.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/client/KuneGinjector.java trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java trunk/src/main/java/cc/kune/core/server/content/CreationService.java trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java trunk/src/main/java/cc/kune/events/KuneEvents.gwt.xml trunk/src/main/java/cc/kune/events/client/EventsClientTool.java trunk/src/main/java/cc/kune/events/client/actions/EventRemoveMenuItem.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItem.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java trunk/src/main/java/cc/kune/tasks/KuneTasks.gwt.xml trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java trunk/src/main/java/cc/kune/wave/server/kspecific/KuneWaveServiceDefault.java trunk/src/main/java/cc/kune/wiki/KuneWiki.gwt.xml trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java Log: NEW - # 222: Create a trash folder icon and improve contents delete functionality http://kune.ourproject.org/issues/ticket/222 Modified: trunk/img/icons/custom-iconic/trash.svg =================================================================== --- trunk/img/icons/custom-iconic/trash.svg 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/img/icons/custom-iconic/trash.svg 2012-03-18 22:25:32 UTC (rev 1771) @@ -62,7 +62,10 @@ d="M 1,0 C 0.44600003,0 0,0.446 0,1 l 0,2 c 0,0.554 0.44600003,1 1,1 1.3041959,0 1.6744253,0 3,0 l 0,22 c 0,3.312 2.688,6 6,6 l 12,0 c 3.312,0 6,-2.688 6,-6 l 0,-22 2,0 1,0 c 0.554,0 1,-0.446 1,-1 L 32,1 C 32,0.446 31.554,0 31,0 L 30,0 26,0 C 24.589979,0 24,0.5207576 24,2.03125 L 24,26 c 0,1.102 -0.898,2 -2,2 L 10,28 C 8.898,28 8,27.102 8,26 8.00153,18.235176 8.00126,7.8861416 8,1 8,0.43960056 7.5213789,0 7,0 5.3333333,0 2.6666667,0 1,0 z" id="rect3871" inkscape:connector-curvature="0" - sodipodi:nodetypes="cssccssssccsssscssssscccc" /> + sodipodi:nodetypes="cssccssssccsssscssssscccc" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/resources/icons/trash-black.png" + inkscape:export-xdpi="45" + inkscape:export-ydpi="45" /> <rect style="color:#000000;fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3086" @@ -71,7 +74,10 @@ x="10" y="4" ry="0.99999994" - rx="1" /><rect + rx="1" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/resources/icons/trash-black.png" + inkscape:export-xdpi="45" + inkscape:export-ydpi="45" /><rect style="color:#000000;fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" id="rect3860" width="4" @@ -79,4 +85,7 @@ x="18" y="4" ry="0.99999994" - rx="1" /></svg> \ No newline at end of file + rx="1" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/resources/icons/trash-black.png" + inkscape:export-xdpi="45" + inkscape:export-ydpi="45" /></svg> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/Kune.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/Kune.gwt.xml 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/Kune.gwt.xml 2012-03-18 22:25:32 UTC (rev 1771) @@ -14,6 +14,7 @@ <inherits name="cc.kune.events.KuneEvents" /> <inherits name="cc.kune.tasks.KuneTasks" /> <inherits name="cc.kune.lists.KuneLists" /> + <inherits name="cc.kune.trash.KuneTrash" /> <inherits name="cc.kune.pspace.PSpace" /> <inherits name="cc.kune.hspace.HSpace" /> <inherits name="com.calclab.suco.Suco" /> Modified: trunk/src/main/java/cc/kune/barters/KuneBarters.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/barters/KuneBarters.gwt.xml 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/barters/KuneBarters.gwt.xml 2012-03-18 22:25:32 UTC (rev 1771) @@ -1,6 +1,6 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module> - <inherits name="cc.kune.core.KuneCore" /> - <source path="client" /> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> <source path="shared" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -27,6 +27,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -45,7 +46,7 @@ NAME, i18n.t("barters"), i18n.t("A decentralized way to offer (or ask for) services and goods to your groups or to anyone. Bartering means the exchange of goods by the agreement of two people"), - icons.barters(), toolSelector, cntCapRegistry, i18n, navResources); + icons.barters(), AccessRolDTO.Viewer, toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/cc/kune/blogs/KuneBlogs.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/blogs/KuneBlogs.gwt.xml 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/blogs/KuneBlogs.gwt.xml 2012-03-18 22:25:32 UTC (rev 1771) @@ -1,6 +1,6 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module> - <inherits name="cc.kune.core.KuneCore" /> - <source path="client" /> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> <source path="shared" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -29,6 +29,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -46,7 +47,7 @@ NAME, i18n.t(BlogsToolConstants.ROOT_NAME), i18n.t("Blogs are a chronological list of posts (ordered by date) about a specific topic. Each post can be commented by the visitors"), - icons.blogs(), toolSelector, cntCapRegistry, i18n, navResources); + icons.blogs(), AccessRolDTO.Viewer, toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; // registerAclEditableTypes(); Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -28,6 +28,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -48,7 +49,8 @@ i18n.t("chatrooms"), i18n.t( "A 'room' where you can have a group-chat with many users at once. Rooms can be public or private. Users can be from [%s] or other sites (compatible with gmail chat)", - i18n.getSiteCommonName()), icons.chats(), toolSelector, cntCapRegistry, i18n, navResources); + i18n.getSiteCommonName()), icons.chats(), AccessRolDTO.Viewer, toolSelector, cntCapRegistry, + i18n, navResources); this.res = res; this.icons = icons; registerIcons(); Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -220,7 +220,7 @@ public void run() { ChatSitebarActions.this.chatClient.loginIfNecessary(); } - }.schedule(2000); + }.schedule(4000); break; case DISCONNECTED: case RECONNECTING: Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -87,6 +87,7 @@ ginjector.getListsParts(); ginjector.getChatParts(); ginjector.getBartersParts(); + ginjector.getTrashParts(); ginjector.getSiteLogo(); ginjector.getChatClient(); Modified: trunk/src/main/java/cc/kune/client/KuneGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneGinjector.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/client/KuneGinjector.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -69,6 +69,8 @@ import cc.kune.pspace.client.PSpacePresenter; import cc.kune.tasks.client.TasksGinModule; import cc.kune.tasks.client.TasksGinjector; +import cc.kune.trash.client.TrashGinModule; +import cc.kune.trash.client.TrashGinjector; import cc.kune.wave.client.WaveGinModule; import cc.kune.wave.client.WaveParts; import cc.kune.wiki.client.WikiGinModule; @@ -84,9 +86,10 @@ @GinModules({ KuneGinModule.class, CoreGinModule.class, WaveGinModule.class, PSpaceGinModule.class, HSpaceGinModule.class, GSpaceGinModule.class, DocsGinModule.class, BlogsGinModule.class, ChatGinModule.class, WikiGinModule.class, BartersGinModule.class, EventsGinModule.class, - TasksGinModule.class, ListsGinModule.class }) + TasksGinModule.class, ListsGinModule.class, TrashGinModule.class }) public interface KuneGinjector extends Ginjector, GSpaceGinjector, DocsGinjector, BlogsGinjector, - WikiGinjector, BartersGinjector, EventsGinjector, ChatGinjector, TasksGinjector, ListsGinjector { + WikiGinjector, BartersGinjector, EventsGinjector, ChatGinjector, TasksGinjector, ListsGinjector, + TrashGinjector { /* * You have to add here all the GWTPresenters (as Provider or AsyncProvider) Modified: trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/common/client/resources/CommonResources.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -131,4 +131,10 @@ @Source("icons/world-16.png") ImageResource world16(); + + @Source("icons/trash-black.png") + ImageResource trashBlack(); + + @Source("icons/trash-white.png") + ImageResource trashWhite(); } Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceHelper.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -1,11 +1,16 @@ package cc.kune.core.client.rpcservices; +import cc.kune.common.client.notify.ConfirmAskEvent; import cc.kune.common.client.notify.NotifyUser; +import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.common.shared.i18n.I18nTranslationService; 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.SocialNetworkSubGroup; +import cc.kune.core.shared.dto.StateContainerDTO; +import com.google.gwt.event.shared.EventBus; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.inject.Inject; import com.google.inject.Provider; @@ -13,15 +18,20 @@ public class ContentServiceHelper { private final Provider<ContentServiceAsync> contentService; + private final EventBus eventBus; private final I18nTranslationService i18n; private final Session session; + private final StateManager stateManager; @Inject public ContentServiceHelper(final Session session, final I18nTranslationService i18n, - final Provider<ContentServiceAsync> contentService) { + final EventBus eventBus, final Provider<ContentServiceAsync> contentService, + final StateManager stateManager) { this.session = session; this.i18n = i18n; + this.eventBus = eventBus; this.contentService = contentService; + this.stateManager = stateManager; } public void addParticipants(final StateToken token, final SocialNetworkSubGroup subGroup) { @@ -40,4 +50,27 @@ } }); } + + public void delContent(final StateToken token) { + ConfirmAskEvent.fire(eventBus, i18n.t("Please confirm"), i18n.t("Are you sure?"), i18n.t("Yes"), + i18n.t("No"), null, null, new OnAcceptCallback() { + @Override + public void onSuccess() { + NotifyUser.showProgress(); + contentService.get().delContent(session.getUserHash(), token, + new AsyncCallbackSimple<StateContainerDTO>() { + @Override + public void onSuccess(final StateContainerDTO state) { + final StateToken parentToken = state.getStateToken(); + if (session.getCurrentStateToken().equals(parentToken)) { + stateManager.setRetrievedStateAndGo(state); + } else { + stateManager.gotoStateToken(parentToken, false); + } + NotifyUser.hideProgress(); + } + }); + } + }); + } } Modified: trunk/src/main/java/cc/kune/core/server/content/CreationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/CreationService.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/core/server/content/CreationService.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -27,6 +27,8 @@ public interface CreationService { + Content copyContent(User user, Container container, Content contentToCopy); + Content createContent(String title, String body, User user, Container container, String typeId); Container createFolder(Group group, Long parentFolderId, String name, I18nLanguage language, Modified: trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -51,10 +51,17 @@ } @Override + public Content copyContent(final User user, final Container container, final Content contentToCopy) { + final ServerTool tool = tools.get(container.getToolName()); + final Content content = contentManager.copyContent(user, container, contentToCopy); + tool.onCreateContent(content, container); + return content; + } + + @Override public Content createContent(final String title, final String body, final User user, final Container container, final String typeId) { - final String toolName = container.getToolName(); - final ServerTool tool = tools.get(toolName); + final ServerTool tool = tools.get(container.getToolName()); tool.checkTypesBeforeContentCreation(container.getTypeId(), typeId); final URL gagdetUrl = tool instanceof ServerWaveTool ? ((ServerWaveTool) tool).getGadgetUrl() : KuneWaveService.WITHOUT_GADGET; Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -225,7 +225,7 @@ final Content contentToCopy = finderService.getContent(ContentUtils.parseId(token.getDocument())); final Container container = finderService.getContainer(ContentUtils.parseId(parentToken.getFolder())); if (rightsService.get(user, contentToCopy.getAccessLists()).isVisible()) { - return mapper.map(contentManager.copyContent(user, container, contentToCopy), + return mapper.map(creationService.copyContent(user, container, contentToCopy), StateContentDTO.class); } else { throw new AccessViolationException(); Modified: trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -87,12 +87,13 @@ } public void register(final ServerTool tool) { + final String name = tool.getName(); + final String rootName = tool.getRootName(); if (tool.getName().equals(TrashToolConstants.NAME)) { - // Trash is a special tool but we don't register it + tools.put(name, tool); + // Trash is a special tool but we don't register it fully return; } - final String name = tool.getName(); - final String rootName = tool.getRootName(); final boolean userAvailable = usersAvailableToolsInProp.contains(name); final boolean groupAvailable = groupsAvailableToolsInProp.contains(name); if (userAvailable && usersRegisEnabledToolsInProp.contains(name)) { Modified: trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/docs/KuneDocs.gwt.xml 2012-03-18 22:25:32 UTC (rev 1771) @@ -1,6 +1,6 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module> - <inherits name="cc.kune.core.KuneCore" /> - <source path="client" /> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> <source path="shared" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -28,6 +28,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -47,7 +48,7 @@ NAME, i18n.t(DocsToolConstants.ROOT_NAME), i18n.t("Here you can create or upload your personal, group or public documents. These documents can be edited and commented collaboratively and simultaneously. These docs can be static pages in your web page if you publish them"), - icons.docs(), toolSelector, cntCapRegistry, i18n, navResources); + icons.docs(), AccessRolDTO.Viewer, toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/cc/kune/events/KuneEvents.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/events/KuneEvents.gwt.xml 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/events/KuneEvents.gwt.xml 2012-03-18 22:25:32 UTC (rev 1771) @@ -1,13 +1,13 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module> - <inherits name="cc.kune.core.KuneCore"/> - <source path="client"/> - <source path="shared"/> - <inherits name='com.bradrydzewski.gwt.calendar.Calendar'/> - <inherits name='com.bradrydzewski.gwt.calendar.theme.google.Google'/> - <inherits name='com.allen_sauer.gwt.dnd.gwt-dnd'/> - <source path='client' - excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> - <source path='shared' +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module> + <inherits name="cc.kune.core.KuneCore"/> + <source path="client"/> + <source path="shared"/> + <inherits name='com.bradrydzewski.gwt.calendar.Calendar'/> + <inherits name='com.bradrydzewski.gwt.calendar.theme.google.Google'/> + <inherits name='com.allen_sauer.gwt.dnd.gwt-dnd'/> + <source path='client' excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> + <source path='shared' + excludes="**/*Test.java,**/*Tests.java,**/*MockProvider.java" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -27,6 +27,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -41,7 +42,7 @@ final ContentCapabilitiesRegistry cntCapRegistry, final NavResources navResources, final IconicResources icons) { super(NAME, i18n.t(ROOT_NAME), i18n.t("A calendar to schedule activities and events"), - icons.events(), toolSelector, cntCapRegistry, i18n, navResources); + icons.events(), AccessRolDTO.Viewer, toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; // registerAclEditableTypes(TYPE_DOCUMENT, TYPE_UPLOADEDFILE); Modified: trunk/src/main/java/cc/kune/events/client/actions/EventRemoveMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventRemoveMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/events/client/actions/EventRemoveMenuItem.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -2,14 +2,12 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.ui.dialogs.PromptTopDialog; import cc.kune.common.shared.i18n.I18nTranslationService; -import cc.kune.common.shared.utils.TextUtils; import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.rpcservices.ContentServiceHelper; import cc.kune.core.client.state.AccessRightsClientManager; 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.events.client.viewer.CalendarViewer; @@ -22,22 +20,21 @@ public class EventRemoveMenuItem extends MenuItemDescriptor { public static class EventEditAction extends CalendarRolAction { private final Provider<CalendarViewer> calendar; - private PromptTopDialog dialog; - private final I18nTranslationService i18n; + private final ContentServiceHelper contentService; @Inject - public EventEditAction(final CoreResources res, final I18nTranslationService i18n, - final Provider<CalendarViewer> calendar, final EventBus eventBus, final Session session, - final StateManager stateManager, final AccessRightsClientManager rightsMan) { + public EventEditAction(final CoreResources res, final Provider<CalendarViewer> calendar, + final EventBus eventBus, final Session session, final I18nTranslationService i18n, + final AccessRightsClientManager rightsMan, final ContentServiceHelper contentService) { super(eventBus, session, calendar, AccessRolDTO.Administrator, true, true); - this.i18n = i18n; this.calendar = calendar; + this.contentService = contentService; withText(i18n.t("Remove this appointment")).withIcon(res.cancel()); } @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.info(i18n.t(TextUtils.IN_DEVELOPMENT)); + contentService.delContent(new StateToken(calendar.get().getAppToEdit().getId())); } } Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -21,70 +21,31 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.notify.ConfirmAskEvent; -import cc.kune.common.client.notify.NotifyUser; -import cc.kune.common.client.utils.OnAcceptCallback; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.actions.RolAction; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; -import cc.kune.core.client.rpcservices.ContentServiceAsync; -import cc.kune.core.client.state.Session; -import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.client.rpcservices.ContentServiceHelper; import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.StateContainerDTO; -import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; -import com.google.inject.Provider; public class DelContentMenuItem extends MenuItemDescriptor { public static class DelContentAction extends RolAction { - private final Provider<ContentServiceAsync> contentService; - private final EventBus eventBus; - private final I18nTranslationService i18n; - private final Session session; - private final StateManager stateManager; + private final ContentServiceHelper contentService; @Inject - public DelContentAction(final EventBus eventBus, final StateManager stateManager, - final Session session, final Provider<ContentServiceAsync> contentService, - final I18nTranslationService i18n) { + public DelContentAction(final ContentServiceHelper contentService) { super(AccessRolDTO.Administrator, true); - this.eventBus = eventBus; - this.stateManager = stateManager; - this.session = session; this.contentService = contentService; - this.i18n = i18n; + } @Override public void actionPerformed(final ActionEvent event) { - final StateToken token = ((AbstractContentSimpleDTO) event.getTarget()).getStateToken(); - ConfirmAskEvent.fire(eventBus, i18n.t("Please confirm"), i18n.t("Are you sure?"), i18n.t("Yes"), - i18n.t("No"), null, null, new OnAcceptCallback() { - @Override - public void onSuccess() { - NotifyUser.showProgress(); - contentService.get().delContent(session.getUserHash(), token, - new AsyncCallbackSimple<StateContainerDTO>() { - @Override - public void onSuccess(final StateContainerDTO state) { - final StateToken parentToken = state.getStateToken(); - if (session.getCurrentStateToken().equals(parentToken)) { - stateManager.setRetrievedStateAndGo(state); - } else { - stateManager.gotoStateToken(parentToken, false); - } - NotifyUser.hideProgress(); - } - }); - } - }); + contentService.delContent(((AbstractContentSimpleDTO) event.getTarget()).getStateToken()); } } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/gspace/client/tool/AbstractClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -19,6 +19,7 @@ */ package cc.kune.gspace.client.tool; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.tool.selector.ToolSelector; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPanel; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPresenter; @@ -28,9 +29,9 @@ public abstract class AbstractClientTool { public AbstractClientTool(final String shortName, final String longName, final String tooltip, - final ImageResource icon, final ToolSelector toolSelector) { + final ImageResource icon, final AccessRolDTO visibleForRol, final ToolSelector toolSelector) { final ToolSelectorItemPresenter presenter = new ToolSelectorItemPresenter(shortName, longName, - tooltip, toolSelector); + tooltip, visibleForRol, toolSelector); final ToolSelectorItemPanel panel = new ToolSelectorItemPanel(shortName, icon); presenter.init(panel); } Modified: trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/gspace/client/tool/FoldableAbstractClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -24,6 +24,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.BasicMimeTypeDTO; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -37,10 +38,10 @@ protected final NavResources navResources; public FoldableAbstractClientTool(final String shortName, final String longName, final String tooltip, - final ImageResource icon, final ToolSelector toolSelector, + final ImageResource icon, final AccessRolDTO visibleForRol, final ToolSelector toolSelector, final ContentCapabilitiesRegistry contentCapabilitiesRegistry, final I18nTranslationService i18n, final NavResources navResources) { - super(shortName, longName, tooltip, icon, toolSelector); + super(shortName, longName, tooltip, icon, visibleForRol, toolSelector); this.contentCapabilitiesRegistry = contentCapabilitiesRegistry; this.i18n = i18n; this.navResources = navResources; Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItem.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItem.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -20,10 +20,13 @@ package cc.kune.gspace.client.tool.selector; import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPresenter.ToolSelectorItemView; public interface ToolSelectorItem { + AccessRolDTO getVisibleForRol(); + String getShortName(); ToolSelectorItemView getView(); Modified: trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorItemPresenter.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -20,6 +20,7 @@ package cc.kune.gspace.client.tool.selector; import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.AccessRolDTO; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -43,6 +44,7 @@ } private final String longName; + private final AccessRolDTO visibleFoRol; private final String shortName; private StateToken token; private final ToolSelector toolSelector; @@ -50,14 +52,20 @@ private ToolSelectorItemView view; public ToolSelectorItemPresenter(final String shortName, final String longName, final String tooltip, - final ToolSelector toolSelector) { + final AccessRolDTO visibleForRol, final ToolSelector toolSelector) { this.shortName = shortName; this.longName = longName; this.tooltip = tooltip; + this.visibleFoRol = visibleForRol; this.toolSelector = toolSelector; } @Override + public AccessRolDTO getVisibleForRol() { + return visibleFoRol; + } + + @Override public String getShortName() { return shortName; } 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 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/gspace/client/tool/selector/ToolSelectorPresenter.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -25,14 +25,16 @@ import cc.kune.common.client.errors.UIException; import cc.kune.common.client.log.Log; import cc.kune.common.shared.utils.TextUtils; +import cc.kune.core.client.actions.RolComparator; import cc.kune.core.client.events.GroupChangedEvent; +import cc.kune.core.client.events.GroupChangedEvent.GroupChangedHandler; import cc.kune.core.client.events.StateChangedEvent; +import cc.kune.core.client.events.StateChangedEvent.StateChangedHandler; import cc.kune.core.client.events.ToolChangedEvent; -import cc.kune.core.client.events.GroupChangedEvent.GroupChangedHandler; -import cc.kune.core.client.events.StateChangedEvent.StateChangedHandler; import cc.kune.core.client.events.ToolChangedEvent.ToolChangedHandler; import cc.kune.core.client.state.StateManager; import cc.kune.core.shared.domain.utils.StateToken; +import cc.kune.core.shared.dto.StateAbstractDTO; import cc.kune.gspace.client.tool.selector.ToolSelectorItemPresenter.ToolSelectorItemView; import com.google.gwt.event.shared.EventBus; @@ -65,12 +67,15 @@ stateManager.onStateChanged(true, new StateChangedHandler() { @Override public void onStateChanged(final StateChangedEvent event) { - for (final String tool : tools.keySet()) { - final List<String> enabledTools = event.getState().getEnabledTools(); - if (enabledTools != null && enabledTools.contains(tool)) { - tools.get(tool).setVisible(true); + for (final String toolName : tools.keySet()) { + final StateAbstractDTO state = event.getState(); + final List<String> enabledTools = state.getEnabledTools(); + if (enabledTools != null && enabledTools.contains(toolName)) { + final ToolSelectorItem tool = tools.get(toolName); + // Set visible only when allowed + tool.setVisible(RolComparator.isEnabled(tool.getVisibleForRol(), state.getGroupRights())); } else { - tools.get(tool).setVisible(false); + tools.get(toolName).setVisible(false); } } } @@ -101,7 +106,9 @@ } tools.put(name, item); item.setSelected(false); + // if (!name.equals(TrashToolConstants.NAME)) { getView().addItem(item.getView()); + // } } private void checkTool(final ToolSelectorItem tool) { Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -26,6 +26,7 @@ import cc.kune.gspace.client.actions.ShowHelpContainerEvent; import cc.kune.gspace.client.viewers.FolderViewerPresenter.FolderViewerView; import cc.kune.gspace.client.viewers.items.FolderItemDescriptor; +import cc.kune.trash.shared.TrashToolConstants; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -83,10 +84,13 @@ typeId, status); final String tooltip = getTooltip(stateToken, mimeType, capabReg.isDragable(typeId) && rights.isAdministrable()); - if (status.equals(ContentStatus.inTheDustbin) - && (!capabReg.showDeleted(typeId) && !session.getShowDeletedContent())) { + final boolean thisTypeShouldShowDelete = capabReg.showDeleted(typeId) + || parentStateToken.getTool().equals(TrashToolConstants.NAME); + final boolean showAllDeleted = session.getShowDeletedContent(); + if (status.equals(ContentStatus.inTheDustbin) && !(thisTypeShouldShowDelete || showAllDeleted)) { // Don't show - // NotifyUser.info("Deleted, don't show"); + // NotifyUser.info("Deleted, don't show: " + parentStateToken + " " + + // thisTypeShouldShowDelete); } else { final FolderItemDescriptor item = new FolderItemDescriptor(genId(stateToken), genId(parentStateToken), icon, name, tooltip, status, stateToken, modifiedOn, Modified: trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -28,6 +28,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -45,7 +46,7 @@ NAME, i18n.t(ROOT_NAME), i18n.t("Lists behave like a mailing list or a forum. You can subscribe and discuss about specific topics"), - icons.lists(), toolSelector, cntCapRegistry, i18n, navResources); + icons.lists(), AccessRolDTO.Viewer, toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; // registerAclEditableTypes(); Modified: trunk/src/main/java/cc/kune/tasks/KuneTasks.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/tasks/KuneTasks.gwt.xml 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/tasks/KuneTasks.gwt.xml 2012-03-18 22:25:32 UTC (rev 1771) @@ -1,6 +1,6 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module> - <inherits name="cc.kune.core.KuneCore" /> - <source path="client" /> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> <source path="shared" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -29,6 +29,7 @@ import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -47,7 +48,7 @@ NAME, i18n.t(ROOT_NAME), i18n.t("A collaborative TO-DO list for the group. Any group-member can participate in any proposed task, add others to a task, comment them, add info, etc"), - icons.tasks(), toolSelector, cntCapRegistry, i18n, navResources); + icons.tasks(), AccessRolDTO.Viewer, toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; // registerAclEditableTypes(); Added: trunk/src/main/java/cc/kune/trash/KuneTrash.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/trash/KuneTrash.gwt.xml (rev 0) +++ trunk/src/main/java/cc/kune/trash/KuneTrash.gwt.xml 2012-03-18 22:25:32 UTC (rev 1771) @@ -0,0 +1,6 @@ +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> + <source path="shared" /> +</module> \ No newline at end of file Added: trunk/src/main/java/cc/kune/trash/client/TrashClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/trash/client/TrashClientTool.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/client/TrashClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -0,0 +1,73 @@ +/* + * + * Copyright (C) 2007-2009 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.trash.client; + +import static cc.kune.trash.shared.TrashToolConstants.NAME; +import static cc.kune.trash.shared.TrashToolConstants.ROOT_NAME; +import static cc.kune.trash.shared.TrashToolConstants.TYPE_ROOT; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.registry.ContentCapabilitiesRegistry; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; +import cc.kune.gspace.client.tool.FoldableAbstractClientTool; +import cc.kune.gspace.client.tool.selector.ToolSelector; + +import com.google.inject.Inject; + +public class TrashClientTool extends FoldableAbstractClientTool { + + private static final String EMPTY = "The trash is empty"; + private final CoreResources res; + + @Inject + public TrashClientTool(final I18nTranslationService i18n, final ToolSelector toolSelector, + final ContentCapabilitiesRegistry cntCapRegistry, final CoreResources res, + final NavResources navResources) { + super(NAME, i18n.t(ROOT_NAME), "", res.trashWhite(), AccessRolDTO.Administrator, toolSelector, + cntCapRegistry, i18n, navResources); + this.res = res; + + // registerAclEditableTypes(); + registerAuthorableTypes(); + registerDragableTypes(); + registerDropableTypes(TYPE_ROOT); + registerPublishModerableTypes(); + registerRateableTypes(); + registerRenamableTypes(); + registerTageableTypes(); + // registerTranslatableTypes(); + registerIcons(); + } + + @Override + public String getName() { + return NAME; + } + + private void registerIcons() { + registerContentTypeIcon(TYPE_ROOT, res.trashBlack()); + final String trashEmpty = i18n.t(EMPTY); + registerEmptyMessages(TYPE_ROOT, trashEmpty); + registerEmptyMessagesNotLogged(TYPE_ROOT, trashEmpty); + registerShowDeleted(TYPE_ROOT); + } + +} Added: trunk/src/main/java/cc/kune/trash/client/TrashGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/trash/client/TrashGinModule.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/client/TrashGinModule.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -0,0 +1,33 @@ +/* + * + * 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.trash.client; + +import cc.kune.core.client.ExtendedGinModule; +import cc.kune.trash.client.actions.TrashClientActions; + +public class TrashGinModule extends ExtendedGinModule { + + @Override + protected void configure() { + s(TrashClientTool.class); + s(TrashClientActions.class); + } + +} Added: trunk/src/main/java/cc/kune/trash/client/TrashGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/trash/client/TrashGinjector.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/client/TrashGinjector.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -0,0 +1,28 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.trash.client; + +import com.google.gwt.inject.client.Ginjector; + +public interface TrashGinjector extends Ginjector { + + TrashParts getTrashParts(); + +} Added: trunk/src/main/java/cc/kune/trash/client/TrashParts.java =================================================================== --- trunk/src/main/java/cc/kune/trash/client/TrashParts.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/client/TrashParts.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -0,0 +1,41 @@ +/* + * + * 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.trash.client; + +import cc.kune.core.shared.SessionConstants; +import cc.kune.gspace.client.tool.ContentViewerSelector; +import cc.kune.gspace.client.viewers.ContentViewerPresenter; +import cc.kune.gspace.client.viewers.FolderViewerPresenter; +import cc.kune.trash.client.actions.TrashClientActions; +import cc.kune.trash.shared.TrashToolConstants; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class TrashParts { + + @Inject + public TrashParts(final SessionConstants session, final Provider<TrashClientTool> clientTool, + final ContentViewerSelector viewerSelector, final TrashClientActions trashActions, + final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { + clientTool.get(); + viewerSelector.register(folderViewer, true, TrashToolConstants.TYPE_ROOT); + } +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/trash/client/actions/TrashClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/trash/client/actions/TrashClientActions.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/client/actions/TrashClientActions.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -0,0 +1,42 @@ +package cc.kune.trash.client.actions; + +import static cc.kune.trash.shared.TrashToolConstants.TYPE_ROOT; +import cc.kune.chat.client.actions.GoParentChatBtn; +import cc.kune.core.client.actions.ActionRegistryByType; +import cc.kune.core.client.i18n.I18nUITranslationService; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.StateManager; +import cc.kune.gspace.client.actions.AbstractFoldableToolActions; +import cc.kune.gspace.client.actions.ActionGroups; +import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; +import cc.kune.gspace.client.actions.RefreshContentMenuItem; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class TrashClientActions extends AbstractFoldableToolActions { + + final String[] all = { TYPE_ROOT }; + final String[] containers = { TYPE_ROOT }; + final String[] containersNoRoot = {}; + final String[] contents = {}; + + @Inject + public TrashClientActions(final I18nUITranslationService i18n, final Session session, + final StateManager stateManager, final ActionRegistryByType registry, final CoreResources res, + final Provider<RefreshContentMenuItem> refresh, final Provider<GoParentChatBtn> folderGoUp, + final Provider<ContentViewerOptionsMenu> optionsMenuContent) { + super(session, stateManager, i18n, registry); + actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); + // actionsRegistry.addAction(ActionGroups.TOOLBAR, folderGoUp, + // DocsToolConstants.TYPE_DOCUMENT); + // actionsRegistry.addAction(ActionGroups.ITEM_MENU, action, + // containersNoRoot); + } + + @Override + protected void createPostSessionInitActions() { + } +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -14,6 +14,11 @@ import cc.kune.core.server.content.CreationService; import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; +import cc.kune.core.shared.domain.ContentStatus; +import cc.kune.core.shared.domain.GroupListMode; +import cc.kune.domain.AccessLists; +import cc.kune.domain.Container; +import cc.kune.domain.Content; import cc.kune.domain.Group; import cc.kune.domain.User; @@ -39,4 +44,20 @@ createRoot(group); return group; } + + @Override + public void onCreateContent(final Content content, final Container parent) { + content.setStatus(ContentStatus.inTheDustbin); + super.onCreateContent(content, parent); + } + + @Override + protected void setContainerAcl(final Container container) { + final AccessLists wikiAcl = new AccessLists(); + wikiAcl.getAdmins().setMode(GroupListMode.NORMAL); + wikiAcl.getAdmins().add(container.getOwner()); + wikiAcl.getEditors().setMode(GroupListMode.NORMAL); + wikiAcl.getViewers().setMode(GroupListMode.NORMAL); + setAccessList(container, wikiAcl); + } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java =================================================================== --- trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -1,17 +1,11 @@ package cc.kune.trash.shared; - public final class TrashToolConstants { public static final String NAME = "trash"; public static final String ROOT_NAME = "trash"; public static final String TYPE_ROOT = NAME + "." + "root"; - // public static final String[] ALLOWED_CONTENTS = - // {DocsToolConstants.TYPE_FOLDER, - // DocsToolConstants.TYPE_DOCUMENT, BlogsToolConstants.TYPE_BLOG, - // BlogsToolConstants.TYPE_POST, ETC - // }; private TrashToolConstants() { } } Modified: trunk/src/main/java/cc/kune/wave/server/kspecific/KuneWaveServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/kspecific/KuneWaveServiceDefault.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/wave/server/kspecific/KuneWaveServiceDefault.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -66,7 +66,6 @@ import com.google.wave.api.BlipThread; import com.google.wave.api.Element; import com.google.wave.api.ElementType; -import com.google.wave.api.FormElement; import com.google.wave.api.Gadget; import com.google.wave.api.JsonRpcConstant.ParamsProperty; import com.google.wave.api.JsonRpcResponse; @@ -127,9 +126,11 @@ for (final Entry<Integer, Element> entry : fromBlip.getElements().entrySet()) { final ElementType type = entry.getValue().getType(); Element result = null; - if (FormElement.getFormElementTypes().contains(type)) { - result = new FormElement(type, entry.getValue().getProperties()); - } else if (type == ElementType.GADGET) { + // if (FormElement.getFormElementTypes().contains(type)) { + // result = new FormElement(type, entry.getValue().getProperties()); + // } else + + if (type == ElementType.GADGET) { result = new Gadget(entry.getValue().getProperties()); // } else if (type == ElementType.IMAGE) { // result = new Image(entry.getValue().getProperties()); @@ -271,7 +272,7 @@ participantsArray[0].toString()); if (waveletToCopy != null) { copyWavelet(waveletToCopy.getRootBlip(), rootBlip); - copyWaveletElements(waveletToCopy.getRootBlip(), rootBlip); + // copyWaveletElements(waveletToCopy.getRootBlip(), rootBlip); } } catch (final DefaultException e2) { LOG.error("Error copying wave content", e2); Modified: trunk/src/main/java/cc/kune/wiki/KuneWiki.gwt.xml =================================================================== --- trunk/src/main/java/cc/kune/wiki/KuneWiki.gwt.xml 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/wiki/KuneWiki.gwt.xml 2012-03-18 22:25:32 UTC (rev 1771) @@ -1,6 +1,6 @@ -<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> -<module> - <inherits name="cc.kune.core.KuneCore" /> - <source path="client" /> +<!DOCTYPE module PUBLIC "-//Google Inc.//DTD Google Web Toolkit 2.1.0//EN" "http://google-web-toolkit.googlecode.com/svn/tags/2.1.0/distro-source/core/…"> +<module> + <inherits name="cc.kune.core.KuneCore" /> + <source path="client" /> <source path="shared" /> </module> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) +++ trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-03-18 22:25:32 UTC (rev 1771) @@ -28,6 +28,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; +import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -47,7 +48,8 @@ i18n.t("wiki"), i18n.t( "Wiki-pages are Documents that can be edited by any visitor (in [%s]), instead of only by the group. This accelerates updating and construction", - i18n.getSiteCommonName()), icons.wikis(), toolSelector, cntCapRegistry, i18n, navResources); + i18n.getSiteCommonName()), icons.wikis(), AccessRolDTO.Viewer, toolSelector, cntCapRegistry, + i18n, navResources); this.icons = icons; registerAuthorableTypes(TYPE_WIKIPAGE, TYPE_UPLOADEDFILE); Added: trunk/src/main/resources/icons/trash-black.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/icons/trash-black.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/main/resources/icons/trash-white.png =================================================================== (Binary files differ) Property changes on: trunk/src/main/resources/icons/trash-white.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

1 0

18 Mar '12

Author: vjrj_ Date: 2012-03-18 21:18:29 +0100 (Sun, 18 Mar 2012) New Revision: 1770 Added: trunk/img/icons/custom-iconic/trash.svg trunk/script/export-svg-to-png.sh trunk/src/main/java/cc/kune/barters/shared/BartersToolConstants.java trunk/src/main/java/cc/kune/blogs/shared/BlogsToolConstants.java trunk/src/main/java/cc/kune/chat/shared/ChatToolConstants.java trunk/src/main/java/cc/kune/docs/shared/DocsToolConstants.java trunk/src/main/java/cc/kune/events/shared/EventsToolConstants.java trunk/src/main/java/cc/kune/gallery/shared/GalleryToolConstants.java trunk/src/main/java/cc/kune/lists/shared/ListsToolConstants.java trunk/src/main/java/cc/kune/tasks/shared/TasksToolConstants.java trunk/src/main/java/cc/kune/trash/ trunk/src/main/java/cc/kune/trash/server/ trunk/src/main/java/cc/kune/trash/server/TrashServerModule.java trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java trunk/src/main/java/cc/kune/trash/shared/ trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java trunk/src/main/java/cc/kune/wiki/shared/WikiToolConstants.java Removed: trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java trunk/src/main/java/cc/kune/events/shared/EventsConstants.java trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java trunk/src/main/java/cc/kune/barters/client/BartersParts.java trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java trunk/src/main/java/cc/kune/blogs/client/BlogsParts.java trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java trunk/src/main/java/cc/kune/chat/client/ChatParts.java trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java trunk/src/main/java/cc/kune/client/KuneEntryPoint.java trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java trunk/src/main/java/cc/kune/core/client/state/impl/ContentCacheDefault.java trunk/src/main/java/cc/kune/core/server/KuneRackModule.java trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java trunk/src/main/java/cc/kune/core/shared/ToolConstants.java trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java trunk/src/main/java/cc/kune/docs/client/DocsParts.java trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java trunk/src/main/java/cc/kune/domain/Content.java trunk/src/main/java/cc/kune/domain/finders/ContainerFinder.java trunk/src/main/java/cc/kune/events/client/EventsClientTool.java trunk/src/main/java/cc/kune/events/client/EventsGinjector.java trunk/src/main/java/cc/kune/events/client/EventsParts.java trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java trunk/src/main/java/cc/kune/events/server/EventsServerTool.java trunk/src/main/java/cc/kune/events/server/EventsServlet.java trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java trunk/src/main/java/cc/kune/lists/client/ListsParts.java trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java trunk/src/main/java/cc/kune/tasks/client/TasksParts.java trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java trunk/src/main/java/cc/kune/wiki/client/WikiParts.java trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java trunk/src/main/resources/kune.properties trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java trunk/src/test/java/cc/kune/docs/DocumentToolTest.java trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java trunk/src/test/java/cc/kune/lists/server/ListsServerToolTest.java trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java Log: NEW - # 222: Create a trash folder icon and improve contents delete functionality http://kune.ourproject.org/issues/ticket/222 Added: trunk/img/icons/custom-iconic/trash.svg =================================================================== --- trunk/img/icons/custom-iconic/trash.svg (rev 0) +++ trunk/img/icons/custom-iconic/trash.svg 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,82 @@ +<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + version="1.1" + id="Layer_1" + x="0px" + y="0px" + width="32px" + height="32px" + viewBox="0 0 32 32" + style="enable-background:new 0 0 32 32;" + xml:space="preserve" + inkscape:version="0.48.2 r9819" + sodipodi:docname="trash.svg"><metadata + id="metadata3056"><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><defs + id="defs3054"> + + + + + +</defs><sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1078" + inkscape:window-height="919" + id="namedview3052" + showgrid="false" + inkscape:zoom="1" + inkscape:cx="16" + inkscape:cy="16" + inkscape:window-x="0" + inkscape:window-y="972" + inkscape:window-maximized="0" + inkscape:current-layer="Layer_1" + inkscape:showpageshadow="false" + showguides="false"><inkscape:grid + type="xygrid" + id="grid3077" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /></sodipodi:namedview> +<path + style="color:#000000;fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="M 1,0 C 0.44600003,0 0,0.446 0,1 l 0,2 c 0,0.554 0.44600003,1 1,1 1.3041959,0 1.6744253,0 3,0 l 0,22 c 0,3.312 2.688,6 6,6 l 12,0 c 3.312,0 6,-2.688 6,-6 l 0,-22 2,0 1,0 c 0.554,0 1,-0.446 1,-1 L 32,1 C 32,0.446 31.554,0 31,0 L 30,0 26,0 C 24.589979,0 24,0.5207576 24,2.03125 L 24,26 c 0,1.102 -0.898,2 -2,2 L 10,28 C 8.898,28 8,27.102 8,26 8.00153,18.235176 8.00126,7.8861416 8,1 8,0.43960056 7.5213789,0 7,0 5.3333333,0 2.6666667,0 1,0 z" + id="rect3871" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cssccssssccsssscssssscccc" /> +<rect + style="color:#000000;fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3086" + width="4" + height="22" + x="10" + y="4" + ry="0.99999994" + rx="1" /><rect + style="color:#000000;fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3860" + width="4" + height="22" + x="18" + y="4" + ry="0.99999994" + rx="1" /></svg> \ No newline at end of file Added: trunk/script/export-svg-to-png.sh =================================================================== --- trunk/script/export-svg-to-png.sh (rev 0) +++ trunk/script/export-svg-to-png.sh 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,8 @@ +DEST=/tmp/ +SIZE=16 +for i in `ls img/icons/custom-iconic/* svg` +do + inkscape --export-png=$DEST/`basename $i .svg`.png \ + --export-width=$SIZE --export-height=$SIZE \ + $i +done \ No newline at end of file Property changes on: trunk/script/export-svg-to-png.sh ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/BartersClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.barters.client; -import static cc.kune.barters.shared.BartersConstants.NAME; -import static cc.kune.barters.shared.BartersConstants.TYPE_BARTER; -import static cc.kune.barters.shared.BartersConstants.TYPE_FOLDER; -import static cc.kune.barters.shared.BartersConstants.TYPE_ROOT; +import static cc.kune.barters.shared.BartersToolConstants.NAME; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_BARTER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_FOLDER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; Modified: trunk/src/main/java/cc/kune/barters/client/BartersParts.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/BartersParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/BartersParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -20,7 +20,7 @@ package cc.kune.barters.client; import cc.kune.barters.client.actions.BartersClientActions; -import cc.kune.barters.shared.BartersConstants; +import cc.kune.barters.shared.BartersToolConstants; import cc.kune.core.shared.SessionConstants; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.viewers.ContentViewerPresenter; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final BartersClientActions bartersActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, BartersConstants.TYPE_BARTER); - viewerSelector.register(folderViewer, true, BartersConstants.TYPE_ROOT, BartersConstants.TYPE_FOLDER); + viewerSelector.register(contentViewer, true, BartersToolConstants.TYPE_BARTER); + viewerSelector.register(folderViewer, true, BartersToolConstants.TYPE_ROOT, BartersToolConstants.TYPE_FOLDER); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/actions/BartersClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ \*/ package cc.kune.barters.client.actions; -import static cc.kune.barters.shared.BartersConstants.TYPE_BARTER; -import static cc.kune.barters.shared.BartersConstants.TYPE_FOLDER; -import static cc.kune.barters.shared.BartersConstants.TYPE_ROOT; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_BARTER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_FOLDER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_ROOT; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.CoreResources; Modified: trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.barters.client.actions; -import cc.kune.barters.shared.BartersConstants; +import cc.kune.barters.shared.BartersToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, BartersConstants.TYPE_ROOT); + super(i18n, action, res, session, BartersToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/actions/NewBartersBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.barters.client.actions; -import cc.kune.barters.shared.BartersConstants; +import cc.kune.barters.shared.BartersToolConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; @@ -34,7 +34,7 @@ public NewBartersBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.barterAdd(), shorcutReg, i18n.t("New barter"), - i18n.t("Create a New Barter here"), i18n.t("New barter"), BartersConstants.TYPE_BARTER); + i18n.t("Create a New Barter here"), i18n.t("New barter"), BartersToolConstants.TYPE_BARTER); } } Modified: trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/client/actions/NewFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.barters.client.actions; -import cc.kune.barters.shared.BartersConstants; +import cc.kune.barters.shared.BartersToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerBtn; @@ -32,7 +32,7 @@ public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder"), - i18n.t("New folder"), BartersConstants.TYPE_FOLDER); + i18n.t("New folder"), BartersToolConstants.TYPE_FOLDER); } } Modified: trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/server/BarterServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.barters.server; -import static cc.kune.barters.shared.BartersConstants.NAME; -import static cc.kune.barters.shared.BartersConstants.ROOT_NAME; -import static cc.kune.barters.shared.BartersConstants.TYPE_BARTER; -import static cc.kune.barters.shared.BartersConstants.TYPE_FOLDER; -import static cc.kune.barters.shared.BartersConstants.TYPE_ROOT; +import static cc.kune.barters.shared.BartersToolConstants.NAME; +import static cc.kune.barters.shared.BartersToolConstants.ROOT_NAME; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_BARTER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_FOLDER; +import static cc.kune.barters.shared.BartersToolConstants.TYPE_ROOT; import java.net.URL; import java.util.Arrays; Deleted: trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java =================================================================== --- trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -1,32 +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.barters.shared; - -public final class BartersConstants { - - public static final String NAME = "barters"; - public static final String ROOT_NAME = "barters"; - public static final String TYPE_BARTER = NAME + "." + "barter"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - - private BartersConstants() { - } -} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/barters/shared/BartersToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/barters/shared/BartersConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/barters/shared/BartersToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/barters/shared/BartersToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,32 @@ +/* + * + * 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.barters.shared; + +public final class BartersToolConstants { + + public static final String NAME = "barters"; + public static final String ROOT_NAME = "barters"; + public static final String TYPE_BARTER = NAME + "." + "barter"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + private BartersToolConstants() { + } +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,12 +19,12 @@ */ package cc.kune.blogs.client; -import static cc.kune.blogs.shared.BlogsConstants.NAME; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; -import cc.kune.blogs.shared.BlogsConstants; +import static cc.kune.blogs.shared.BlogsToolConstants.NAME; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_UPLOADEDFILE; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; @@ -44,7 +44,7 @@ final IconicResources icons) { super( NAME, - i18n.t(BlogsConstants.ROOT_NAME), + i18n.t(BlogsToolConstants.ROOT_NAME), i18n.t("Blogs are a chronological list of posts (ordered by date) about a specific topic. Each post can be commented by the visitors"), icons.blogs(), toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; Modified: trunk/src/main/java/cc/kune/blogs/client/BlogsParts.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/BlogsParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/BlogsParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -20,7 +20,7 @@ package cc.kune.blogs.client; import cc.kune.blogs.client.actions.BlogsClientActions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.core.shared.SessionConstants; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.viewers.ContentViewerPresenter; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final BlogsClientActions blogsActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, BlogsConstants.TYPE_POST); - viewerSelector.register(folderViewer, true, BlogsConstants.TYPE_ROOT, BlogsConstants.TYPE_BLOG); + viewerSelector.register(contentViewer, true, BlogsToolConstants.TYPE_POST); + viewerSelector.register(folderViewer, true, BlogsToolConstants.TYPE_ROOT, BlogsToolConstants.TYPE_BLOG); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/BlogsClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ \*/ package cc.kune.blogs.client.actions; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_UPLOADEDFILE; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/GoParentBlogBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.blogs.client.actions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; @@ -32,7 +32,7 @@ @Inject public GoParentBlogBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, BlogsConstants.TYPE_ROOT); + super(i18n, action, res, session, BlogsToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewBlogBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.blogs.client.actions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerBtn; @@ -32,7 +32,7 @@ public NewBlogBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res.blogAdd(), i18n.t("New blog"), i18n.t("Create a new blog"), - i18n.t("New blog"), BlogsConstants.TYPE_BLOG); + i18n.t("New blog"), BlogsToolConstants.TYPE_BLOG); } } Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostIconBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.blogs.client.actions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; @@ -34,7 +34,7 @@ public NewPostIconBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.blogAdd(), shorcutReg, i18n.t("New post"), i18n.t("Create a new blog post"), - i18n.t("New post"), BlogsConstants.TYPE_POST); + i18n.t("New post"), BlogsToolConstants.TYPE_POST); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/client/actions/NewPostMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.blogs.client.actions; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; @@ -34,7 +34,7 @@ public NewPostMenuItem(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg, final BlogsNewMenu blogsNewMenu) { super(i18n, action, res.blogAdd(), shorcutReg, i18n.t("New post"), i18n.t("Create a new blog post"), - i18n.t("New post"), BlogsConstants.TYPE_POST, blogsNewMenu.get()); + i18n.t("New post"), BlogsToolConstants.TYPE_POST, blogsNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/server/BlogServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,12 +19,12 @@ */ package cc.kune.blogs.server; -import static cc.kune.blogs.shared.BlogsConstants.NAME; -import static cc.kune.blogs.shared.BlogsConstants.ROOT_NAME; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.blogs.shared.BlogsToolConstants.NAME; +import static cc.kune.blogs.shared.BlogsToolConstants.ROOT_NAME; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_UPLOADEDFILE; import java.util.Arrays; Deleted: trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -1,35 +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.blogs.shared; - -import cc.kune.core.shared.ToolConstants; - -public final class BlogsConstants { - - public static final String NAME = "blogs"; - public static final String ROOT_NAME = "blogs"; - public static final String TYPE_BLOG = NAME + "." + "blog"; - public static final String TYPE_POST = NAME + "." + "post"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - - private BlogsConstants() { - } -} Copied: trunk/src/main/java/cc/kune/blogs/shared/BlogsToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/blogs/shared/BlogsConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/blogs/shared/BlogsToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/blogs/shared/BlogsToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,35 @@ +/* + * + * 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.blogs.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class BlogsToolConstants { + + public static final String NAME = "blogs"; + public static final String ROOT_NAME = "blogs"; + public static final String TYPE_BLOG = NAME + "." + "blog"; + public static final String TYPE_POST = NAME + "." + "post"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + private BlogsToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ */ package cc.kune.chat.client; -import static cc.kune.chat.shared.ChatConstants.NAME; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOM; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOT; +import static cc.kune.chat.shared.ChatToolConstants.NAME; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOM; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOT; import cc.kune.chat.client.resources.ChatResources; import cc.kune.common.shared.utils.TextUtils; import cc.kune.core.client.i18n.I18nUITranslationService; @@ -61,7 +61,7 @@ private void registerIcons() { registerTutorial(TYPE_ROOT); - registerTutorial(TYPE_ROOM); + // registerTutorial(TYPE_ROOM); registerContentTypeIcon(TYPE_ROOT, icons.chats()); registerContentTypeIcon(TYPE_ROOM, res.groupChat()); final String emptyMsg = i18n.tWithNT("See the archive of old conversations" Modified: trunk/src/main/java/cc/kune/chat/client/ChatParts.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/client/ChatParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -28,7 +28,7 @@ import cc.kune.chat.client.actions.StartChatWithMemberAction; import cc.kune.chat.client.actions.StartChatWithThisBuddyAction; import cc.kune.chat.client.actions.StartChatWithThisPersonAction; -import cc.kune.chat.shared.ChatConstants; +import cc.kune.chat.shared.ChatToolConstants; import cc.kune.common.client.actions.AbstractAction; import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; @@ -81,8 +81,8 @@ final Provider<OpenGroupPublicChatRoomAction> openGroupRoomAction, // final Provider<OpenGroupPublicChatRoomButton> openGroupRoom, final ContentViewerSelector viewerSelector, final FolderViewerPresenter folderViewer) { - viewerSelector.register(folderViewer, true, ChatConstants.TYPE_ROOT); - viewerSelector.register(folderViewer, true, ChatConstants.TYPE_ROOM); + viewerSelector.register(folderViewer, true, ChatToolConstants.TYPE_ROOT); + viewerSelector.register(folderViewer, true, ChatToolConstants.TYPE_ROOM); clientTool.get(); session.onAppStart(true, new AppStartHandler() { @Override Modified: trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,8 +19,8 @@ \*/ package cc.kune.chat.client.actions; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOM; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOT; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOM; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOT; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.CoreResources; Modified: trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/client/actions/GoParentChatBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.chat.client.actions; -import cc.kune.chat.shared.ChatConstants; +import cc.kune.chat.shared.ChatToolConstants; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; @@ -32,7 +32,7 @@ @Inject public GoParentChatBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, ChatConstants.TYPE_ROOT); + super(i18n, action, res, session, ChatToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/server/ChatManagerDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.chat.server; -import cc.kune.chat.shared.ChatConstants; +import cc.kune.chat.shared.ChatToolConstants; import cc.kune.core.client.errors.AccessViolationException; import cc.kune.core.client.errors.ContentNotFoundException; import cc.kune.core.client.errors.GroupNotFoundException; @@ -63,7 +63,7 @@ try { return creationService.createFolder(groupManager.findByShortName(groupShortName), ContentUtils.parseId(parentToken.getFolder()), roomName, user.getLanguage(), - ChatConstants.TYPE_ROOM); + ChatToolConstants.TYPE_ROOM); } catch (final ContentNotFoundException e) { xmppManager.destroyRoom(connection, roomName); throw new ContentNotFoundException(); Modified: trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/server/ChatServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.chat.server; -import static cc.kune.chat.shared.ChatConstants.NAME; -import static cc.kune.chat.shared.ChatConstants.ROOT_NAME; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOM; -import static cc.kune.chat.shared.ChatConstants.TYPE_ROOT; +import static cc.kune.chat.shared.ChatToolConstants.NAME; +import static cc.kune.chat.shared.ChatToolConstants.ROOT_NAME; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOM; +import static cc.kune.chat.shared.ChatToolConstants.TYPE_ROOT; import java.util.Arrays; import java.util.Collections; Deleted: trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java =================================================================== --- trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -1,32 +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.chat.shared; - -public final class ChatConstants { - - public static final String NAME = "chats"; - public static final String ROOT_NAME = "chats"; - public static final String TYPE_CHAT = NAME + "." + "chat"; - public static final String TYPE_ROOM = NAME + "." + "room"; - public static final String TYPE_ROOT = NAME + "." + "root"; - - private ChatConstants() { - } -} Copied: trunk/src/main/java/cc/kune/chat/shared/ChatToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/chat/shared/ChatConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/chat/shared/ChatToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/shared/ChatToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,32 @@ +/* + * + * 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.chat.shared; + +public final class ChatToolConstants { + + public static final String NAME = "chats"; + public static final String ROOT_NAME = "chats"; + public static final String TYPE_CHAT = NAME + "." + "chat"; + public static final String TYPE_ROOM = NAME + "." + "room"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + private ChatToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/client/KuneEntryPoint.java =================================================================== --- trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/client/KuneEntryPoint.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -80,13 +80,13 @@ /* Tools (order in GUI) */ ginjector.getDocsParts(); - ginjector.getBartersParts(); ginjector.getBlogsParts(); + ginjector.getWikiParts(); + ginjector.getEventsParts(); + ginjector.getTasksParts(); + ginjector.getListsParts(); ginjector.getChatParts(); - ginjector.getListsParts(); - ginjector.getMeetingsParts(); - ginjector.getTasksParts(); - ginjector.getWikiParts(); + ginjector.getBartersParts(); ginjector.getSiteLogo(); ginjector.getChatClient(); Modified: trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/client/errors/ErrorHandler.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -148,7 +148,8 @@ logException(caught, true); eventBus.fireEvent(new UserNotifyEvent(NotifyLevel.error, i18n.t("Oops! Something has gone wrong with our servers. Retry later, please."))); - final String error = "Other kind of exception received in ErrorHandler"; + final String error = "Other kind of exception received in ErrorHandler (" + caught.getMessage() + + ")"; Log.error(error, caught); StackErrorEvent.fire(eventBus, caught); } Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentService.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -68,7 +68,7 @@ StateContentDTO copyContent(String userHash, StateToken parentToken, StateToken token) throws DefaultException; - StateContentDTO delContent(String userHash, StateToken token) throws DefaultException; + StateContainerDTO delContent(String userHash, StateToken token) throws DefaultException; StateAbstractDTO getContent(String userHash, StateToken token) throws DefaultException; Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/ContentServiceAsync.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -68,7 +68,7 @@ void copyContent(String userHash, StateToken parentToken, StateToken token, AsyncCallback<StateContentDTO> callback); - void delContent(String userHash, StateToken token, AsyncCallback<StateContentDTO> asyncCallback); + void delContent(String userHash, StateToken token, AsyncCallback<StateContainerDTO> asyncCallback); void getContent(String user, StateToken newState, AsyncCallback<StateAbstractDTO> callback); Modified: trunk/src/main/java/cc/kune/core/client/state/impl/ContentCacheDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/impl/ContentCacheDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/client/state/impl/ContentCacheDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,8 +24,8 @@ import cc.kune.common.client.notify.ProgressShowEvent; import cc.kune.core.client.events.AppStartEvent; +import cc.kune.core.client.events.AppStartEvent.AppStartHandler; import cc.kune.core.client.events.UserSignInOrSignOutEvent; -import cc.kune.core.client.events.AppStartEvent.AppStartHandler; import cc.kune.core.client.events.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; import cc.kune.core.client.rpcservices.ContentServiceAsync; import cc.kune.core.client.state.ContentCache; @@ -76,7 +76,9 @@ private StateAbstractDTO getCached(final StateToken newState) { assert newState != null; - return useCache ? cacheMap.get(newState) : null; + final StateAbstractDTO cached = cacheMap.get(newState); + // We use cache always for docs (waves) + return useCache ? cached : newState.hasAll() ? cached : null; } @Override Modified: trunk/src/main/java/cc/kune/core/server/KuneRackModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/KuneRackModule.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -67,6 +67,7 @@ import cc.kune.lists.client.rpc.ListsService; import cc.kune.lists.server.ListsServerModule; import cc.kune.tasks.server.TaskServerModule; +import cc.kune.trash.server.TrashServerModule; import cc.kune.wave.server.KuneWaveServerUtils; import cc.kune.wave.server.kspecific.WaveEmailNotifier; import cc.kune.wiki.server.WikiServerModule; @@ -191,13 +192,14 @@ }); builder.use(new PlatformServerModule()); builder.use(new DocumentServerModule()); + builder.use(new WikiServerModule()); builder.use(new BlogServerModule()); - builder.use(new WikiServerModule()); - builder.use(new ChatServerModule()); - builder.use(new BarterServerModule()); builder.use(new EventsServerModule()); builder.use(new TaskServerModule()); builder.use(new ListsServerModule()); + builder.use(new ChatServerModule()); + builder.use(new BarterServerModule()); + builder.use(new TrashServerModule()); // builder.use(new GalleryServerModule()); builder.use(new RESTServicesModule()); builder.use(configModule); Modified: trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/PlatformServerModule.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -109,7 +109,6 @@ import cc.kune.core.server.users.UserInfoServiceDefault; import cc.kune.core.server.xmpp.XmppManager; import cc.kune.core.server.xmpp.XmppManagerDefault; -import cc.kune.domain.SocialNetwork; import cc.kune.hspace.client.ClientStatsService; import cc.kune.lists.client.rpc.ListsService; import cc.kune.lists.server.rpc.ListsRPC; @@ -123,12 +122,7 @@ public class PlatformServerModule extends AbstractExtendedModule { private void bindFinders() { - // http://google-guice.googlecode.com/svn/trunk/javadoc/com/google/inject/Inje… - // (...) Just-in-time bindings created for child injectors will be - // created in an ancestor injector whenever possible (...) - // (This fails with finders, then we make explicit bindings) - - bind(SocialNetwork.class); + // ?? bind(SocialNetwork.class); } private void bindManagers() { Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManager.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -31,10 +31,14 @@ Container createFolder(Group group, Container parent, String name, I18nLanguage language, String typeId); - Container createRootFolder(Group group, String toolName, String name, String type); + Container createRootFolder(Group group, String toolName, String name, final String rootType); boolean findIfExistsTitle(Container container, String title); + Container getTrashFolder(Group group); + + boolean hasTrashFolder(Group group); + void moveContainer(Container container, Container newContainer); Container renameFolder(Group group, Container container, String newName) throws DefaultException; Modified: trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/content/ContainerManagerDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -42,6 +42,7 @@ import cc.kune.domain.I18nLanguage; import cc.kune.domain.finders.ContainerFinder; import cc.kune.domain.finders.ContentFinder; +import cc.kune.trash.shared.TrashToolConstants; import com.google.inject.Inject; import com.google.inject.Provider; @@ -76,9 +77,9 @@ @Override public Container createRootFolder(final Group group, final String toolName, final String name, - final String type) { + final String rootType) { final Container container = new Container(name, group, toolName); - container.setTypeId(type); + container.setTypeId(rootType); return persist(container); } @@ -99,6 +100,16 @@ } @Override + public Container getTrashFolder(final Group group) { + return containerFinder.findTypeId(group, TrashToolConstants.TYPE_ROOT); + } + + @Override + public boolean hasTrashFolder(final Group group) { + return containerFinder.findIfExistsTypeId(group, TrashToolConstants.TYPE_ROOT) > 0; + } + + @Override public void moveContainer(final Container container, final Container newContainer) { if (newContainer.equals(container.getParent())) { throw new MoveOnSameContainerException(); Modified: trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/content/CreationServiceDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -40,7 +40,6 @@ private final ContainerManager containerManager; private final ContentManagerDefault contentManager; - private final ServerToolRegistry tools; @Inject Modified: trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/manager/GroupManager.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -77,6 +77,8 @@ Group getSiteDefaultGroup(); + void initTrash(Group group); + SearchResult<Group> search(String search); SearchResult<Group> search(String search, Integer firstResult, Integer maxResults); Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/GroupManagerDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -65,6 +65,7 @@ import cc.kune.domain.finders.GroupFinder; import cc.kune.domain.finders.LicenseFinder; import cc.kune.domain.finders.UserFinder; +import cc.kune.trash.server.TrashServerTool; import com.google.inject.Inject; import com.google.inject.Provider; @@ -80,27 +81,27 @@ private final LicenseFinder licenseFinder; private final LicenseManager licenseManager; private final KuneBasicProperties properties; - private final ServerToolRegistry registry; private final ServerToolRegistry serverToolRegistry; + private final Provider<TrashServerTool> trashTool; private final UserFinder userFinder; @Inject public GroupManagerDefault(@DataSourceKune final Provider<EntityManager> provider, final GroupFinder finder, final UserFinder userFinder, final KuneProperties kuneProperties, - final KuneBasicProperties properties, final ServerToolRegistry registry, - final LicenseManager licenseManager, final LicenseFinder licenseFinder, - final FileManager fileManager, final ServerToolRegistry serverToolRegistry, + final KuneBasicProperties properties, final LicenseManager licenseManager, + final LicenseFinder licenseFinder, final FileManager fileManager, + final ServerToolRegistry serverToolRegistry, final Provider<TrashServerTool> trashTool, final I18nTranslationService i18n) { super(provider, Group.class); this.finder = finder; this.userFinder = userFinder; this.kuneProperties = kuneProperties; this.properties = properties; - this.registry = registry; this.licenseManager = licenseManager; this.licenseFinder = licenseFinder; this.fileManager = fileManager; this.serverToolRegistry = serverToolRegistry; + this.trashTool = trashTool; this.i18n = i18n; } @@ -271,11 +272,13 @@ } throw e; } - for (final ServerTool tool : registry.all()) { + for (final ServerTool tool : serverToolRegistry.all()) { if (toolsToEnable.contains(tool.getName())) { tool.initGroup(user, group, vars); } } + // Init always the trash + initTrash(group); } private void initSocialNetwork(final Group group, final Group userGroup, @@ -291,6 +294,11 @@ } @Override + public void initTrash(final Group group) { + trashTool.get().initGroup(group); + } + + @Override public SearchResult<Group> search(final String search) { return this.search(search, null, null); } Modified: trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/persist/DataSourceKunePersistModule.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -87,6 +87,11 @@ jpm.properties(dbProperties); } + // http://google-guice.googlecode.com/svn/trunk/javadoc/com/google/inject/Inje… + // (...) Just-in-time bindings created for child injectors will be + // created in an ancestor injector whenever possible (...) + // (This fails with finders, then we make explicit bindings) + jpm.addFinder(ContainerFinder.class); jpm.addFinder(ContentFinder.class); jpm.addFinder(ExtMediaDescripFinder.class); Modified: trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/rpc/ContentRPC.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -255,10 +255,19 @@ @Authenticated @Authorizated(accessRolRequired = AccessRol.Administrator) @KuneTransactional - public StateContentDTO delContent(final String userHash, final StateToken token) + public StateContainerDTO delContent(final String userHash, final StateToken token) throws DefaultException { final Long contentId = ContentUtils.parseId(token.getDocument()); - return getState(getCurrentUser(), contentManager.setStatus(contentId, ContentStatus.inTheDustbin)); + final Content content = finderService.getContent(contentId); + contentManager.setStatus(contentId, ContentStatus.inTheDustbin); + final Container previousParent = content.getContainer(); + final Group group = previousParent.getOwner(); + if (!containerManager.hasTrashFolder(group)) { + groupManager.initTrash(group); + } + final Container trash = containerManager.getTrashFolder(group); + moveContent(userHash, token, trash.getStateToken()); + return getState(getCurrentUser(), previousParent); } @Override Modified: trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/state/StateServiceDefault.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,9 @@ */ package cc.kune.core.server.state; -import org.waveprotocol.wave.model.waveref.InvalidWaveRefException; import org.waveprotocol.wave.util.escapers.jvm.JavaWaverefEncoder; import cc.kune.common.shared.i18n.I18nTranslationService; -import cc.kune.core.client.errors.DefaultException; import cc.kune.core.server.access.AccessRightsService; import cc.kune.core.server.content.ContentManager; import cc.kune.core.server.manager.GroupManager; @@ -36,7 +34,7 @@ import cc.kune.domain.Revision; import cc.kune.domain.User; import cc.kune.events.server.utils.EventsServerConversionUtil; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.wave.server.kspecific.KuneWaveService; import com.google.inject.Inject; @@ -74,7 +72,7 @@ @Override public StateContainer create(final User userLogged, final Container container) { - final boolean isCalendar = container.getTypeId().equals(EventsConstants.TYPE_ROOT); + final boolean isCalendar = container.getTypeId().equals(EventsToolConstants.TYPE_ROOT); final StateContainer state = isCalendar ? new StateEventContainer() : new StateContainer(); state.setTitle(container.getName()); state.setTypeId(container.getTypeId()); @@ -126,8 +124,12 @@ state.setTitle(wavelet.getTitle()); state.setIsParticipant(userLogged != User.UNKNOWN_USER ? kuneWaveManager.isParticipant(wavelet, userLogged.getShortName()) : false); - } catch (final InvalidWaveRefException e) { - throw new DefaultException("Error retriving Wave"); + } catch (final Exception e) { + state.setContent(i18n.t("Error accessing this document. " + + "Please contact the administrators providing this reference ([%s]) " + + "and any other relevant info.", waveId)); + state.setTitle(revision.getTitle()); + // throw new DefaultException("Error retriving Wave"); } } else { state.setContent(textBody); Modified: trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/server/tool/ServerToolRegistry.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -28,6 +28,7 @@ import org.apache.commons.logging.LogFactory; import cc.kune.core.server.properties.KuneProperties; +import cc.kune.trash.shared.TrashToolConstants; import com.google.inject.Inject; import com.google.inject.Singleton; @@ -86,6 +87,10 @@ } public void register(final ServerTool tool) { + if (tool.getName().equals(TrashToolConstants.NAME)) { + // Trash is a special tool but we don't register it + return; + } final String name = tool.getName(); final String rootName = tool.getRootName(); final boolean userAvailable = usersAvailableToolsInProp.contains(name); Modified: trunk/src/main/java/cc/kune/core/shared/ToolConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/ToolConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/core/shared/ToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -21,12 +21,10 @@ public final class ToolConstants { - public static final String UPLOADEDFILE_SUFFIX = "uploaded"; - @Deprecated - public static final String WAVE_SUFFIX = "wave"; + public static final String UPLOADEDFILE_SUFFIX = "uploaded"; - private ToolConstants() { + private ToolConstants() { - } + } } Modified: trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/DocsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,16 +19,16 @@ */ package cc.kune.docs.client; -import static cc.kune.docs.shared.DocsConstants.NAME; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.NAME; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.tool.FoldableAbstractClientTool; import cc.kune.gspace.client.tool.selector.ToolSelector; @@ -45,7 +45,7 @@ final IconicResources icons) { super( NAME, - i18n.t(DocsConstants.ROOT_NAME), + i18n.t(DocsToolConstants.ROOT_NAME), i18n.t("Here you can create or upload your personal, group or public documents. These documents can be edited and commented collaboratively and simultaneously. These docs can be static pages in your web page if you publish them"), icons.docs(), toolSelector, cntCapRegistry, i18n, navResources); this.icons = icons; Modified: trunk/src/main/java/cc/kune/docs/client/DocsParts.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/DocsParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/DocsParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -21,7 +21,7 @@ import cc.kune.core.shared.SessionConstants; import cc.kune.docs.client.actions.DocsClientActions; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.viewers.ContentViewerPresenter; import cc.kune.gspace.client.viewers.FolderViewerPresenter; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final DocsClientActions docsActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, DocsConstants.TYPE_DOCUMENT); - viewerSelector.register(folderViewer, true, DocsConstants.TYPE_ROOT, DocsConstants.TYPE_FOLDER); + viewerSelector.register(contentViewer, true, DocsToolConstants.TYPE_DOCUMENT); + viewerSelector.register(folderViewer, true, DocsToolConstants.TYPE_ROOT, DocsToolConstants.TYPE_FOLDER); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/DocsClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ \*/ package cc.kune.docs.client.actions; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.GoParentContainerBtn; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, DocsConstants.TYPE_ROOT); + super(i18n, action, res, session, DocsToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocIconBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; @@ -35,7 +35,7 @@ final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.pageAdd(), shorcutReg, i18n.t("New doc"), i18n.t("Create a New Document. " + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), - i18n.t("New document"), DocsConstants.TYPE_DOCUMENT); + i18n.t("New document"), DocsToolConstants.TYPE_DOCUMENT); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewDocMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; @@ -42,7 +42,7 @@ i18n.t("New document"), i18n.t("Create a New Document here. " + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), - i18n.t("New document"), DocsConstants.TYPE_DOCUMENT, docsFolderNewMenu.get()); + i18n.t("New document"), DocsToolConstants.TYPE_DOCUMENT, docsFolderNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -21,7 +21,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.NewContainerBtn; import com.google.inject.Inject; @@ -32,7 +32,7 @@ public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder"), - i18n.t("New folder"), DocsConstants.TYPE_FOLDER); + i18n.t("New folder"), DocsToolConstants.TYPE_FOLDER); } } Modified: trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/client/actions/NewFolderMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -21,7 +21,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.gspace.client.actions.NewContainerMenuItem; import com.google.inject.Inject; @@ -33,7 +33,7 @@ final NavResources res, final DocsFolderNewMenu docsFolderNewMenu) { super(i18n, action, res.folderAdd(), i18n.t("New folder"), i18n.t("Create a new folder. A folder will be a 'section' in the public web"), - i18n.t("New folder"), DocsConstants.TYPE_FOLDER, docsFolderNewMenu.get()); + i18n.t("New folder"), DocsToolConstants.TYPE_FOLDER, docsFolderNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/server/DocumentServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,12 +19,12 @@ */ package cc.kune.docs.server; -import static cc.kune.docs.shared.DocsConstants.NAME; -import static cc.kune.docs.shared.DocsConstants.ROOT_NAME; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.NAME; +import static cc.kune.docs.shared.DocsToolConstants.ROOT_NAME; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import java.util.Arrays; @@ -35,7 +35,7 @@ import cc.kune.core.server.content.CreationService; import cc.kune.core.server.manager.ToolConfigurationManager; import cc.kune.core.server.tool.ServerToolTarget; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.domain.Container; import cc.kune.domain.Content; import cc.kune.domain.Group; @@ -62,7 +62,7 @@ final boolean hasVars = otherVars.length >= 2; final String title = hasVars ? (String) otherVars[0] : i18n.t("Document sample"); final String body = hasVars ? (String) otherVars[1] : i18n.t("This is only a sample of document"); - final String contentType = DocsConstants.TYPE_DOCUMENT; + final String contentType = DocsToolConstants.TYPE_DOCUMENT; final Content content = createInitialContent(user, group, rootFolder, title, body, contentType); group.setDefaultContent(content); Deleted: trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -1,35 +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.docs.shared; - -import cc.kune.core.shared.ToolConstants; - -public final class DocsConstants { - - public static final String NAME = "docs"; - public static final String ROOT_NAME = "documents"; - public static final String TYPE_DOCUMENT = NAME + "." + "doc"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - - private DocsConstants() { - } -} Copied: trunk/src/main/java/cc/kune/docs/shared/DocsToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/docs/shared/DocsConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/docs/shared/DocsToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/docs/shared/DocsToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,35 @@ +/* + * + * 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.docs.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class DocsToolConstants { + + public static final String NAME = "docs"; + public static final String ROOT_NAME = "documents"; + public static final String TYPE_DOCUMENT = NAME + "." + "doc"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + private DocsToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/domain/Content.java =================================================================== --- trunk/src/main/java/cc/kune/domain/Content.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/domain/Content.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -52,16 +52,16 @@ import org.hibernate.search.annotations.IndexedEmbedded; import org.hibernate.validator.NotNull; -import cc.kune.barters.shared.BartersConstants; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.barters.shared.BartersToolConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.core.shared.domain.ContentStatus; import cc.kune.core.shared.domain.utils.StateToken; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.domain.utils.HasStateToken; -import cc.kune.events.shared.EventsConstants; -import cc.kune.lists.shared.ListsConstants; -import cc.kune.tasks.shared.TasksConstants; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.events.shared.EventsToolConstants; +import cc.kune.lists.shared.ListsToolConstants; +import cc.kune.tasks.shared.TasksToolConstants; +import cc.kune.wiki.shared.WikiToolConstants; @Entity @Table(name = "contents") @@ -265,11 +265,11 @@ @Transient public boolean isWave() { - return (typeId.equals(DocsConstants.TYPE_DOCUMENT)) - || typeId.equals(TasksConstants.TYPE_TASK) - || typeId.equals(ListsConstants.TYPE_POST) - || typeId.equals(WikiConstants.TYPE_WIKIPAGE) - || (typeId.equals(BlogsConstants.TYPE_POST) || typeId.equals(BartersConstants.TYPE_BARTER) || typeId.equals(EventsConstants.TYPE_MEETING)); + return (typeId.equals(DocsToolConstants.TYPE_DOCUMENT)) + || typeId.equals(TasksToolConstants.TYPE_TASK) + || typeId.equals(ListsToolConstants.TYPE_POST) + || typeId.equals(WikiToolConstants.TYPE_WIKIPAGE) + || (typeId.equals(BlogsToolConstants.TYPE_POST) || typeId.equals(BartersToolConstants.TYPE_BARTER) || typeId.equals(EventsToolConstants.TYPE_MEETING)); } public void removeAuthor(final User user) { Modified: trunk/src/main/java/cc/kune/domain/finders/ContainerFinder.java =================================================================== --- trunk/src/main/java/cc/kune/domain/finders/ContainerFinder.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/domain/finders/ContainerFinder.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -20,11 +20,19 @@ package cc.kune.domain.finders; import cc.kune.domain.Container; +import cc.kune.domain.Group; import com.google.inject.name.Named; import com.google.inject.persist.finder.Finder; public interface ContainerFinder { - @Finder(query = "SELECT COUNT(*) FROM Container c WHERE c.parent = :container AND c.name LIKE :title") - public Long findIfExistsTitle(@Named("container") final Container container, @Named("title") final String title); + @Finder(query = "SELECT COUNT(*) FROM Container c WHERE c.parent = :container AND c.name LIKE :title") + public Long findIfExistsTitle(@Named("container") final Container container, + @Named("title") final String title); + + @Finder(query = "SELECT COUNT(*) FROM Container c WHERE c.typeId = :typeId AND c.owner = :owner") + public Long findIfExistsTypeId(@Named("owner") final Group group, @Named("typeId") final String typeId); + + @Finder(query = "FROM Container c WHERE c.typeId = :typeId AND c.owner = :owner") + public Container findTypeId(@Named("owner") final Group group, @Named("typeId") final String typeId); } Modified: trunk/src/main/java/cc/kune/events/client/EventsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/EventsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.events.client; -import static cc.kune.events.shared.EventsConstants.NAME; -import static cc.kune.events.shared.EventsConstants.ROOT_NAME; -import static cc.kune.events.shared.EventsConstants.TYPE_MEETING; -import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; +import static cc.kune.events.shared.EventsToolConstants.NAME; +import static cc.kune.events.shared.EventsToolConstants.ROOT_NAME; +import static cc.kune.events.shared.EventsToolConstants.TYPE_MEETING; +import static cc.kune.events.shared.EventsToolConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; Modified: trunk/src/main/java/cc/kune/events/client/EventsGinjector.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsGinjector.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/EventsGinjector.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -28,5 +28,5 @@ AsyncProvider<CalendarViewerPresenter> getCalendarViewerPresenter(); - EventsParts getMeetingsParts(); + EventsParts getEventsParts(); } Modified: trunk/src/main/java/cc/kune/events/client/EventsParts.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/EventsParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/EventsParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.core.shared.SessionConstants; import cc.kune.events.client.actions.EventsClientActions; import cc.kune.events.client.viewer.CalendarViewer; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.tool.ContentViewerSelector; import cc.kune.gspace.client.viewers.ContentViewerPresenter; @@ -37,7 +37,7 @@ final ContentViewerPresenter contentViewer, final CalendarViewer calendarViewer) { clientTool.get(); // remove this... - viewerSelector.register(contentViewer, true, EventsConstants.TYPE_MEETING); - viewerSelector.register(calendarViewer, true, EventsConstants.TYPE_ROOT); + viewerSelector.register(contentViewer, true, EventsToolConstants.TYPE_MEETING); + viewerSelector.register(calendarViewer, true, EventsToolConstants.TYPE_ROOT); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/actions/EventAddMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -18,7 +18,7 @@ import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.events.client.viewer.CalendarViewer; import cc.kune.events.shared.EventsClientConversionUtil; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import com.bradrydzewski.gwt.calendar.client.Appointment; import com.bradrydzewski.gwt.calendar.client.AppointmentStyle; @@ -102,8 +102,8 @@ appt.setStyle(AppointmentStyle.ORANGE); contService.get().addNewContentWithGadgetAndState(session.getUserHash(), - session.getContainerState().getStateToken(), EventsConstants.TYPE_MEETING_DEF_GADGETNAME, - EventsConstants.TYPE_MEETING, title, "", EventsClientConversionUtil.toMap(appt), + session.getContainerState().getStateToken(), EventsToolConstants.TYPE_MEETING_DEF_GADGETNAME, + EventsToolConstants.TYPE_MEETING, title, "", EventsClientConversionUtil.toMap(appt), new AsyncCallbackSimple<StateContentDTO>() { @Override public void onFailure(final Throwable caught) { Modified: trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/actions/EventsClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,8 +19,8 @@ \*/ package cc.kune.events.client.actions; -import static cc.kune.events.shared.EventsConstants.TYPE_MEETING; -import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; +import static cc.kune.events.shared.EventsToolConstants.TYPE_MEETING; +import static cc.kune.events.shared.EventsToolConstants.TYPE_ROOT; import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.resources.CoreResources; Modified: trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.actions.GoParentContainerBtn; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, EventsConstants.TYPE_ROOT); + super(i18n, action, res, session, EventsToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPanel.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -12,7 +12,7 @@ import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.CoreResources; import cc.kune.events.client.viewer.CalendarViewerPresenter.CalendarViewerView; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.armor.GSpaceArmor; import cc.kune.gspace.client.viewers.AbstractFolderViewerPanel; import cc.kune.gspace.client.viewers.ContentTitleWidget; @@ -283,7 +283,7 @@ final String dateFormatted = fmt.format(currentDate); final ForIsWidget docHeader = gsArmor.getDocHeader(); UiUtils.clear(docHeader); - contentTitle.setTitle(i18n.t("Events in [%s]", dateFormatted), EventsConstants.TYPE_ROOT, null, + contentTitle.setTitle(i18n.t("Events in [%s]", dateFormatted), EventsToolConstants.TYPE_ROOT, null, false); docHeader.add(contentTitle); } Modified: trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/client/viewer/CalendarViewerPresenter.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -20,7 +20,7 @@ import cc.kune.core.shared.dto.StateEventContainerDTO; import cc.kune.events.client.actions.CalendarOnOverMenu; import cc.kune.events.shared.EventsClientConversionUtil; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.viewers.AbstractFolderViewerView; import cc.kune.gspace.client.viewers.FolderViewerUtils; @@ -172,7 +172,7 @@ map.put(ICalConstants.DATE_TIME_START, DateUtils.toString(app.getStart())); map.put(ICalConstants.DATE_TIME_END, DateUtils.toString(app.getEnd())); contentService.get().setGadgetProperties(session.getUserHash(), new StateToken(app.getId()), - EventsConstants.TYPE_MEETING_DEF_GADGETNAME, map, new AsyncCallback<Void>() { + EventsToolConstants.TYPE_MEETING_DEF_GADGETNAME, map, new AsyncCallback<Void>() { @Override public void onFailure(final Throwable caught) { event.setCancelled(true); Modified: trunk/src/main/java/cc/kune/events/server/EventsServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/server/EventsServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.events.server; -import static cc.kune.events.shared.EventsConstants.NAME; -import static cc.kune.events.shared.EventsConstants.ROOT_NAME; -import static cc.kune.events.shared.EventsConstants.TYPE_MEETING; -import static cc.kune.events.shared.EventsConstants.TYPE_ROOT; +import static cc.kune.events.shared.EventsToolConstants.NAME; +import static cc.kune.events.shared.EventsToolConstants.ROOT_NAME; +import static cc.kune.events.shared.EventsToolConstants.TYPE_MEETING; +import static cc.kune.events.shared.EventsToolConstants.TYPE_ROOT; import java.net.URL; import java.util.Arrays; @@ -59,7 +59,7 @@ final CreationService creationService) { super(NAME, ROOT_NAME, TYPE_ROOT, Arrays.asList(TYPE_MEETING), Arrays.asList(TYPE_ROOT), Collections.<String> emptyList(), Arrays.asList(TYPE_ROOT), contentManager, containerManager, - creationService, configurationManager, i18n, ServerToolTarget.forGroups); + creationService, configurationManager, i18n, ServerToolTarget.forBoth); gadgetUrl = UrlUtils.of(MEETING_GADGET); } Modified: trunk/src/main/java/cc/kune/events/server/EventsServlet.java =================================================================== --- trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/server/EventsServlet.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -37,7 +37,7 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.domain.Container; import cc.kune.events.server.utils.EventsServerConversionUtil; -import cc.kune.events.shared.EventsConstants; +import cc.kune.events.shared.EventsToolConstants; import com.google.inject.Inject; @@ -68,7 +68,7 @@ try { final Container cnt = getContainer(userHash, token); - if (cnt.getTypeId().equals(EventsConstants.TYPE_ROOT)) { + if (cnt.getTypeId().equals(EventsToolConstants.TYPE_ROOT)) { final List<Map<String, String>> listOfProps = EventsServerConversionUtil.getAppointments(cnt); for (final Map<String, String> props : listOfProps) { try { Deleted: trunk/src/main/java/cc/kune/events/shared/EventsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/events/shared/EventsConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/events/shared/EventsConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -1,32 +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.events.shared; - -public final class EventsConstants { - - public static final String NAME = "events"; - public static final String ROOT_NAME = "events"; - public static final String TYPE_MEETING = NAME + "." + "meeting"; - public static final String TYPE_MEETING_DEF_GADGETNAME = "massmob"; - public static final String TYPE_ROOT = NAME + "." + "root"; - - private EventsConstants() { - } -} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/events/shared/EventsToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/events/shared/EventsConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/events/shared/EventsToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/events/shared/EventsToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,32 @@ +/* + * + * 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.events.shared; + +public final class EventsToolConstants { + + public static final String NAME = "events"; + public static final String ROOT_NAME = "events"; + public static final String TYPE_MEETING = NAME + "." + "meeting"; + public static final String TYPE_MEETING_DEF_GADGETNAME = "massmob"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + private EventsToolConstants() { + } +} \ No newline at end of file Modified: trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/gallery/server/GalleryServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.gallery.server; -import static cc.kune.gallery.shared.GalleryConstants.NAME; -import static cc.kune.gallery.shared.GalleryConstants.ROOT_NAME; -import static cc.kune.gallery.shared.GalleryConstants.TYPE_ALBUM; -import static cc.kune.gallery.shared.GalleryConstants.TYPE_ROOT; -import static cc.kune.gallery.shared.GalleryConstants.TYPE_UPLOADEDFILE; +import static cc.kune.gallery.shared.GalleryToolConstants.NAME; +import static cc.kune.gallery.shared.GalleryToolConstants.ROOT_NAME; +import static cc.kune.gallery.shared.GalleryToolConstants.TYPE_ALBUM; +import static cc.kune.gallery.shared.GalleryToolConstants.TYPE_ROOT; +import static cc.kune.gallery.shared.GalleryToolConstants.TYPE_UPLOADEDFILE; import java.util.Arrays; Deleted: trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java =================================================================== --- trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -1,33 +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.gallery.shared; - -import cc.kune.core.shared.ToolConstants; - -public final class GalleryConstants { - public static final String NAME = "gallery"; - public static final String ROOT_NAME = "gallery"; - public static final String TYPE_ALBUM = NAME + "." + "album"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - - private GalleryConstants() { - } -} Copied: trunk/src/main/java/cc/kune/gallery/shared/GalleryToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/gallery/shared/GalleryConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/gallery/shared/GalleryToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/gallery/shared/GalleryToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,33 @@ +/* + * + * 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.gallery.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class GalleryToolConstants { + public static final String NAME = "gallery"; + public static final String ROOT_NAME = "gallery"; + public static final String TYPE_ALBUM = NAME + "." + "album"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + + private GalleryToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/gspace/client/actions/DelContentMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -34,8 +34,7 @@ import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.AbstractContentSimpleDTO; import cc.kune.core.shared.dto.AccessRolDTO; -import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.gspace.client.viewers.FolderViewerPresenter; +import cc.kune.core.shared.dto.StateContainerDTO; import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; @@ -48,21 +47,19 @@ private final Provider<ContentServiceAsync> contentService; private final EventBus eventBus; private final I18nTranslationService i18n; - private final Provider<FolderViewerPresenter> presenter; private final Session session; private final StateManager stateManager; @Inject public DelContentAction(final EventBus eventBus, final StateManager stateManager, final Session session, final Provider<ContentServiceAsync> contentService, - final I18nTranslationService i18n, final Provider<FolderViewerPresenter> presenter) { + final I18nTranslationService i18n) { super(AccessRolDTO.Administrator, true); this.eventBus = eventBus; this.stateManager = stateManager; this.session = session; this.contentService = contentService; this.i18n = i18n; - this.presenter = presenter; } @Override @@ -74,20 +71,14 @@ public void onSuccess() { NotifyUser.showProgress(); contentService.get().delContent(session.getUserHash(), token, - new AsyncCallbackSimple<StateContentDTO>() { + new AsyncCallbackSimple<StateContainerDTO>() { @Override - public void onSuccess(final StateContentDTO state) { - // Is this necessary? - // session.setCurrentState(state); - final StateToken parent = token.copy().clearDocument(); - if (session.getCurrentStateToken().equals(parent)) { - stateManager.refreshCurrentStateWithoutCache(); - // Warning: the previous action - // is asynchronous (it gets a - // content) - presenter.get().refreshState(); + public void onSuccess(final StateContainerDTO state) { + final StateToken parentToken = state.getStateToken(); + if (session.getCurrentStateToken().equals(parentToken)) { + stateManager.setRetrievedStateAndGo(state); } else { - stateManager.gotoStateToken(parent, false); + stateManager.gotoStateToken(parentToken, false); } NotifyUser.hideProgress(); } Modified: trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/gspace/client/options/general/UserOptGeneralPresenter.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -128,6 +128,8 @@ @Override public void onSuccess(final StateAbstractDTO result) { NotifyUser.hideProgress(); + stateManager.setRetrievedStateAndGo(result); + sendChangeEntityEvent(); if (askChangeLanguage) { i18n.changeToLanguageIfNecessary(lang.getCode(), i18n.t(lang.getEnglishName()), true, new I18nLanguageChangeNeeded() { @@ -138,8 +140,6 @@ @Override public void onChangeNotNeeded() { askChangeLanguage = false; - stateManager.setRetrievedStateAndGo(result); - sendChangeEntityEvent(); } }); } Modified: trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/ListsClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.lists.client; -import static cc.kune.lists.shared.ListsConstants.NAME; -import static cc.kune.lists.shared.ListsConstants.ROOT_NAME; -import static cc.kune.lists.shared.ListsConstants.TYPE_LIST; -import static cc.kune.lists.shared.ListsConstants.TYPE_POST; -import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; +import static cc.kune.lists.shared.ListsToolConstants.NAME; +import static cc.kune.lists.shared.ListsToolConstants.ROOT_NAME; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_LIST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_POST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_ROOT; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; @@ -67,7 +67,7 @@ private void registerIcons() { registerTutorial(TYPE_ROOT); - registerTutorial(TYPE_LIST); + // registerTutorial(TYPE_LIST); registerContentTypeIcon(TYPE_ROOT, icons.lists()); registerContentTypeIcon(TYPE_LIST, navResources.list()); registerContentTypeIcon(TYPE_POST, navResources.email()); Modified: trunk/src/main/java/cc/kune/lists/client/ListsParts.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/ListsParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/ListsParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.gspace.client.viewers.ContentViewerPresenter; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.lists.client.actions.ListsClientActions; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.inject.Inject; import com.google.inject.Provider; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final ListsClientActions listsActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, ListsConstants.TYPE_POST); - viewerSelector.register(folderViewer, true, ListsConstants.TYPE_ROOT, ListsConstants.TYPE_LIST); + viewerSelector.register(contentViewer, true, ListsToolConstants.TYPE_POST); + viewerSelector.register(folderViewer, true, ListsToolConstants.TYPE_ROOT, ListsToolConstants.TYPE_LIST); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -23,7 +23,7 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.gspace.client.actions.GoParentContainerBtn; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, ListsConstants.TYPE_ROOT); + super(i18n, action, res, session, ListsToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ \*/ package cc.kune.lists.client.actions; -import static cc.kune.lists.shared.ListsConstants.TYPE_LIST; -import static cc.kune.lists.shared.ListsConstants.TYPE_POST; -import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_LIST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_POST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_ROOT; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/client/actions/NewListAction.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -34,7 +34,7 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.lists.client.rpc.ListsServiceAsync; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; @@ -106,7 +106,7 @@ NotifyUser.showProgress(); diag.hide(); listsService.get().createList(session.getUserHash(), session.getCurrentStateToken(), - diag.getTextFieldValue(), ListsConstants.TYPE_LIST, true, + diag.getTextFieldValue(), ListsToolConstants.TYPE_LIST, true, new AsyncCallbackSimple<StateContainerDTO>() { @Override public void onSuccess(final StateContainerDTO state) { Modified: trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/server/ListsServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.lists.server; -import static cc.kune.lists.shared.ListsConstants.NAME; -import static cc.kune.lists.shared.ListsConstants.ROOT_NAME; -import static cc.kune.lists.shared.ListsConstants.TYPE_LIST; -import static cc.kune.lists.shared.ListsConstants.TYPE_POST; -import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; +import static cc.kune.lists.shared.ListsToolConstants.NAME; +import static cc.kune.lists.shared.ListsToolConstants.ROOT_NAME; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_LIST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_POST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_ROOT; import java.util.ArrayList; import java.util.Arrays; Modified: trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java =================================================================== --- trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/server/rpc/ListsRPC.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -38,7 +38,7 @@ import cc.kune.domain.Container; import cc.kune.domain.Group; import cc.kune.lists.client.rpc.ListsService; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.inject.Inject; @@ -67,7 +67,7 @@ public StateContainerDTO createList(final String userHash, final StateToken parentToken, final String listaName, final String description, final boolean isPublic) { final StateContainerDTO result = contentRPC.addFolder(userHash, parentToken, - composeListName(parentToken, listaName), ListsConstants.TYPE_LIST); + composeListName(parentToken, listaName), ListsToolConstants.TYPE_LIST); // Not public list, don't permit subscriptions neither view posts return contentRPC.getState(setContainerAcl(result.getStateToken(), isPublic)); } @@ -89,7 +89,7 @@ final String postTitle) { final Container container = getContainer(parentToken); final StateContentDTO content = contentRPC.addContent(userHash, parentToken, - "[" + container.getName() + "] " + postTitle, ListsConstants.TYPE_POST); + "[" + container.getName() + "] " + postTitle, ListsToolConstants.TYPE_POST); // FIXME In the future use tabs here return content; } Deleted: trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java =================================================================== --- trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -1,32 +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.lists.shared; - -public final class ListsConstants { - - public static final String NAME = "lists"; - public static final String ROOT_NAME = "lists"; - public static final String TYPE_LIST = NAME + "." + "list"; - public static final String TYPE_POST = NAME + "." + "post"; - public static final String TYPE_ROOT = NAME + "." + "root"; - - private ListsConstants() { - } -} Copied: trunk/src/main/java/cc/kune/lists/shared/ListsToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/lists/shared/ListsConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/lists/shared/ListsToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/lists/shared/ListsToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,32 @@ +/* + * + * 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.lists.shared; + +public final class ListsToolConstants { + + public static final String NAME = "lists"; + public static final String ROOT_NAME = "lists"; + public static final String TYPE_LIST = NAME + "." + "list"; + public static final String TYPE_POST = NAME + "." + "post"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + private ListsToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/TasksClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.tasks.client; -import static cc.kune.tasks.shared.TasksConstants.NAME; -import static cc.kune.tasks.shared.TasksConstants.ROOT_NAME; -import static cc.kune.tasks.shared.TasksConstants.TYPE_FOLDER; -import static cc.kune.tasks.shared.TasksConstants.TYPE_ROOT; -import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; +import static cc.kune.tasks.shared.TasksToolConstants.NAME; +import static cc.kune.tasks.shared.TasksToolConstants.ROOT_NAME; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_FOLDER; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_ROOT; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_TASK; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; Modified: trunk/src/main/java/cc/kune/tasks/client/TasksParts.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/TasksParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/TasksParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.gspace.client.viewers.ContentViewerPresenter; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.tasks.client.actions.TasksClientActions; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; import com.google.inject.Provider; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final TasksClientActions tasksActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, TasksConstants.TYPE_TASK); - viewerSelector.register(folderViewer, true, TasksConstants.TYPE_ROOT, TasksConstants.TYPE_FOLDER); + viewerSelector.register(contentViewer, true, TasksToolConstants.TYPE_TASK); + viewerSelector.register(folderViewer, true, TasksToolConstants.TYPE_ROOT, TasksToolConstants.TYPE_FOLDER); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -23,7 +23,7 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.gspace.client.actions.GoParentContainerBtn; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, TasksConstants.TYPE_ROOT); + super(i18n, action, res, session, TasksToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerBtn; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; @@ -32,7 +32,7 @@ public NewFolderBtn(final I18nTranslationService i18n, final NewContainerAction action, final NavResources res) { super(i18n, action, res.taskfolderadd(), i18n.t("New task folder"), i18n.t("Create a new folder"), - i18n.t("New task folder"), TasksConstants.TYPE_FOLDER); + i18n.t("New task folder"), TasksToolConstants.TYPE_FOLDER); } } Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskIconBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; @@ -34,7 +34,7 @@ public NewTaskIconBtn(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg) { super(i18n, action, res.taskadd(), shorcutReg, i18n.t("New task"), i18n.t("Create a new task"), - i18n.t("New task"), TasksConstants.TYPE_TASK); + i18n.t("New task"), TasksToolConstants.TYPE_TASK); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/NewTaskMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; -import cc.kune.tasks.shared.TasksConstants; +import cc.kune.tasks.shared.TasksToolConstants; import com.google.inject.Inject; @@ -34,7 +34,7 @@ public NewTaskMenuItem(final I18nTranslationService i18n, final NewContentAction action, final NavResources res, final GlobalShortcutRegister shorcutReg, final TasksFolderNewMenu tasksNewMenu) { super(i18n, action, res.taskadd(), shorcutReg, i18n.t("New task"), i18n.t("Create a new task"), - i18n.t("New task"), TasksConstants.TYPE_TASK, tasksNewMenu.get()); + i18n.t("New task"), TasksToolConstants.TYPE_TASK, tasksNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/client/actions/TasksClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ \*/ package cc.kune.tasks.client.actions; -import static cc.kune.tasks.shared.TasksConstants.TYPE_FOLDER; -import static cc.kune.tasks.shared.TasksConstants.TYPE_ROOT; -import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_FOLDER; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_ROOT; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_TASK; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/server/TaskServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.tasks.server; -import static cc.kune.tasks.shared.TasksConstants.NAME; -import static cc.kune.tasks.shared.TasksConstants.ROOT_NAME; -import static cc.kune.tasks.shared.TasksConstants.TYPE_FOLDER; -import static cc.kune.tasks.shared.TasksConstants.TYPE_ROOT; -import static cc.kune.tasks.shared.TasksConstants.TYPE_TASK; +import static cc.kune.tasks.shared.TasksToolConstants.NAME; +import static cc.kune.tasks.shared.TasksToolConstants.ROOT_NAME; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_FOLDER; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_ROOT; +import static cc.kune.tasks.shared.TasksToolConstants.TYPE_TASK; import java.util.Arrays; import java.util.Date; Deleted: trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java =================================================================== --- trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -1,32 +0,0 @@ -/* - * - * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) - * This file is part of kune. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package cc.kune.tasks.shared; - -public final class TasksConstants { - - public static final String NAME = "tasks"; - public static final String ROOT_NAME = "tasks"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_TASK = NAME + "." + "task"; - - private TasksConstants() { - } -} Copied: trunk/src/main/java/cc/kune/tasks/shared/TasksToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/tasks/shared/TasksConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/tasks/shared/TasksToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/tasks/shared/TasksToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,32 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.tasks.shared; + +public final class TasksToolConstants { + + public static final String NAME = "tasks"; + public static final String ROOT_NAME = "tasks"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_TASK = NAME + "." + "task"; + + private TasksToolConstants() { + } +} Added: trunk/src/main/java/cc/kune/trash/server/TrashServerModule.java =================================================================== --- trunk/src/main/java/cc/kune/trash/server/TrashServerModule.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/server/TrashServerModule.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,11 @@ +package cc.kune.trash.server; + +import com.google.inject.Binder; +import com.google.inject.Module; + +public class TrashServerModule implements Module { + @Override + public void configure(final Binder binder) { + binder.bind(TrashServerTool.class).asEagerSingleton(); + } +} Added: trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/server/TrashServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,42 @@ +package cc.kune.trash.server; + +import static cc.kune.trash.shared.TrashToolConstants.NAME; +import static cc.kune.trash.shared.TrashToolConstants.ROOT_NAME; +import static cc.kune.trash.shared.TrashToolConstants.TYPE_ROOT; + +import java.util.Arrays; +import java.util.Collections; + +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.server.AbstractServerTool; +import cc.kune.core.server.content.ContainerManager; +import cc.kune.core.server.content.ContentManager; +import cc.kune.core.server.content.CreationService; +import cc.kune.core.server.manager.ToolConfigurationManager; +import cc.kune.core.server.tool.ServerToolTarget; +import cc.kune.domain.Group; +import cc.kune.domain.User; + +import com.google.inject.Inject; + +public class TrashServerTool extends AbstractServerTool { + + @Inject + public TrashServerTool(final ContentManager contentManager, final ContainerManager containerManager, + final ToolConfigurationManager configurationManager, final I18nTranslationService i18n, + final CreationService creationService) { + super(NAME, ROOT_NAME, TYPE_ROOT, Collections.<String> emptyList(), Arrays.asList(TYPE_ROOT), + Collections.<String> emptyList(), Arrays.asList(TYPE_ROOT), contentManager, containerManager, + creationService, configurationManager, i18n, ServerToolTarget.forBoth); + } + + public Group initGroup(final Group group) { + return initGroup(null, group); + } + + @Override + public Group initGroup(final User user, final Group group, final Object... vars) { + createRoot(group); + return group; + } +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java =================================================================== --- trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/trash/shared/TrashToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,17 @@ +package cc.kune.trash.shared; + + +public final class TrashToolConstants { + + public static final String NAME = "trash"; + public static final String ROOT_NAME = "trash"; + public static final String TYPE_ROOT = NAME + "." + "root"; + + // public static final String[] ALLOWED_CONTENTS = + // {DocsToolConstants.TYPE_FOLDER, + // DocsToolConstants.TYPE_DOCUMENT, BlogsToolConstants.TYPE_BLOG, + // BlogsToolConstants.TYPE_POST, ETC + // }; + private TrashToolConstants() { + } +} Modified: trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/WikiClientTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,11 +19,11 @@ */ package cc.kune.wiki.client; -import static cc.kune.wiki.shared.WikiConstants.NAME; -import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; -import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; -import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.wiki.shared.WikiToolConstants.NAME; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.registry.ContentCapabilitiesRegistry; import cc.kune.core.client.resources.iconic.IconicResources; Modified: trunk/src/main/java/cc/kune/wiki/client/WikiParts.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/WikiParts.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/WikiParts.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.gspace.client.viewers.ContentViewerPresenter; import cc.kune.gspace.client.viewers.FolderViewerPresenter; import cc.kune.wiki.client.actions.WikiClientActions; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; import com.google.inject.Provider; @@ -36,7 +36,7 @@ final ContentViewerSelector viewerSelector, final WikiClientActions wikiActions, final ContentViewerPresenter contentViewer, final FolderViewerPresenter folderViewer) { clientTool.get(); - viewerSelector.register(contentViewer, true, WikiConstants.TYPE_WIKIPAGE); - viewerSelector.register(folderViewer, true, WikiConstants.TYPE_ROOT, WikiConstants.TYPE_FOLDER); + viewerSelector.register(contentViewer, true, WikiToolConstants.TYPE_WIKIPAGE); + viewerSelector.register(folderViewer, true, WikiToolConstants.TYPE_ROOT, WikiToolConstants.TYPE_FOLDER); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/GoParentFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -23,7 +23,7 @@ import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.state.Session; import cc.kune.gspace.client.actions.GoParentContainerBtn; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -32,7 +32,7 @@ @Inject public GoParentFolderBtn(final I18nTranslationService i18n, final GoParentContainerAction action, final CoreResources res, final Session session) { - super(i18n, action, res, session, WikiConstants.TYPE_ROOT); + super(i18n, action, res, session, WikiToolConstants.TYPE_ROOT); } } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerBtn; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -33,6 +33,6 @@ final NavResources res) { super(i18n, action, res.wikiAdd(), i18n.t("New folder"), i18n.t("Create a new folder. A folder will be a 'section' in the public web"), - i18n.t("New folder"), WikiConstants.TYPE_FOLDER); + i18n.t("New folder"), WikiToolConstants.TYPE_FOLDER); } } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewFolderMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,7 +22,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContainerMenuItem; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -33,7 +33,7 @@ final NavResources res, final WikiFolderNewMenu wikiFolderNewMenu) { super(i18n, action, res.wikiAdd(), i18n.t("New folder"), i18n.t("Create a new folder. A folder will be a 'section' in the public web"), - i18n.t("New folder"), WikiConstants.TYPE_FOLDER, wikiFolderNewMenu.get()); + i18n.t("New folder"), WikiToolConstants.TYPE_FOLDER, wikiFolderNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiIconBtn.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentBtn; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -41,7 +41,7 @@ i18n.t("New wikipage"), i18n.t("Create a New Wikipage here. " + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), - i18n.t("New wikipage"), WikiConstants.TYPE_WIKIPAGE); + i18n.t("New wikipage"), WikiToolConstants.TYPE_WIKIPAGE); withStyles("k-btn-min, k-fl"); } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/NewWikiMenuItem.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -24,7 +24,7 @@ import cc.kune.core.client.resources.nav.NavResources; import cc.kune.gspace.client.actions.NewContentAction; import cc.kune.gspace.client.actions.NewContentMenuItem; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.wiki.shared.WikiToolConstants; import com.google.inject.Inject; @@ -42,7 +42,7 @@ i18n.t("New wikipage"), i18n.t("Create a New Wikipage here. " + "If you choose to publish it, this document will appear as a new 'Page' in the public web"), - i18n.t("New wikipage"), WikiConstants.TYPE_WIKIPAGE, wikiFolderNewMenu.get()); + i18n.t("New wikipage"), WikiToolConstants.TYPE_WIKIPAGE, wikiFolderNewMenu.get()); } } Modified: trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/client/actions/WikiClientActions.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ \*/ package cc.kune.wiki.client.actions; -import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; -import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; -import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import cc.kune.chat.client.actions.ChatAboutContentBtn; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.core.client.actions.ActionRegistryByType; Modified: trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/server/WikiServerTool.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,12 +19,12 @@ */ package cc.kune.wiki.server; -import static cc.kune.wiki.shared.WikiConstants.NAME; -import static cc.kune.wiki.shared.WikiConstants.ROOT_NAME; -import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; -import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; -import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.wiki.shared.WikiToolConstants.NAME; +import static cc.kune.wiki.shared.WikiToolConstants.ROOT_NAME; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import java.util.Arrays; import java.util.Date; Deleted: trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java =================================================================== --- trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -1,35 +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.wiki.shared; - -import cc.kune.core.shared.ToolConstants; - -public final class WikiConstants { - - public static final String NAME = "wiki"; - public static final String ROOT_NAME = "wiki"; - public static final String TYPE_FOLDER = NAME + "." + "folder"; - public static final String TYPE_ROOT = NAME + "." + "root"; - public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; - public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; - - private WikiConstants() { - } -} \ No newline at end of file Copied: trunk/src/main/java/cc/kune/wiki/shared/WikiToolConstants.java (from rev 1747, trunk/src/main/java/cc/kune/wiki/shared/WikiConstants.java) =================================================================== --- trunk/src/main/java/cc/kune/wiki/shared/WikiToolConstants.java (rev 0) +++ trunk/src/main/java/cc/kune/wiki/shared/WikiToolConstants.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -0,0 +1,35 @@ +/* + * + * 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.wiki.shared; + +import cc.kune.core.shared.ToolConstants; + +public final class WikiToolConstants { + + public static final String NAME = "wiki"; + public static final String ROOT_NAME = "wiki"; + public static final String TYPE_FOLDER = NAME + "." + "folder"; + public static final String TYPE_ROOT = NAME + "." + "root"; + public static final String TYPE_UPLOADEDFILE = NAME + "." + ToolConstants.UPLOADEDFILE_SUFFIX; + public static final String TYPE_WIKIPAGE = NAME + "." + "wikipage"; + + private WikiToolConstants() { + } +} \ No newline at end of file Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/main/resources/kune.properties 2012-03-18 20:18:29 UTC (rev 1770) @@ -88,11 +88,11 @@ kune.site.welcomewave = # which tools are available in this site by users -kune.tools.userSiteAvailableTools = docs,blogs,wiki,tasks,barters +kune.tools.userSiteAvailableTools = docs,blogs,wiki,tasks,events,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 +kune.tools.userRegisEnabledTools = docs,blogs,wiki,tasks,events,barters # WARNING: be sure that all tools in userRegisEnabledTools are included in userSiteAvailableTools # which tools are available in this site by groups Modified: trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/blogs/server/BlogServerToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.blogs.server; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_BLOG; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_POST; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_ROOT; -import static cc.kune.blogs.shared.BlogsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_BLOG; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_POST; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_ROOT; +import static cc.kune.blogs.shared.BlogsToolConstants.TYPE_UPLOADEDFILE; import org.junit.Before; import org.junit.Test; Modified: trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/PersistencePreLoadedDataTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.core.server; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; import static org.junit.Assert.assertEquals; import java.util.TimeZone; Modified: trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/integration/DatabaseInitializerTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,8 +19,8 @@ */ package cc.kune.core.server.integration; -import static cc.kune.docs.shared.DocsConstants.NAME; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.NAME; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; @@ -104,6 +104,7 @@ final List<String> enabledTools = groupManager.findEnabledTools(defaultGroup.getId()); assertNotNull(enabledTools); assertTrue(enabledTools.size() > 0); + assertNotNull(containerManager.getTrashFolder(defaultGroup).getId()); } } Modified: trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/integration/IntegrationTestHelper.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -45,6 +45,7 @@ import cc.kune.events.server.EventsServerModule; import cc.kune.lists.server.ListsServerModule; import cc.kune.tasks.server.TaskServerModule; +import cc.kune.trash.server.TrashServerModule; import cc.kune.wave.server.CustomSettingsBinder; import cc.kune.wiki.server.WikiServerModule; @@ -90,7 +91,7 @@ new ListsServerModule(), new RobotApiModule(), new PlatformServerModule(), new DocumentServerModule(), new ChatServerModule(), new ServerModule(false, 1, 2, 2), federationModule, new WikiServerModule(), new TaskServerModule(), new BarterServerModule(), - new EventsServerModule()); + new EventsServerModule(), new TrashServerModule()); try { childInjector.getInstance(WaveServerImpl.class).initialize(); } catch (final WaveServerException e) { Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceAddTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ */ package cc.kune.core.server.integration.content; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.wiki.shared.WikiConstants.NAME; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.wiki.shared.WikiToolConstants.NAME; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -40,7 +40,7 @@ import cc.kune.core.shared.dto.ContentSimpleDTO; import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; public class ContentServiceAddTest extends ContentServiceIntegrationTest { @@ -95,7 +95,7 @@ final ContainerDTO parent = defaultContent.getContainer(); final String title = "folder name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), - parent.getStateToken(), title, DocsConstants.TYPE_FOLDER); + parent.getStateToken(), title, DocsToolConstants.TYPE_FOLDER); assertNotNull(newState); assertNotNull(newState.getGroupMembers()); assertNotNull(newState.getParticipation()); @@ -130,11 +130,11 @@ final ContainerDTO parent = defaultContent.getContainer(); final String title = "folder name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), - parent.getStateToken(), title, DocsConstants.TYPE_FOLDER); + parent.getStateToken(), title, DocsToolConstants.TYPE_FOLDER); assertNotNull(newState); final StateContainerDTO newState2 = contentService.addFolder(session.getHash(), - parent.getStateToken(), title, DocsConstants.TYPE_FOLDER); + parent.getStateToken(), title, DocsToolConstants.TYPE_FOLDER); assertNotNull(newState2); final ContainerDTO parentAgain = getSiteDefaultContent().getContainer(); Modified: trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/integration/content/ContentServiceVariousTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.core.server.integration.content; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; @@ -42,7 +42,7 @@ import cc.kune.core.shared.dto.StateContainerDTO; import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.UserSimpleDTO; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; public class ContentServiceVariousTest extends ContentServiceIntegrationTest { @@ -121,7 +121,7 @@ final String oldTitle = "some title"; String newTitle = "folder new name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), - defaultContent.getStateToken(), oldTitle, DocsConstants.TYPE_FOLDER); + defaultContent.getStateToken(), oldTitle, DocsToolConstants.TYPE_FOLDER); final ContainerDTO newFolder = newState.getContainer(); @@ -229,7 +229,7 @@ final String oldTitle = "some title"; String newTitle = "folder new name"; final StateContainerDTO newState = contentService.addFolder(session.getHash(), - folder.getStateToken(), oldTitle, DocsConstants.TYPE_FOLDER); + folder.getStateToken(), oldTitle, DocsToolConstants.TYPE_FOLDER); final ContainerDTO newFolder = newState.getContainer(); Modified: trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/manager/ContainerManagerDefaultTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,7 +19,7 @@ */ package cc.kune.core.server.manager; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; @@ -30,7 +30,7 @@ import cc.kune.core.client.errors.MoveOnSameContainerException; import cc.kune.core.client.errors.NameInUseException; import cc.kune.core.server.PersistencePreLoadedDataTest; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; import cc.kune.domain.Container; public class ContainerManagerDefaultTest extends PersistencePreLoadedDataTest { @@ -39,8 +39,8 @@ @Before public void before() { - rootFolder = containerManager.createRootFolder(user.getUserGroup(), DocsConstants.NAME, - DocsConstants.ROOT_NAME, TYPE_FOLDER); + rootFolder = containerManager.createRootFolder(user.getUserGroup(), DocsToolConstants.NAME, + DocsToolConstants.ROOT_NAME, TYPE_FOLDER); } private Container createContainer(final Container parent) { Modified: trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java =================================================================== --- trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/core/server/manager/ContentManagerDefaultTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,8 +19,8 @@ */ package cc.kune.core.server.manager; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; Modified: trunk/src/test/java/cc/kune/docs/DocumentToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/docs/DocumentToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/docs/DocumentToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,23 +19,23 @@ */ package cc.kune.docs; -import static cc.kune.docs.shared.DocsConstants.NAME; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.NAME; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; import static org.junit.Assert.assertEquals; import org.junit.Test; -import cc.kune.docs.shared.DocsConstants; +import cc.kune.docs.shared.DocsToolConstants; public class DocumentToolTest { @Test public void clientAndServerSync() { - assertEquals(NAME, DocsConstants.NAME); - assertEquals(TYPE_ROOT, DocsConstants.TYPE_ROOT); - assertEquals(TYPE_FOLDER, DocsConstants.TYPE_FOLDER); - assertEquals(TYPE_DOCUMENT, DocsConstants.TYPE_DOCUMENT); + assertEquals(NAME, DocsToolConstants.NAME); + assertEquals(TYPE_ROOT, DocsToolConstants.TYPE_ROOT); + assertEquals(TYPE_FOLDER, DocsToolConstants.TYPE_FOLDER); + assertEquals(TYPE_DOCUMENT, DocsToolConstants.TYPE_DOCUMENT); } } Modified: trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/docs/server/DocumentServerToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.docs.server; -import static cc.kune.docs.shared.DocsConstants.TYPE_DOCUMENT; -import static cc.kune.docs.shared.DocsConstants.TYPE_FOLDER; -import static cc.kune.docs.shared.DocsConstants.TYPE_ROOT; -import static cc.kune.docs.shared.DocsConstants.TYPE_UPLOADEDFILE; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_DOCUMENT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_FOLDER; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_ROOT; +import static cc.kune.docs.shared.DocsToolConstants.TYPE_UPLOADEDFILE; import org.junit.Before; import org.junit.Test; Modified: trunk/src/test/java/cc/kune/lists/server/ListsServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/lists/server/ListsServerToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/lists/server/ListsServerToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,9 +19,9 @@ */ package cc.kune.lists.server; -import static cc.kune.lists.shared.ListsConstants.TYPE_LIST; -import static cc.kune.lists.shared.ListsConstants.TYPE_POST; -import static cc.kune.lists.shared.ListsConstants.TYPE_ROOT; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_LIST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_POST; +import static cc.kune.lists.shared.ListsToolConstants.TYPE_ROOT; import org.junit.Before; import org.junit.Test; Modified: trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java =================================================================== --- trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/lists/server/ListsServiceTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -41,7 +41,7 @@ import cc.kune.core.shared.dto.StateContentDTO; import cc.kune.core.shared.dto.UserInfoDTO; import cc.kune.lists.client.rpc.ListsService; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import com.google.inject.Inject; @@ -60,7 +60,7 @@ final UserInfoDTO userInfoDTO = doLogin(); userGroup = userInfoDTO.getUserGroup(); final StateAbstractDTO rootList = contentService.getContent(getHash(), new StateToken( - getDefSiteShortName(), ListsConstants.ROOT_NAME)); + getDefSiteShortName(), ListsToolConstants.ROOT_NAME)); openList = listsService.createList(getHash(), rootList.getStateToken(), "test list", "", true); closeList = listsService.createList(getHash(), rootList.getStateToken(), "test list", "", false); } Modified: trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/selenium/spaces/GroupSpacePageObject.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -22,15 +22,15 @@ import org.openqa.selenium.WebElement; import org.openqa.selenium.support.FindBy; -import cc.kune.blogs.shared.BlogsConstants; +import cc.kune.blogs.shared.BlogsToolConstants; import cc.kune.chat.client.actions.OpenRoomBtn; -import cc.kune.chat.shared.ChatConstants; +import cc.kune.chat.shared.ChatToolConstants; 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.docs.shared.DocsConstants; -import cc.kune.events.shared.EventsConstants; +import cc.kune.docs.shared.DocsToolConstants; +import cc.kune.events.shared.EventsToolConstants; import cc.kune.gspace.client.actions.GoParentContainerBtn; import cc.kune.gspace.client.actions.NewContainerBtn; import cc.kune.gspace.client.actions.NewContentBtn; @@ -47,12 +47,12 @@ import cc.kune.lists.client.actions.NewListAction; import cc.kune.lists.client.actions.NewListPostAction; import cc.kune.lists.client.actions.SubscribeToListBtn; -import cc.kune.lists.shared.ListsConstants; +import cc.kune.lists.shared.ListsToolConstants; import cc.kune.selenium.PageObject; import cc.kune.selenium.SeleniumConstants; import cc.kune.selenium.SeleniumUtils; -import cc.kune.tasks.shared.TasksConstants; -import cc.kune.wiki.shared.WikiConstants; +import cc.kune.tasks.shared.TasksToolConstants; +import cc.kune.wiki.shared.WikiToolConstants; public class GroupSpacePageObject extends PageObject { @@ -62,17 +62,17 @@ public WebElement addNewBuddieTextBox; @FindBy(id = SeleniumConstants.GWTDEV + AddEntityToThisGroupAction.ADD_NEW_MEMBER_TEXTBOX) public WebElement addNewMemberTextBox; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + BlogsConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + BlogsToolConstants.NAME) public WebElement blogTool; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ChatConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ChatToolConstants.NAME) public WebElement chatTool; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + DocsConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + DocsToolConstants.NAME) public WebElement docTool; @FindBy(xpath = "//div[@id='gwt-debug-k-cnt-title-id']/div/span") public WebElement entityTitle; @FindBy(xpath = "//div[@id='gwt-debug-k-cnt-title-id']/div/input") public WebElement entityTitleTextarea; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + EventsConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + EventsToolConstants.NAME) public WebElement eventTool; @FindBy(xpath = "//td/img") public WebElement firstAvatarOfGroup; @@ -98,7 +98,7 @@ public WebElement groupOptionsTools; @FindBy(id = SeleniumConstants.GWTDEV + SubscribeToListBtn.ID) public WebElement listSubscribeBtn; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ListsConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + ListsToolConstants.NAME) public WebElement listTool; @FindBy(id = SeleniumConstants.GWTDEV + NewContainerBtn.BTN_ID) public WebElement newContainerBtn; @@ -120,9 +120,9 @@ public WebElement searchEntitiesOk; @FindBy(xpath = "//div[3]/div/button") public WebElement socialNetOptions; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + TasksConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + TasksToolConstants.NAME) public WebElement taskTool; - @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + WikiConstants.NAME) + @FindBy(id = SeleniumConstants.GWTDEV + ToolSelectorItemPanel.TOOL_ID_PREFIX + WikiToolConstants.NAME) public WebElement wikiTool; public void openFirtsContent() { Modified: trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java =================================================================== --- trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java 2012-03-18 12:04:16 UTC (rev 1769) +++ trunk/src/test/java/cc/kune/wiki/server/WikiServerToolTest.java 2012-03-18 20:18:29 UTC (rev 1770) @@ -19,10 +19,10 @@ */ package cc.kune.wiki.server; -import static cc.kune.wiki.shared.WikiConstants.TYPE_FOLDER; -import static cc.kune.wiki.shared.WikiConstants.TYPE_ROOT; -import static cc.kune.wiki.shared.WikiConstants.TYPE_UPLOADEDFILE; -import static cc.kune.wiki.shared.WikiConstants.TYPE_WIKIPAGE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_FOLDER; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_ROOT; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_UPLOADEDFILE; +import static cc.kune.wiki.shared.WikiToolConstants.TYPE_WIKIPAGE; import org.junit.Before; import org.junit.Test;

1 0

r1769 - in trunk/src/main/java/cc/kune: chat/client core/client/cookies core/shared
by Vicente J. Ruiz Jurado 18 Mar '12

18 Mar '12

Author: vjrj_ Date: 2012-03-18 13:04:16 +0100 (Sun, 18 Mar 2012) New Revision: 1769 Added: trunk/src/main/java/cc/kune/chat/client/XmppSessionProvider.java Modified: trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java trunk/src/main/java/cc/kune/chat/client/ChatInstances.java trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java trunk/src/main/java/cc/kune/core/shared/SessionConstants.java Log: Cookie remove improved. Chat instances improved to avoid dups objects (Suco). Modified: trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2012-03-18 02:35:00 UTC (rev 1768) +++ trunk/src/main/java/cc/kune/chat/client/ChatGinModule.java 2012-03-18 12:04:16 UTC (rev 1769) @@ -27,6 +27,20 @@ import cc.kune.core.client.avatar.SmallAvatarDecorator; import cc.kune.core.client.contacts.SimpleContactManager; +import com.calclab.emite.core.client.conn.XmppConnection; +import com.calclab.emite.core.client.xmpp.sasl.SASLManager; +import com.calclab.emite.core.client.xmpp.session.XmppSession; +import com.calclab.emite.im.client.chat.ChatManager; +import com.calclab.emite.im.client.presence.PresenceManager; +import com.calclab.emite.im.client.roster.SubscriptionHandler; +import com.calclab.emite.im.client.roster.SubscriptionManager; +import com.calclab.emite.im.client.roster.XmppRoster; +import com.calclab.emite.reconnect.client.SessionReconnect; +import com.calclab.emite.xep.avatar.client.AvatarManager; +import com.calclab.emite.xep.muc.client.RoomManager; +import com.calclab.emite.xep.storage.client.PrivateStorageManager; +import com.google.inject.Singleton; + public class ChatGinModule extends ExtendedGinModule { /* * (non-Javadoc) @@ -46,5 +60,24 @@ // bind(OpenGroupPublicChatRoomButton.class); s(ChatClientTool.class); s(ChatClientActions.class); + + // This is needed because of Suco use and to prevent object duplicates + bind(XmppSession.class).toProvider(ChatInstances.XmppSessionProvider.class).in(Singleton.class); + bind(XmppRoster.class).toProvider(ChatInstances.XmppRosterProvider.class).in(Singleton.class); + bind(ChatManager.class).toProvider(ChatInstances.ChatManagerProvider.class).in(Singleton.class); + bind(RoomManager.class).toProvider(ChatInstances.RoomManagerProvider.class).in(Singleton.class); + bind(SessionReconnect.class).toProvider(ChatInstances.SessionReconnectProvider.class).in( + Singleton.class); + bind(AvatarManager.class).toProvider(ChatInstances.AvatarManagerProvider.class).in(Singleton.class); + bind(PresenceManager.class).toProvider(ChatInstances.PresenceManagerProvider.class).in( + Singleton.class); + bind(PrivateStorageManager.class).toProvider(ChatInstances.PrivateStorageManagerProvider.class).in( + Singleton.class); + bind(SubscriptionManager.class).toProvider(ChatInstances.SubscriptionManagerProvider.class).in( + Singleton.class); + bind(SubscriptionHandler.class).toProvider(ChatInstances.SubscriptionHandlerProvider.class).in( + Singleton.class); + bind(XmppConnection.class).toProvider(ChatInstances.XmppConnectionProvider.class).in(Singleton.class); + bind(SASLManager.class).toProvider(ChatInstances.SASLManagerProvider.class).in(Singleton.class); } } Modified: trunk/src/main/java/cc/kune/chat/client/ChatInstances.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatInstances.java 2012-03-18 02:35:00 UTC (rev 1768) +++ trunk/src/main/java/cc/kune/chat/client/ChatInstances.java 2012-03-18 12:04:16 UTC (rev 1769) @@ -19,6 +19,8 @@ */ package cc.kune.chat.client; +import com.calclab.emite.core.client.conn.XmppConnection; +import com.calclab.emite.core.client.xmpp.sasl.SASLManager; import com.calclab.emite.core.client.xmpp.session.XmppSession; import com.calclab.emite.im.client.chat.ChatManager; import com.calclab.emite.im.client.presence.PresenceManager; @@ -30,9 +32,92 @@ import com.calclab.emite.xep.muc.client.RoomManager; import com.calclab.emite.xep.storage.client.PrivateStorageManager; import com.calclab.suco.client.Suco; +import com.google.inject.Provider; public class ChatInstances { + public class AvatarManagerProvider implements Provider<AvatarManager> { + @Override + public AvatarManager get() { + return Suco.get(AvatarManager.class); + } + } + + public class ChatManagerProvider implements Provider<ChatManager> { + @Override + public ChatManager get() { + return Suco.get(ChatManager.class); + } + } + + public class PresenceManagerProvider implements Provider<PresenceManager> { + @Override + public PresenceManager get() { + return Suco.get(PresenceManager.class); + } + } + + public class PrivateStorageManagerProvider implements Provider<PrivateStorageManager> { + @Override + public PrivateStorageManager get() { + return Suco.get(PrivateStorageManager.class); + } + } + + public class RoomManagerProvider implements Provider<RoomManager> { + @Override + public RoomManager get() { + return Suco.get(RoomManager.class); + } + } + + public class SASLManagerProvider implements Provider<SASLManager> { + @Override + public SASLManager get() { + return Suco.get(SASLManager.class); + } + } + + public class SessionReconnectProvider implements Provider<SessionReconnect> { + @Override + public SessionReconnect get() { + return Suco.get(SessionReconnect.class); + } + } + + public class SubscriptionHandlerProvider implements Provider<SubscriptionHandler> { + @Override + public SubscriptionHandler get() { + return Suco.get(SubscriptionHandler.class); + } + } + + public class SubscriptionManagerProvider implements Provider<SubscriptionManager> { + @Override + public SubscriptionManager get() { + return Suco.get(SubscriptionManager.class); + } + } + public class XmppConnectionProvider implements Provider<XmppConnection> { + @Override + public XmppConnection get() { + return Suco.get(XmppConnection.class); + } + } + public class XmppRosterProvider implements Provider<XmppRoster> { + @Override + public XmppRoster get() { + return Suco.get(XmppRoster.class); + } + } + + public class XmppSessionProvider implements Provider<XmppSession> { + @Override + public XmppSession get() { + return Suco.get(XmppSession.class); + } + } + public final AvatarManager avatarManager; public final ChatManager chatManager; public final PresenceManager presenceManager; Added: trunk/src/main/java/cc/kune/chat/client/XmppSessionProvider.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/XmppSessionProvider.java (rev 0) +++ trunk/src/main/java/cc/kune/chat/client/XmppSessionProvider.java 2012-03-18 12:04:16 UTC (rev 1769) @@ -0,0 +1,14 @@ +package cc.kune.chat.client; + +import com.calclab.emite.core.client.xmpp.session.XmppSession; +import com.calclab.suco.client.Suco; +import com.google.inject.Provider; + +public class XmppSessionProvider implements Provider<XmppSession> { + + @Override + public XmppSession get() { + return Suco.get(XmppSession.class); + } + +} Modified: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java 2012-03-18 02:35:00 UTC (rev 1768) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java 2012-03-18 12:04:16 UTC (rev 1769) @@ -56,8 +56,10 @@ // http://groups.google.com/group/Google-Web-Toolkit/browse_thread/thread/ded8… // http://code.google.com/p/google-web-toolkit/issues/detail?id=1735&q=removeC… Cookies.removeCookie(SessionConstants.USERHASH); + Cookies.removeCookie(SessionConstants.JSESSIONID); // Workaround: Cookies.setCookie(SessionConstants.USERHASH, null, new Date(0), null, "/", false); + Cookies.setCookie(SessionConstants.JSESSIONID, null, new Date(0), null, "/", false); } @Override @@ -73,7 +75,7 @@ // http://code.google.com/p/google-web-toolkit-incubator/wiki/LoginSecurityFAQ final Date expires = new Date(System.currentTimeMillis() + SessionConstants.SESSION_DURATION); Cookies.setCookie(SessionConstants.USERHASH, userHash, expires, null, "/", false); - Cookies.setCookie("JSESSIONID", userHash, expires, null, "/", false); + Cookies.setCookie(SessionConstants.JSESSIONID, userHash, expires, null, "/", false); Log.info("Received hash: " + userHash, null); } } Modified: trunk/src/main/java/cc/kune/core/shared/SessionConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/SessionConstants.java 2012-03-18 02:35:00 UTC (rev 1768) +++ trunk/src/main/java/cc/kune/core/shared/SessionConstants.java 2012-03-18 12:04:16 UTC (rev 1769) @@ -6,8 +6,9 @@ public final static long A_DAY = _AN_HOUR * 24; public final static long ANON_SESSION_DURATION = A_DAY; public final static long ANON_SESSION_DURATION_AFTER_REG = A_DAY * 365; + public static final String JSESSIONID = "JSESSIONID"; + // session duration public final static long SESSION_DURATION = A_DAY * 30; // four weeks login - // session duration // public final static long SESSION_DURATION = 100; // For test public final static String USERHASH = "k007userHash";

1 0

r1768 - in trunk: . src/main/java/cc/kune/core/client/cookies src/main/java/cc/kune/core/server/manager/impl src/main/java/cc/kune/core/shared src/main/java/cc/kune/gspace/client/viewers src/main/java/cc/kune/wave/server src/main/resources src/main/webapp/tutorials
by Vicente J. Ruiz Jurado 18 Mar '12

18 Mar '12

Author: vjrj_ Date: 2012-03-18 03:35:00 +0100 (Sun, 18 Mar 2012) New Revision: 1768 Removed: trunk/src/main/webapp/tutorials/lists.svg.2012_03_14_10_40_56.0.svg Modified: trunk/.classpath trunk/.project trunk/INSTALL trunk/pom.xml trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java trunk/src/main/java/cc/kune/core/shared/SessionConstants.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java trunk/src/main/java/cc/kune/wave/server/WaveMain.java trunk/src/main/resources/kune.properties trunk/src/main/resources/wave-server-production.properties trunk/src/main/resources/wave-server-testing.properties trunk/src/main/resources/wave-server.properties Log: Some bug fixes (cookie lifetime, welcome wave) Modified: trunk/.classpath =================================================================== --- trunk/.classpath 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/.classpath 2012-03-18 02:35:00 UTC (rev 1768) @@ -11,24 +11,24 @@ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar" sourcepath="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6-sources.jar"/> <classpathentry kind="var" path="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" sourcepath="M2_REPO/aopalliance/aopalliance/1.0/aopalliance-1.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/api/0.3.13/api-0.3.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/api-src/0.3.13/api-src-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/api/0.3.14/api-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/api-src/0.3.14/api-src-0.3.14.jar"/> <classpathentry kind="var" path="M2_REPO/avalon-framework/avalon-framework/4.1.3/avalon-framework-4.1.3.jar"/> <classpathentry kind="var" path="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1.jar" sourcepath="M2_REPO/backport-util-concurrent/backport-util-concurrent/3.1/backport-util-concurrent-3.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.13/box-0.3.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.13/box-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.13/box-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.14/box-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.14/box-src-0.3.14.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.13/client-0.3.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.13/client-common-0.3.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.13/client-common-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/client-common-src/0.3.13/client-common-src-0.3.13-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler/0.3.13/client-scheduler-0.3.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.13/client-scheduler-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.13/client-scheduler-src-0.3.13-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.13/client-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/client-src/0.3.13/client-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client/0.3.14/client-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common/0.3.14/client-common-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-common-src/0.3.14/client-common-src-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler/0.3.14/client-scheduler-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-scheduler-src/0.3.14/client-scheduler-src-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/client-src/0.3.14/client-src-0.3.14.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.13/common-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/common-src/0.3.13/common-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/common-src/0.3.14/common-src-0.3.14.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"/> @@ -37,10 +37,10 @@ <classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.3.1/commons-io-1.3.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.5/commons-lang-2.5-sources.jar"/> <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.13/communication-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/communication-src/0.3.13/communication-src-0.3.13-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.13/concurrencycontrol-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.13/concurrencycontrol-src-0.3.13-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/crypto/0.3.13/crypto-0.3.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/crypto-src/0.3.13/crypto-src-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/communication-src/0.3.14/communication-src-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/concurrencycontrol-src/0.3.14/concurrencycontrol-src-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/crypto/0.3.14/crypto-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/crypto-src/0.3.14/crypto-src-0.3.14.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"/> @@ -49,6 +49,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/gxp/google-gxp/0.2.4-beta/google-gxp-0.2.4-beta.jar" sourcepath="M2_REPO/com/google/gxp/google-gxp/0.2.4-beta/google-gxp-0.2.4-beta-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"/> @@ -65,7 +66,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.13/gwt-util-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/gwt-util-src/0.3.13/gwt-util-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/gwt-util-src/0.3.14/gwt-util-src-0.3.14.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"/> @@ -122,17 +123,17 @@ <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-profile/2.0/maven-profile-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-project/2.0/maven-project-2.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-repository-metadata/2.0/maven-repository-metadata-2.0-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.13/media-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/media-src/0.3.13/media-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/media-src/0.3.14/media-src-0.3.14.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/0.3.13/model-0.3.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.13/model-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.13/model-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model/0.3.14/model-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.14/model-src-0.3.14.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.13/proto-msg-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-msg/0.3.14/proto-msg-0.3.14.jar"/> <classpathentry kind="var" path="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0.jar" sourcepath="M2_REPO/org/quartz-scheduler/quartz/2.1.0/quartz-2.1.0-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/w3c/css/sac/1.3/sac-1.3.jar" sourcepath="M2_REPO/org/w3c/css/sac/1.3/sac-1.3-sources.jar"/> <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0.jar" sourcepath="M2_REPO/org/seleniumhq/selenium/selenium-android-driver/2.12.0/selenium-android-driver-2.12.0-sources.jar"/> @@ -157,10 +158,10 @@ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> <classpathentry kind="var" path="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1.jar" sourcepath="M2_REPO/org/testng/testng/6.2.1/testng-6.2.1-sources.jar"/> <classpathentry kind="var" path="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5.jar" sourcepath="M2_REPO/tigase/tigase-xmltools/3.3.5/tigase-xmltools-3.3.5-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util/0.3.13/util-0.3.13.jar"/> - <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.13/util-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.13/util-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util/0.3.14/util-0.3.14.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.14/util-src-0.3.14.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.13/waveinabox-server-0.3-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/waveinabox-server-0.3/0.3.14/waveinabox-server-0.3-0.3.14.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/.project =================================================================== --- trunk/.project 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/.project 2012-03-18 02:35:00 UTC (rev 1768) @@ -1,60 +1,42 @@ -<?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>kune</name> - <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.recommenders.rcp.analysis.RecommendersBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - <nature>org.eclipse.ajdt.ui.ajnature</nature> - <nature>com.google.gwt.eclipse.core.gwtNature</nature> - <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> - <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> - <nature>org.eclipse.recommenders.rcp.analysis.RecommendersNature</nature> - </natures> -</projectDescription> + <name>kune</name> + <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects/> + <buildSpec> + <buildCommand> + <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> + </buildCommand> + <buildCommand> + <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + </buildCommand> + <buildCommand> + <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> + </buildCommand> + <buildCommand> + <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> + </buildCommand> + <buildCommand> + <name>org.eclipse.recommenders.rcp.analysis.RecommendersBuilder</name> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.ajdt.ui.ajnature</nature> + <nature>com.google.gwt.eclipse.core.gwtNature</nature> + <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> + <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> + <nature>org.eclipse.recommenders.rcp.analysis.RecommendersNature</nature> + </natures> +</projectDescription> \ No newline at end of file Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/INSTALL 2012-03-18 02:35:00 UTC (rev 1768) @@ -249,11 +249,13 @@ Download from http://kune.cc/downloads/openfireauth kune-openfireauth-VERSION.jar and copy to /usr/share/openfire/lib as root. Set the correct owner: -chown openfire:openfire /usr/share/openfire/lib/kune-openfireauth-VERSION.jar +sudo chown openfire:openfire /usr/share/openfire/lib/kune-openfireauth-VERSION.jar +sudo ln -s /etc/kune/wave-server.properties /usr/share/openfire/lib/wave-server.properties +(do something equivalent in Windows systems in the openfire folder) -(do something equivalent in Windows systems in the openfire folder). +The wave-server.properties file is in src/main/resources in the devel environment. -Execute this: +Next, execute this: $ mysql -p -u kune kune_openfire # or mysql -p -u root DELETE FROM `ofProperty` WHERE name='provider.auth.className'; Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/pom.xml 2012-03-18 02:35:00 UTC (rev 1768) @@ -22,7 +22,7 @@ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <slf4j.version>1.6.1</slf4j.version> <openjpa.version>2.0.1</openjpa.version> - <wiab.version>0.3.13</wiab.version> + <wiab.version>0.3.14</wiab.version> <jetty.version>8.0.1.v20110908</jetty.version> <skipTests>true</skipTests> </properties> @@ -537,6 +537,11 @@ <version>r09</version> </dependency> <dependency> + <groupId>com.google.gxp</groupId> + <artifactId>google-gxp</artifactId> + <version>0.2.4-beta</version> + </dependency> + <dependency> <groupId>org.waveprotocol</groupId> <artifactId>box</artifactId> <version>${wiab.version}</version> @@ -546,13 +551,13 @@ <artifactId>box-src</artifactId> <version>${wiab.version}</version> </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>waveinabox-server-0.3</artifactId> + <version>${wiab.version}</version> + </dependency> <dependency> <groupId>org.waveprotocol</groupId> - <artifactId>waveinabox-server-0.3</artifactId> - <version>${wiab.version}</version> - </dependency> - <dependency> - <groupId>org.waveprotocol</groupId> <artifactId>gwt-util-src</artifactId> <version>${wiab.version}</version> </dependency> Modified: trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/java/cc/kune/core/client/cookies/CookiesManagerImpl.java 2012-03-18 02:35:00 UTC (rev 1768) @@ -63,7 +63,8 @@ @Override public void setAnonCookie(final Boolean userRegister) { final Date expires = new Date(System.currentTimeMillis() - + (userRegister ? SessionConstants.ANON_SESSION_DURATION_AFTER_REG : SessionConstants.ANON_SESSION_DURATION)); + + (userRegister ? SessionConstants.ANON_SESSION_DURATION_AFTER_REG + : SessionConstants.ANON_SESSION_DURATION)); Cookies.setCookie(ANON, userRegister.toString(), expires, null, "/", false); } @@ -72,6 +73,7 @@ // http://code.google.com/p/google-web-toolkit-incubator/wiki/LoginSecurityFAQ final Date expires = new Date(System.currentTimeMillis() + SessionConstants.SESSION_DURATION); Cookies.setCookie(SessionConstants.USERHASH, userHash, expires, null, "/", false); + Cookies.setCookie("JSESSIONID", userHash, expires, null, "/", false); Log.info("Received hash: " + userHash, null); } } Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2012-03-18 02:35:00 UTC (rev 1768) @@ -43,6 +43,7 @@ import org.waveprotocol.box.server.robots.agent.RobotAgentUtil; import org.waveprotocol.wave.model.id.InvalidIdException; import org.waveprotocol.wave.model.id.WaveId; +import org.waveprotocol.wave.model.id.WaveletId; import org.waveprotocol.wave.model.wave.ParticipantId; import org.waveprotocol.wave.model.waveref.WaveRef; @@ -270,10 +271,12 @@ try { try { if (!TextUtils.empty(defWave)) { - final WaveId copyWaveId = WaveId.ofChecked(participantUtils.getDomain(), defWave); + final String domain = participantUtils.getDomain(); + final WaveId copyWaveId = WaveId.ofChecked(domain, defWave); welcome = kuneWaveManager.createWave( ContentConstants.WELCOME_WAVE_CONTENT_TITLE.replaceAll("\\[%s\\]", - properties.getDefaultSiteName()), "", WaveRef.of(copyWaveId), + properties.getDefaultSiteName()), "", + WaveRef.of(copyWaveId, WaveletId.of(domain, "conv+root")), new SimpleArgCallback<WaveRef>() { @Override public void onCallback(final WaveRef arg) { Modified: trunk/src/main/java/cc/kune/core/shared/SessionConstants.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/SessionConstants.java 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/java/cc/kune/core/shared/SessionConstants.java 2012-03-18 02:35:00 UTC (rev 1768) @@ -6,7 +6,7 @@ public final static long A_DAY = _AN_HOUR * 24; public final static long ANON_SESSION_DURATION = A_DAY; public final static long ANON_SESSION_DURATION_AFTER_REG = A_DAY * 365; - public final static long SESSION_DURATION = A_DAY * 14; // two weeks login + public final static long SESSION_DURATION = A_DAY * 30; // four weeks login // session duration // public final static long SESSION_DURATION = 100; // For test public final static String USERHASH = "k007userHash"; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2012-03-18 02:35:00 UTC (rev 1768) @@ -65,7 +65,10 @@ new ShowHelpContainerEvent.ShowHelpContainerHandler() { @Override public void onShowHelpContainer(final ShowHelpContainerEvent event) { - getView().showTutorial(event.getTool()); + final AbstractFolderViewerView currentView = getView(); + if (currentView != null) { + currentView.showTutorial(event.getTool()); + } } }); } Modified: trunk/src/main/java/cc/kune/wave/server/WaveMain.java =================================================================== --- trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/java/cc/kune/wave/server/WaveMain.java 2012-03-18 02:35:00 UTC (rev 1768) @@ -59,6 +59,7 @@ import org.waveprotocol.box.server.rpc.SignOutServlet; import org.waveprotocol.box.server.rpc.UserRegistrationServlet; import org.waveprotocol.box.server.rpc.WaveRefServlet; +import org.waveprotocol.box.server.waveserver.ImportServlet; import org.waveprotocol.box.server.waveserver.WaveBus; import org.waveprotocol.box.server.waveserver.WaveServerException; import org.waveprotocol.box.server.waveserver.WaveletProvider; @@ -215,6 +216,7 @@ server.addServlet(SessionManager.SIGN_IN_URL, injector.getInstance(AuthenticationServlet.class)); server.addServlet("/auth/signout", injector.getInstance(SignOutServlet.class)); server.addServlet("/auth/register", injector.getInstance(UserRegistrationServlet.class)); + server.addServlet("/fetch/*", injector.getInstance(FetchServlet.class)); server.addServlet("/search/*", injector.getInstance(SearchServlet.class)); @@ -227,6 +229,11 @@ server.addServlet("/profile/*", injector.getInstance(FetchProfilesServlet.class)); server.addServlet("/waveref/*", injector.getInstance(WaveRefServlet.class)); + boolean enableImport = injector + .getInstance(Key.get(Boolean.class, Names.named(CoreSettings.ENABLE_IMPORT))); + if (enableImport) + server.addServlet("/import", injector.getInstance(ImportServlet.class)); + String gadgetHostName = injector .getInstance(Key.get(String.class, Names.named(CoreSettings.GADGET_SERVER_HOSTNAME))); @@ -248,6 +255,7 @@ //server.addServlet(PasswordRobot.ROBOT_URI + "/*", injector.getInstance(PasswordRobot.class)); //server.addServlet(PasswordAdminRobot.ROBOT_URI + "/*", injector.getInstance(PasswordAdminRobot.class)); //server.addServlet(WelcomeRobot.ROBOT_URI + "/*", injector.getInstance(WelcomeRobot.class)); + //server.addServlet(RegistrationRobot.ROBOT_URI + "/*", injector.getInstance(RegistrationRobot.class)); } private static void initializeFrontend(Injector injector, ServerRpcProvider server, Modified: trunk/src/main/resources/kune.properties =================================================================== --- trunk/src/main/resources/kune.properties 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/resources/kune.properties 2012-03-18 02:35:00 UTC (rev 1768) @@ -48,7 +48,7 @@ kune.db.password = db4kune # openfire db info: -kune.openfire.db.url = jdbc:mysql://localhost/kune_openfire?createDatabaseIfNotExist=true&useUnicode=true&characterEncoding=UTF-8 +kune.openfire.db.url = jdbc:mysql://localhost/kune_openfire?createDatabaseIfNotExist=false&useUnicode=true&characterEncoding=UTF-8 kune.openfire.db.user = kune kune.openfire.db.password = db4kune @@ -84,8 +84,8 @@ kune.server.names.reservedwords = root,adm,kune,fuck,about,home,newgroup,preview,register,signin,translate,inbox,sub,www,ftp,pop,pop3,smtp,mail,wave,resetpasswd,verifyemail,prefs,gprefs # If defined create a copy of this wave as welcome to new users -# kune.site.welcomewave = w+rtackLTkDCA -kune.site.welcomewave = +# kune.site.welcomewave = w+9MkoynGd97A +kune.site.welcomewave = # which tools are available in this site by users kune.tools.userSiteAvailableTools = docs,blogs,wiki,tasks,barters Modified: trunk/src/main/resources/wave-server-production.properties =================================================================== --- trunk/src/main/resources/wave-server-production.properties 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/resources/wave-server-production.properties 2012-03-18 02:35:00 UTC (rev 1768) @@ -79,12 +79,14 @@ # Thread counts #The number of threads to listen on wavelet updates. Default value: 1 listener_executor_thread_count = 1 -#The number of threads for loading wavelets. Default value: 1 -wavelet_load_executor_thread_count = 1 -#The number of threads to persist deltas. Default value: 1 -delta_persist_executor_thread_count = 1 +#The number of threads for loading wavelets. Default value: 2 +wavelet_load_executor_thread_count = 2 +#The number of threads to persist deltas. Default value: 2 +delta_persist_executor_thread_count = 2 # To enable federation, edit the server.federation.config file and include it here. +# Or run ant -f server-config.xml server-federation-config +# If not using the server-config.xml ant script - it is possible just to comment the line. #include = server.federation.config # These two parameters MUST appear in this file AFTER the above include of the @@ -110,3 +112,6 @@ #Password to the keystore ssl_keystore_password = fafafa + +# Enable import of waves via /import URL. Default value: false +enable_import = false Modified: trunk/src/main/resources/wave-server-testing.properties =================================================================== --- trunk/src/main/resources/wave-server-testing.properties 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/resources/wave-server-testing.properties 2012-03-18 02:35:00 UTC (rev 1768) @@ -79,12 +79,14 @@ # Thread counts #The number of threads to listen on wavelet updates. Default value: 1 listener_executor_thread_count = 1 -#The number of threads for loading wavelets. Default value: 1 -wavelet_load_executor_thread_count = 1 -#The number of threads to persist deltas. Default value: 1 -delta_persist_executor_thread_count = 1 +#The number of threads for loading wavelets. Default value: 2 +wavelet_load_executor_thread_count = 2 +#The number of threads to persist deltas. Default value: 2 +delta_persist_executor_thread_count = 2 # To enable federation, edit the server.federation.config file and include it here. +# Or run ant -f server-config.xml server-federation-config +# If not using the server-config.xml ant script - it is possible just to comment the line. #include = server.federation.config # These two parameters MUST appear in this file AFTER the above include of the @@ -110,3 +112,6 @@ #Password to the keystore ssl_keystore_password = fafafa + +# Enable import of waves via /import URL. Default value: false +enable_import = false Modified: trunk/src/main/resources/wave-server.properties =================================================================== --- trunk/src/main/resources/wave-server.properties 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/resources/wave-server.properties 2012-03-18 02:35:00 UTC (rev 1768) @@ -79,12 +79,14 @@ # Thread counts #The number of threads to listen on wavelet updates. Default value: 1 listener_executor_thread_count = 1 -#The number of threads for loading wavelets. Default value: 1 -wavelet_load_executor_thread_count = 1 -#The number of threads to persist deltas. Default value: 1 -delta_persist_executor_thread_count = 1 +#The number of threads for loading wavelets. Default value: 2 +wavelet_load_executor_thread_count = 2 +#The number of threads to persist deltas. Default value: 2 +delta_persist_executor_thread_count = 2 # To enable federation, edit the server.federation.config file and include it here. +# Or run ant -f server-config.xml server-federation-config +# If not using the server-config.xml ant script - it is possible just to comment the line. #include = server.federation.config # These two parameters MUST appear in this file AFTER the above include of the @@ -110,3 +112,6 @@ #Password to the keystore ssl_keystore_password = fafafa + +# Enable import of waves via /import URL. Default value: false +enable_import = false Deleted: trunk/src/main/webapp/tutorials/lists.svg.2012_03_14_10_40_56.0.svg =================================================================== --- trunk/src/main/webapp/tutorials/lists.svg.2012_03_14_10_40_56.0.svg 2012-03-17 21:43:47 UTC (rev 1767) +++ trunk/src/main/webapp/tutorials/lists.svg.2012_03_14_10_40_56.0.svg 2012-03-18 02:35:00 UTC (rev 1768) @@ -1,2176 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> - - -<svg - xmlns:ns1="http://sozi.baierouge.fr" - xmlns:xhtml="http://www.w3.org/1999/xhtml" - 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="1052.3622" - height="1488.189" - id="svg2" - version="1.1" - inkscape:version="0.48.2 r9819" - sodipodi:docname="lists.svg"> -  - <script - id="kunelangtable"> - var idLangList = [ - {id: "layer7", layer: "es"}, - {id: "layer8", layer: "en"}, - {id: "layer9", layer: "fr"} - ]; - </script> - <script - xlink:href="lang.js" - id="kunelang" /> -  -  - <xhtml:link - href="http://fonts.googleapis.com/css?family=Ubuntu" - rel="stylesheet" - type="text/css" /> - <style - id="style3802"> - text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } - </style> -  - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="5.1629238" - inkscape:cx="174.94934" - inkscape:cy="1340.8534" - inkscape:document-units="px" - inkscape:current-layer="svg2" - showgrid="false" - showborder="true" - inkscape:showpageshadow="false" - inkscape:window-width="1078" - inkscape:window-height="919" - inkscape:window-x="0" - inkscape:window-y="24" - inkscape:window-maximized="0"> - <inkscape:grid - type="xygrid" - id="grid3793" /> - </sodipodi:namedview> - <defs - id="defs4"> - <marker - style="overflow:visible" - id="Arrow1Mstart" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mstart"> - <path - transform="matrix(0.4,0,0,0.4,4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path4730" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="Arrow1Mend" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mend"> - <path - transform="matrix(-0.4,0,0,-0.4,-4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path4733" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7815" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mstart"> - <path - transform="matrix(0.4,0,0,0.4,4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7817" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7819" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mend"> - <path - transform="matrix(-0.4,0,0,-0.4,-4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7821" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7823" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mstart"> - <path - transform="matrix(0.4,0,0,0.4,4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7825" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7827" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mend"> - <path - transform="matrix(-0.4,0,0,-0.4,-4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7829" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7831" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mstart"> - <path - transform="matrix(0.4,0,0,0.4,4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7833" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7835" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mend"> - <path - transform="matrix(-0.4,0,0,-0.4,-4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7837" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7839" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mstart"> - <path - transform="matrix(0.4,0,0,0.4,4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7841" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7843" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mend"> - <path - transform="matrix(-0.4,0,0,-0.4,-4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7845" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7847" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mstart"> - <path - transform="matrix(0.4,0,0,0.4,4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7849" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="marker7851" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mend"> - <path - transform="matrix(-0.4,0,0,-0.4,-4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path7853" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="Arrow1Mend-8" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mend"> - <path - transform="matrix(-0.4,0,0,-0.4,-4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path4733-7" - inkscape:connector-curvature="0" /> - </marker> - <marker - style="overflow:visible" - id="Arrow1Mend-1" - refX="0" - refY="0" - orient="auto" - inkscape:stockid="Arrow1Mend"> - <path - transform="matrix(-0.4,0,0,-0.4,-4,0)" - style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" - d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" - id="path4733-1" - inkscape:connector-curvature="0" /> - </marker> - </defs> - <metadata - id="metadata7"> - <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 /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - transform="translate(0,435.82679)" - id="layer1" - inkscape:groupmode="layer" - inkscape:label="layers" - style="display:inline"> - <rect - y="-403.77679" - x="30.756149" - height="295.13507" - width="424.69003" - id="rect4591" - style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635472;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> - <rect - style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.65257782;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="rect4607" - width="262.71176" - height="148.65785" - x="-950.12659" - y="0.38178363" /> - <rect - y="0.38868061" - x="-1006.9199" - height="217.02725" - width="342.89246" - id="rect4609" - style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635478;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> - <g - id="g3425" - transform="translate(-1009.8665,-222.02045)" - style="display:inline"> - <path - sodipodi:nodetypes="ccccccccccccccccc" - inkscape:connector-curvature="0" - id="path3077-8-3" - d="m 100.68086,315.8408 -22.015998,0 0,32.023 c 13,0 19,0 31.999998,0 l 0,-22.015 z m 5.984,28.023 c -10.907568,0 -10.783438,0 -23.999998,0 0,0 0.006,-21.441 0.006,-24.084 2.1,0 7.807,0 12.006,0 l 0,12.01 12.009998,0 c -10e-4,2.733 -0.022,12.074 -0.022,12.074 z m -7.983998,-16.078 c 0,-1.543 0,-5.918 0,-8.006 1.614998,1.619 6.401998,6.404 8.005998,8.006 -2.047,0 -6.454,0 -8.005998,0 z" - style="fill:#231f20;display:inline" /> - <g - id="g7067-2-7" - transform="translate(-533.40886,132.49381)" - inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step1.png" - inkscape:export-xdpi="89.910126" - inkscape:export-ydpi="89.910126" - style="display:inline"> - <path - transform="translate(835.07499,-335.32678)" - d="m -215,554.68896 a 11.5,11.5 0 1 1 -23,0 11.5,11.5 0 1 1 23,0 z" - sodipodi:ry="11.5" - sodipodi:rx="11.5" - sodipodi:cy="554.68896" - sodipodi:cx="-226.5" - id="path3311-8-9" - style="fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-opacity:1" - sodipodi:type="arc" /> - <text - sodipodi:linespacing="100%" - id="text3313-0-8" - y="225.77936" - x="608.74896" - style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:HoratioDMed" - xml:space="preserve"><tspan - style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - y="225.77936" - x="608.74896" - sodipodi:role="line" - id="tspan3315-3-1">1</tspan></text> - </g> - </g> - <path - sodipodi:type="arc" - style="color:#000000;fill:none;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path6371" - sodipodi:cx="272.5" - sodipodi:cy="379.86218" - sodipodi:rx="17.5" - sodipodi:ry="12.5" - d="m 290,379.86218 a 17.5,12.5 0 1 1 -35,0 17.5,12.5 0 1 1 35,0 z" - transform="translate(-1008.4256,-287.55371)" /> - <g - id="g3313" - transform="translate(-992.70885,-208.53837)" - style="display:inline"> - <path - style="fill:#f9f9f9" - d="m 272.7667,388.08329 c -2.54143,-2.54142 -2.92308,-3.66126 -2.92308,-8.57692 0,-4.95443 0.37281,-6.02666 3.01371,-8.66755 l 3.01371,-3.01371 10.5747,0.34063 c 10.15723,0.32718 10.66991,0.4514 12.98629,3.14639 1.9188,2.23243 2.41159,3.93397 2.41159,8.32693 0,4.769 -0.39822,5.91937 -2.92308,8.44423 -2.84693,2.84693 -3.18758,2.92308 -13.07692,2.92308 -9.88934,0 -10.22999,-0.0762 -13.07692,-2.92308 z m 13.31587,-16.07692 c 7.30092,0 9.85583,-0.30522 9.07671,-1.08434 -0.59639,-0.59639 -3.72389,-1.31079 -6.95,-1.58756 -7.13954,-0.61251 -13.05029,1.20488 -15.1945,4.6719 l -1.54615,2.5 2.22645,-2.25 c 2.01829,-2.03963 3.17647,-2.25 12.38749,-2.25 z" - id="path3246" - inkscape:connector-curvature="0" /> - <path - style="fill:#f6f6f6" - d="m 274.61876,389.44757 c -3.65504,-1.98352 -4.77944,-4.37891 -4.7529,-10.12546 0.0235,-5.09011 1.74853,-8.19733 5.66202,-10.1987 2.90395,-1.48509 17.53345,-1.4306 20.84368,0.0777 3.39417,1.54648 5.47206,5.65566 5.47206,10.82139 0,8.42076 -3.82339,11.00359 -16.20034,10.94388 -5.3605,-0.0259 -9.26461,-0.5637 -11.02452,-1.51876 z m 12.90797,-12.6287 c -0.31922,-0.79773 -0.55618,-0.56078 -0.60416,0.60417 -0.0434,1.05416 0.19293,1.64479 0.52522,1.3125 0.33229,-0.33229 0.36782,-1.19479 0.0789,-1.91667 z m -1.63342,-2.8125 c 6.57267,0 11.95031,-0.34175 11.95031,-0.75945 0,-2.71445 -9.39855,-4.85775 -16.57952,-3.7809 -4.69383,0.70389 -9.45165,4.12143 -9.39007,6.7449 0.0183,0.78153 0.43477,0.60121 1.04969,-0.45455 0.88076,-1.51218 2.64331,-1.75 12.96959,-1.75 z" - id="path3244" - inkscape:connector-curvature="0" /> - <path - style="fill:#f1f1f1" - d="m 274.61876,389.44757 c -3.65504,-1.98352 -4.77944,-4.37891 -4.7529,-10.12546 0.0235,-5.09011 1.74853,-8.19733 5.66202,-10.1987 2.90395,-1.48509 17.53345,-1.4306 20.84368,0.0777 3.39417,1.54648 5.47206,5.65566 5.47206,10.82139 0,8.42076 -3.82339,11.00359 -16.20034,10.94388 -5.3605,-0.0259 -9.26461,-0.5637 -11.02452,-1.51876 z m 13.22486,-5.4412 c 0,-1.33333 0.66667,-2 2,-2 1.1,0 2,-0.3876 2,-0.86133 0,-0.47373 -1.08096,-0.65469 -2.40213,-0.40213 -1.55439,0.29714 -2.56419,1.30694 -2.86133,2.86133 -0.25256,1.32117 -0.0716,2.40213 0.40213,2.40213 0.47373,0 0.86133,-0.9 0.86133,-2 z m -3.27083,-2.60417 c -0.33229,-0.33229 -1.1948,-0.36782 -1.91667,-0.079 -0.79773,0.31923 -0.56078,0.55619 0.60417,0.60417 1.05416,0.0434 1.64479,-0.19293 1.3125,-0.52522 z m -6.22762,-5.39583 c 2.93418,0 6.04668,-0.27314 6.91666,-0.60699 1.15193,-0.44204 1.61331,0.0335 1.69779,1.75 0.0834,1.69473 0.2445,1.86528 0.57333,0.60699 0.37104,-1.41984 1.5821,-1.75 6.41918,-1.75 5.73268,0 5.91897,-0.0801 4.84618,-2.08466 -2.44374,-4.56617 -14.30311,-6.46791 -21.5228,-3.45133 -3.34507,1.39766 -6.56324,6.33861 -6.35294,9.75387 0.0434,0.70517 0.53092,0.0446 1.08333,-1.46788 0.92434,-2.53084 1.42955,-2.75 6.33927,-2.75 z" - id="path3242" - inkscape:connector-curvature="0" /> - <path - style="fill:#ededed" - d="m 274.95369,389.61086 c -6.97427,-3.86554 -6.73822,-17.17474 0.36199,-20.4098 3.39236,-1.54567 17.66352,-1.54567 21.05588,0 7.25704,3.30652 7.25704,17.3041 0,20.61063 -3.55107,1.61797 -18.38735,1.47886 -21.41787,-0.20083 z m 12.88993,-5.60449 c 0,-1.33333 0.66667,-2 2,-2 1.1,0 2,-0.3876 2,-0.86133 0,-0.47373 -1.08096,-0.65469 -2.40213,-0.40213 -1.55439,0.29714 -2.56419,1.30694 -2.86133,2.86133 -0.25256,1.32117 -0.0716,2.40213 0.40213,2.40213 0.47373,0 0.86133,-0.9 0.86133,-2 z m -3.27083,-2.60417 c -0.33229,-0.33229 -1.1948,-0.36782 -1.91667,-0.079 -0.79773,0.31923 -0.56078,0.55619 0.60417,0.60417 1.05416,0.0434 1.64479,-0.19293 1.3125,-0.52522 z m -6.14584,-2.39583 c 5.75,0 6.41667,-0.20779 6.41667,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.79487 0.66667,2 6.5,2 6.94488,0 7.76089,-0.77549 5.41951,-5.1504 -2.41042,-4.50391 -14.32005,-6.38039 -21.48762,-3.38559 -3.34507,1.39766 -6.56324,6.33861 -6.35294,9.75387 0.0618,1.00373 0.18846,1.0107 0.58333,0.0321 0.32996,-0.81773 2.72339,-1.25 6.92105,-1.25 z" - id="path3240" - inkscape:connector-curvature="0" /> - <path - style="fill:#e9e9e9" - d="m 274.95369,389.61086 c -3.33059,-1.846 -5.03308,-5.35338 -5.07463,-10.45449 -0.0296,-3.63828 0.52084,-4.90628 3.36456,-7.75 3.37391,-3.37391 3.47059,-3.4 12.6,-3.4 9.12941,0 9.22609,0.0261 12.6,3.4 2.90213,2.90213 3.4,4.08824 3.4,8.1 0,4.01177 -0.49787,5.19787 -3.4,8.1 -3.36179,3.36179 -3.49947,3.3996 -12.25,3.36457 -5.41249,-0.0217 -9.77829,-0.54995 -11.23993,-1.36008 z m 12.88993,-5.47949 c 0,-1.9604 3.40064,-3.125 9.125,-3.125 2.53731,0 2.875,-0.35771 2.875,-3.04545 0,-6.40647 -6.88048,-9.76274 -17.72043,-8.64395 -8.48291,0.87551 -12.48896,6.04429 -10.31422,13.30787 0.73509,2.45517 0.87546,2.54861 0.9487,0.63153 0.0743,-1.94401 0.62994,-2.25 4.08595,-2.25 2.2,0 4,-0.45 4,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.84754,1 -1.88342,1 -1.21488,0 -2.05307,0.88741 -2.36133,2.5 -0.26285,1.375 -0.0903,2.5 0.38342,2.5 0.47373,0 0.86133,-0.84375 0.86133,-1.875 z m -3.27083,-2.72917 c -0.33229,-0.33229 -1.1948,-0.36782 -1.91667,-0.079 -0.79773,0.31923 -0.56078,0.55619 0.60417,0.60417 1.05416,0.0434 1.64479,-0.19293 1.3125,-0.52522 z" - id="path3238" - inkscape:connector-curvature="0" /> - <path - style="fill:#e5e5e5" - d="m 274.95369,389.61086 c -3.33059,-1.846 -5.03308,-5.35338 -5.07463,-10.45449 -0.0296,-3.63828 0.52084,-4.90628 3.36456,-7.75 3.37391,-3.37391 3.47059,-3.4 12.6,-3.4 9.12941,0 9.22609,0.0261 12.6,3.4 2.90213,2.90213 3.4,4.08824 3.4,8.1 0,4.01177 -0.49787,5.19787 -3.4,8.1 -3.36179,3.36179 -3.49947,3.3996 -12.25,3.36457 -5.41249,-0.0217 -9.77829,-0.54995 -11.23993,-1.36008 z m 12.88993,-5.10449 c 0,-1.16336 1.32037,-1.5 5.88337,-1.5 6.56443,0 7.43908,-0.966 5.95902,-6.58133 -1.49553,-5.67401 -3.99016,-6.91867 -13.86681,-6.91867 -7.93793,0 -9.06954,0.23965 -11.37971,2.40993 -2.98579,2.80501 -4.14498,7.52837 -2.72168,11.09007 0.54947,1.375 1.02756,1.9375 1.06242,1.25 0.0433,-0.85407 1.96386,-1.25 6.06339,-1.25 3.33333,0 6,-0.44444 6,-1 0,-0.55 -0.9,-1 -2,-1 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.84754,1 -1.88342,1 -1.21488,0 -2.05307,0.88741 -2.36133,2.5 -0.26285,1.375 -0.0903,2.5 0.38342,2.5 0.47373,0 0.86133,-0.675 0.86133,-1.5 z" - id="path3236" - inkscape:connector-curvature="0" /> - <path - style="fill:#e1e1e1" - d="m 274.66961,389.29425 c -3.36162,-2.08548 -4.82599,-5.25179 -4.82599,-10.43493 0,-3.2759 0.65186,-4.70481 3.4,-7.45295 3.37391,-3.37391 3.47059,-3.4 12.6,-3.4 9.12941,0 9.22609,0.0261 12.6,3.4 2.90213,2.90213 3.4,4.08824 3.4,8.1 0,4.01177 -0.49787,5.19787 -3.4,8.1 -3.35996,3.35996 -3.50423,3.39969 -12.25,3.37339 -6.4656,-0.0194 -9.57044,-0.47356 -11.52401,-1.68551 z m 10.17401,-6.3767 c 0,-1.24451 -0.69765,-1.91118 -2,-1.91118 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.84754,1 -1.88342,1 -1.17145,0 -2.04971,0.86984 -2.32329,2.30103 -0.42654,2.23126 -0.25573,2.2886 5.63342,1.89125 3.34031,-0.22537 6.51529,-0.82534 7.05551,-1.33325 0.54023,-0.50791 0.93421,-2.75477 0.87552,-4.99301 -0.078,-2.97664 -0.8177,-4.78073 -2.75418,-6.71778 -2.4667,-2.46741 -3.25485,-2.64824 -11.54234,-2.64824 -8.02217,0 -9.14679,0.23644 -11.46273,2.40993 -2.96199,2.77982 -4.14919,7.5094 -2.78637,11.10048 0.88663,2.33632 1.32168,2.46873 7.06634,2.15077 5.24185,-0.29013 6.12154,-0.61347 6.12154,-2.25 z" - id="path3234" - inkscape:connector-curvature="0" /> - <path - style="fill:#dcdcdc" - d="m 275.22656,389.42308 c -3.73042,-1.84034 -5.38294,-5.08333 -5.38294,-10.56376 0,-3.2759 0.65186,-4.70481 3.4,-7.45295 3.37391,-3.37391 3.47059,-3.4 12.6,-3.4 9.12941,0 9.22609,0.0261 12.6,3.4 4.89855,4.89856 4.89855,11.30144 0,16.2 -3.32886,3.32886 -3.57472,3.39952 -11.75,3.37723 -5.45404,-0.0149 -9.43106,-0.55609 -11.46706,-1.56052 z m 23.32253,-4.08996 c 2.62172,-4.00124 2.1238,-9.95203 -1.10268,-13.17851 -2.47,-2.47 -3.25094,-2.64824 -11.60279,-2.64824 -8.45306,0 -9.10983,0.15528 -11.72727,2.77273 -3.45619,3.45618 -3.89097,10.28165 -0.86774,13.62228 1.7131,1.89296 2.99506,2.10499 12.72694,2.10499 10.62697,0 10.85352,-0.0482 12.57354,-2.67325 z m -13.70547,-2.32675 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z" - id="path3232" - inkscape:connector-curvature="0" /> - <path - style="fill:#d3d3d3" - d="m 276.23174,390.07419 c -6.74233,-2.8771 -8.58217,-12.5807 -3.47015,-18.30204 l 2.91797,-3.26578 10.0593,0 c 9.55886,0 10.19169,0.13238 12.72027,2.66096 1.94599,1.946 2.78866,3.98996 3.13623,7.60719 0.42579,4.43128 0.15974,5.29945 -2.5555,8.33904 -2.97123,3.32615 -3.20433,3.39742 -11.86351,3.62732 -4.858,0.12897 -9.78308,-0.17103 -10.94461,-0.66669 z m 20.15627,-2.50495 c 5.16707,-3.38559 5.61236,-11.18808 0.8916,-15.623 -2.03934,-1.91587 -3.87117,-2.45559 -9.39338,-2.76762 -9.20388,-0.52007 -13.40194,0.95786 -15.5442,5.47234 -2.99873,6.31936 -0.45732,12.27035 6.14414,14.38717 4.21561,1.35177 14.93996,0.47181 17.90184,-1.46889 z m -11.54439,-4.56287 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z" - id="path3230" - inkscape:connector-curvature="0" /> - <path - style="fill:#cacaca" - d="m 276.34362,390.1089 c -3.32573,-1.44083 -5.6417,-4.7347 -6.16978,-8.77491 -1.17583,-8.99611 3.91096,-13.32014 15.66978,-13.32014 8.57989,0 13.32692,2.11841 15.10996,6.74298 1.59988,4.14952 0.43075,10.16322 -2.55692,13.15212 -2.35114,2.35211 -3.42069,2.61957 -11.3247,2.83193 -4.80059,0.12897 -9.62834,-0.15541 -10.72834,-0.63198 z m 20.97569,-3.0797 c 5.13629,-4.82528 3.99128,-14.09412 -2.05306,-16.6196 -4.01896,-1.67923 -13.87697,-1.83801 -18.30379,-0.29481 -5.17185,1.80291 -7.69655,9.01593 -4.97286,14.20732 2.29231,4.36916 6.20726,5.69454 15.63159,5.29197 5.93089,-0.25335 7.72547,-0.73167 9.69812,-2.58488 z m -12.47569,-4.02283 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z" - id="path3228" - inkscape:connector-curvature="0" /> - <path - style="fill:#c3c3c3" - d="m 275.85753,389.25482 c -5.73027,-2.87402 -7.6127,-9.25604 -4.50356,-15.26847 1.46973,-2.84213 5.16543,-5.63753 6.15066,-4.65231 0.26934,0.26935 -0.44914,0.7877 -1.59662,1.15189 -2.48243,0.7879 -5.06439,5.38675 -5.06439,9.02044 0,4.11705 2.64823,8.18172 6.11884,9.39158 4.5965,1.60235 14.54047,1.36392 18.34147,-0.43977 5.27305,-2.50222 7.02439,-8.68003 4.07668,-14.38029 -1.8882,-3.65136 -3.37909,-4.23097 -13.03699,-5.06828 l -8,-0.69358 6.78212,-0.15483 c 8.24791,-0.18829 13.03112,1.61644 15.15146,5.71673 3.0026,5.80639 1.51103,11.97229 -3.65865,15.12424 -4.33677,2.64413 -15.71672,2.78261 -20.76102,0.25265 z m 8.98609,-6.24845 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z" - id="path3226" - inkscape:connector-curvature="0" /> - <path - style="fill:#b5b5b5" - d="m 286.34362,390.05352 c 8.79911,-0.70744 12.02529,-1.97612 13.02358,-5.12145 0.36247,-1.14203 0.8794,-1.85605 1.14875,-1.58671 0.26934,0.26935 -0.033,1.46635 -0.6718,2.66002 -1.75159,3.27288 -7.06078,5.02098 -14.71841,4.84616 l -6.78212,-0.15483 8,-0.64319 z m -12.63922,-2.1065 -2.36078,-2.05935 3,1.75669 c 3.94843,2.31206 4.00717,2.36201 2.77745,2.36201 -0.58073,0 -2.11823,-0.92671 -3.41667,-2.05935 z m 11.13922,-4.94065 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z m -14.80505,-3.5 c 0.0204,-1.65 0.2445,-2.20394 0.49804,-1.23097 0.25354,0.97297 0.23687,2.32297 -0.0371,3 -0.27393,0.67703 -0.48137,-0.11903 -0.46099,-1.76903 z m 31,0 c 0.0204,-1.65 0.2445,-2.20394 0.49804,-1.23097 0.25354,0.97297 0.23687,2.32297 -0.0371,3 -0.27393,0.67703 -0.48137,-0.11903 -0.46099,-1.76903 z m -1.69623,-5.50404 c -0.34984,-1.10223 -1.84266,-2.65921 -3.31739,-3.45997 -1.47473,-0.80075 -2.09838,-1.47393 -1.38588,-1.49595 1.53083,-0.0473 6.20455,4.40793 6.20455,5.91451 0,1.71269 -0.81953,1.18941 -1.50128,-0.95859 z m -27.49872,-1.37352 c 0,-0.20765 0.7875,-0.99515 1.75,-1.75 1.58606,-1.24387 1.62143,-1.2085 0.37756,0.37756 -1.30637,1.66575 -2.12756,2.19548 -2.12756,1.37244 z m 10.25,-4.35091 c 2.0625,-0.21574 5.4375,-0.21574 7.5,0 2.0625,0.21575 0.375,0.39226 -3.75,0.39226 -4.125,0 -5.8125,-0.17651 -3.75,-0.39226 z" - id="path3224" - inkscape:connector-curvature="0" /> - <path - style="fill:#aaaaaa" - d="m 282.59362,390.28297 c 1.7875,-0.22182 4.7125,-0.22182 6.5,0 1.7875,0.22183 0.325,0.40333 -3.25,0.40333 -3.575,0 -5.0375,-0.1815 -3.25,-0.40333 z m 14.25,-1.65415 c 0,-0.20766 0.7875,-0.99516 1.75,-1.75 1.58606,-1.24388 1.62143,-1.20851 0.37756,0.37755 -1.30637,1.66575 -2.12756,2.19548 -2.12756,1.37245 z m -12,-5.62245 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z m -14.92105,-3.58333 c 0.048,-1.16495 0.28494,-1.4019 0.60416,-0.60417 0.28887,0.72188 0.25335,1.58438 -0.0789,1.91667 -0.3323,0.33229 -0.56864,-0.25834 -0.52522,-1.3125 z m 31,0 c 0.048,-1.16495 0.28494,-1.4019 0.60416,-0.60417 0.28888,0.72188 0.25335,1.58438 -0.079,1.91667 -0.33229,0.33229 -0.56864,-0.25834 -0.52522,-1.3125 z m -18.32895,-11.14007 c 1.7875,-0.22182 4.7125,-0.22182 6.5,0 1.7875,0.22183 0.325,0.40333 -3.25,0.40333 -3.575,0 -5.0375,-0.1815 -3.25,-0.40333 z" - id="path3222" - inkscape:connector-curvature="0" /> - <path - style="fill:#f7f7f7;fill-opacity:1;stroke:#f7f7f7;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 291.91157,381.00816 -9.98127,0" - id="path3271" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - id="path3273" - d="m 286.92093,376.01752 0,9.98127" - style="fill:#f7f7f7;fill-opacity:1;stroke:#f7f7f7;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - <path - style="fill:none;stroke:#666666;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="m 285.92094,375.01753 0,9.98127" - id="path3267" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - id="path3269" - d="m 290.91157,380.00816 -9.98127,0" - style="fill:none;stroke:#666666;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> - </g> - <g - transform="translate(-1013.9918,-253.757)" - id="g3761" - style="display:inline"> - <g - id="g3697" - transform="matrix(0.32896515,0,0,0.32896515,-160.43506,33.34333)"> - <g - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-gen.png" - id="g3699" - transform="translate(350,0)"> - <path - inkscape:connector-curvature="0" - id="path3701" - d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" - style="fill:#dce2e8" /> - <path - inkscape:connector-curvature="0" - id="path3703" - d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" - style="fill:#d4dbe2" /> - <path - inkscape:connector-curvature="0" - id="path3705" - d="m 597.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" - style="fill:#a9b6c7;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3707" - d="m 595.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" - style="fill:#b6c5d8;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3709" - d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" - style="fill:#c9cfd7" /> - <path - inkscape:connector-curvature="0" - id="path3711" - d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" - style="fill:#b6c5d8" /> - <path - inkscape:connector-curvature="0" - id="path3713" - d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" - style="fill:#89929e" /> - <path - inkscape:connector-curvature="0" - id="path3715" - d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" - style="fill:#b4c3d5" /> - <path - inkscape:connector-curvature="0" - id="path3717" - d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" - style="fill:#b3bcc9" /> - <path - inkscape:connector-curvature="0" - id="path3719" - d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" - style="fill:#a9b6c7" /> - <path - inkscape:connector-curvature="0" - id="path3721" - d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" - style="fill:#a5aeba" /> - <path - inkscape:connector-curvature="0" - id="path3723" - d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" - style="fill:#99a5b4" /> - <path - inkscape:connector-curvature="0" - id="path3725" - d="m 597.625,771.4375 c -3.21749,0.80995 -6.35889,1.89093 -9.49855,2.95674 -0.97154,0.37142 -1.85289,0.9729 -2.5952,1.69951 -0.85286,0.75372 -1.5183,1.68678 -2.24295,2.5579 -1.43359,1.82026 -2.70936,3.75542 -4.06955,5.6296 -0.88196,1.49498 -1.70097,3.03188 -2.28734,4.66945 -0.773,1.87386 -1.3796,3.81126 -2.03693,5.7276 -1.48856,4.58577 -2.86664,9.20755 -4.15527,13.85304 -0.38084,1.5389 -0.8175,3.06718 -1.11421,4.62491 -0.0983,1.32482 0.42765,2.57219 0.8125,3.8125 0.65443,1.89642 1.24797,3.81318 1.875,5.71875 0.4387,1.03708 1.53192,1.69185 2.625,1.8125 1.24203,-0.0193 2.52075,0.0375 3.71875,-0.34375 1.02063,-0.39402 1.60505,-1.36074 1.86562,-2.3781 0.73273,-2.56005 1.01952,-5.21766 1.50049,-7.83083 0.4005,-2.37627 0.77571,-4.75672 1.16514,-7.13482 0.60941,-2.21748 1.28797,-4.41783 2.03973,-6.59038 0.78279,-2.02938 1.71569,-3.99664 2.55402,-6.00337 0.89003,-1.89943 1.86665,-3.76562 3.01491,-5.52201 1.40777,-2.01133 3.33858,-3.57662 5.32812,-4.9803 1.23992,-0.75485 2.42213,-1.59957 3.68923,-2.3108 1.42795,-0.88217 2.95575,-1.58776 4.46774,-2.31189 0.99896,-0.30772 1.95269,-0.81445 2.99484,-0.95052 0.94868,-0.0968 1.93298,0.0577 2.84891,-0.26823 0.92455,-0.56794 0.73006,-1.98773 -0.15625,-2.5 -0.80724,-0.63096 -1.7434,-1.0782 -2.63346,-1.5793 -1.68129,-0.84475 -3.47432,-1.44213 -5.30345,-1.87163 -1.35714,-0.28247 -2.73917,-0.47084 -4.12559,-0.51782 l -0.18169,0.0202 -0.0996,0.0111 z" - style="fill:#99a5b4;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3727" - d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" - style="fill:#929ca9" /> - <path - inkscape:connector-curvature="0" - id="path3729" - d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" - style="fill:#8a95a3;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3731" - d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" - style="fill:#8a95a3" /> - </g> - <path - inkscape:connector-curvature="0" - id="path3733" - d="m 902.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" - style="fill:#dce2e8" /> - <path - inkscape:connector-curvature="0" - id="path3735" - d="m 902.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" - style="fill:#d4dbe2" /> - <path - inkscape:connector-curvature="0" - id="path3737" - d="m 947.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" - style="fill:#a9b6c7;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3739" - d="m 945.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" - style="fill:#b6c5d8;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3741" - d="m 903.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" - style="fill:#c9cfd7" /> - <path - inkscape:connector-curvature="0" - id="path3743" - d="m 904.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" - style="fill:#b6c5d8" /> - <path - inkscape:connector-curvature="0" - id="path3745" - d="m 955.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" - style="fill:#89929e" /> - <path - inkscape:connector-curvature="0" - id="path3747" - d="m 905.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" - style="fill:#b4c3d5" /> - <path - inkscape:connector-curvature="0" - id="path3749" - d="m 978.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" - style="fill:#b3bcc9" /> - <path - inkscape:connector-curvature="0" - id="path3751" - d="m 979.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" - style="fill:#a9b6c7" /> - <path - inkscape:connector-curvature="0" - id="path3753" - d="m 981.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" - style="fill:#a5aeba" /> - <path - inkscape:connector-curvature="0" - id="path3755" - d="m 984.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 947.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" - style="fill:#99a5b4" /> - <path - inkscape:connector-curvature="0" - id="path3757" - d="m 987.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" - style="fill:#929ca9" /> - <path - inkscape:connector-curvature="0" - id="path3759" - d="m 988.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" - style="fill:#8a95a3" /> - <path - inkscape:connector-curvature="0" - id="path3761" - d="m 954.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" - style="fill:#8a95a3;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3763" - d="m 946.9375,772.125 c -9.56715,1.74839 -17.25457,9.64487 -19.96875,18.8125 -4.82877,10.88517 -7.07054,23.03246 -5.61836,34.90144 0.0198,1.07326 0.1459,2.15794 -0.0379,3.22356 3.75192,-4.50382 3.8025,-10.67156 5.9811,-15.89686 3.37158,-10.6816 8.79354,-21.17419 17.67515,-28.29064 4.36603,-3.68349 9.47725,-6.3808 14.71875,-8.59375 0.72214,-1.81857 -1.47582,-3.24498 -3.09375,-3.125 -3.11721,-0.92307 -6.41633,-1.23 -9.65625,-1.03125 z" - style="fill:#99a5b4;fill-opacity:1" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> - <g - id="g3678" - transform="translate(129.51923,31.279777)"> - <rect - style="color:#000000;fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3680" - width="34.242748" - height="8.1750183" - x="4.0543771" - y="287.32199" - rx="1.6497765" - ry="1.6497765" /> - <text - xml:space="preserve" - style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="8.0973129" - y="294.16464" - id="text3682" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan3684" - x="8.0973129" - y="294.16464">simone</tspan></text> - </g> - </g> - <g - transform="translate(-1031.1443,-263.46575)" - id="g3742" - style="display:inline"> - <g - id="g5773" - transform="matrix(0.32832475,0,0,0.32832475,85.879825,140.2387)"> - <path - style="fill:#dce2e8" - d="m 15.652276,526.89841 c -0.610306,-1.59043 1.679869,-11.36996 3.481806,-14.86804 3.193736,-6.19997 6.408908,-8.92653 16.688018,-14.15192 15.103201,-7.67772 14.080467,-6.32495 10.351016,-13.69128 -14.619009,-28.87514 0.626491,-58.97154 24.060007,-47.49727 13.579837,6.6494 16.194478,31.36184 5.166481,48.83132 C 74.079822,487.61189 73,489.56197 73,489.85473 c 0,0.96965 10.409081,7.10101 16,9.42463 10.938874,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.810704,0.4196 z" - id="path5775" - inkscape:connector-curvature="0" /> - <path - style="fill:#d4dbe2" - d="m 16,527.9114 c 0,-12.82229 7.444121,-22.89231 22.182697,-30.00761 12.879762,-6.21793 12.949565,-6.32177 9.035801,-13.4409 -14.220674,-25.86739 -1.36795,-55.39011 20.882279,-47.9666 14.595085,4.86946 18.104408,32.01735 6.356458,49.17313 -2.031924,2.96726 -2.353004,4.11342 -1.455316,5.19507 2.007816,2.41927 10.29052,7.29999 16.261866,9.58257 C 98.567144,504.00332 106,514.86317 106,524.89969 c 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" - id="path5777" - inkscape:connector-curvature="0" /> - <path - style="fill:#c9cfd7" - d="m 16.456704,526.61441 c 0.368875,-0.96127 1.119209,-3.83918 1.667409,-6.39535 2.216133,-10.33347 6.136986,-14.70774 18.826133,-21.00325 14.555889,-7.22166 14.803417,-7.54851 10.923343,-14.42362 -9.684632,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.784152,-11.11959 37.313196,18.96264 22.150804,45.86301 C 73.327781,486.9762 72,489.7139 72,490.18081 c 0,1.40694 10.137395,7.90103 15.78241,10.11034 9.778791,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.525159,9.96359 -42.526253,0 -45.068616,-0.1 -44.436307,-1.74777 z" - id="path5779" - inkscape:connector-curvature="0" /> - <path - style="fill:#b6c5d8" - d="m 17.373092,526.61218 c 0.279327,-0.9625 1.031608,-3.77247 1.671735,-6.24438 2.783906,-10.75028 5.91216,-14.19465 18.510886,-20.3814 14.312213,-7.02817 14.766578,-7.73334 10.45997,-16.23375 -9.151893,-18.06407 -4.861359,-45.39047 7.126784,-45.39047 1.093959,0 2.932921,-0.50516 4.086582,-1.12258 17.687459,-9.46604 28.608915,25.64678 14.765412,47.47125 -2.432458,3.83481 -2.830287,5.14422 -1.902558,6.26207 2.544299,3.06569 11.034196,8.55209 15.595883,10.07848 10.544154,3.52818 15.517054,10.12038 17.773324,23.56078 0.62952,3.75 0.62952,3.75 -43.983185,3.75 -42.015093,0 -44.583129,-0.10189 -44.104833,-1.75 z" - id="path5781" - inkscape:connector-curvature="0" /> - <path - style="fill:#b4c3d5" - d="m 18.625,527.56443 c -0.271169,-0.43876 -0.07962,-1.45126 0.42567,-2.25 0.717286,-1.13386 0.922062,-0.95895 0.934017,0.79775 0.01574,2.31303 -0.49232,2.85568 -1.359687,1.45225 z M 56,527.42433 c 0,-0.51582 0.868825,-0.87241 1.930722,-0.79241 1.061897,0.08 1.710339,0.50202 1.440983,0.93785 C 58.686419,528.67858 56,528.5627 56,527.42433 z m 7.696917,-0.45528 c -0.409197,-1.04122 -0.508402,-2.12872 -0.220456,-2.41666 0.91206,-0.91206 1.714561,0.58256 1.332392,2.48152 -0.350243,1.74033 -0.403729,1.73721 -1.111936,-0.0649 z M 90.5,526.36218 c -0.591982,-1.86517 -1.736214,-2.47275 -3.897148,-2.06937 -0.493432,0.0921 -0.155932,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.167845,-5.58423 0.672148,-5.58423 -0.540872,0 -0.718644,-1.28178 -0.399256,-2.87872 0.692849,-3.46424 -1.332361,-5.24299 -3.1458,-2.76296 -1.080063,1.47707 -1.357435,1.49422 -2.47074,0.15277 -0.689752,-0.8311 -2.128577,-1.51109 -3.19739,-1.51109 -1.068813,0 -2.769543,-0.44219 -3.779399,-0.98265 -1.551676,-0.83043 -1.753393,-0.66637 -1.302178,1.05908 0.390745,1.49421 -0.0383,2.19137 -1.599905,2.59974 -1.278027,0.33421 -2.433926,1.71612 -2.882081,3.4456 -0.926234,3.57446 -2.640327,3.80366 -3.064627,0.4098 -0.239509,-1.91577 0.273933,-2.75503 2.113306,-3.45436 1.336324,-0.50807 2.68336,-1.89384 2.993412,-3.07948 0.451486,-1.72648 0.229815,-2.01748 -1.113305,-1.46147 -5.685387,2.35358 -8.400394,2.32578 -10.656986,-0.10913 -2.239511,-2.41647 -2.239511,-2.41647 -5.128955,0.26138 -2.847928,2.63937 -5.360813,0.88121 -2.63559,-1.84402 1.780268,-1.78026 -1.938125,-7.92517 -4.444221,-7.34438 -3.615262,0.83783 -3.517367,-1.10555 0.198459,-3.93974 4.186314,-3.19306 4.282774,-4.3519 0.84984,-10.20976 -3.029424,-5.16932 -5.077383,-19.22645 -3.004036,-20.61961 0.806655,-0.54203 0.627922,-1.16489 -0.605548,-2.11025 -3.325028,-2.54837 -2.212109,-5.47361 1.355956,-3.56404 2.689657,1.43946 9.562135,-2.54678 7.881678,-4.57161 -1.614969,-1.94592 0.543446,-2.81116 2.39466,-0.95995 1.932595,1.9326 0.234654,6.47485 -2.420364,6.47485 -2.390146,0 -4.051441,2.23713 -2.965777,3.99377 0.740689,1.19846 1.218594,1.12186 2.987344,-0.47884 3.406254,-3.08261 7.063255,-3.27149 3.920021,-0.20246 -1.321935,1.29073 -3.198156,2.63706 -4.169381,2.99186 -1.463856,0.53475 -1.653838,1.37626 -1.110841,4.92037 1.036819,6.76728 2.913385,6.57626 2.640423,-0.26877 -0.134821,-3.38089 0.142221,-3.95593 1.905896,-3.95593 1.571318,0 1.938872,0.47715 1.540636,2 -0.287656,1.1 -0.115141,2 0.383369,2 0.498509,0 0.96263,-0.45 1.03138,-1 0.238805,-1.91044 0.467909,-2.51699 2.115671,-5.60124 1.187834,-2.22337 1.350686,-3.4074 0.575302,-4.18279 -0.621603,-0.6216 -0.749078,-1.85432 -0.299757,-2.89875 1.303858,-3.03077 1.124261,-9.3161 -0.266216,-9.31669 -1.489085,-6.3e-4 -1.676094,-2.61915 -0.25,-3.50053 2.022248,-1.24982 1.004309,-3.5 -1.583333,-3.5 -1.628176,0 -2.425149,-0.46217 -2.155505,-1.25 0.8577,-2.50597 12.235836,-1.56907 15.262791,1.25676 9.369225,8.74672 9.558066,30.04723 0.394255,44.47037 -3.908079,6.15102 3.276749,13.99627 15.520797,16.94746 8.108519,1.9544 13.904595,10.2116 16.022105,22.82541 0.75747,4.5122 -13.553142,6.18611 -14.96111,1.75 z m -6.090775,-20.1003 c -1.883722,-2.0815 -5.196659,-3.05266 -5.996842,-1.75793 -1.215823,1.96724 0.488687,3.45823 3.953475,3.45823 3.308319,0 3.464506,-0.12996 2.043367,-1.7003 z M 49,465.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.772141,57.4647 c 2.492459,-3.37124 5.498463,-4.13134 3.801947,-0.96137 -1.115671,2.08465 -2.792239,3.38743 -4.740006,3.68324 -0.667664,0.1014 -0.247131,-1.11882 0.938059,-2.72187 z m 15.267776,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.984111,-1.62354 1.914649,-0.73472 2.981717,0.0749 2.061373,1.56407 -0.830379,1.34358 -2.234909,1.371 -3.045484,0.0595 z m 17.198218,0.36758 c -0.925629,-0.92563 0.189072,-2.36052 1.833779,-2.36052 0.842134,0 1.177876,0.60386 0.833994,1.5 -0.610368,1.59059 -1.613974,1.91432 -2.667773,0.86052 z M 24,522.37361 c 0,-1.24034 3.17723,-5.01143 4.222241,-5.01143 1.216405,0 0.911488,3.46627 -0.422241,4.8 -1.450736,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.563834,-1.56383 -1.523926,-3.97474 0.102613,-6.19917 1.129249,-1.54434 1.463614,-1.58743 2.512331,-0.32381 0.959725,1.1564 0.897189,1.717 -0.302613,2.71275 -1.953977,1.62165 -1.932441,3.01023 0.04669,3.01023 0.857459,0 1.280902,0.45 0.940983,1 -0.818297,1.32403 -1.837753,1.26225 -3.3,-0.2 z m 17.043786,-0.05 c 0.225748,-0.6875 1.725748,-1.37269 3.333333,-1.52264 2.788155,-0.26007 2.833407,-0.20246 0.981751,1.25 -2.346126,1.84032 -4.882473,2.00058 -4.315084,0.27264 z m 28.413426,-2.29909 c 0.680432,-1.77318 3.471169,-1.56926 4.093255,0.29909 0.260434,0.78218 -0.538884,1.25 -2.135749,1.25 -1.8935,0 -2.398572,-0.39969 -1.957506,-1.54909 z M 21,516.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.647568,-4.24293 c -0.841403,-3.14186 -0.799742,-3.81609 0.235801,-3.81609 1.240865,0 2.226771,4.28986 1.217791,5.29884 -0.458333,0.45833 -1.11245,-0.20891 -1.453592,-1.48275 z m 4.591902,-1.82793 c 0.691029,-1.10652 1.819842,-1.79564 2.508473,-1.53139 C 45.436575,509.0832 46,508.86353 46,508.3308 c 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.212109,0 1.824239,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.903813,0.88337 -2.008474,0.88337 -1.762089,0 -1.854346,-0.2468 -0.752056,-2.01184 z M 33,506.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.04125,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.429973,0.69664 c -0.606232,-0.98091 2.181599,-3.69502 2.977678,-2.89894 0.706368,0.70637 -0.591568,3.78563 -1.595677,3.78563 -0.458697,0 -1.080597,-0.39901 -1.382001,-0.88669 z M 44,453.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.273145,1.68903 0.606989,2.55901 0.398311,1.03799 0.05452,1.58179 -1,1.58179 C 44.682954,455.36218 44,454.53728 44,453.4212 z m 7,-4.85902 c 0,-3.04736 4.537474,-4.07671 5.289749,-1.2 0.434416,1.66121 0.03068,2 -2.383369,2 -1.598509,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.434447,-5.29196 7.396256,-2.78553 0.909842,2.37101 -0.318374,3.71929 -2.066485,2.26848 -1.165167,-0.967 -1.912674,-0.97579 -3.410972,-0.0401 C 50.863459,442.83989 50,443.0906 50,442.73795 z" - id="path5783" - inkscape:connector-curvature="0" /> - <path - style="fill:#b3bcc9" - d="m 92,525.56218 c 0,-1.54 -0.527793,-3.32779 -1.172874,-3.97287 -0.855295,-0.8553 -0.884251,-1.80634 -0.106941,-3.51235 1.75157,-3.84427 -0.705254,-11.42904 -4.802674,-14.82692 -4.086046,-3.38846 -2.898331,-3.60091 4.550449,-0.81396 13.71103,5.12995 20.56433,25.9261 8.543858,25.9261 -7.011818,0 -7.011818,0 -7.011818,-2.8 z M 59.910502,504.75434 c -0.635465,-0.76569 -1.955842,-1.39216 -2.934171,-1.39216 -0.978329,0 -2.708052,-1.575 -3.84383,-3.5 -1.135778,-1.925 -2.755227,-3.5 -3.598776,-3.5 -1.951918,0 -1.967601,-1.39503 -0.03372,-3 2.076834,-1.72362 1.890939,-3.35723 -1,-8.78785 -4.069166,-7.64391 -3.455289,-10.71763 1.420545,-7.11277 5.169207,3.82176 11.750544,-2.46804 15.52335,-14.83571 1.370596,-4.49296 0.796129,-18.89883 -0.883128,-22.14616 -1.612127,-3.11751 -1.612127,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.559878,46.61877 -3.518421,5.84292 -3.518421,5.84292 2.297632,11.07309 3.521616,3.16687 5.178879,5.24555 4.200912,5.26916 -0.888328,0.0214 -2.688328,0.8515 -4,1.84459 -4.749564,3.59595 -14.858241,5.13632 -16.974357,2.58655 z" - id="path5785" - inkscape:connector-curvature="0" /> - <path - style="fill:#a9b6c7" - d="m 92.815054,521.61218 c 0.280763,-4.98157 -0.149325,-8.25644 -1.641625,-12.5 -2.022056,-5.75 -2.022056,-5.75 0.0199,-5.75 4.892222,0 12.116871,11.11379 14.138841,21.75 0.61783,3.25 0.61783,3.25 -6.139863,3.25 -6.757689,0 -6.757689,0 -6.377257,-6.75 z M 57.736081,502.60026 c -4.74666,-2.19188 -8.21023,-7.48361 -6.720339,-10.26749 0.787293,-1.47107 0.578728,-2.8552 -0.859855,-5.70638 -3.780683,-7.49305 -3.71844,-7.75193 1.891408,-7.86675 11.763399,-0.24076 19.607447,-21.36594 14.350292,-38.64746 -1.513683,-4.97583 8.15369,0.5478 11.171092,6.38281 4.79792,9.27815 2.757176,28.21359 -4.135306,38.37023 -3.248042,4.78626 -3.108843,5.61941 1.566627,9.37672 8.383493,6.73716 -5.850701,13.62864 -17.263919,8.35832 z" - id="path5787" - inkscape:connector-curvature="0" /> - <path - style="fill:#a5aeba" - d="m 95,519.94322 c 0,-6.15501 -0.465546,-9.23013 -1.731223,-11.43544 -2.129347,-3.71017 -1.162952,-4.96151 2.153516,-2.78847 3.134773,2.05398 7.071677,8.79205 8.555507,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z M 63,502.21435 c -5.613254,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.901534,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.482187,-6.12103 12.466652,3.12893 23.836582,-23.06489 17.885689,-41.20469 -1.768008,-5.38933 6.735063,1.04007 9.607989,7.26486 3.853849,8.35016 1.790957,26.18765 -4.142144,35.81645 -3.771821,6.12126 -3.726023,7.00345 0.532187,10.25135 4.268856,3.25601 4.328389,3.95246 0.506787,5.92869 -5.335159,2.75892 -7.429145,3.16975 -12.006787,2.35568 z" - id="path5789" - inkscape:connector-curvature="0" /> - <path - style="fill:#99a5b4" - d="m 97.580726,526.11218 c -0.251559,-1.2375 -0.72938,-5.35305 -1.061826,-9.14566 -0.332446,-3.79262 -1.069261,-7.76418 -1.637367,-8.8257 -0.934152,-1.74548 -0.829324,-1.82107 1.096284,-0.79051 2.819043,1.5087 5.542873,6.12588 6.994333,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.326202,0 -4.056171,-0.37006 -4.438324,-2.25 z M 60.5,500.40269 c -3.265642,-1.35967 -7.602087,-6.57417 -8.46488,-10.17887 -0.442539,-1.8489 -1.129624,-4.14914 -1.526857,-5.11164 -0.576601,-1.39711 -0.209671,-1.75 1.819649,-1.75 12.357308,0 23.416086,-23.45864 18.741894,-39.7566 -1.195778,-4.16943 -0.0374,-4.10946 3.740804,0.19368 7.79605,8.87921 6.233208,28.06127 -3.573583,43.86154 -1.72735,2.78303 -1.718871,2.81367 1.521988,5.5 6.506488,5.39319 -3.087271,11.06061 -12.259015,7.24189 z" - id="path5791" - inkscape:connector-curvature="0" /> - <path - style="fill:#929ca9" - d="m 100.78845,526.61218 c -2.135149,-2.45575 -3.345892,-15.95753 -1.276991,-14.24049 0.800071,0.664 2.186211,3.746 3.080301,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.756084,-31 c -5.277946,-5.08752 -5.842086,-9.34879 -1.362926,-10.29495 10.175676,-2.14947 19.086762,-19.27014 18.092621,-34.76096 -0.486107,-7.57459 -0.486107,-7.57459 1.781461,-4.93839 6.180155,7.18486 4.779027,27.36115 -2.676692,38.54443 -3.503817,5.25559 -3.542145,6.21682 -0.36683,9.19987 3.118955,2.93011 3.114395,3.39903 -0.04705,4.83949 -5.40941,2.46469 -11.183057,1.49515 -15.420584,-2.58949 z" - id="path5793" - inkscape:connector-curvature="0" /> - <path - style="fill:#8a95a3" - d="m 101.70717,525.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.065403,-31 c -4.91445,-3.9769 -5.748541,-5.95905 -2.891767,-6.87206 5.527572,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.933234,-2.88544 2.073853,-5.01359 2.414595,-4.50511 5.220373,-17.98198 4.375484,-21.01657 -0.461667,-1.65818 -0.368419,-1.7777 0.455976,-0.58445 4.302348,6.22731 1.172547,26.46135 -5.612772,36.28634 -2.614917,3.78635 -2.614917,3.78635 -0.365672,6.82862 1.237084,1.67324 2.097118,3.17093 1.911187,3.3282 -4.208579,3.5597 -8.799793,3.17382 -14.196289,-1.19316 z" - id="path5795" - inkscape:connector-curvature="0" /> - <path - style="fill:#89929e" - d="m 68.553851,495.44931 c -0.369537,-0.59792 -1.542351,-1.08713 -2.606255,-1.08713 -1.842561,0 -1.829965,-0.12007 0.265385,-2.52994 2.199755,-2.52994 2.199755,-2.52994 3.583106,0.11028 1.388266,2.6496 0.236851,5.90001 -1.242236,3.50679 z m -9.192225,-2.58713 c -0.316582,-0.825 -1.202459,-1.5 -1.968615,-1.5 -0.766156,0 -1.393011,-0.45 -1.393011,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.944645,-1.14465 0.859526,-0.85952 1.306427,-0.50004 1.794143,1.44317 0.99716,3.973 -1.799649,6.79122 -3.177162,3.20148 z m 8.279576,-8.19213 c -0.380672,-0.38067 0.492512,-1.63673 1.940409,-2.79125 1.907671,-1.52112 2.773627,-3.32052 3.144932,-6.53498 0.281816,-2.43973 1.077686,-4.89617 1.768601,-5.45875 0.690915,-0.56259 1.74847,-1.92289 2.350124,-3.02289 1.570686,-2.87168 1.407159,-0.26284 -0.427266,6.81644 -2.261098,8.72586 -6.159851,13.60838 -8.7768,10.99143 z" - id="path5797" - inkscape:connector-curvature="0" /> - </g> - <g - id="g3694" - transform="translate(84.950091,-5.8293697)"> - <rect - ry="1.6497765" - rx="1.6497765" - y="320.32199" - x="4.0543771" - height="8.1750183" - width="34.242748" - id="rect3696" - style="color:#000000;fill:#aa0088;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <text - sodipodi:linespacing="125%" - id="text3698" - y="327.16464" - x="9.8441248" - style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - y="327.16464" - x="9.8441248" - id="tspan3700" - sodipodi:role="line">luther</tspan></text> - </g> - </g> - <g - transform="translate(-1050.9742,-245.6861)" - id="g3841" - style="display:inline"> - <g - transform="matrix(0.32832475,0,0,0.32832475,43.184716,216.8905)" - id="g3310-3" - style="display:inline"> - <path - inkscape:connector-curvature="0" - id="path3334-5" - d="m 15.652276,526.89841 c -0.610306,-1.59043 1.679869,-11.36996 3.481806,-14.86804 3.193736,-6.19997 6.408908,-8.92653 16.688018,-14.15192 15.103201,-7.67772 14.080467,-6.32495 10.351016,-13.69128 -14.619009,-28.87514 0.626491,-58.97154 24.060007,-47.49727 13.579837,6.6494 16.194478,31.36184 5.166481,48.83132 C 74.079822,487.61189 73,489.56197 73,489.85473 c 0,0.96965 10.409081,7.10101 16,9.42463 10.938874,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.810704,0.4196 z" - style="fill:#dce2e8" /> - <path - inkscape:connector-curvature="0" - id="path3332-9" - d="m 16,527.9114 c 0,-12.82229 7.444121,-22.89231 22.182697,-30.00761 12.879762,-6.21793 12.949565,-6.32177 9.035801,-13.4409 -14.220674,-25.86739 -1.36795,-55.39011 20.882279,-47.9666 14.595085,4.86946 18.104408,32.01735 6.356458,49.17313 -2.031924,2.96726 -2.353004,4.11342 -1.455316,5.19507 2.007816,2.41927 10.29052,7.29999 16.261866,9.58257 C 98.567144,504.00332 106,514.86317 106,524.89969 c 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" - style="fill:#d4dbe2" /> - <path - inkscape:connector-curvature="0" - id="path3330-6" - d="m 16.456704,526.61441 c 0.368875,-0.96127 1.119209,-3.83918 1.667409,-6.39535 2.216133,-10.33347 6.136986,-14.70774 18.826133,-21.00325 14.555889,-7.22166 14.803417,-7.54851 10.923343,-14.42362 -9.684632,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.784152,-11.11959 37.313196,18.96264 22.150804,45.86301 C 73.327781,486.9762 72,489.7139 72,490.18081 c 0,1.40694 10.137395,7.90103 15.78241,10.11034 9.778791,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.525159,9.96359 -42.526253,0 -45.068616,-0.1 -44.436307,-1.74777 z" - style="fill:#c9cfd7" /> - <path - inkscape:connector-curvature="0" - id="path3328-5" - d="m 17.373092,526.61218 c 0.279327,-0.9625 1.031608,-3.77247 1.671735,-6.24438 2.783906,-10.75028 5.91216,-14.19465 18.510886,-20.3814 14.312213,-7.02817 14.766578,-7.73334 10.45997,-16.23375 -9.151893,-18.06407 -4.861359,-45.39047 7.126784,-45.39047 1.093959,0 2.932921,-0.50516 4.086582,-1.12258 17.687459,-9.46604 28.608915,25.64678 14.765412,47.47125 -2.432458,3.83481 -2.830287,5.14422 -1.902558,6.26207 2.544299,3.06569 11.034196,8.55209 15.595883,10.07848 10.544154,3.52818 15.517054,10.12038 17.773324,23.56078 0.62952,3.75 0.62952,3.75 -43.983185,3.75 -42.015093,0 -44.583129,-0.10189 -44.104833,-1.75 z" - style="fill:#b6c5d8" /> - <path - inkscape:connector-curvature="0" - id="path3326-6" - d="m 18.625,527.56443 c -0.271169,-0.43876 -0.07962,-1.45126 0.42567,-2.25 0.717286,-1.13386 0.922062,-0.95895 0.934017,0.79775 0.01574,2.31303 -0.49232,2.85568 -1.359687,1.45225 z M 56,527.42433 c 0,-0.51582 0.868825,-0.87241 1.930722,-0.79241 1.061897,0.08 1.710339,0.50202 1.440983,0.93785 C 58.686419,528.67858 56,528.5627 56,527.42433 z m 7.696917,-0.45528 c -0.409197,-1.04122 -0.508402,-2.12872 -0.220456,-2.41666 0.91206,-0.91206 1.714561,0.58256 1.332392,2.48152 -0.350243,1.74033 -0.403729,1.73721 -1.111936,-0.0649 z M 90.5,526.36218 c -0.591982,-1.86517 -1.736214,-2.47275 -3.897148,-2.06937 -0.493432,0.0921 -0.155932,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.167845,-5.58423 0.672148,-5.58423 -0.540872,0 -0.718644,-1.28178 -0.399256,-2.87872 0.692849,-3.46424 -1.332361,-5.24299 -3.1458,-2.76296 -1.080063,1.47707 -1.357435,1.49422 -2.47074,0.15277 -0.689752,-0.8311 -2.128577,-1.51109 -3.19739,-1.51109 -1.068813,0 -2.769543,-0.44219 -3.779399,-0.98265 -1.551676,-0.83043 -1.753393,-0.66637 -1.302178,1.05908 0.390745,1.49421 -0.0383,2.19137 -1.599905,2.59974 -1.278027,0.33421 -2.433926,1.71612 -2.882081,3.4456 -0.926234,3.57446 -2.640327,3.80366 -3.064627,0.4098 -0.239509,-1.91577 0.273933,-2.75503 2.113306,-3.45436 1.336324,-0.50807 2.68336,-1.89384 2.993412,-3.07948 0.451486,-1.72648 0.229815,-2.01748 -1.113305,-1.46147 -5.685387,2.35358 -8.400394,2.32578 -10.656986,-0.10913 -2.239511,-2.41647 -2.239511,-2.41647 -5.128955,0.26138 -2.847928,2.63937 -5.360813,0.88121 -2.63559,-1.84402 1.780268,-1.78026 -1.938125,-7.92517 -4.444221,-7.34438 -3.615262,0.83783 -3.517367,-1.10555 0.198459,-3.93974 4.186314,-3.19306 4.282774,-4.3519 0.84984,-10.20976 -3.029424,-5.16932 -5.077383,-19.22645 -3.004036,-20.61961 0.806655,-0.54203 0.627922,-1.16489 -0.605548,-2.11025 -3.325028,-2.54837 -2.212109,-5.47361 1.355956,-3.56404 2.689657,1.43946 9.562135,-2.54678 7.881678,-4.57161 -1.614969,-1.94592 0.543446,-2.81116 2.39466,-0.95995 1.932595,1.9326 0.234654,6.47485 -2.420364,6.47485 -2.390146,0 -4.051441,2.23713 -2.965777,3.99377 0.740689,1.19846 1.218594,1.12186 2.987344,-0.47884 3.406254,-3.08261 7.063255,-3.27149 3.920021,-0.20246 -1.321935,1.29073 -3.198156,2.63706 -4.169381,2.99186 -1.463856,0.53475 -1.653838,1.37626 -1.110841,4.92037 1.036819,6.76728 2.913385,6.57626 2.640423,-0.26877 -0.134821,-3.38089 0.142221,-3.95593 1.905896,-3.95593 1.571318,0 1.938872,0.47715 1.540636,2 -0.287656,1.1 -0.115141,2 0.383369,2 0.498509,0 0.96263,-0.45 1.03138,-1 0.238805,-1.91044 0.467909,-2.51699 2.115671,-5.60124 1.187834,-2.22337 1.350686,-3.4074 0.575302,-4.18279 -0.621603,-0.6216 -0.749078,-1.85432 -0.299757,-2.89875 1.303858,-3.03077 1.124261,-9.3161 -0.266216,-9.31669 -1.489085,-6.3e-4 -1.676094,-2.61915 -0.25,-3.50053 2.022248,-1.24982 1.004309,-3.5 -1.583333,-3.5 -1.628176,0 -2.425149,-0.46217 -2.155505,-1.25 0.8577,-2.50597 12.235836,-1.56907 15.262791,1.25676 9.369225,8.74672 9.558066,30.04723 0.394255,44.47037 -3.908079,6.15102 3.276749,13.99627 15.520797,16.94746 8.108519,1.9544 13.904595,10.2116 16.022105,22.82541 0.75747,4.5122 -13.553142,6.18611 -14.96111,1.75 z m -6.090775,-20.1003 c -1.883722,-2.0815 -5.196659,-3.05266 -5.996842,-1.75793 -1.215823,1.96724 0.488687,3.45823 3.953475,3.45823 3.308319,0 3.464506,-0.12996 2.043367,-1.7003 z M 49,465.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.772141,57.4647 c 2.492459,-3.37124 5.498463,-4.13134 3.801947,-0.96137 -1.115671,2.08465 -2.792239,3.38743 -4.740006,3.68324 -0.667664,0.1014 -0.247131,-1.11882 0.938059,-2.72187 z m 15.267776,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.984111,-1.62354 1.914649,-0.73472 2.981717,0.0749 2.061373,1.56407 -0.830379,1.34358 -2.234909,1.371 -3.045484,0.0595 z m 17.198218,0.36758 c -0.925629,-0.92563 0.189072,-2.36052 1.833779,-2.36052 0.842134,0 1.177876,0.60386 0.833994,1.5 -0.610368,1.59059 -1.613974,1.91432 -2.667773,0.86052 z M 24,522.37361 c 0,-1.24034 3.17723,-5.01143 4.222241,-5.01143 1.216405,0 0.911488,3.46627 -0.422241,4.8 -1.450736,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.563834,-1.56383 -1.523926,-3.97474 0.102613,-6.19917 1.129249,-1.54434 1.463614,-1.58743 2.512331,-0.32381 0.959725,1.1564 0.897189,1.717 -0.302613,2.71275 -1.953977,1.62165 -1.932441,3.01023 0.04669,3.01023 0.857459,0 1.280902,0.45 0.940983,1 -0.818297,1.32403 -1.837753,1.26225 -3.3,-0.2 z m 17.043786,-0.05 c 0.225748,-0.6875 1.725748,-1.37269 3.333333,-1.52264 2.788155,-0.26007 2.833407,-0.20246 0.981751,1.25 -2.346126,1.84032 -4.882473,2.00058 -4.315084,0.27264 z m 28.413426,-2.29909 c 0.680432,-1.77318 3.471169,-1.56926 4.093255,0.29909 0.260434,0.78218 -0.538884,1.25 -2.135749,1.25 -1.8935,0 -2.398572,-0.39969 -1.957506,-1.54909 z M 21,516.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.647568,-4.24293 c -0.841403,-3.14186 -0.799742,-3.81609 0.235801,-3.81609 1.240865,0 2.226771,4.28986 1.217791,5.29884 -0.458333,0.45833 -1.11245,-0.20891 -1.453592,-1.48275 z m 4.591902,-1.82793 c 0.691029,-1.10652 1.819842,-1.79564 2.508473,-1.53139 C 45.436575,509.0832 46,508.86353 46,508.3308 c 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.212109,0 1.824239,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.903813,0.88337 -2.008474,0.88337 -1.762089,0 -1.854346,-0.2468 -0.752056,-2.01184 z M 33,506.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.04125,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.429973,0.69664 c -0.606232,-0.98091 2.181599,-3.69502 2.977678,-2.89894 0.706368,0.70637 -0.591568,3.78563 -1.595677,3.78563 -0.458697,0 -1.080597,-0.39901 -1.382001,-0.88669 z M 44,453.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.273145,1.68903 0.606989,2.55901 0.398311,1.03799 0.05452,1.58179 -1,1.58179 C 44.682954,455.36218 44,454.53728 44,453.4212 z m 7,-4.85902 c 0,-3.04736 4.537474,-4.07671 5.289749,-1.2 0.434416,1.66121 0.03068,2 -2.383369,2 -1.598509,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.434447,-5.29196 7.396256,-2.78553 0.909842,2.37101 -0.318374,3.71929 -2.066485,2.26848 -1.165167,-0.967 -1.912674,-0.97579 -3.410972,-0.0401 C 50.863459,442.83989 50,443.0906 50,442.73795 z" - style="fill:#b4c3d5" /> - <path - inkscape:connector-curvature="0" - id="path3324-3" - d="m 92,525.56218 c 0,-1.54 -0.527793,-3.32779 -1.172874,-3.97287 -0.855295,-0.8553 -0.884251,-1.80634 -0.106941,-3.51235 1.75157,-3.84427 -0.705254,-11.42904 -4.802674,-14.82692 -4.086046,-3.38846 -2.898331,-3.60091 4.550449,-0.81396 13.71103,5.12995 20.56433,25.9261 8.543858,25.9261 -7.011818,0 -7.011818,0 -7.011818,-2.8 z M 59.910502,504.75434 c -0.635465,-0.76569 -1.955842,-1.39216 -2.934171,-1.39216 -0.978329,0 -2.708052,-1.575 -3.84383,-3.5 -1.135778,-1.925 -2.755227,-3.5 -3.598776,-3.5 -1.951918,0 -1.967601,-1.39503 -0.03372,-3 2.076834,-1.72362 1.890939,-3.35723 -1,-8.78785 -4.069166,-7.64391 -3.455289,-10.71763 1.420545,-7.11277 5.169207,3.82176 11.750544,-2.46804 15.52335,-14.83571 1.370596,-4.49296 0.796129,-18.89883 -0.883128,-22.14616 -1.612127,-3.11751 -1.612127,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.559878,46.61877 -3.518421,5.84292 -3.518421,5.84292 2.297632,11.07309 3.521616,3.16687 5.178879,5.24555 4.200912,5.26916 -0.888328,0.0214 -2.688328,0.8515 -4,1.84459 -4.749564,3.59595 -14.858241,5.13632 -16.974357,2.58655 z" - style="fill:#b3bcc9" /> - <path - inkscape:connector-curvature="0" - id="path3322-0" - d="m 92.815054,521.61218 c 0.280763,-4.98157 -0.149325,-8.25644 -1.641625,-12.5 -2.022056,-5.75 -2.022056,-5.75 0.0199,-5.75 4.892222,0 12.116871,11.11379 14.138841,21.75 0.61783,3.25 0.61783,3.25 -6.139863,3.25 -6.757689,0 -6.757689,0 -6.377257,-6.75 z M 57.736081,502.60026 c -4.74666,-2.19188 -8.21023,-7.48361 -6.720339,-10.26749 0.787293,-1.47107 0.578728,-2.8552 -0.859855,-5.70638 -3.780683,-7.49305 -3.71844,-7.75193 1.891408,-7.86675 11.763399,-0.24076 19.607447,-21.36594 14.350292,-38.64746 -1.513683,-4.97583 8.15369,0.5478 11.171092,6.38281 4.79792,9.27815 2.757176,28.21359 -4.135306,38.37023 -3.248042,4.78626 -3.108843,5.61941 1.566627,9.37672 8.383493,6.73716 -5.850701,13.62864 -17.263919,8.35832 z" - style="fill:#a9b6c7" /> - <path - inkscape:connector-curvature="0" - id="path3320-2" - d="m 95,519.94322 c 0,-6.15501 -0.465546,-9.23013 -1.731223,-11.43544 -2.129347,-3.71017 -1.162952,-4.96151 2.153516,-2.78847 3.134773,2.05398 7.071677,8.79205 8.555507,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z M 63,502.21435 c -5.613254,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.901534,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.482187,-6.12103 12.466652,3.12893 23.836582,-23.06489 17.885689,-41.20469 -1.768008,-5.38933 6.735063,1.04007 9.607989,7.26486 3.853849,8.35016 1.790957,26.18765 -4.142144,35.81645 -3.771821,6.12126 -3.726023,7.00345 0.532187,10.25135 4.268856,3.25601 4.328389,3.95246 0.506787,5.92869 -5.335159,2.75892 -7.429145,3.16975 -12.006787,2.35568 z" - style="fill:#a5aeba" /> - <path - inkscape:connector-curvature="0" - id="path3318-0" - d="m 97.580726,526.11218 c -0.251559,-1.2375 -0.72938,-5.35305 -1.061826,-9.14566 -0.332446,-3.79262 -1.069261,-7.76418 -1.637367,-8.8257 -0.934152,-1.74548 -0.829324,-1.82107 1.096284,-0.79051 2.819043,1.5087 5.542873,6.12588 6.994333,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.326202,0 -4.056171,-0.37006 -4.438324,-2.25 z M 60.5,500.40269 c -3.265642,-1.35967 -7.602087,-6.57417 -8.46488,-10.17887 -0.442539,-1.8489 -1.129624,-4.14914 -1.526857,-5.11164 -0.576601,-1.39711 -0.209671,-1.75 1.819649,-1.75 12.357308,0 23.416086,-23.45864 18.741894,-39.7566 -1.195778,-4.16943 -0.0374,-4.10946 3.740804,0.19368 7.79605,8.87921 6.233208,28.06127 -3.573583,43.86154 -1.72735,2.78303 -1.718871,2.81367 1.521988,5.5 6.506488,5.39319 -3.087271,11.06061 -12.259015,7.24189 z" - style="fill:#99a5b4" /> - <path - inkscape:connector-curvature="0" - id="path3316-7" - d="m 100.78845,526.61218 c -2.135149,-2.45575 -3.345892,-15.95753 -1.276991,-14.24049 0.800071,0.664 2.186211,3.746 3.080301,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.756084,-31 c -5.277946,-5.08752 -5.842086,-9.34879 -1.362926,-10.29495 10.175676,-2.14947 19.086762,-19.27014 18.092621,-34.76096 -0.486107,-7.57459 -0.486107,-7.57459 1.781461,-4.93839 6.180155,7.18486 4.779027,27.36115 -2.676692,38.54443 -3.503817,5.25559 -3.542145,6.21682 -0.36683,9.19987 3.118955,2.93011 3.114395,3.39903 -0.04705,4.83949 -5.40941,2.46469 -11.183057,1.49515 -15.420584,-2.58949 z" - style="fill:#929ca9" /> - <path - inkscape:connector-curvature="0" - id="path3314-4" - d="m 101.70717,525.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.065403,-31 c -4.91445,-3.9769 -5.748541,-5.95905 -2.891767,-6.87206 5.527572,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.933234,-2.88544 2.073853,-5.01359 2.414595,-4.50511 5.220373,-17.98198 4.375484,-21.01657 -0.461667,-1.65818 -0.368419,-1.7777 0.455976,-0.58445 4.302348,6.22731 1.172547,26.46135 -5.612772,36.28634 -2.614917,3.78635 -2.614917,3.78635 -0.365672,6.82862 1.237084,1.67324 2.097118,3.17093 1.911187,3.3282 -4.208579,3.5597 -8.799793,3.17382 -14.196289,-1.19316 z" - style="fill:#8a95a3" /> - <path - inkscape:connector-curvature="0" - id="path3312-7" - d="m 68.553851,495.44931 c -0.369537,-0.59792 -1.542351,-1.08713 -2.606255,-1.08713 -1.842561,0 -1.829965,-0.12007 0.265385,-2.52994 2.199755,-2.52994 2.199755,-2.52994 3.583106,0.11028 1.388266,2.6496 0.236851,5.90001 -1.242236,3.50679 z m -9.192225,-2.58713 c -0.316582,-0.825 -1.202459,-1.5 -1.968615,-1.5 -0.766156,0 -1.393011,-0.45 -1.393011,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.944645,-1.14465 0.859526,-0.85952 1.306427,-0.50004 1.794143,1.44317 0.99716,3.973 -1.799649,6.79122 -3.177162,3.20148 z m 8.279576,-8.19213 c -0.380672,-0.38067 0.492512,-1.63673 1.940409,-2.79125 1.907671,-1.52112 2.773627,-3.32052 3.144932,-6.53498 0.281816,-2.43973 1.077686,-4.89617 1.768601,-5.45875 0.690915,-0.56259 1.74847,-1.92289 2.350124,-3.02289 1.570686,-2.87168 1.407159,-0.26284 -0.427266,6.81644 -2.261098,8.72586 -6.159851,13.60838 -8.7768,10.99143 z" - style="fill:#89929e" /> - </g> - <g - id="g3702" - transform="translate(42,82)"> - <rect - style="color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3704" - width="34.242748" - height="8.1750183" - x="4.0543771" - y="309.32199" - rx="1.6497765" - ry="1.6497765" /> - <text - xml:space="preserve" - style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="13.782688" - y="316.16464" - id="text3706" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan3708" - x="13.782688" - y="316.16464">laila</tspan></text> - </g> - </g> - <g - transform="translate(-1051.2436,-269.08037)" - id="g3801" - style="display:inline"> - <g - id="g3629" - transform="matrix(0.32896515,0,0,0.32896515,-246.21372,55.85625)"> - <g - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-gen.png" - id="g3631" - transform="translate(350,0)"> - <path - inkscape:connector-curvature="0" - id="path3633" - d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" - style="fill:#dce2e8" /> - <path - inkscape:connector-curvature="0" - id="path3635" - d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" - style="fill:#d4dbe2" /> - <path - inkscape:connector-curvature="0" - id="path3637" - d="m 597.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" - style="fill:#a9b6c7;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3639" - d="m 595.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" - style="fill:#b6c5d8;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3641" - d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" - style="fill:#c9cfd7" /> - <path - inkscape:connector-curvature="0" - id="path3643" - d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" - style="fill:#b6c5d8" /> - <path - inkscape:connector-curvature="0" - id="path3645" - d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" - style="fill:#89929e" /> - <path - inkscape:connector-curvature="0" - id="path3647" - d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" - style="fill:#b4c3d5" /> - <path - inkscape:connector-curvature="0" - id="path3649" - d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" - style="fill:#b3bcc9" /> - <path - inkscape:connector-curvature="0" - id="path3651" - d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" - style="fill:#a9b6c7" /> - <path - inkscape:connector-curvature="0" - id="path3653" - d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" - style="fill:#a5aeba" /> - <path - inkscape:connector-curvature="0" - id="path3655" - d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" - style="fill:#99a5b4" /> - <path - inkscape:connector-curvature="0" - id="path3657" - d="m 597.625,771.4375 c -3.21749,0.80995 -6.35889,1.89093 -9.49855,2.95674 -0.97154,0.37142 -1.85289,0.9729 -2.5952,1.69951 -0.85286,0.75372 -1.5183,1.68678 -2.24295,2.5579 -1.43359,1.82026 -2.70936,3.75542 -4.06955,5.6296 -0.88196,1.49498 -1.70097,3.03188 -2.28734,4.66945 -0.773,1.87386 -1.3796,3.81126 -2.03693,5.7276 -1.48856,4.58577 -2.86664,9.20755 -4.15527,13.85304 -0.38084,1.5389 -0.8175,3.06718 -1.11421,4.62491 -0.0983,1.32482 0.42765,2.57219 0.8125,3.8125 0.65443,1.89642 1.24797,3.81318 1.875,5.71875 0.4387,1.03708 1.53192,1.69185 2.625,1.8125 1.24203,-0.0193 2.52075,0.0375 3.71875,-0.34375 1.02063,-0.39402 1.60505,-1.36074 1.86562,-2.3781 0.73273,-2.56005 1.01952,-5.21766 1.50049,-7.83083 0.4005,-2.37627 0.77571,-4.75672 1.16514,-7.13482 0.60941,-2.21748 1.28797,-4.41783 2.03973,-6.59038 0.78279,-2.02938 1.71569,-3.99664 2.55402,-6.00337 0.89003,-1.89943 1.86665,-3.76562 3.01491,-5.52201 1.40777,-2.01133 3.33858,-3.57662 5.32812,-4.9803 1.23992,-0.75485 2.42213,-1.59957 3.68923,-2.3108 1.42795,-0.88217 2.95575,-1.58776 4.46774,-2.31189 0.99896,-0.30772 1.95269,-0.81445 2.99484,-0.95052 0.94868,-0.0968 1.93298,0.0577 2.84891,-0.26823 0.92455,-0.56794 0.73006,-1.98773 -0.15625,-2.5 -0.80724,-0.63096 -1.7434,-1.0782 -2.63346,-1.5793 -1.68129,-0.84475 -3.47432,-1.44213 -5.30345,-1.87163 -1.35714,-0.28247 -2.73917,-0.47084 -4.12559,-0.51782 l -0.18169,0.0202 -0.0996,0.0111 z" - style="fill:#99a5b4;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3659" - d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" - style="fill:#929ca9" /> - <path - inkscape:connector-curvature="0" - id="path3661" - d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" - style="fill:#8a95a3;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3663" - d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" - style="fill:#8a95a3" /> - </g> - <path - inkscape:connector-curvature="0" - id="path3665" - d="m 902.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" - style="fill:#dce2e8" /> - <path - inkscape:connector-curvature="0" - id="path3667" - d="m 902.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" - style="fill:#d4dbe2" /> - <path - inkscape:connector-curvature="0" - id="path3669" - d="m 947.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" - style="fill:#a9b6c7;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3671" - d="m 945.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" - style="fill:#b6c5d8;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3673" - d="m 903.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" - style="fill:#c9cfd7" /> - <path - inkscape:connector-curvature="0" - id="path3675" - d="m 904.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" - style="fill:#b6c5d8" /> - <path - inkscape:connector-curvature="0" - id="path3677" - d="m 955.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" - style="fill:#89929e" /> - <path - inkscape:connector-curvature="0" - id="path3679" - d="m 905.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" - style="fill:#b4c3d5" /> - <path - inkscape:connector-curvature="0" - id="path3681" - d="m 978.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" - style="fill:#b3bcc9" /> - <path - inkscape:connector-curvature="0" - id="path3683" - d="m 979.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" - style="fill:#a9b6c7" /> - <path - inkscape:connector-curvature="0" - id="path3685" - d="m 981.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" - style="fill:#a5aeba" /> - <path - inkscape:connector-curvature="0" - id="path3687" - d="m 984.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 947.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" - style="fill:#99a5b4" /> - <path - inkscape:connector-curvature="0" - id="path3689" - d="m 987.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" - style="fill:#929ca9" /> - <path - inkscape:connector-curvature="0" - id="path3691" - d="m 988.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" - style="fill:#8a95a3" /> - <path - inkscape:connector-curvature="0" - id="path3693" - d="m 954.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" - style="fill:#8a95a3;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path3695" - d="m 946.9375,772.125 c -9.56715,1.74839 -17.25457,9.64487 -19.96875,18.8125 -4.82877,10.88517 -7.07054,23.03246 -5.61836,34.90144 0.0198,1.07326 0.1459,2.15794 -0.0379,3.22356 3.75192,-4.50382 3.8025,-10.67156 5.9811,-15.89686 3.37158,-10.6816 8.79354,-21.17419 17.67515,-28.29064 4.36603,-3.68349 9.47725,-6.3808 14.71875,-8.59375 0.72214,-1.81857 -1.47582,-3.24498 -3.09375,-3.125 -3.11721,-0.92307 -6.41633,-1.23 -9.65625,-1.03125 z" - style="fill:#99a5b4;fill-opacity:1" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> - <g - id="g3718" - transform="translate(44.271316,-1.2461478)"> - <rect - ry="1.6497765" - rx="1.6497765" - y="342.32199" - x="4.0543771" - height="8.1750183" - width="34.242748" - id="rect3720" - style="color:#000000;fill:#8d5fd3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <text - sodipodi:linespacing="125%" - id="text3722" - y="349.16464" - x="8.4838123" - style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - y="349.16464" - x="8.4838123" - id="tspan3724" - sodipodi:role="line">richard</tspan></text> - </g> - </g> - <g - transform="translate(-1078.381,-239.13572)" - id="g3879" - style="display:inline"> - <g - id="g5522" - transform="matrix(0.32896515,0,0,0.32896515,-199.52174,148.10628)"> - <g - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-gen.png" - id="g32891" - transform="translate(350,0)"> - <path - inkscape:connector-curvature="0" - id="path32893" - d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" - style="fill:#dce2e8" /> - <path - inkscape:connector-curvature="0" - id="path32895" - d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" - style="fill:#d4dbe2" /> - <path - inkscape:connector-curvature="0" - id="path32897" - d="m 597.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" - style="fill:#a9b6c7;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path32899" - d="m 595.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" - style="fill:#b6c5d8;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path32901" - d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" - style="fill:#c9cfd7" /> - <path - inkscape:connector-curvature="0" - id="path32903" - d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" - style="fill:#b6c5d8" /> - <path - inkscape:connector-curvature="0" - id="path32905" - d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" - style="fill:#89929e" /> - <path - inkscape:connector-curvature="0" - id="path32907" - d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" - style="fill:#b4c3d5" /> - <path - inkscape:connector-curvature="0" - id="path32909" - d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" - style="fill:#b3bcc9" /> - <path - inkscape:connector-curvature="0" - id="path32911" - d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" - style="fill:#a9b6c7" /> - <path - inkscape:connector-curvature="0" - id="path32913" - d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" - style="fill:#a5aeba" /> - <path - inkscape:connector-curvature="0" - id="path32915" - d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" - style="fill:#99a5b4" /> - <path - inkscape:connector-curvature="0" - id="path32917" - d="m 597.625,771.4375 c -3.21749,0.80995 -6.35889,1.89093 -9.49855,2.95674 -0.97154,0.37142 -1.85289,0.9729 -2.5952,1.69951 -0.85286,0.75372 -1.5183,1.68678 -2.24295,2.5579 -1.43359,1.82026 -2.70936,3.75542 -4.06955,5.6296 -0.88196,1.49498 -1.70097,3.03188 -2.28734,4.66945 -0.773,1.87386 -1.3796,3.81126 -2.03693,5.7276 -1.48856,4.58577 -2.86664,9.20755 -4.15527,13.85304 -0.38084,1.5389 -0.8175,3.06718 -1.11421,4.62491 -0.0983,1.32482 0.42765,2.57219 0.8125,3.8125 0.65443,1.89642 1.24797,3.81318 1.875,5.71875 0.4387,1.03708 1.53192,1.69185 2.625,1.8125 1.24203,-0.0193 2.52075,0.0375 3.71875,-0.34375 1.02063,-0.39402 1.60505,-1.36074 1.86562,-2.3781 0.73273,-2.56005 1.01952,-5.21766 1.50049,-7.83083 0.4005,-2.37627 0.77571,-4.75672 1.16514,-7.13482 0.60941,-2.21748 1.28797,-4.41783 2.03973,-6.59038 0.78279,-2.02938 1.71569,-3.99664 2.55402,-6.00337 0.89003,-1.89943 1.86665,-3.76562 3.01491,-5.52201 1.40777,-2.01133 3.33858,-3.57662 5.32812,-4.9803 1.23992,-0.75485 2.42213,-1.59957 3.68923,-2.3108 1.42795,-0.88217 2.95575,-1.58776 4.46774,-2.31189 0.99896,-0.30772 1.95269,-0.81445 2.99484,-0.95052 0.94868,-0.0968 1.93298,0.0577 2.84891,-0.26823 0.92455,-0.56794 0.73006,-1.98773 -0.15625,-2.5 -0.80724,-0.63096 -1.7434,-1.0782 -2.63346,-1.5793 -1.68129,-0.84475 -3.47432,-1.44213 -5.30345,-1.87163 -1.35714,-0.28247 -2.73917,-0.47084 -4.12559,-0.51782 l -0.18169,0.0202 -0.0996,0.0111 z" - style="fill:#99a5b4;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path32919" - d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" - style="fill:#929ca9" /> - <path - inkscape:connector-curvature="0" - id="path32921" - d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" - style="fill:#8a95a3;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path32923" - d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" - style="fill:#8a95a3" /> - </g> - <path - inkscape:connector-curvature="0" - id="path32959" - d="m 902.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" - style="fill:#dce2e8" /> - <path - inkscape:connector-curvature="0" - id="path32961" - d="m 902.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" - style="fill:#d4dbe2" /> - <path - inkscape:connector-curvature="0" - id="path32963" - d="m 947.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" - style="fill:#a9b6c7;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path32965" - d="m 945.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" - style="fill:#b6c5d8;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path32967" - d="m 903.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" - style="fill:#c9cfd7" /> - <path - inkscape:connector-curvature="0" - id="path32969" - d="m 904.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" - style="fill:#b6c5d8" /> - <path - inkscape:connector-curvature="0" - id="path32971" - d="m 955.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" - style="fill:#89929e" /> - <path - inkscape:connector-curvature="0" - id="path32973" - d="m 905.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" - style="fill:#b4c3d5" /> - <path - inkscape:connector-curvature="0" - id="path32975" - d="m 978.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" - style="fill:#b3bcc9" /> - <path - inkscape:connector-curvature="0" - id="path32977" - d="m 979.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" - style="fill:#a9b6c7" /> - <path - inkscape:connector-curvature="0" - id="path32979" - d="m 981.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" - style="fill:#a5aeba" /> - <path - inkscape:connector-curvature="0" - id="path32981" - d="m 984.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 947.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" - style="fill:#99a5b4" /> - <path - inkscape:connector-curvature="0" - id="path32985" - d="m 987.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" - style="fill:#929ca9" /> - <path - inkscape:connector-curvature="0" - id="path32989" - d="m 988.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" - style="fill:#8a95a3" /> - <path - inkscape:connector-curvature="0" - id="path32987" - d="m 954.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" - style="fill:#8a95a3;fill-opacity:1" /> - <path - inkscape:connector-curvature="0" - id="path32983" - d="m 946.9375,772.125 c -9.56715,1.74839 -17.25457,9.64487 -19.96875,18.8125 -4.82877,10.88517 -7.07054,23.03246 -5.61836,34.90144 0.0198,1.07326 0.1459,2.15794 -0.0379,3.22356 3.75192,-4.50382 3.8025,-10.67156 5.9811,-15.89686 3.37158,-10.6816 8.79354,-21.17419 17.67515,-28.29064 4.36603,-3.68349 9.47725,-6.3808 14.71875,-8.59375 0.72214,-1.81857 -1.47582,-3.24498 -3.09375,-3.125 -3.11721,-0.92307 -6.41633,-1.23 -9.65625,-1.03125 z" - style="fill:#99a5b4;fill-opacity:1" - sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> - </g> - <g - id="g3726" - transform="translate(91,102)"> - <rect - style="color:#000000;fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect3728" - width="34.242748" - height="8.1750183" - x="4.0543771" - y="331.32199" - rx="1.6497765" - ry="1.6497765" /> - <text - xml:space="preserve" - style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="5.1400628" - y="338.16464" - id="text3730" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - id="tspan3732" - x="5.1400628" - y="338.16464">bertrand</tspan></text> - </g> - </g> - <g - transform="translate(-1065.2093,-213.69216)" - id="g3860" - style="display:inline"> - <g - id="g5773-9" - transform="matrix(0.32832475,0,0,0.32832475,152.67902,228.57631)" - style="display:inline"> - <path - style="fill:#dce2e8" - d="m 15.652276,526.89841 c -0.610306,-1.59043 1.679869,-11.36996 3.481806,-14.86804 3.193736,-6.19997 6.408908,-8.92653 16.688018,-14.15192 15.103201,-7.67772 14.080467,-6.32495 10.351016,-13.69128 -14.619009,-28.87514 0.626491,-58.97154 24.060007,-47.49727 13.579837,6.6494 16.194478,31.36184 5.166481,48.83132 C 74.079822,487.61189 73,489.56197 73,489.85473 c 0,0.96965 10.409081,7.10101 16,9.42463 10.938874,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.810704,0.4196 z" - id="path5775-3" - inkscape:connector-curvature="0" /> - <path - style="fill:#d4dbe2" - d="m 16,527.9114 c 0,-12.82229 7.444121,-22.89231 22.182697,-30.00761 12.879762,-6.21793 12.949565,-6.32177 9.035801,-13.4409 -14.220674,-25.86739 -1.36795,-55.39011 20.882279,-47.9666 14.595085,4.86946 18.104408,32.01735 6.356458,49.17313 -2.031924,2.96726 -2.353004,4.11342 -1.455316,5.19507 2.007816,2.41927 10.29052,7.29999 16.261866,9.58257 C 98.567144,504.00332 106,514.86317 106,524.89969 c 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" - id="path5777-3" - inkscape:connector-curvature="0" /> - <path - style="fill:#c9cfd7" - d="m 16.456704,526.61441 c 0.368875,-0.96127 1.119209,-3.83918 1.667409,-6.39535 2.216133,-10.33347 6.136986,-14.70774 18.826133,-21.00325 14.555889,-7.22166 14.803417,-7.54851 10.923343,-14.42362 -9.684632,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.784152,-11.11959 37.313196,18.96264 22.150804,45.86301 C 73.327781,486.9762 72,489.7139 72,490.18081 c 0,1.40694 10.137395,7.90103 15.78241,10.11034 9.778791,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.525159,9.96359 -42.526253,0 -45.068616,-0.1 -44.436307,-1.74777 z" - id="path5779-7" - inkscape:connector-curvature="0" /> - <path - style="fill:#b6c5d8" - d="m 17.373092,526.61218 c 0.279327,-0.9625 1.031608,-3.77247 1.671735,-6.24438 2.783906,-10.75028 5.91216,-14.19465 18.510886,-20.3814 14.312213,-7.02817 14.766578,-7.73334 10.45997,-16.23375 -9.151893,-18.06407 -4.861359,-45.39047 7.126784,-45.39047 1.093959,0 2.932921,-0.50516 4.086582,-1.12258 17.687459,-9.46604 28.608915,25.64678 14.765412,47.47125 -2.432458,3.83481 -2.830287,5.14422 -1.902558,6.26207 2.544299,3.06569 11.034196,8.55209 15.595883,10.07848 10.544154,3.52818 15.517054,10.12038 17.773324,23.56078 0.62952,3.75 0.62952,3.75 -43.983185,3.75 -42.015093,0 -44.583129,-0.10189 -44.104833,-1.75 z" - id="path5781-4" - inkscape:connector-curvature="0" /> - <path - style="fill:#b4c3d5" - d="m 18.625,527.56443 c -0.271169,-0.43876 -0.07962,-1.45126 0.42567,-2.25 0.717286,-1.13386 0.922062,-0.95895 0.934017,0.79775 0.01574,2.31303 -0.49232,2.85568 -1.359687,1.45225 z M 56,527.42433 c 0,-0.51582 0.868825,-0.87241 1.930722,-0.79241 1.061897,0.08 1.710339,0.50202 1.440983,0.93785 C 58.686419,528.67858 56,528.5627 56,527.42433 z m 7.696917,-0.45528 c -0.409197,-1.04122 -0.508402,-2.12872 -0.220456,-2.41666 0.91206,-0.91206 1.714561,0.58256 1.332392,2.48152 -0.350243,1.74033 -0.403729,1.73721 -1.111936,-0.0649 z M 90.5,526.36218 c -0.591982,-1.86517 -1.736214,-2.47275 -3.897148,-2.06937 -0.493432,0.0921 -0.155932,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.167845,-5.58423 0.672148,-5.58423 -0.540872,0 -0.718644,-1.28178 -0.399256,-2.87872 0.692849,-3.46424 -1.332361,-5.24299 -3.1458,-2.76296 -1.080063,1.47707 -1.357435,1.49422 -2.47074,0.15277 -0.689752,-0.8311 -2.128577,-1.51109 -3.19739,-1.51109 -1.068813,0 -2.769543,-0.44219 -3.779399,-0.98265 -1.551676,-0.83043 -1.753393,-0.66637 -1.302178,1.05908 0.390745,1.49421 -0.0383,2.19137 -1.599905,2.59974 -1.278027,0.33421 -2.433926,1.71612 -2.882081,3.4456 -0.926234,3.57446 -2.640327,3.80366 -3.064627,0.4098 -0.239509,-1.91577 0.273933,-2.75503 2.113306,-3.45436 1.336324,-0.50807 2.68336,-1.89384 2.993412,-3.07948 0.451486,-1.72648 0.229815,-2.01748 -1.113305,-1.46147 -5.685387,2.35358 -8.400394,2.32578 -10.656986,-0.10913 -2.239511,-2.41647 -2.239511,-2.41647 -5.128955,0.26138 -2.847928,2.63937 -5.360813,0.88121 -2.63559,-1.84402 1.780268,-1.78026 -1.938125,-7.92517 -4.444221,-7.34438 -3.615262,0.83783 -3.517367,-1.10555 0.198459,-3.93974 4.186314,-3.19306 4.282774,-4.3519 0.84984,-10.20976 -3.029424,-5.16932 -5.077383,-19.22645 -3.004036,-20.61961 0.806655,-0.54203 0.627922,-1.16489 -0.605548,-2.11025 -3.325028,-2.54837 -2.212109,-5.47361 1.355956,-3.56404 2.689657,1.43946 9.562135,-2.54678 7.881678,-4.57161 -1.614969,-1.94592 0.543446,-2.81116 2.39466,-0.95995 1.932595,1.9326 0.234654,6.47485 -2.420364,6.47485 -2.390146,0 -4.051441,2.23713 -2.965777,3.99377 0.740689,1.19846 1.218594,1.12186 2.987344,-0.47884 3.406254,-3.08261 7.063255,-3.27149 3.920021,-0.20246 -1.321935,1.29073 -3.198156,2.63706 -4.169381,2.99186 -1.463856,0.53475 -1.653838,1.37626 -1.110841,4.92037 1.036819,6.76728 2.913385,6.57626 2.640423,-0.26877 -0.134821,-3.38089 0.142221,-3.95593 1.905896,-3.95593 1.571318,0 1.938872,0.47715 1.540636,2 -0.287656,1.1 -0.115141,2 0.383369,2 0.498509,0 0.96263,-0.45 1.03138,-1 0.238805,-1.91044 0.467909,-2.51699 2.115671,-5.60124 1.187834,-2.22337 1.350686,-3.4074 0.575302,-4.18279 -0.621603,-0.6216 -0.749078,-1.85432 -0.299757,-2.89875 1.303858,-3.03077 1.124261,-9.3161 -0.266216,-9.31669 -1.489085,-6.3e-4 -1.676094,-2.61915 -0.25,-3.50053 2.022248,-1.24982 1.004309,-3.5 -1.583333,-3.5 -1.628176,0 -2.425149,-0.46217 -2.155505,-1.25 0.8577,-2.50597 12.235836,-1.56907 15.262791,1.25676 9.369225,8.74672 9.558066,30.04723 0.394255,44.47037 -3.908079,6.15102 3.276749,13.99627 15.520797,16.94746 8.108519,1.9544 13.904595,10.2116 16.022105,22.82541 0.75747,4.5122 -13.553142,6.18611 -14.96111,1.75 z m -6.090775,-20.1003 c -1.883722,-2.0815 -5.196659,-3.05266 -5.996842,-1.75793 -1.215823,1.96724 0.488687,3.45823 3.953475,3.45823 3.308319,0 3.464506,-0.12996 2.043367,-1.7003 z M 49,465.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.772141,57.4647 c 2.492459,-3.37124 5.498463,-4.13134 3.801947,-0.96137 -1.115671,2.08465 -2.792239,3.38743 -4.740006,3.68324 -0.667664,0.1014 -0.247131,-1.11882 0.938059,-2.72187 z m 15.267776,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.984111,-1.62354 1.914649,-0.73472 2.981717,0.0749 2.061373,1.56407 -0.830379,1.34358 -2.234909,1.371 -3.045484,0.0595 z m 17.198218,0.36758 c -0.925629,-0.92563 0.189072,-2.36052 1.833779,-2.36052 0.842134,0 1.177876,0.60386 0.833994,1.5 -0.610368,1.59059 -1.613974,1.91432 -2.667773,0.86052 z M 24,522.37361 c 0,-1.24034 3.17723,-5.01143 4.222241,-5.01143 1.216405,0 0.911488,3.46627 -0.422241,4.8 -1.450736,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.563834,-1.56383 -1.523926,-3.97474 0.102613,-6.19917 1.129249,-1.54434 1.463614,-1.58743 2.512331,-0.32381 0.959725,1.1564 0.897189,1.717 -0.302613,2.71275 -1.953977,1.62165 -1.932441,3.01023 0.04669,3.01023 0.857459,0 1.280902,0.45 0.940983,1 -0.818297,1.32403 -1.837753,1.26225 -3.3,-0.2 z m 17.043786,-0.05 c 0.225748,-0.6875 1.725748,-1.37269 3.333333,-1.52264 2.788155,-0.26007 2.833407,-0.20246 0.981751,1.25 -2.346126,1.84032 -4.882473,2.00058 -4.315084,0.27264 z m 28.413426,-2.29909 c 0.680432,-1.77318 3.471169,-1.56926 4.093255,0.29909 0.260434,0.78218 -0.538884,1.25 -2.135749,1.25 -1.8935,0 -2.398572,-0.39969 -1.957506,-1.54909 z M 21,516.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.647568,-4.24293 c -0.841403,-3.14186 -0.799742,-3.81609 0.235801,-3.81609 1.240865,0 2.226771,4.28986 1.217791,5.29884 -0.458333,0.45833 -1.11245,-0.20891 -1.453592,-1.48275 z m 4.591902,-1.82793 c 0.691029,-1.10652 1.819842,-1.79564 2.508473,-1.53139 C 45.436575,509.0832 46,508.86353 46,508.3308 c 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.212109,0 1.824239,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.903813,0.88337 -2.008474,0.88337 -1.762089,0 -1.854346,-0.2468 -0.752056,-2.01184 z M 33,506.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.04125,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.429973,0.69664 c -0.606232,-0.98091 2.181599,-3.69502 2.977678,-2.89894 0.706368,0.70637 -0.591568,3.78563 -1.595677,3.78563 -0.458697,0 -1.080597,-0.39901 -1.382001,-0.88669 z M 44,453.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.273145,1.68903 0.606989,2.55901 0.398311,1.03799 0.05452,1.58179 -1,1.58179 C 44.682954,455.36218 44,454.53728 44,453.4212 z m 7,-4.85902 c 0,-3.04736 4.537474,-4.07671 5.289749,-1.2 0.434416,1.66121 0.03068,2 -2.383369,2 -1.598509,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.434447,-5.29196 7.396256,-2.78553 0.909842,2.37101 -0.318374,3.71929 -2.066485,2.26848 -1.165167,-0.967 -1.912674,-0.97579 -3.410972,-0.0401 C 50.863459,442.83989 50,443.0906 50,442.73795 z" - id="path5783-3" - inkscape:connector-curvature="0" /> - <path - style="fill:#b3bcc9" - d="m 92,525.56218 c 0,-1.54 -0.527793,-3.32779 -1.172874,-3.97287 -0.855295,-0.8553 -0.884251,-1.80634 -0.106941,-3.51235 1.75157,-3.84427 -0.705254,-11.42904 -4.802674,-14.82692 -4.086046,-3.38846 -2.898331,-3.60091 4.550449,-0.81396 13.71103,5.12995 20.56433,25.9261 8.543858,25.9261 -7.011818,0 -7.011818,0 -7.011818,-2.8 z M 59.910502,504.75434 c -0.635465,-0.76569 -1.955842,-1.39216 -2.934171,-1.39216 -0.978329,0 -2.708052,-1.575 -3.84383,-3.5 -1.135778,-1.925 -2.755227,-3.5 -3.598776,-3.5 -1.951918,0 -1.967601,-1.39503 -0.03372,-3 2.076834,-1.72362 1.890939,-3.35723 -1,-8.78785 -4.069166,-7.64391 -3.455289,-10.71763 1.420545,-7.11277 5.169207,3.82176 11.750544,-2.46804 15.52335,-14.83571 1.370596,-4.49296 0.796129,-18.89883 -0.883128,-22.14616 -1.612127,-3.11751 -1.612127,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.559878,46.61877 -3.518421,5.84292 -3.518421,5.84292 2.297632,11.07309 3.521616,3.16687 5.178879,5.24555 4.200912,5.26916 -0.888328,0.0214 -2.688328,0.8515 -4,1.84459 -4.749564,3.59595 -14.858241,5.13632 -16.974357,2.58655 z" - id="path5785-7" - inkscape:connector-curvature="0" /> - <path - style="fill:#a9b6c7" - d="m 92.815054,521.61218 c 0.280763,-4.98157 -0.149325,-8.25644 -1.641625,-12.5 -2.022056,-5.75 -2.022056,-5.75 0.0199,-5.75 4.892222,0 12.116871,11.11379 14.138841,21.75 0.61783,3.25 0.61783,3.25 -6.139863,3.25 -6.757689,0 -6.757689,0 -6.377257,-6.75 z M 57.736081,502.60026 c -4.74666,-2.19188 -8.21023,-7.48361 -6.720339,-10.26749 0.787293,-1.47107 0.578728,-2.8552 -0.859855,-5.70638 -3.780683,-7.49305 -3.71844,-7.75193 1.891408,-7.86675 11.763399,-0.24076 19.607447,-21.36594 14.350292,-38.64746 -1.513683,-4.97583 8.15369,0.5478 11.171092,6.38281 4.79792,9.27815 2.757176,28.21359 -4.135306,38.37023 -3.248042,4.78626 -3.108843,5.61941 1.566627,9.37672 8.383493,6.73716 -5.850701,13.62864 -17.263919,8.35832 z" - id="path5787-1" - inkscape:connector-curvature="0" /> - <path - style="fill:#a5aeba" - d="m 95,519.94322 c 0,-6.15501 -0.465546,-9.23013 -1.731223,-11.43544 -2.129347,-3.71017 -1.162952,-4.96151 2.153516,-2.78847 3.134773,2.05398 7.071677,8.79205 8.555507,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z M 63,502.21435 c -5.613254,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.901534,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.482187,-6.12103 12.466652,3.12893 23.836582,-23.06489 17.885689,-41.20469 -1.768008,-5.38933 6.735063,1.04007 9.607989,7.26486 3.853849,8.35016 1.790957,26.18765 -4.142144,35.81645 -3.771821,6.12126 -3.726023,7.00345 0.532187,10.25135 4.268856,3.25601 4.328389,3.95246 0.506787,5.92869 -5.335159,2.75892 -7.429145,3.16975 -12.006787,2.35568 z" - id="path5789-3" - inkscape:connector-curvature="0" /> - <path - style="fill:#99a5b4" - d="m 97.580726,526.11218 c -0.251559,-1.2375 -0.72938,-5.35305 -1.061826,-9.14566 -0.332446,-3.79262 -1.069261,-7.76418 -1.637367,-8.8257 -0.934152,-1.74548 -0.829324,-1.82107 1.096284,-0.79051 2.819043,1.5087 5.542873,6.12588 6.994333,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.326202,0 -4.056171,-0.37006 -4.438324,-2.25 z M 60.5,500.40269 c -3.265642,-1.35967 -7.602087,-6.57417 -8.46488,-10.17887 -0.442539,-1.8489 -1.129624,-4.14914 -1.526857,-5.11164 -0.576601,-1.39711 -0.209671,-1.75 1.819649,-1.75 12.357308,0 23.416086,-23.45864 18.741894,-39.7566 -1.195778,-4.16943 -0.0374,-4.10946 3.740804,0.19368 7.79605,8.87921 6.233208,28.06127 -3.573583,43.86154 -1.72735,2.78303 -1.718871,2.81367 1.521988,5.5 6.506488,5.39319 -3.087271,11.06061 -12.259015,7.24189 z" - id="path5791-9" - inkscape:connector-curvature="0" /> - <path - style="fill:#929ca9" - d="m 100.78845,526.61218 c -2.135149,-2.45575 -3.345892,-15.95753 -1.276991,-14.24049 0.800071,0.664 2.186211,3.746 3.080301,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.756084,-31 c -5.277946,-5.08752 -5.842086,-9.34879 -1.362926,-10.29495 10.175676,-2.14947 19.086762,-19.27014 18.092621,-34.76096 -0.486107,-7.57459 -0.486107,-7.57459 1.781461,-4.93839 6.180155,7.18486 4.779027,27.36115 -2.676692,38.54443 -3.503817,5.25559 -3.542145,6.21682 -0.36683,9.19987 3.118955,2.93011 3.114395,3.39903 -0.04705,4.83949 -5.40941,2.46469 -11.183057,1.49515 -15.420584,-2.58949 z" - id="path5793-6" - inkscape:connector-curvature="0" /> - <path - style="fill:#8a95a3" - d="m 101.70717,525.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.065403,-31 c -4.91445,-3.9769 -5.748541,-5.95905 -2.891767,-6.87206 5.527572,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.933234,-2.88544 2.073853,-5.01359 2.414595,-4.50511 5.220373,-17.98198 4.375484,-21.01657 -0.461667,-1.65818 -0.368419,-1.7777 0.455976,-0.58445 4.302348,6.22731 1.172547,26.46135 -5.612772,36.28634 -2.614917,3.78635 -2.614917,3.78635 -0.365672,6.82862 1.237084,1.67324 2.097118,3.17093 1.911187,3.3282 -4.208579,3.5597 -8.799793,3.17382 -14.196289,-1.19316 z" - id="path5795-4" - inkscape:connector-curvature="0" /> - <path - style="fill:#89929e" - d="m 68.553851,495.44931 c -0.369537,-0.59792 -1.542351,-1.08713 -2.606255,-1.08713 -1.842561,0 -1.829965,-0.12007 0.265385,-2.52994 2.199755,-2.52994 2.199755,-2.52994 3.583106,0.11028 1.388266,2.6496 0.236851,5.90001 -1.242236,3.50679 z m -9.192225,-2.58713 c -0.316582,-0.825 -1.202459,-1.5 -1.968615,-1.5 -0.766156,0 -1.393011,-0.45 -1.393011,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.944645,-1.14465 0.859526,-0.85952 1.306427,-0.50004 1.794143,1.44317 0.99716,3.973 -1.799649,6.79122 -3.177162,3.20148 z m 8.279576,-8.19213 c -0.380672,-0.38067 0.492512,-1.63673 1.940409,-2.79125 1.907671,-1.52112 2.773627,-3.32052 3.144932,-6.53498 0.281816,-2.43973 1.077686,-4.89617 1.768601,-5.45875 0.690915,-0.56259 1.74847,-1.92289 2.350124,-3.02289 1.570686,-2.87168 1.407159,-0.26284 -0.427266,6.81644 -2.261098,8.72586 -6.159851,13.60838 -8.7768,10.99143 z" - id="path5797-2" - inkscape:connector-curvature="0" /> - </g> - <g - id="g3734" - transform="translate(152,104.62758)"> - <rect - ry="1.6497765" - rx="1.6497765" - y="298.32199" - x="4.0543771" - height="8.1750183" - width="34.242748" - id="rect3736" - style="color:#000000;fill:#0044aa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <text - sodipodi:linespacing="125%" - id="text3738" - y="305.16464" - x="10.072125" - style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - y="305.16464" - x="10.072125" - id="tspan3740" - sodipodi:role="line">ursula</tspan></text> - </g> - </g> - <path - style="fill:#231f20;display:inline" - d="m -340.24786,55.781484 -22.016,0 0,32.023 c 13,0 19,0 32,0 l 0,-22.015 z m 5.984,28.023 c -10.90757,0 -10.78344,0 -24,0 0,0 0.006,-21.441 0.006,-24.084 2.1,0 7.807,0 12.006,0 l 0,12.01 12.01,0 c -0.001,2.733 -0.022,12.074 -0.022,12.074 z m -7.984,-16.078 c 0,-1.543 0,-5.918 0,-8.006 1.615,1.619 6.402,6.404 8.006,8.006 -2.047,0 -6.454,0 -8.006,0 z" - id="path3077-8-3-9" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccccccccccccc" /> - <path - sodipodi:nodetypes="ccccccccccccccccc" - inkscape:connector-curvature="0" - id="path11222" - d="m -340.24786,95.781484 -22.016,0 0,32.022996 c 13,0 19,0 32,0 l 0,-22.015 z m 5.984,28.022996 c -10.90757,0 -10.78344,0 -24,0 0,0 0.006,-21.441 0.006,-24.083996 2.1,0 7.807,0 12.006,0 l 0,12.009996 12.01,0 c -0.001,2.733 -0.022,12.074 -0.022,12.074 z m -7.984,-16.078 c 0,-1.543 0,-5.918 0,-8.005996 1.615,1.618996 6.402,6.403996 8.006,8.005996 -2.047,0 -6.454,0 -8.006,0 z" - style="fill:#231f20;display:inline" /> - <path - inkscape:connector-curvature="0" - id="path11228" - d="m -406.0761,77.334524 23.30768,0 0,-48.73424 14.83216,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> - <path - inkscape:connector-curvature="0" - id="path11230" - d="m -385.89572,77.334524 17.51247,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> - <path - inkscape:connector-curvature="0" - id="path11232" - d="m -382.77891,77.395104 0,26.592096 14.45711,0" - style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> - <g - id="g6400" - transform="translate(-1107.878,-266.45295)" - style="display:inline"> - <rect - y="285.06863" - x="749.5293" - height="25.397747" - width="9.1984463" - id="rect6396" - style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - y="292.81506" - x="749.21997" - height="18.093594" - width="26.767767" - id="rect6398" - style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00000119;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - sodipodi:nodetypes="ccccccccccccccccc" - inkscape:connector-curvature="0" - id="path6390" - d="m 745.98776,281.46637 c 0,10.69792 0,21.39583 0,32.09375 10.66667,0 21.33333,0 32,0 3.8e-4,-10.69792 8.2e-4,-21.39583 0,-32.09375 -10.66667,0 -21.33333,0 -32,0 z m 4,4 c 2.57307,0.0164 5.1453,0.11052 7.71875,0.0937 0.0104,2.65625 0.0208,5.3125 0.0312,7.96875 5.41667,-0.0208 10.83333,-0.0417 16.25,-0.0625 0,5.36458 0,10.72917 0,16.09375 -8.47194,-0.0641 -16.17572,0.01 -24,0 3e-5,-8.03119 -7e-5,-16.06271 5e-5,-24.0937 z m 11,0 c 4.33333,0 8.66667,0 13,0 0,1.33333 0,2.66667 0,4 -4.33333,0 -8.66667,0 -13,0 0,-1.33333 0,-2.66667 0,-4 z" - style="fill:#231f20;display:inline" /> - </g> - <g - transform="translate(-1188.1346,-218.36969)" - id="g6405" - style="display:inline"> - <rect - style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6407" - width="9.1984463" - height="25.397747" - x="749.5293" - y="285.06863" /> - <rect - style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00000119;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="rect6409" - width="26.767767" - height="18.093594" - x="749.21997" - y="292.81506" /> - <path - style="fill:#231f20;display:inline" - d="m 745.98776,281.46637 c 0,10.69792 0,21.39583 0,32.09375 10.66667,0 21.33333,0 32,0 3.8e-4,-10.69792 8.2e-4,-21.39583 0,-32.09375 -10.66667,0 -21.33333,0 -32,0 z m 4,4 c 2.57307,0.0164 5.1453,0.11052 7.71875,0.0937 0.0104,2.65625 0.0208,5.3125 0.0312,7.96875 5.41667,-0.0208 10.83333,-0.0417 16.25,-0.0625 0,5.36458 0,10.72917 0,16.09375 -8.47194,-0.0641 -16.17572,0.01 -24,0 3e-5,-8.03119 -7e-5,-16.06271 5e-5,-24.0937 z m 11,0 c 4.33333,0 8.66667,0 13,0 0,1.33333 0,2.66667 0,4 -4.33333,0 -8.66667,0 -13,0 0,-1.33333 0,-2.66667 0,-4 z" - id="path6411" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccccccccccccc" /> - </g> - <path - style="fill:#231f20;display:inline" - d="m -420.24786,22.781484 -22.016,0 0,32.023 c 13,0 19,0 32,0 l 0,-22.015 z m 5.984,28.023 c -10.90757,0 -10.78344,0 -24,0 0,0 0.006,-21.441 0.006,-24.084 2.1,0 7.807,0 12.006,0 l 0,12.01 12.01,0 c -0.001,2.733 -0.022,12.074 -0.022,12.074 z m -7.984,-16.078 c 0,-1.543 0,-5.918 0,-8.006 1.615,1.619 6.402,6.404 8.006,8.006 -2.047,0 -6.454,0 -8.006,0 z" - id="path6442" - inkscape:connector-curvature="0" - sodipodi:nodetypes="ccccccccccccccccc" /> - <g - id="g14469" - transform="translate(-1188.1346,-177.36969)" - style="display:inline"> - <rect - y="285.06863" - x="749.5293" - height="25.397747" - width="9.1984463" - id="rect14471" - style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <rect - y="292.81506" - x="749.21997" - height="18.093594" - width="26.767767" - id="rect14473" - style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00000119;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - sodipodi:nodetypes="ccccccccccccccccc" - inkscape:connector-curvature="0" - id="path14475" - d="m 745.98776,281.46637 c 0,10.69792 0,21.39583 0,32.09375 10.66667,0 21.33333,0 32,0 3.8e-4,-10.69792 8.2e-4,-21.39583 0,-32.09375 -10.66667,0 -21.33333,0 -32,0 z m 4,4 c 2.57307,0.0164 5.1453,0.11052 7.71875,0.0937 0.0104,2.65625 0.0208,5.3125 0.0312,7.96875 5.41667,-0.0208 10.83333,-0.0417 16.25,-0.0625 0,5.36458 0,10.72917 0,16.09375 -8.47194,-0.0641 -16.17572,0.01 -24,0 3e-5,-8.03119 -7e-5,-16.06271 5e-5,-24.0937 z m 11,0 c 4.33333,0 8.66667,0 13,0 0,1.33333 0,2.66667 0,4 -4.33333,0 -8.66667,0 -13,0 0,-1.33333 0,-2.66667 0,-4 z" - style="fill:#231f20;display:inline" /> - </g> - <path - inkscape:connector-curvature="0" - id="path5988" - d="m -924.86091,63.859844 2.9776,21.67033" - style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="m -880.57616,78.271684 -14.73368,16.16751" - id="path6999" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - id="path7001" - d="m -941.46332,152.74321 -14.04853,16.76629" - style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="m -954.32745,126.04894 -21.71261,2.65179" - id="path7003" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - id="path7005" - d="m -954.97098,92.860704 -19.77711,-9.34533" - style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="m -908.90778,153.05708 6.86002,20.77041" - id="path7007" - inkscape:connector-curvature="0" /> - <g - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/world-90.png" - transform="matrix(0.55742735,0,0,0.55742735,-570.97575,136.86742)" - id="g6729" - style="display:inline"> - <path - inkscape:connector-curvature="0" - id="path4967-4" - d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" - style="color:#000000;fill:#aaeeff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - transform="matrix(1.9,0,0,3.8,180.92883,-5.4644227)" /> - <path - sodipodi:nodetypes="cccccccc" - inkscape:connector-curvature="0" - id="path4969-0" - d="m 343.41091,82.102257 c -4.61208,1.27568 -8.4152,4.3488 -12.51252,6.67072 -2.35308,1.74788 -5.12984,6.52288 -1.96136,8.60572 2.50816,0.42204 4.52272,-1.71204 6.9918,-1.86684 2.88372,-0.66468 5.82796,-1.19016 8.56184,-2.36416 4.67024,-1.47172 4.67024,-1.47172 5.1476,-3.19456 0.2268,-2.594 -1.61708,-4.99872 -3.35792,-6.7716 -0.7942,-0.65116 -1.8022,-1.26156 -2.86944,-1.07928 z" - style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - sodipodi:nodetypes="cacccccccccc" - inkscape:connector-curvature="0" - id="path4983-6" - d="m 379.92883,107.51186 c -6.54148,3.33576 -14.24416,6.695 -17.08312,13.33832 -0.87308,2.04304 0.36,4.4522 0.66656,6.63188 1.24588,2.32204 -1.79852,4.3692 -0.89984,6.6998 1.0754,2.41996 4.1484,2.05532 6.18628,1.27852 2.07688,-0.71376 -0.86608,-2.75712 0,0 0.94212,2.20364 8.67396,2.87608 11.00512,1.87524 2.24192,-0.82204 3.76764,-1.20964 4.83784,-3.08096 3.5092,-7.13912 5.23236,-15.22316 4.6808,-23.17324 -0.172,-2.14232 -0.83076,-4.21536 -1.6044,-6.19228 -0.8002,-2.60864 -3.50284,0.028 -4.56584,1.10028 -0.97392,0.68904 -2.05424,1.25484 -3.2234,1.52244 z" - style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - sodipodi:nodetypes="cccccacccc" - style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="m 328.42251,109.20506 c -3.85116,1.46336 -8.01156,2.4666 -11.52748,4.61236 -2.9146,2.45496 -2.5518,6.93884 -1.0408,10.06404 1.85428,4 3.32528,8.1856 5.54108,12.01032 2.14308,2.82516 -0.1448,1.59612 2.45892,3.98968 0.73584,0.87624 5.32,5.30628 8,4 1.33596,-0.65116 1.00188,-2.62 0.8862,-4.3696 0.84188,-3.62872 -1.33312,-7.09848 -1.15972,-10.75332 -0.0936,-4.58884 0.80728,-9.12276 1.354,-13.6626 0.312,-2.51708 -1.10816,-7.20092 -4.5122,-5.89088 z" - id="path4985-4" - inkscape:connector-curvature="0" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - inkscape:export-xdpi="90" - inkscape:export-ydpi="90" /> - <path - inkscape:connector-curvature="0" - id="path4987-7" - d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" - style="color:#000000;fill:none;stroke:#002255;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - transform="matrix(1.9,0,0,3.8,180.92883,-5.4644227)" /> - </g> - <g - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/webapp/others/defgroup.png" - id="g3063" - transform="matrix(0.36909856,0,0,0.36909856,-837.85498,41.587354)" - style="display:inline"> - <g - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/grop-def-new.png" - transform="matrix(0.9,0,0,0.9,246.64216,77.109544)" - id="g3047"> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - sodipodi:type="star" - style="color:#000000;fill:none;stroke:#28220b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - id="path3049" - sodipodi:sides="5" - sodipodi:cx="35" - sodipodi:cy="12.362183" - sodipodi:r1="5" - sodipodi:r2="4.045085" - sodipodi:arg1="1.5707963" - sodipodi:arg2="2.1991149" - inkscape:flatsided="true" - inkscape:rounded="0" - inkscape:randomized="0" - d="m 35,17.362183 -4.755283,-3.454915 1.816357,-5.5901703 5.877852,-10e-8 1.816357,5.5901694 z" - inkscape:transform-center-y="-0.21689042" - transform="matrix(4.71003,1.6779794,-1.6779794,4.71003,-33.10757,48.018455)" - inkscape:transform-center-x="2.1800737" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceEnabled.png" - transform="matrix(2.375,0,0,4.7499998,-102.75,10.817397)" - d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z" - sodipodi:ry="10" - sodipodi:rx="20" - sodipodi:cy="32.362183" - sodipodi:cx="90" - id="path3051" - style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,45.524372,-53.39817)" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="16.362183" - sodipodi:cx="15" - id="path3053" - style="color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - sodipodi:type="arc" - style="color:#000000;fill:#69312f;fill-opacity:1;stroke:#69312f;stroke-width:0.5;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="path3055" - sodipodi:cx="15" - sodipodi:cy="16.362183" - sodipodi:rx="1" - sodipodi:ry="1" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" - transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,18.680548,-64.20388)" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,43.935022,-24.026857)" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="16.362183" - sodipodi:cx="15" - id="path3057" - style="color:#000000;fill:#28220b;fill-opacity:1;stroke:#28220b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - sodipodi:type="arc" - style="color:#000000;fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-width:0.5;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="path3059" - sodipodi:cx="15" - sodipodi:cy="16.362183" - sodipodi:rx="1" - sodipodi:ry="1" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" - transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,16.336633,-16.494463)" /> - <path - inkscape:export-ydpi="90" - inkscape:export-xdpi="90" - inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" - transform="matrix(11.211448,3.9941526,-3.9941526,11.211448,-16.590722,-79.68006)" - d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" - sodipodi:ry="1" - sodipodi:rx="1" - sodipodi:cy="16.362183" - sodipodi:cx="15" - id="path3061" - style="color:#000000;fill:#ffdb6b;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - sodipodi:type="arc" /> - </g> - </g> - <text - sodipodi:linespacing="125%" - id="text3071-9" - y="69.533607" - x="-830.94623" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - id="tspan3545" - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="69.533607" - x="-830.94623" - sodipodi:role="line">Por el contrario aquí</tspan><tspan - style="font-size:12px;font-weight:bold;fill:#aa4400" - y="84.533607" - x="-830.94623" - sodipodi:role="line" - id="tspan3932">un<tspan - style="font-weight:normal" - id="tspan3934"> mismo </tspan>documento</tspan><tspan - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="99.533607" - x="-830.94623" - sodipodi:role="line" - id="tspan6262">puede ser editado por </tspan><tspan - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="114.53361" - x="-830.94623" - sodipodi:role="line" - id="tspan6264">varias personas de</tspan><tspan - id="tspan13782" - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="129.5336" - x="-830.94623" - sodipodi:role="line">tu grupos</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3071-9-9" - y="166.61867" - x="-829.6145" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="166.61867" - x="-829.6145" - sodipodi:role="line" - id="tspan6304">u otras a las que se </tspan><tspan - style="font-size:12px;font-weight:bold;fill:#aa4400" - y="181.61867" - x="-829.6145" - sodipodi:role="line" - id="tspan3563"><tspan - style="font-weight:normal" - id="tspan3565">lo </tspan>compartes</tspan></text> - <g - transform="matrix(1.9571643,0,0,1.9571643,-1631.0648,-1042.5543)" - id="text23658" - style="font-size:2.80011916px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"> - <path - inkscape:connector-curvature="0" - id="path23733" - style="font-weight:bold;marker:none" - d="m 612.83876,554.92091 0.43681,0 0,1.94048 -0.43681,0 0,-1.94048" /> - <path - inkscape:connector-curvature="0" - id="path23735" - style="font-weight:bold;marker:none" - d="m 613.69673,555.43893 c 0.0709,-0.0205 0.16241,-0.0392 0.27441,-0.056 0.11201,-0.0187 0.22961,-0.028 0.35282,-0.028 0.12507,0 0.22867,0.0168 0.31081,0.0504 0.084,0.0317 0.15027,0.0775 0.19881,0.1372 0.0485,0.0597 0.0831,0.13068 0.1036,0.21281 0.0205,0.0821 0.0308,0.17361 0.0308,0.27441 l 0,0.83164 -0.41721,0 0,-0.78123 c -1e-5,-0.13441 -0.0177,-0.22961 -0.0532,-0.28562 -0.0355,-0.056 -0.10173,-0.084 -0.1988,-0.084 -0.0299,0 -0.0616,0.002 -0.0952,0.006 -0.0336,0.002 -0.0635,0.005 -0.0896,0.008 l 0,1.13685 -0.41722,0 0,-1.42246" /> - <path - inkscape:connector-curvature="0" - id="path23737" - style="font-weight:bold;marker:none" - d="m 615.76558,556.86139 -0.41722,0 0,-1.47286 0.41722,0 0,1.47286 m 0.0392,-1.89848 c 0,0.0765 -0.0252,0.13721 -0.0756,0.18201 -0.0485,0.0429 -0.10641,0.0644 -0.17361,0.0644 -0.0672,0 -0.126,-0.0215 -0.17641,-0.0644 -0.0485,-0.0448 -0.0728,-0.10547 -0.0728,-0.18201 0,-0.0765 0.0243,-0.13627 0.0728,-0.17921 0.0504,-0.0448 0.10921,-0.0672 0.17641,-0.0672 0.0672,0 0.12507,0.0224 0.17361,0.0672 0.0504,0.0429 0.0756,0.10267 0.0756,0.17921" /> - <path - inkscape:connector-curvature="0" - id="path23739" - style="font-weight:bold;marker:none" - d="m 616.08777,556.12496 c 0,-0.10641 0.0168,-0.20628 0.0504,-0.29961 0.0355,-0.0952 0.0859,-0.17734 0.15121,-0.24642 0.0653,-0.0709 0.14467,-0.12693 0.23801,-0.168 0.0933,-0.0411 0.19974,-0.0616 0.31921,-0.0616 0.0784,10e-6 0.15027,0.007 0.21561,0.0224 0.0653,0.0131 0.1288,0.0327 0.19041,0.0588 l -0.0868,0.33321 c -0.0392,-0.0149 -0.0821,-0.028 -0.1288,-0.0392 -0.0467,-0.0112 -0.0989,-0.0168 -0.15681,-0.0168 -0.1232,0 -0.21561,0.0383 -0.27721,0.1148 -0.0597,0.0765 -0.0896,0.17735 -0.0896,0.30242 0,0.13254 0.028,0.23521 0.084,0.30801 0.0579,0.0728 0.15774,0.10921 0.29961,0.10921 0.0504,0 0.10454,-0.005 0.16241,-0.014 0.0579,-0.009 0.11107,-0.0243 0.15961,-0.0448 l 0.0588,0.34162 c -0.0485,0.0205 -0.10921,0.0383 -0.18201,0.0532 -0.0728,0.0149 -0.15307,0.0224 -0.24081,0.0224 -0.13441,0 -0.25014,-0.0196 -0.34721,-0.0588 -0.0971,-0.0411 -0.17734,-0.0961 -0.24081,-0.16521 -0.0616,-0.0691 -0.10734,-0.15027 -0.13721,-0.24361 -0.028,-0.0952 -0.042,-0.19787 -0.042,-0.30801" /> - <path - inkscape:connector-curvature="0" - id="path23741" - style="font-weight:bold;marker:none" - d="m 618.86439,556.12216 c 0,0.11574 -0.0168,0.22214 -0.0504,0.31921 -0.0336,0.0952 -0.0821,0.17734 -0.14561,0.24641 -0.0635,0.0672 -0.14,0.11947 -0.2296,0.15681 -0.0877,0.0373 -0.18668,0.056 -0.29682,0.056 -0.10827,0 -0.20721,-0.0187 -0.29681,-0.056 -0.0877,-0.0373 -0.16334,-0.0896 -0.22681,-0.15681 -0.0635,-0.0691 -0.11294,-0.1512 -0.14841,-0.24641 -0.0355,-0.0971 -0.0532,-0.20347 -0.0532,-0.31921 0,-0.11574 0.0177,-0.22121 0.0532,-0.31642 0.0373,-0.0952 0.0877,-0.1764 0.15121,-0.24361 0.0653,-0.0672 0.14187,-0.11947 0.22961,-0.1568 0.0896,-0.0373 0.18667,-0.056 0.29121,-0.056 0.10641,10e-6 0.20348,0.0187 0.29121,0.056 0.0896,0.0373 0.16614,0.0896 0.22961,0.1568 0.0635,0.0672 0.11294,0.14841 0.14841,0.24361 0.0355,0.0952 0.0532,0.20068 0.0532,0.31642 m -0.42561,0 c -10e-6,-0.12881 -0.0261,-0.22961 -0.0784,-0.30242 -0.0504,-0.0747 -0.1232,-0.112 -0.21841,-0.112 -0.0952,0 -0.16894,0.0373 -0.22121,0.112 -0.0523,0.0728 -0.0784,0.17361 -0.0784,0.30242 0,0.1288 0.0261,0.23147 0.0784,0.30801 0.0523,0.0747 0.12601,0.11201 0.22121,0.11201 0.0952,0 0.16801,-0.0373 0.21841,-0.11201 0.0523,-0.0765 0.0784,-0.17921 0.0784,-0.30801" /> - </g> - <g - transform="matrix(1.9571643,0,0,1.9571643,-1685.6366,-960.80361)" - id="text23670" - style="font-size:2.80011916px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"> - <path - inkscape:connector-curvature="0" - id="path23709" - style="font-weight:bold;marker:none" - d="m 641.27886,556.96227 c -0.10641,0 -0.21281,-0.004 -0.31922,-0.0112 -0.10453,-0.006 -0.21374,-0.0205 -0.32761,-0.0448 l 0,-1.88168 c 0.0896,-0.0168 0.18761,-0.0289 0.29401,-0.0364 0.10641,-0.009 0.20534,-0.014 0.29681,-0.014 0.12321,0 0.23615,0.009 0.33882,0.028 0.10454,0.0168 0.19414,0.0467 0.26881,0.0896 0.0747,0.0429 0.13254,0.0999 0.17361,0.17081 0.0429,0.0691 0.0644,0.15494 0.0644,0.25761 0,0.15494 -0.0747,0.27722 -0.22401,0.36682 0.1232,0.0467 0.20721,0.11014 0.25201,0.19041 0.0448,0.0803 0.0672,0.1708 0.0672,0.27161 0,0.20347 -0.0747,0.35655 -0.224,0.45922 -0.14748,0.10267 -0.36775,0.154 -0.66083,0.154 m -0.22121,-0.87083 0,0.50122 c 0.0317,0.004 0.0663,0.007 0.1036,0.008 0.0373,0.002 0.0784,0.003 0.12321,0.003 0.13067,0 0.23614,-0.0187 0.31641,-0.056 0.0803,-0.0373 0.1204,-0.10641 0.12041,-0.20721 -10e-6,-0.0896 -0.0336,-0.15308 -0.10081,-0.19041 -0.0672,-0.0392 -0.16334,-0.0588 -0.28841,-0.0588 l -0.27441,0 m 0,-0.33322 0.21281,0 c 0.1344,0 0.23054,-0.0168 0.28841,-0.0504 0.0579,-0.0355 0.0868,-0.0915 0.0868,-0.16801 0,-0.0784 -0.0299,-0.13347 -0.0896,-0.1652 -0.0597,-0.0317 -0.14748,-0.0476 -0.26321,-0.0476 -0.0373,10e-6 -0.0775,9.4e-4 -0.12041,0.003 -0.0429,1e-5 -0.0812,0.002 -0.1148,0.006 l 0,0.42282" /> - <path - inkscape:connector-curvature="0" - id="path23711" - style="font-weight:bold;marker:none" - d="m 643.07338,556.96507 c -0.12134,-0.002 -0.22027,-0.0149 -0.29681,-0.0392 -0.0747,-0.0243 -0.13441,-0.0579 -0.17921,-0.1008 -0.0429,-0.0448 -0.0728,-0.098 -0.0896,-0.15961 -0.0149,-0.0635 -0.0224,-0.1344 -0.0224,-0.21281 l 0,-1.62127 0.41722,-0.0672 0,1.60447 c 0,0.0373 0.003,0.0709 0.008,0.1008 0.006,0.0299 0.0159,0.0551 0.0308,0.0756 0.0168,0.0205 0.0401,0.0373 0.07,0.0504 0.0299,0.0131 0.07,0.0215 0.12041,0.0252 l -0.0588,0.34441" /> - <path - inkscape:connector-curvature="0" - id="path23713" - style="font-weight:bold;marker:none" - d="m 644.74899,556.19784 c 0,0.11574 -0.0168,0.22214 -0.0504,0.31921 -0.0336,0.0952 -0.0821,0.17735 -0.14561,0.24642 -0.0635,0.0672 -0.14,0.11947 -0.22961,0.1568 -0.0877,0.0373 -0.18667,0.056 -0.29681,0.056 -0.10827,0 -0.20721,-0.0187 -0.29681,-0.056 -0.0877,-0.0373 -0.16334,-0.0896 -0.22681,-0.1568 -0.0635,-0.0691 -0.11294,-0.15121 -0.14841,-0.24642 -0.0355,-0.0971 -0.0532,-0.20347 -0.0532,-0.31921 0,-0.11574 0.0177,-0.22121 0.0532,-0.31641 0.0373,-0.0952 0.0877,-0.17641 0.15121,-0.24361 0.0653,-0.0672 0.14187,-0.11947 0.22961,-0.15681 0.0896,-0.0373 0.18667,-0.056 0.29121,-0.056 0.1064,0 0.20348,0.0187 0.29121,0.056 0.0896,0.0373 0.16614,0.0896 0.22961,0.15681 0.0635,0.0672 0.11294,0.1484 0.14841,0.24361 0.0355,0.0952 0.0532,0.20067 0.0532,0.31641 m -0.42562,0 c 0,-0.1288 -0.0261,-0.22961 -0.0784,-0.30241 -0.0504,-0.0747 -0.12321,-0.11201 -0.21841,-0.11201 -0.0952,0 -0.16894,0.0373 -0.22121,0.11201 -0.0523,0.0728 -0.0784,0.17361 -0.0784,0.30241 0,0.12881 0.0261,0.23148 0.0784,0.30801 0.0523,0.0747 0.12601,0.11201 0.22121,0.11201 0.0952,0 0.16801,-0.0373 0.21841,-0.11201 0.0523,-0.0765 0.0784,-0.1792 0.0784,-0.30801" /> - <path - inkscape:connector-curvature="0" - id="path23715" - style="font-weight:bold;marker:none" - d="m 645.4278,556.15304 c 0,0.23334 0.0943,0.35001 0.28281,0.35001 0.0429,0 0.0831,-0.006 0.12041,-0.0168 0.0373,-0.0112 0.0691,-0.0243 0.0952,-0.0392 l 0,-0.66643 c -0.0205,-0.004 -0.0448,-0.007 -0.0728,-0.008 -0.028,-0.004 -0.0607,-0.006 -0.098,-0.006 -0.11014,0 -0.19228,0.0364 -0.24641,0.10921 -0.0541,0.0728 -0.0812,0.16521 -0.0812,0.27721 m 0.91564,0.59922 c 0,0.24082 -0.0616,0.41909 -0.18481,0.53483 -0.12134,0.1176 -0.30988,0.1764 -0.56562,0.17641 -0.0896,-10e-6 -0.17921,-0.008 -0.26881,-0.0252 -0.0896,-0.0149 -0.17268,-0.0355 -0.24921,-0.0616 l 0.0728,-0.35001 c 0.0653,0.0261 0.13347,0.0467 0.20441,0.0616 0.0728,0.0149 0.15494,0.0224 0.24641,0.0224 0.11947,0 0.20347,-0.0261 0.25201,-0.0784 0.0504,-0.0523 0.0756,-0.11947 0.0756,-0.20161 l 0,-0.0532 c -0.0448,0.0205 -0.0915,0.0364 -0.14,0.0476 -0.0467,0.009 -0.098,0.014 -0.15401,0.014 -0.20347,0 -0.35935,-0.0597 -0.46762,-0.17921 -0.10827,-0.12134 -0.16241,-0.29028 -0.16241,-0.50682 0,-0.10827 0.0168,-0.20628 0.0504,-0.29401 0.0336,-0.0896 0.0821,-0.16614 0.1456,-0.22961 0.0653,-0.0635 0.14467,-0.11201 0.23801,-0.14561 0.0933,-0.0355 0.19881,-0.0532 0.31642,-0.0532 0.0504,0 0.10173,0.003 0.154,0.008 0.0541,0.004 0.10734,0.009 0.15961,0.0168 0.0523,0.007 0.10174,0.0168 0.14841,0.028 0.0485,0.009 0.0915,0.0196 0.1288,0.0308 l 0,1.23765" /> - </g> - <g - transform="matrix(1.9571643,0,0,1.9571643,-1654.8196,-1001.6789)" - id="text23674" - style="font-size:2.80011916px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"> - <path - inkscape:connector-curvature="0" - id="path23718" - style="font-weight:bold;marker:none" - d="m 624.13801,556.86139 c -0.0205,-0.0672 -0.0439,-0.13627 -0.07,-0.20721 -0.0243,-0.0709 -0.0485,-0.14187 -0.0728,-0.21281 l -0.75603,0 c -0.0243,0.0709 -0.0495,0.14187 -0.0756,0.21281 -0.0243,0.0709 -0.0467,0.14001 -0.0672,0.20721 l -0.45362,0 c 0.0728,-0.20908 0.14187,-0.40228 0.20721,-0.57963 0.0653,-0.17734 0.1288,-0.34441 0.1904,-0.50122 0.0635,-0.1568 0.12508,-0.30521 0.18481,-0.44522 0.0616,-0.14187 0.12507,-0.28001 0.19041,-0.41441 l 0.41722,0 c 0.0635,0.1344 0.126,0.27254 0.18761,0.41441 0.0616,0.14001 0.1232,0.28842 0.1848,0.44522 0.0635,0.15681 0.12787,0.32388 0.19321,0.50122 0.0653,0.17735 0.13441,0.37055 0.20721,0.57963 l -0.46762,0 m -0.52362,-1.50086 c -0.009,0.028 -0.0233,0.0663 -0.042,0.1148 -0.0187,0.0485 -0.0401,0.10454 -0.0644,0.16801 -0.0243,0.0635 -0.0513,0.13347 -0.0812,0.21001 -0.028,0.0765 -0.0569,0.1568 -0.0868,0.24081 l 0.55162,0 c -0.0299,-0.084 -0.0588,-0.16428 -0.0868,-0.24081 -0.028,-0.0765 -0.0551,-0.14654 -0.0812,-0.21001 -0.0243,-0.0635 -0.0457,-0.11947 -0.0644,-0.16801 -0.0187,-0.0485 -0.0336,-0.0868 -0.0448,-0.1148" /> - <path - inkscape:connector-curvature="0" - id="path23720" - style="font-weight:bold;marker:none" - d="m 625.71645,555.75814 c -0.0373,-0.009 -0.0812,-0.0187 -0.13161,-0.028 -0.0504,-0.0112 -0.10454,-0.0168 -0.16241,-0.0168 -0.0261,0 -0.0579,0.003 -0.0952,0.008 -0.0355,0.004 -0.0625,0.008 -0.0812,0.014 l 0,1.12565 -0.41722,0 0,-1.39446 c 0.0747,-0.0261 0.16241,-0.0504 0.26321,-0.0728 0.10267,-0.0243 0.21654,-0.0364 0.34161,-0.0364 0.0224,0 0.0495,0.002 0.0812,0.006 0.0317,0.002 0.0635,0.006 0.0952,0.0112 0.0317,0.004 0.0635,0.009 0.0952,0.0168 0.0317,0.006 0.0588,0.0131 0.0812,0.0224 l -0.07,0.34441" /> - <path - inkscape:connector-curvature="0" - id="path23722" - style="font-weight:bold;marker:none" - d="m 625.91276,556.12496 c 0,-0.10641 0.0168,-0.20628 0.0504,-0.29961 0.0355,-0.0952 0.0859,-0.17734 0.15121,-0.24642 0.0653,-0.0709 0.14467,-0.12693 0.23801,-0.168 0.0933,-0.0411 0.19974,-0.0616 0.31921,-0.0616 0.0784,10e-6 0.15028,0.007 0.21561,0.0224 0.0653,0.0131 0.12881,0.0327 0.19041,0.0588 l -0.0868,0.33321 c -0.0392,-0.0149 -0.0821,-0.028 -0.12881,-0.0392 -0.0467,-0.0112 -0.0989,-0.0168 -0.1568,-0.0168 -0.12321,0 -0.21561,0.0383 -0.27722,0.1148 -0.0597,0.0765 -0.0896,0.17735 -0.0896,0.30242 0,0.13254 0.028,0.23521 0.084,0.30801 0.0579,0.0728 0.15774,0.10921 0.29962,0.10921 0.0504,0 0.10453,-0.005 0.1624,-0.014 0.0579,-0.009 0.11107,-0.0243 0.15961,-0.0448 l 0.0588,0.34162 c -0.0485,0.0205 -0.1092,0.0383 -0.18201,0.0532 -0.0728,0.0149 -0.15307,0.0224 -0.24081,0.0224 -0.1344,0 -0.25014,-0.0196 -0.34721,-0.0588 -0.0971,-0.0411 -0.17734,-0.0961 -0.24081,-0.16521 -0.0616,-0.0691 -0.10734,-0.15027 -0.13721,-0.24361 -0.028,-0.0952 -0.042,-0.19787 -0.042,-0.30801" /> - <path - inkscape:connector-curvature="0" - id="path23724" - style="font-weight:bold;marker:none" - d="m 627.38282,556.86139 0,-2.10569 0.41722,-0.0672 0,0.70563 c 0.028,-0.009 0.0635,-0.0177 0.10641,-0.0252 0.0448,-0.009 0.0877,-0.014 0.1288,-0.014 0.11947,0 0.21841,0.0168 0.29681,0.0504 0.0803,0.0317 0.14374,0.0775 0.19041,0.1372 0.0485,0.0597 0.0821,0.13068 0.10081,0.21281 0.0205,0.0821 0.0308,0.17361 0.0308,0.27441 l 0,0.83164 -0.41722,0 0,-0.78123 c 0,-0.13441 -0.0177,-0.22961 -0.0532,-0.28562 -0.0336,-0.056 -0.0971,-0.084 -0.19041,-0.084 -0.0373,0 -0.0728,0.004 -0.1064,0.0112 -0.0317,0.006 -0.0607,0.0121 -0.0868,0.0196 l 0,1.12005 -0.41722,0" /> - <path - inkscape:connector-curvature="0" - id="path23726" - style="font-weight:bold;marker:none" - d="m 629.45167,556.86139 -0.41721,0 0,-1.47286 0.41721,0 0,1.47286 m 0.0392,-1.89848 c 0,0.0765 -0.0252,0.13721 -0.0756,0.18201 -0.0485,0.0429 -0.1064,0.0644 -0.1736,0.0644 -0.0672,0 -0.12601,-0.0215 -0.17641,-0.0644 -0.0485,-0.0448 -0.0728,-0.10547 -0.0728,-0.18201 -1e-5,-0.0765 0.0243,-0.13627 0.0728,-0.17921 0.0504,-0.0448 0.1092,-0.0672 0.17641,-0.0672 0.0672,0 0.12507,0.0224 0.1736,0.0672 0.0504,0.0429 0.0756,0.10267 0.0756,0.17921" /> - <path - inkscape:connector-curvature="0" - id="path23728" - style="font-weight:bold;marker:none" - d="m 630.20053,556.86139 c -0.0952,-0.18668 -0.19227,-0.40508 -0.29121,-0.65523 -0.0971,-0.25014 -0.18948,-0.52269 -0.27721,-0.81763 l 0.44242,0 c 0.0187,0.0728 0.0401,0.15214 0.0644,0.23801 0.0261,0.084 0.0523,0.16987 0.0784,0.25761 0.028,0.0859 0.0551,0.16987 0.0812,0.25201 0.028,0.0821 0.0551,0.15681 0.0812,0.22401 0.0243,-0.0672 0.0504,-0.14187 0.0784,-0.22401 0.028,-0.0821 0.0551,-0.16614 0.0812,-0.25201 0.028,-0.0877 0.0541,-0.17361 0.0784,-0.25761 0.0261,-0.0859 0.0485,-0.16521 0.0672,-0.23801 l 0.43122,0 c -0.0877,0.29494 -0.18108,0.56749 -0.28001,0.81763 -0.0971,0.25015 -0.19321,0.46855 -0.28841,0.65523 l -0.34722,0" /> - <path - inkscape:connector-curvature="0" - id="path23730" - style="font-weight:bold;marker:none" - d="m 632.68174,556.12216 c 0,0.11574 -0.0168,0.22214 -0.0504,0.31921 -0.0336,0.0952 -0.0821,0.17734 -0.14561,0.24641 -0.0635,0.0672 -0.14,0.11947 -0.22961,0.15681 -0.0877,0.0373 -0.18667,0.056 -0.29681,0.056 -0.10827,0 -0.20721,-0.0187 -0.29681,-0.056 -0.0877,-0.0373 -0.16334,-0.0896 -0.22681,-0.15681 -0.0635,-0.0691 -0.11294,-0.1512 -0.14841,-0.24641 -0.0355,-0.0971 -0.0532,-0.20347 -0.0532,-0.31921 0,-0.11574 0.0177,-0.22121 0.0532,-0.31642 0.0373,-0.0952 0.0877,-0.1764 0.15121,-0.24361 0.0653,-0.0672 0.14187,-0.11947 0.22961,-0.1568 0.0896,-0.0373 0.18667,-0.056 0.29121,-0.056 0.10641,10e-6 0.20348,0.0187 0.29121,0.056 0.0896,0.0373 0.16614,0.0896 0.22961,0.1568 0.0635,0.0672 0.11294,0.14841 0.14841,0.24361 0.0355,0.0952 0.0532,0.20068 0.0532,0.31642 m -0.42562,0 c 0,-0.12881 -0.0261,-0.22961 -0.0784,-0.30242 -0.0504,-0.0747 -0.1232,-0.112 -0.21841,-0.112 -0.0952,0 -0.16894,0.0373 -0.22121,0.112 -0.0523,0.0728 -0.0784,0.17361 -0.0784,0.30242 0,0.1288 0.0261,0.23147 0.0784,0.30801 0.0523,0.0747 0.12601,0.11201 0.22121,0.11201 0.0952,0 0.16801,-0.0373 0.21841,-0.11201 0.0523,-0.0765 0.0784,-0.17921 0.0784,-0.30801" /> - </g> - <rect - style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635472;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="rect8725" - width="249.10905" - height="164.02649" - x="30.756149" - y="-87.776787" /> - <rect - y="922.49878" - x="101.90163" - height="100.40426" - width="220.28499" - id="rect14204" - style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> - <rect - style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" - id="rect6444" - width="212.24748" - height="91.091072" - x="73.813522" - y="821.78479" /> - </g> - <g - style="display:inline" - inkscape:label="graphics" - id="layer6" - inkscape:groupmode="layer"> - <g - id="g3781" - transform="matrix(1.5625,0,0,1.5636219,-179.60041,-93.377544)"> - <polygon - transform="matrix(-1,0,0,1,240.06426,148.07327)" - style="fill:#231f20" - points="32,4 0,4 0,0 32,0 32,4 " - id="polygon5" /> - <polygon - transform="matrix(-1.4,0,0,1,240.06426,148.07327)" - style="fill:#231f20" - points="0,8 20,8 20,12 20,12 0,12 " - id="polygon7" /> - <polygon - transform="matrix(-0.875,0,0,1,240.06426,148.07327)" - style="fill:#231f20" - points="0,20 32,20 32,24 32,24 0,24 " - id="polygon9" /> - <polygon - transform="matrix(-1,0,0,1,240.06426,148.07327)" - style="fill:#231f20" - points="24,32 0,32 0,28 24,28 24,32 " - id="polygon11" /> - </g> - <path - style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" - d="m 163.01082,1415.7865 c -36.78501,6.5326 -42.5348,26.8357 -42.5348,26.8357 l -2.47152,7.1281" - id="path14206" - inkscape:connector-curvature="0" /> - <path - inkscape:connector-curvature="0" - id="path5858-1" - d="M 134.07077,1295.6357 C 97.285756,1289.1031 91.535966,1268.8 91.535966,1268.8 l -2.47152,-7.1281" - style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> - <path - id="path3-6" - d="m 110.34936,428.52925 v -8 h -4.734 c -0.141,-0.391 -0.289,-0.771 -0.469,-1.146 l 3.344,-3.339 -5.656,-5.661 -3.344,3.344 c -0.364,-0.172 -0.766,-0.265 -1.141,-0.406 v -4.792 h -8 v 4.792 c -0.383,0.141 -0.781,0.234 -1.145,0.406 l -3.34,-3.344 -5.66,5.661 3.34,3.339 c -0.175,0.375 -0.324,0.755 -0.461,1.146 h -4.734 v 8 h 4.734 c 0.137,0.391 0.285,0.771 0.461,1.146 l -3.34,3.339 5.66,5.661 3.34,-3.344 c 0.363,0.172 0.762,0.266 1.145,0.406 v 4.792 h 8 v -4.792 c 0.375,-0.141 0.777,-0.234 1.141,-0.406 l 3.344,3.344 5.656,-5.661 -3.344,-3.339 c 0.18,-0.375 0.328,-0.755 0.469,-1.146 h 4.734 z m -16,0.083 c -2.211,0 -4,-1.791 -4,-4 0,-2.208 1.789,-4 4,-4 2.207,0 4,1.792 4,4 0,2.209 -1.793,4 -4,4 z" - style="fill:#231f20;display:inline" - inkscape:connector-curvature="0" /> - </g> - <g - style="display:inline" - inkscape:label="es" - id="layer7" - inkscape:groupmode="layer"> - <g - transform="translate(106.00677,59.44173)" - id="g21408" - style="display:inline"> - <text - transform="scale(0.99912117,1.0008796)" - sodipodi:linespacing="125%" - id="text3067" - y="122.68937" - x="101.1684" - style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - id="tspan8721" - style="font-size:32px;font-weight:bold;fill:#aa4400" - y="122.68937" - x="101.1684" - sodipodi:role="line">listas</tspan></text> - <text - xml:space="preserve" - style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="101.42439" - y="95.114334" - id="text21398" - sodipodi:linespacing="125%" - transform="scale(0.99912117,1.0008796)"><tspan - sodipodi:role="line" - x="101.42439" - y="95.114334" - style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan21402">explicando las</tspan></text> - </g> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="149.85907" - y="-168.92439" - id="text18351" - sodipodi:linespacing="125%" - transform="translate(0,435.82679)"><tspan - y="-168.92439" - x="149.85907" - id="tspan18363" - sodipodi:role="line" - style="font-style:italic">pulsa con tu ratón para continuar</tspan></text> - <text - sodipodi:linespacing="125%" - id="text3071-9-1" - y="406.39865" - x="135.67761" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - id="tspan13782-8" - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="406.39865" - x="135.67761" - sodipodi:role="line">Lo siento, estamos</tspan><tspan - id="tspan8780" - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="421.39865" - x="135.67761" - sodipodi:role="line">diseñando este</tspan><tspan - id="tspan8782" - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="436.39865" - x="135.67761" - sodipodi:role="line">tutorial.</tspan><tspan - id="tspan8870" - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="451.39865" - x="135.67761" - sodipodi:role="line">Mientras tanto...</tspan><tspan - id="tspan8784" - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="466.39865" - x="135.67761" - sodipodi:role="line" /></text> - <text - sodipodi:linespacing="125%" - id="text14208" - y="1375.6914" - x="170.81166" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="1375.6914" - x="170.81166" - sodipodi:role="line" - id="tspan14210" /><tspan - style="font-size:12px;font-weight:normal;fill:#aa4400" - y="1390.6914" - x="170.81166" - sodipodi:role="line" - id="tspan14214">...darnos tu <tspan - id="tspan14216" - style="font-weight:bold">feedback </tspan></tspan><tspan - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - y="1405.6914" - x="170.81166" - sodipodi:role="line" - id="tspan14218">y participar para </tspan><tspan - id="tspan14220" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - y="1420.6914" - x="170.81166" - sodipodi:role="line">mejorar esta </tspan><tspan - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - y="1435.6914" - x="170.81166" - sodipodi:role="line" - id="tspan14222">herramienta...</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="143.14952" - y="1291.6486" - id="text6446" - sodipodi:linespacing="125%"><tspan - id="tspan14200" - sodipodi:role="line" - x="143.14952" - y="1291.6486" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...aquí puedes crear </tspan><tspan - id="tspan14247" - sodipodi:role="line" - x="143.14952" - y="1306.6486" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">nuevas <tspan - style="font-weight:bold" - id="tspan18194">listas</tspan> y </tspan><tspan - id="tspan14251" - sodipodi:role="line" - x="143.14952" - y="1321.6486" - style="font-size:12px;font-style:normal;font-weight:bold;fill:#aa4400"><tspan - id="tspan8937" - style="font-weight:normal"><tspan - style="font-weight:bold" - id="tspan18196">mensajes</tspan>...</tspan></tspan></text> - </g> - <g - style="display:none" - inkscape:label="en" - id="layer8" - inkscape:groupmode="layer"> - <text - transform="scale(0.99912117,1.0008796)" - sodipodi:linespacing="125%" - id="text11705" - y="166.0929" - x="207.26842" - style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - id="tspan11707" - style="font-size:32px;font-weight:bold;fill:#aa4400" - y="166.0929" - x="207.26842" - sodipodi:role="line">lists</tspan></text> - <text - transform="translate(0,435.82679)" - sodipodi:linespacing="125%" - id="text11713" - y="-168.92439" - x="149.85907" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - style="font-style:italic" - sodipodi:role="line" - id="tspan11715" - x="149.85907" - y="-168.92439">click to continue</tspan></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="134.0341" - y="409.18921" - id="text11717" - sodipodi:linespacing="125%"><tspan - sodipodi:role="line" - x="134.0341" - y="409.18921" - style="font-size:12px;font-weight:normal;fill:#aa4400" - id="tspan11719">Sorry, we are</tspan><tspan - id="tspan11791" - sodipodi:role="line" - x="134.0341" - y="424.18921" - style="font-size:12px;font-weight:normal;fill:#aa4400">still designing </tspan><tspan - id="tspan11793" - sodipodi:role="line" - x="134.0341" - y="439.18921" - style="font-size:12px;font-weight:normal;fill:#aa4400">this tutorial.</tspan><tspan - sodipodi:role="line" - x="134.0341" - y="454.18921" - style="font-size:12px;font-weight:normal;fill:#aa4400" - id="tspan11725">Meanwhile...</tspan><tspan - sodipodi:role="line" - x="134.0341" - y="469.18921" - style="font-size:12px;font-weight:normal;fill:#aa4400" - id="tspan11727" /></text> - <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - x="170.81166" - y="1375.6914" - id="text11729" - sodipodi:linespacing="125%"><tspan - id="tspan11731" - sodipodi:role="line" - x="170.81166" - y="1375.6914" - style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan - id="tspan11733" - sodipodi:role="line" - x="170.81166" - y="1390.6914" - style="font-size:12px;font-weight:normal;fill:#aa4400">...give us your <tspan - style="font-weight:bold" - id="tspan11735">feedback </tspan></tspan><tspan - sodipodi:role="line" - x="170.81166" - y="1405.6914" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - id="tspan11739">and participate</tspan><tspan - id="tspan11741" - sodipodi:role="line" - x="170.81166" - y="1420.6914" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">to improve this tool...</tspan></text> - <text - sodipodi:linespacing="125%" - id="text11743" - y="1291.6486" - x="143.14952" - style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - y="1291.6486" - x="143.14952" - sodipodi:role="line" - id="tspan11745">...here you can create</tspan><tspan - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - y="1306.6486" - x="143.14952" - sodipodi:role="line" - id="tspan11751">your new <tspan - style="font-weight:bold" - id="tspan18192">lists</tspan> and</tspan><tspan - id="tspan11814" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - y="1321.6486" - x="143.14952" - sodipodi:role="line"><tspan - id="tspan11816" - style="font-weight:bold">posts</tspan>...</tspan></text> - <text - transform="scale(0.99912117,1.0008796)" - sodipodi:linespacing="125%" - id="text11787" - y="184.92917" - x="207.5244" - style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" - xml:space="preserve"><tspan - id="tspan11789" - style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" - y="184.92917" - x="207.5244" - sodipodi:role="line">explained</tspan></text> - </g> - <g - style="display:none" - inkscape:label="fr" - id="layer9" - inkscape:groupmode="layer" /> - <script - ns1:version="11.11-07001323" - id="sozi-script">var sozi=sozi||{};(function(){var a=sozi.events=sozi.events||{},b={};a.listen=function(d,e){var c=b[d];if(!c){c=b[d]=[]}c.push(e)};a.fire=function(g){var d=b[g],c,f,e=Array.prototype.slice.call(arguments,1);if(d){c=d.length;for(f=0;f<c;f+=1){d[f].apply(null,e)}}}}());var sozi=sozi||{};(function(){var w=sozi.framelist=sozi.framelist||{},k=this,r=k.document,q,m,c,j=0,d=5,i,u,b… h(A){return function(B){sozi.player.previewFrame(A);B.stopPropagation()}}function l(A){A.stopPropagation()}function p(B){var A=B.relatedTarget;while(A!==m&&A!==q){A=A.parentNode}if(A===q){w.hide();sozi.player.restart();B.stopPropagation()}}function t(B){var A=c.getCTM().f;if(A<=-k.innerHeight/2){A+=k.innerHeight/2}else{if(A<0){A=0}}c.setAttribute("transform","translate(0,"+A+")");B.stopPropagation()}function e(B){var A=c.getCTM().f;if(A+j>=k.innerHeight*3/2){A-=k.innerHeight/2}else{if(A+j>k.innerHeight+2*d){A=k.innerHeight-j-4*d}}c.setAttribute("transform","translate(0,"+A+")");B.stopPropagation()}function s(A){var C=sozi.animation.profiles[g](A),B=1-C;z=y*C+b*B;m.setAttribute("transform","translate("+z+",0)")}function x(){}function o(){var G=r.createElementNS(a,"rect"),A=r.createElementNS(a,"path"),E=r.createElementNS(a,"path"),H=0,F,C=sozi.document.frames.length,B=sozi.location.getFrameIndex(),D,I;q=r.documentElement;m=r.createElementNS(a,"g");m.setAttribute("id","sozi-toc");q.appendChild(m);c=r.createElementNS(a,"g");m.appendChild(c);G.setAttribute("id","sozi-toc-background");G.setAttribute("x",d);G.setAttribute("y",d);G.setAttribute("rx",d);G.setAttribute("ry",d);G.addEventListener("click",l,false);G.addEventListener("mousedown",l,false);G.addEventListener("mouseout",p,false);c.appendChild(G);for(D=0;D<C;D+=1){I=r.createElementNS(a,"text");I.appendChild(r.createTextNode(sozi.document.frames[D].title));c.appendChild(I);if(D===B){I.setAttribute("class","sozi-toc-current")}F=I.getBBox().width;j+=I.getBBox().height;if(F>H){H=F}I.setAttribute("x",2*d);I.setAttribute("y",j+d);I.addEventListener("click",h(D),false);I.addEventListener("mousedown",l,false)}A.setAttribute("class","sozi-toc-arrow");A.setAttribute("d","M"+(H+3*d)+","+(5*d)+" l"+(4*d)+",0 l-"+(2*d)+",-"+(3*d)+" z");A.addEventListener("click",t,false);A.addEventListener("mousedown",l,false);m.appendChild(A);E.setAttribute("class","sozi-toc-arrow");E.setAttribute("d","M"+(H+3*d)+","+(7*d)+" l"+(4*d)+",0 l-"+(2*d)+","+(3*d)+" z");E.addEventListener("click",e,false);E.addEventListener("mousedown",l,false);m.appendChild(E);G.setAttribute("width",H+7*d);G.setAttribute("height",j+2*d);i=-H-9*d;u=0;z=y=i;m.setAttribute("transform","translate("+i+",0)");v=new sozi.animation.Animator(s,x)}function n(A){var D=r.getElementsByClassName("sozi-toc-current"),C=c.getElementsByTagName("text"),B;for(B=0;B<D.length;B+=1){D[B].removeAttribute("class")}C[A].setAttribute("class","sozi-toc-current")}w.show=function(){b=z;y=u;v.start(f)};w.hide=function(){b=z;y=i;v.start(f)};w.isVisible=function(){return y===u};sozi.events.listen("displayready",o);sozi.events.listen("cleanup",w.hide);sozi.events.listen("framechange",n)}());var sozi=sozi||{};(function(){var t=sozi.player=sozi.player||{},u=sozi.display=sozi.display||{},j=this,o=j.document,p=0,v=1,s=1.05,x=5,c=false,l=false,g=0,e=0;function a(A,z,B){t.stop();u.zoom(A>0?s:1/s,z,B)}function w(y){t.stop();u.rotate(y>0?x:-x)}function r(){if(sozi.framelist.isVisible()){sozi.framelist.hide();t.restart()}else{t.stop();sozi.framelist.show()}}function i(y){if(y.button===p){c=true;l=false;g=y.clientX;e=y.clientY}else{if(y.button===v){r()}}y.stopPropagation()}function m(y){if(c){t.stop();l=true;sozi.events.fire("cleanup");u.drag(y.clientX-g,y.clientY-e);g=y.clientX;e=y.clientY}y.stopPropagation()}function f(y){if(y.button===p){c=false}y.stopPropagation()}function q(y){t.moveToPrevious();y.stopPropagation();y.preventDefault()}function h(y){if(!l&&y.button!==v){t.moveToNext()}y.stopPropagation()}function k(y){var z=0;if(!y){y=j.event}if(y.wheelDelta){z=y.wheelDelta;if(j.opera){z=-z}}else{if(y.detail){z=-y.detail}}if(z!==0){if(y.shiftKey){w(z)}else{a(z,y.clientX,y.clientY)}}y.stopPropagation();y.preventDefault()}function n(y){switch(y.charCode){case 43:a(1,j.innerWidth/2,j.innerHeight/2);break;case 45:a(-1,j.innerWidth/2,j.innerHeight/2);break;case 61:t.moveToCurrent();break;case 70:case 102:t.showAll();break;case 84:case 116:r();break;case 82:w(-1);break;case 114:w(1);break}y.stopPropagation()}function d(y){switch(y.keyCode){case 36:t.moveToFirst();break;case 35:t.moveToLast();break;case 38:t.jumpToPrevious();break;case 33:case 37:t.moveToPrevious();break;case 40:t.jumpToNext();break;case 34:case 39:case 13:case 32:t.moveToNext();break}y.stopPropagation()}function b(){var y=o.documentElement;y.addEventListener("click",h,false);y.addEventListener("mousedown",i,false);y.addEventListener("mouseup",f,false);y.addEventListener("mousemove",m,false);y.addEventListener("keypress",n,false);y.addEventListener("keydown",d,false);y.addEventListener("contextmenu",q,false);y.addEventListener("DOMMouseScroll",k,false);j.onmousewheel=k}j.addEventListener("load",b,false)}());var sozi=sozi||{};(function(){var e=sozi.animation=sozi.animation||{},h=this,j=40,d=[],b,i=h.mozRequestAnimationFrame||h.webkitRequestAnimationFrame||h.msRequestAnimationFrame||h.oRequestAnimationFrame;function c(){if(i){i(f)}else{b=h.setInterval(function(){f(Date.now())},j)}}function f(l){var k;if(d.length>0){if(i){i(f)}for(k=0;k<d.length;k+=1){d[k].step(l)}}else{if(!i){h.clearInterval(b)}}}function a(k){d.push(k);if(d.length===1){c()}}function g(k){d.splice(d.indexOf(k),1)}e.Animator=function(k,l){this.onStep=k;this.onDone=l;this.durationMs=0;this.data={};this.initialTime=0;this.started=false};e.Animator.prototype.start=function(k,l){this.durationMs=k;this.data=l;this.initialTime=Date.now();this.onStep(0,this.data);if(!this.started){this.started=true;a(this)}};e.Animator.prototype.stop=function(){if(this.started){g(this);this.started=false}};e.Animator.prototype.step=function(l){var k=l-this.initialTime;if(k>=this.durationMs){this.stop();this.onStep(1,this.data);this.onDone()}else{this.onStep(k/this.durationMs,this.data)}};e.profiles={linear:function(k){return k},accelerate:function(k){return Math.pow(k,3)},"strong-accelerate":function(k){return Math.pow(k,5)},decelerate:function(k){return 1-Math.pow(1-k,3)},"strong-decelerate":function(k){return 1-Math.pow(1-k,5)},"accelerate-decelerate":function(k){var l=k<=0.5?k:1-k,m=Math.pow(2*l,3)/2;return k<=0.5?m:1-m},"strong-accelerate-decelerate":function(k){var l=k<=0.5?k:1-k,m=Math.pow(2*l,5)/2;return k<=0.5?m:1-m},"decelerate-accelerate":function(k){var l=k<=0.5?k:1-k,m=(1-Math.pow(1-2*l,2))/2;return k<=0.5?m:1-m},"strong-decelerate-accelerate":function(k){var l=k<=0.5?k:1-k,m=(1-Math.pow(1-2*l,3))/2;return k<=0.5?m:1-m}}}());var sozi=sozi||{};(function(){var d=sozi.player=sozi.player||{},j=sozi.display=sozi.display||{},h=this,c,k,e=500,q=-10,l="linear",g=0,n=0,o=false,p=false;function f(t,w){var v=1-t,u=w.profile(t),s=1-u,r,x;for(r in w.initialState){if(w.initialState.hasOwnProperty(r)){if(typeof w.initialState[r]==="number"&&typeof w.finalState[r]==="number"){j.geometry[r]=w.finalState[r]*u+w.initialState[r]*s}}}if(w.zoomWidth&&w.zoomWidth.k!==0){x=t-w.zoomWidth.ts;j.geometry.width=w.zoomWidth.k*x*x+w.zoomWidth.ss}if(w.zoomHeight&&w.zoomHeight.k!==0){x=t-w.zoomHeight.ts;j.geometry.height=w.zoomHeight.k*x*x+w.zoomHeight.ss}j.clip=w.finalState.clip;j.update()}function i(){var r;if(sozi.document.frames[n].timeoutEnable){p=true;r=(n+1)%sozi.document.frames.length;k=h.setTimeout(function(){d.moveToFrame(r)},sozi.document.frames[n].timeoutMs)}}function m(){g=n;if(o){i()}}d.startFromIndex=function(r){o=true;p=false;g=r;n=r;j.showFrame(sozi.document.frames[r]);i()};d.restart=function(){d.startFromIndex(n)};d.stop=function(){c.stop();if(p){h.clearTimeout(k);p=false}o=false;g=n};function b(r,B,z){var C={ss:((r<0)?Math.max(B,z):Math.min(B,z))*(100-r)/100,ts:0.5,k:0},x,w,t,s,A,y;if(r!==0){x=B-z;w=B-C.ss;t=z-C.ss;if(x!==0){s=Math.sqrt(w*t);A=(w-s)/x;y=(w+s)/x;C.ts=(A>0&&A<=1)?A:y}C.k=w/C.ts/C.ts}return C}d.jumpToFrame=function(r){d.stop();sozi.events.fire("cleanup");g=r;n=r;j.showFrame(sozi.document.frames[r]);sozi.events.fire("framechange",r)};d.previewFrame=function(s){var u=sozi.document.frames[s].geometry,r,t;if(q!==0){r=b(q,j.geometry.width,u.width);t=b(q,j.geometry.height,u.height)}n=s;c.start(e,{initialState:j.getCurrentGeometry(),finalState:u,profile:sozi.animation.profiles[l],zoomWidth:r,zoomHeight:t});sozi.events.fire("framechange",s)};d.moveToFrame=function(t){var s=e,w=q,u=sozi.animation.profiles[l],r,v;if(p){h.clearTimeout(k);p=false}if(t===(n+1)%sozi.document.frames.length){s=sozi.document.frames[t].transitionDurationMs;w=sozi.document.frames[t].transitionZoomPercent;u=sozi.document.frames[t].transitionProfile}sozi.events.fire("cleanup");if(w!==0){r=b(w,j.geometry.width,sozi.document.frames[t].geometry.width);v=b(w,j.geometry.height,sozi.document.frames[t].geometry.height)}o=true;n=t;c.start(s,{initialState:j.getCurrentGeometry(),finalState:sozi.document.frames[n].geometry,profile:u,zoomWidth:r,zoomHeight:v});sozi.events.fire("framechange",t)};d.moveToFirst=function(){d.moveToFrame(0)};d.jumpToPrevious=function(){var r=n;if(!c.started||g<=n){r-=1}if(r>=0){d.jumpToFrame(r)}};d.moveToPrevious=function(){var r=n,s;for(r-=1;r>=0;r-=1){s=sozi.document.frames[r];if(!s.timeoutEnable||s.timeoutMs!==0){d.moveToFrame(r);break}}};d.jumpToNext=function(){var r=n;if(!c.started||g>=n){r+=1}if(r<sozi.document.frames.length){d.jumpToFrame(r)}};d.moveToNext=function(){if(n<sozi.document.frames.length-1||sozi.document.frames[n].timeoutEnable){d.moveToFrame((n+1)%sozi.document.frames.length)}};d.moveToLast=function(){d.moveToFrame(sozi.document.frames.length-1)};d.moveToCurrent=function(){d.moveToFrame(n)};d.showAll=function(){d.stop();sozi.events.fire("cleanup");c.start(e,{initialState:j.getCurrentGeometry(),finalState:j.getDocumentGeometry(),profile:sozi.animation.profiles[l]})};function a(){d.startFromIndex(sozi.location.getFrameIndex())}c=new sozi.animation.Animator(f,m);sozi.events.listen("displayready",a)}());var sozi=sozi||{};(function(){var d=sozi.display=sozi.display||{},h=this,i=h.document,j,c,k,a,g="http://… f(){var o,l=i.createElementNS(g,"g"),m=i.createElementNS(g,"clipPath");j=i.documentElement;k=j.getBBox();a=i.createElementNS(g,"g");while(true){o=j.firstChild;if(!o){break}j.removeChild(o);a.appendChild(o)}c=i.createElementNS(g,"rect");c.setAttribute("id","sozi-clip-rect");m.setAttribute("id","sozi-clip-path");m.appendChild(c);j.appendChild(m);l.setAttribute("clip-path","url(#sozi-clip-path)");l.appendChild(a);j.appendChild(l);j.setAttribute("width",h.innerWidth);j.setAttribute("height",h.innerHeight);sozi.events.fire("displayready")}function b(){j.setAttribute("width",h.innerWidth);j.setAttribute("height",h.innerHeight);d.update()}function e(){var l={};l.scale=Math.min(h.innerWidth/d.geometry.width,h.innerHeight/d.geometry.height);l.width=d.geometry.width*l.scale;l.height=d.geometry.height*l.scale;l.x=(h.innerWidth-l.width)/2;l.y=(h.innerHeight-l.height)/2;return l}d.getElementGeometry=function(l){var s,p,t,n,q,o,r=l.getCTM(),m=Math.sqrt(r.a*r.a+r.b*r.b);if(l.nodeName==="rect"){s=l.x.baseVal.value;p=l.y.baseVal.value;t=l.width.baseVal.value;n=l.height.baseVal.value}else{q=l.getBBox();s=q.x;p=q.y;t=q.width;n=q.height}o=i.documentElement.createSVGPoint();o.x=s+t/2;o.y=p+n/2;o=o.matrixTransform(r);return{cx:o.x,cy:o.y,width:t*m,height:n*m,rotate:Math.atan2(r.b,r.a)*180/Math.PI}};d.getDocumentGeometry=function(){return{cx:k.x+k.width/2,cy:k.y+k.height/2,width:k.width,height:k.height,rotate:0,clip:false}};d.getCurrentGeometry=function(){return{cx:d.geometry.cx,cy:d.geometry.cy,width:d.geometry.width,height:d.geometry.height,rotate:d.geometry.rotate,clip:d.geometry.clip}};d.update=function(){var l=e(),n=-d.geometry.cx+d.geometry.width/2+l.x/l.scale,m=-d.geometry.cy+d.geometry.height/2+l.y/l.scale;a.setAttribute("transform","scale("+l.scale+")translate("+n+","+m+")rotate("+(-d.geometry.rotate)+","+d.geometry.cx+","+d.geometry.cy+")");c.setAttribute("x",d.geometry.clip?l.x:0);c.setAttribute("y",d.geometry.clip?l.y:0);c.setAttribute("width",d.geometry.clip?l.width:h.innerWidth);c.setAttribute("height",d.geometry.clip?l.height:h.innerHeight)};d.showFrame=function(m){var l;for(l in m.geometry){if(m.geometry.hasOwnProperty(l)){d.geometry[l]=m.geometry[l]}}d.update()};d.drag=function(m,l){var n=e(),o=d.geometry.rotate*Math.PI/180;d.geometry.cx-=(m*Math.cos(o)-l*Math.sin(o))/n.scale;d.geometry.cy-=(m*Math.sin(o)+l*Math.cos(o))/n.scale;d.geometry.clip=false;d.update()};d.zoom=function(o,m,p){var n=(1-o)*(m-h.innerWidth/2),l=(1-o)*(p-h.innerHeight/2);d.geometry.width/=o;d.geometry.height/=o;d.drag(n,l)};d.rotate=function(l){d.geometry.rotate+=l;d.geometry.rotate%=360;d.update()};sozi.events.listen("documentready",f);h.addEventListener("resize",b,false)}());var sozi=sozi||{};(function(){var c=sozi.document=sozi.document||{},g=this,a=g.document,f="http://sozi.baierouge.fr",d={title:"Untitled",sequence:"0",hide:"true",clip:"true","timeout-enable":"false","timeout-ms":"5000","transition-duration-ms":"1000","transition-zoom-percent":"0","transition-profile":"linear"};c.frames=[];function h(j,i){var k=j.getAttributeNS(f,i);return k===""?d[i]:k}function b(){var j=a.getElementsByTagNameNS(f,"frame"),k=j.length,m,l,n;for(l=0;l<k;l+=1){m=a.getElementById(j[l].getAttributeNS(f,"refid"));if(m){n={geometry:sozi.display.getElementGeometry(m),title:h(j[l],"title"),sequence:parseInt(h(j[l],"sequence"),10),hide:h(j[l],"hide")==="true",timeoutEnable:h(j[l],"timeout-enable")==="true",timeoutMs:parseInt(h(j[l],"timeout-ms"),10),transitionDurationMs:parseInt(h(j[l],"transition-duration-ms"),10),transitionZoomPercent:parseInt(h(j[l],"transition-zoom-percent"),10),transitionProfile:sozi.animation.profiles[h(j[l],"transition-profile")||"linear"]};if(n.hide){m.setAttribute("visibility","hidden")}n.geometry.clip=h(j[l],"clip")==="true";c.frames.push(n)}}c.frames.sort(function(o,i){return o.sequence-i.sequence})}function e(){a.documentElement.removeAttribute("viewBox");b();sozi.events.fire("documentready")}g.addEventListener("load",e,false)}());var sozi=sozi||{};(function(){var a=sozi.location=sozi.location||{},e=this,c=false;a.getFrameIndex=function(){var g=e.location.hash?parseInt(e.location.hash.slice(1),10)-1:0;if(isNaN(g)||g<0){return 0}else{if(g>=sozi.document.frames.length){return sozi.document.frames.length-1}else{return g}}};function f(){var g=a.getFrameIndex();if(!c){sozi.player.moveToFrame(g)}c=false}function d(g){c=true;e.location.hash="#"+(g+1)}function b(){confLang();sozi.events.listen("framechange",d)}e.addEventListener("hashchange",f,false);e.addEventListener("load",b,false)}());</script> - <style - ns1:version="11.11-07001323" - id="sozi-style">#sozi-toc text{fill:#eff;font-family:Verdana,sans-serif;font-size:12pt}#sozi-toc text:hover{fill:#0cf;cursor:pointer}#sozi-toc text.sozi-toc-current{fill:#fa4}#sozi-toc-background{stroke:#222;stroke-opacity:.1;stroke-width:10;fill:#222;fill-opacity:.9}.sozi-toc-arrow{fill:#eff;fill-opacity:.75;stroke:none}.sozi-toc-arrow:hover{fill:#0cf}</style> - <ns1:frame - ns1:transition-profile="linear" - ns1:timeout-enable="false" - ns1:timeout-ms="5000" - ns1:transition-zoom-percent="0" - ns1:title="Intro" - ns1:clip="true" - ns1:hide="true" - ns1:transition-duration-ms="1000" - ns1:sequence="1" - ns1:refid="rect4591" /> - <ns1:frame - ns1:refid="rect8725" - ns1:sequence="2" - ns1:transition-duration-ms="1000" - ns1:hide="true" - ns1:clip="true" - ns1:title="under construction" - ns1:transition-zoom-percent="0" - ns1:timeout-ms="5000" - ns1:timeout-enable="false" - ns1:transition-profile="linear" /> - <ns1:frame - ns1:transition-profile="linear" - ns1:timeout-enable="false" - ns1:timeout-ms="5000" - ns1:transition-zoom-percent="0" - ns1:title="new" - ns1:clip="true" - ns1:hide="true" - ns1:transition-duration-ms="1000" - ns1:sequence="3" - ns1:refid="rect6444" /> - <ns1:frame - ns1:transition-profile="linear" - ns1:timeout-enable="false" - ns1:timeout-ms="5000" - ns1:transition-zoom-percent="0" - ns1:title="feedback" - ns1:clip="true" - ns1:hide="true" - ns1:transition-duration-ms="1000" - ns1:sequence="4" - ns1:refid="rect14204" /> -</svg>

1 0

r1767 - in trunk: . dev-utils src/main/java/cc/kune/common/client/actions/gwtui src/main/java/cc/kune/core/server src/main/java/cc/kune/core/server/manager/file src/main/java/cc/kune/core/server/manager/impl src/main/java/cc/kune/core/server/rpc src/main/java/cc/kune/gspace/client/actions src/main/java/cc/kune/gspace/client/viewers src/main/java/cc/kune/lists/client/actions src/main/webapp/tutorials
by Vicente J. Ruiz Jurado 17 Mar '12

17 Mar '12

Author: vjrj_ Date: 2012-03-17 22:43:47 +0100 (Sat, 17 Mar 2012) New Revision: 1767 Added: trunk/dev-utils/wave.patch trunk/src/main/webapp/tutorials/lists.svg.2012_03_14_10_40_56.0.svg Modified: trunk/.project trunk/INSTALL trunk/TODO trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/core/server/UserSessionManager.java trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerOptionsMenu.java trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerShareMenu.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java trunk/src/main/java/cc/kune/lists/client/actions/OptionsListMenu.java Log: Some more fixes Modified: trunk/.project =================================================================== --- trunk/.project 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/.project 2012-03-17 21:43:47 UTC (rev 1767) @@ -1,46 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>kune</name> - <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> - <projects/> - <buildSpec> - <buildCommand> - <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> - </buildCommand> - <buildCommand> - <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.common.project.facet.core.builder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.wst.validation.validationbuilder</name> - </buildCommand> - <buildCommand> - <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> - </buildCommand> - <buildCommand> - <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> - </buildCommand> - <buildCommand> - <name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name> - </buildCommand> - <buildCommand> - <name>org.eclipse.recommenders.rcp.analysis.RecommendersBuilder</name> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.wst.common.project.facet.core.nature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> - <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> - <nature>org.eclipse.ajdt.ui.ajnature</nature> - <nature>com.google.gwt.eclipse.core.gwtNature</nature> - <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> - <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> - <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature> - <nature>org.eclipse.recommenders.rcp.analysis.RecommendersNature</nature> - </natures> -</projectDescription> \ No newline at end of file + <name>kune</name> + <comment>kune free/open/libre collaboration platform. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>com.google.gdt.eclipse.core.webAppProjectValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.google.gwt.eclipse.core.gwtProjectValidator</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.common.project.facet.core.builder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.wst.validation.validationbuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>com.instantiations.assist.eclipse.coverage.instrumentationBuilder</name> + <arguments> + </arguments> + </buildCommand> + <buildCommand> + <name>org.eclipse.recommenders.rcp.analysis.RecommendersBuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + <nature>org.eclipse.ajdt.ui.ajnature</nature> + <nature>com.google.gwt.eclipse.core.gwtNature</nature> + <nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature> + <nature>com.instantiations.assist.eclipse.coverage.codeCoverageNature</nature> + <nature>org.eclipse.recommenders.rcp.analysis.RecommendersNature</nature> + </natures> +</projectDescription> Modified: trunk/INSTALL =================================================================== --- trunk/INSTALL 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/INSTALL 2012-03-17 21:43:47 UTC (rev 1767) @@ -247,9 +247,8 @@ ===Openfire auth via Kune=== -Download from http://kune.cc/downloads/openfireauth model-VERSION.jar and kune-openfireauth-VERSION.jar and copy to /usr/share/openfire/lib as root. Set the correct owner: +Download from http://kune.cc/downloads/openfireauth kune-openfireauth-VERSION.jar and copy to /usr/share/openfire/lib as root. Set the correct owner: -chown openfire:openfire /usr/share/openfire/lib/model-VERSION.jar chown openfire:openfire /usr/share/openfire/lib/kune-openfireauth-VERSION.jar (do something equivalent in Windows systems in the openfire folder). @@ -263,8 +262,7 @@ DELETE FROM `ofProperty` WHERE name='hybridAuthProvider.tertiaryProvider.className'; INSERT INTO `ofProperty` VALUES ('provider.auth.className','org.jivesoftware.openfire.auth.HybridAuthProvider'); INSERT INTO `ofProperty` VALUES('hybridAuthProvider.primaryProvider.className','cc.kune.core.server.auth.openfire.KuneAuthProvider'); -INSERT INTO `ofProperty` VALUES('hybridAuthProvider.secondaryProvider.className','org.jivesoftware.openfire.auth.JDBCAuthProvider'); -INSERT INTO `ofProperty` VALUES('hybridAuthProvider.tertiaryProvider.className','org.jivesoftware.openfire.auth.DefaultAuthProvider'); +INSERT INTO `ofProperty` VALUES('hybridAuthProvider.secondaryProvider.className','org.jivesoftware.openfire.auth.DefaultAuthProvider'); Alternatively you can do this via 'Server > Server Manager > System Properties'. @@ -275,8 +273,6 @@ jdbcProvider.driver = com.mysql.jdbc.Driver jdbcProvider.connectionString = jdbc:mysql://localhost/kune_dev?user=kune&password=db4kune&useUnicode=true&characterEncoding=utf-8 provider.user.className = org.jivesoftware.openfire.user.JDBCUserProvider -jdbcAuthProvider.passwordSQL = SELECT password FROM kune_dev.kusers WHERE shortName=? -jdbcAuthProvider.passwordType = plain jdbcUserProvider.allUsersSQL = SELECT shortName FROM kune_dev.kusers jdbcUserProvider.emailField = email jdbcUserProvider.loadUserSQL = SELECT shortName,email FROM kune_dev.kusers WHERE shortName=? @@ -303,10 +299,6 @@ <className>org.jivesoftware.openfire.user.JDBCUserProvider</className> </user> </provider> - <jdbcAuthProvider> - <passwordSQL>SELECT password FROM kune_dev.kusers WHERE shortName=?</passwordSQL> - <passwordType>plain</passwordType> - </jdbcAuthProvider> <jdbcUserProvider> <loadUserSQL>SELECT shortName,email FROM kune_dev.kusers WHERE shortName=?</loadUserSQL> <userCountSQL>SELECT COUNT(*) FROM kune_dev.kusers</userCountSQL> @@ -324,7 +316,6 @@ </pre> Instead of: - <jdbcAuthProvider/> <jdbcUserProvider/> <admin/> Modified: trunk/TODO =================================================================== --- trunk/TODO 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/TODO 2012-03-17 21:43:47 UTC (rev 1767) @@ -22,6 +22,11 @@ *** copy the jar and the compilation to other sites in the same lan *** update /etc/kune (if needed) *** migrate the database (if needed) +** users presence vi API (for better notifications) +http://www.igniterealtime.org/projects/openfire/plugins/presence/readme.html +http://127.0.0.1:9090/plugins/presence/status?jid=admin@localhost&type=xml +http://community.igniterealtime.org/thread/29064 +http://www.igniterealtime.org/builds/wildfire/docs/3.3.0_alpha_1/documentation/javadoc/org/jivesoftware/wildfire/commands/admin/GetUsersPresence.html ** group.inexistentTool nasty error ** calendar support *** gwt-cal + http://ical4j.sourceforge.net/introduction.html Added: trunk/dev-utils/wave.patch =================================================================== --- trunk/dev-utils/wave.patch (rev 0) +++ trunk/dev-utils/wave.patch 2012-03-17 21:43:47 UTC (rev 1767) @@ -0,0 +1,891 @@ +diff --git a/.classpath b/.classpath +index dbfd956..1ab7f02 100644 +--- a/.classpath ++++ b/.classpath +@@ -37,7 +37,7 @@ + <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-io-8.0.1.v20110908.jar"/> + <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-security-8.0.1.v20110908.jar"/> + <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-server-8.0.1.v20110908.jar"/> +- <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-servlet-8.0.1.v20110908.jar"/> ++ <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-servlet-8.0.1.v20110908.jar" sourcepath="/home/vjrj/.m2/repository/org/eclipse/jetty/jetty-servlet/8.0.1.v20110908/jetty-servlet-8.0.1.v20110908-sources.jar"/> + <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-servlets-8.0.1.v20110908.jar"/> + <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-util-8.0.1.v20110908.jar"/> + <classpathentry kind="lib" path="third_party/runtime/jetty/jetty-webapp-8.0.1.v20110908.jar"/> +@@ -67,7 +67,7 @@ + <classpathentry kind="lib" path="third_party/test/hamcrest/hamcrest-all-1.2.jar"/> + <classpathentry kind="lib" path="third_party/test/jmock/jmock-2.5.1.jar"/> + <classpathentry kind="lib" path="third_party/test/jmock/jmock-junit3-2.5.1.jar"/> +- <classpathentry kind="lib" path="third_party/test/junit/junit.jar"/> ++ <classpathentry kind="lib" path="third_party/test/junit/junit.jar" sourcepath="/home/vjrj/.m2/repository/junit/junit/3.8.2/junit-3.8.2-sources.jar"/> + <classpathentry kind="lib" path="third_party/test/junit/src.jar"/> + <classpathentry kind="lib" path="third_party/test/mockito/mockito-all-1.8.2.jar"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> +diff --git a/.settings/org.eclipse.jdt.ui.prefs b/.settings/org.eclipse.jdt.ui.prefs +index d34cf38..02223a6 100644 +--- a/.settings/org.eclipse.jdt.ui.prefs ++++ b/.settings/org.eclipse.jdt.ui.prefs +@@ -1,8 +1,61 @@ +-#Fri Sep 03 16:36:23 EST 2010 ++#Thu Feb 09 02:06:43 CET 2012 + eclipse.preferences.version=1 ++editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=false + formatter_profile=_Wave Protocol Format + formatter_settings_version=11 + org.eclipse.jdt.ui.ignorelowercasenames=true + org.eclipse.jdt.ui.importorder=com.google;com;edu;freemarker;junit;net;org;java;javax; + org.eclipse.jdt.ui.ondemandthreshold=99 + org.eclipse.jdt.ui.staticondemandthreshold=99 ++sp_cleanup.add_default_serial_version_id=true ++sp_cleanup.add_generated_serial_version_id=false ++sp_cleanup.add_missing_annotations=true ++sp_cleanup.add_missing_deprecated_annotations=true ++sp_cleanup.add_missing_methods=false ++sp_cleanup.add_missing_nls_tags=false ++sp_cleanup.add_missing_override_annotations=true ++sp_cleanup.add_missing_override_annotations_interface_methods=true ++sp_cleanup.add_serial_version_id=false ++sp_cleanup.always_use_blocks=true ++sp_cleanup.always_use_parentheses_in_expressions=false ++sp_cleanup.always_use_this_for_non_static_field_access=false ++sp_cleanup.always_use_this_for_non_static_method_access=false ++sp_cleanup.convert_to_enhanced_for_loop=true ++sp_cleanup.correct_indentation=true ++sp_cleanup.format_source_code=false ++sp_cleanup.format_source_code_changes_only=false ++sp_cleanup.make_local_variable_final=true ++sp_cleanup.make_parameters_final=true ++sp_cleanup.make_private_fields_final=true ++sp_cleanup.make_type_abstract_if_missing_method=false ++sp_cleanup.make_variable_declarations_final=true ++sp_cleanup.never_use_blocks=false ++sp_cleanup.never_use_parentheses_in_expressions=true ++sp_cleanup.on_save_use_additional_actions=false ++sp_cleanup.organize_imports=false ++sp_cleanup.qualify_static_field_accesses_with_declaring_class=false ++sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true ++sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true ++sp_cleanup.qualify_static_member_accesses_with_declaring_class=false ++sp_cleanup.qualify_static_method_accesses_with_declaring_class=false ++sp_cleanup.remove_private_constructors=true ++sp_cleanup.remove_trailing_whitespaces=true ++sp_cleanup.remove_trailing_whitespaces_all=true ++sp_cleanup.remove_trailing_whitespaces_ignore_empty=false ++sp_cleanup.remove_unnecessary_casts=true ++sp_cleanup.remove_unnecessary_nls_tags=false ++sp_cleanup.remove_unused_imports=true ++sp_cleanup.remove_unused_local_variables=false ++sp_cleanup.remove_unused_private_fields=true ++sp_cleanup.remove_unused_private_members=false ++sp_cleanup.remove_unused_private_methods=true ++sp_cleanup.remove_unused_private_types=true ++sp_cleanup.sort_members=true ++sp_cleanup.sort_members_all=true ++sp_cleanup.use_blocks=true ++sp_cleanup.use_blocks_only_for_return_and_throw=false ++sp_cleanup.use_parentheses_in_expressions=false ++sp_cleanup.use_this_for_non_static_field_access=false ++sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true ++sp_cleanup.use_this_for_non_static_method_access=false ++sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +diff --git a/src/org/waveprotocol/box/server/ServerMain.java b/src/org/waveprotocol/box/server/ServerMain.java +index 7ce78fb..abc5a4e 100644 +--- a/src/org/waveprotocol/box/server/ServerMain.java ++++ b/src/org/waveprotocol/box/server/ServerMain.java +@@ -211,23 +211,23 @@ public class ServerMain { + } + + private static void initializeServlets(Injector injector, ServerRpcProvider server) { +- server.addServlet("/attachment/*", AttachmentServlet.class); ++ server.addServlet("/attachment/*", injector.getInstance(AttachmentServlet.class)); + +- server.addServlet(SessionManager.SIGN_IN_URL, AuthenticationServlet.class); +- server.addServlet("/auth/signout", SignOutServlet.class); +- server.addServlet("/auth/register", UserRegistrationServlet.class); ++ server.addServlet(SessionManager.SIGN_IN_URL, injector.getInstance(AuthenticationServlet.class)); ++ server.addServlet("/auth/signout", injector.getInstance(SignOutServlet.class)); ++ server.addServlet("/auth/register", injector.getInstance(UserRegistrationServlet.class)); + +- server.addServlet("/fetch/*", FetchServlet.class); +- server.addServlet("/search/*", SearchServlet.class); ++ server.addServlet("/fetch/*", injector.getInstance(FetchServlet.class)); ++ server.addServlet("/search/*", injector.getInstance(SearchServlet.class)); + +- server.addServlet("/robot/dataapi", DataApiServlet.class); +- server.addServlet(DataApiOAuthServlet.DATA_API_OAUTH_PATH + "/*", DataApiOAuthServlet.class); +- server.addServlet("/robot/dataapi/rpc", DataApiServlet.class); +- server.addServlet("/robot/register/*", RobotRegistrationServlet.class); +- server.addServlet("/robot/rpc", ActiveApiServlet.class); +- server.addServlet("/webclient/remote_logging", RemoteLoggingServiceImpl.class); +- server.addServlet("/profile/*", FetchProfilesServlet.class); +- server.addServlet("/waveref/*", WaveRefServlet.class); ++ server.addServlet("/robot/dataapi", injector.getInstance(DataApiServlet.class)); ++ server.addServlet(DataApiOAuthServlet.DATA_API_OAUTH_PATH + "/*", injector.getInstance(DataApiOAuthServlet.class)); ++ server.addServlet("/robot/dataapi/rpc", injector.getInstance(DataApiServlet.class)); ++ server.addServlet("/robot/register/*", injector.getInstance(RobotRegistrationServlet.class)); ++ server.addServlet("/robot/rpc", injector.getInstance(ActiveApiServlet.class)); ++ server.addServlet("/webclient/remote_logging", injector.getInstance(RemoteLoggingServiceImpl.class)); ++ server.addServlet("/profile/*", injector.getInstance(FetchProfilesServlet.class)); ++ server.addServlet("/waveref/*", injector.getInstance(WaveRefServlet.class)); + + String gadgetHostName = + injector +@@ -236,9 +236,9 @@ public class ServerMain { + injector.getInstance(Key.get(Integer.class, Names.named(CoreSettings.GADGET_SERVER_PORT))); + Map<String, String> initParams = + Collections.singletonMap("HostHeader", gadgetHostName + ":" + port); +- server.addServlet("/gadgets/*", GadgetProxyServlet.class, initParams); ++ server.addServlet("/gadgets/*", injector.getInstance(GadgetProxyServlet.class), initParams); + +- server.addServlet("/", WaveClientServlet.class); ++ server.addServlet("/", injector.getInstance(WaveClientServlet.class)); + } + + private static void initializeRobots(Injector injector, WaveBus waveBus) { +@@ -247,10 +247,10 @@ public class ServerMain { + } + + private static void initializeRobotAgents(Injector injector, ServerRpcProvider server) { +- server.addServlet(PasswordRobot.ROBOT_URI + "/*", PasswordRobot.class); +- server.addServlet(PasswordAdminRobot.ROBOT_URI + "/*", PasswordAdminRobot.class); +- server.addServlet(WelcomeRobot.ROBOT_URI + "/*", WelcomeRobot.class); +- server.addServlet(RegistrationRobot.ROBOT_URI + "/*", RegistrationRobot.class); ++ //server.addServlet(PasswordRobot.ROBOT_URI + "/*", injector.getInstance(PasswordRobot.class)); ++ //server.addServlet(PasswordAdminRobot.ROBOT_URI + "/*", injector.getInstance(PasswordAdminRobot.class)); ++ //server.addServlet(WelcomeRobot.ROBOT_URI + "/*", injector.getInstance(WelcomeRobot.class)); ++ //server.addServlet(RegistrationRobot.ROBOT_URI + "/*", injector.getInstance(RegistrationRobot.class)); + } + + private static void initializeFrontend(Injector injector, ServerRpcProvider server, +diff --git a/src/org/waveprotocol/box/server/persistence/file/DeltaIndex.java b/src/org/waveprotocol/box/server/persistence/file/DeltaIndex.java +index aea036c..cf2f4df 100644 +--- a/src/org/waveprotocol/box/server/persistence/file/DeltaIndex.java ++++ b/src/org/waveprotocol/box/server/persistence/file/DeltaIndex.java +@@ -177,7 +177,7 @@ public class DeltaIndex { + // We're expected to append the new delta + long fileLength = file.length(); + Preconditions.checkState(position == fileLength, +- "position = %d, file=%d", position, fileLength); ++ "position = %d, file=%d, filename=%s", position, fileLength, fileRef.getAbsoluteFile()); + file.seek(position); + file.writeLong(offset); + // fill in the additional positions with the 1-complement of the offset, +diff --git a/src/org/waveprotocol/box/server/persistence/file/FileDeltaCollection.java b/src/org/waveprotocol/box/server/persistence/file/FileDeltaCollection.java +index 78294bd..ef21db7 100644 +--- a/src/org/waveprotocol/box/server/persistence/file/FileDeltaCollection.java ++++ b/src/org/waveprotocol/box/server/persistence/file/FileDeltaCollection.java +@@ -309,7 +309,7 @@ public class FileDeltaCollection implements DeltasAccess { + nextRecord = Pair.of(Pair.of(transformed.getAppliedAtVersion(), + transformed.size()), nextPosition); + nextPosition = file.getFilePointer(); +- } catch (IOException e) { ++ } catch (Exception e) { + // The next entry is invalid. There was probably a write error / crash. + LOG.severe("Error reading delta file for " + waveletName + " starting at " + + nextPosition, e); +diff --git a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java +index 82c3c8d..df08f85 100755 +--- a/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java ++++ b/src/org/waveprotocol/box/server/rpc/ServerRpcProvider.java +@@ -25,9 +25,7 @@ import com.google.inject.Inject; + import com.google.inject.Injector; + import com.google.inject.Singleton; + import com.google.inject.name.Named; +-import com.google.inject.servlet.GuiceFilter; +-import com.google.inject.servlet.GuiceServletContextListener; +-import com.google.inject.servlet.ServletModule; ++import com.google.inject.servlet.SessionScoped; + import com.google.protobuf.Descriptors; + import com.google.protobuf.Descriptors.MethodDescriptor; + import com.google.protobuf.Message; +@@ -45,11 +43,11 @@ import com.glines.socketio.server.transport.XHRPollingTransport; + import com.glines.socketio.server.transport.jetty.JettyWebSocketTransport; + + import org.eclipse.jetty.http.ssl.SslContextFactory; +-import org.eclipse.jetty.server.ssl.SslSelectChannelConnector; + import org.eclipse.jetty.server.Connector; + import org.eclipse.jetty.server.Server; + import org.eclipse.jetty.server.nio.SelectChannelConnector; + import org.eclipse.jetty.server.session.HashSessionManager; ++import org.eclipse.jetty.server.ssl.SslSelectChannelConnector; + import org.eclipse.jetty.servlet.DefaultServlet; + import org.eclipse.jetty.servlet.ServletHolder; + import org.eclipse.jetty.servlets.GzipFilter; +@@ -81,7 +79,6 @@ import java.util.concurrent.Executors; + import javax.annotation.Nullable; + import javax.servlet.DispatcherType; + import javax.servlet.ServletConfig; +-import javax.servlet.ServletContextListener; + import javax.servlet.ServletException; + import javax.servlet.ServletRequest; + import javax.servlet.ServletResponse; +@@ -105,6 +102,9 @@ public class ServerRpcProvider { + */ + private static final int BUFFER_SIZE = 1024 * 1024; + ++ // We can retrieve the injector from the context attributes via this attribute name ++ public static final String INJECTOR_ATTRIBUTE = Injector.class.getName(); ++ + private final InetSocketAddress[] httpAddresses; + private final Integer flashsocketPolicyPort; + private final ExecutorService threadPool; +@@ -157,7 +157,7 @@ public class ServerRpcProvider { + return socketChannel; + } + } +- ++ @SessionScoped + static class SocketIOConnection extends Connection { + private final SocketIOServerChannel socketChannel; + +@@ -364,6 +364,7 @@ public class ServerRpcProvider { + final WebAppContext context = new WebAppContext(); + + context.setParentLoaderPriority(true); ++ context.setAttribute(INJECTOR_ATTRIBUTE, injector); + + if (jettySessionManager != null) { + // This disables JSessionIDs in URLs redirects +@@ -376,29 +377,42 @@ public class ServerRpcProvider { + final ResourceCollection resources = new ResourceCollection(resourceBases); + context.setBaseResource(resources); + +- addWebSocketServlets(); ++ addWebSocketServlets(context); + + try { +- final Injector parentInjector = injector; +- +- final ServletModule servletModule = getServletModule(parentInjector); +- +- ServletContextListener contextListener = new GuiceServletContextListener() { +- +- private final Injector childInjector = parentInjector.createChildInjector(servletModule); +- +- @Override +- protected Injector getInjector() { +- return childInjector; +- } +- }; +- +- context.addEventListener(contextListener); +- context.addFilter(GuiceFilter.class, "/*", EnumSet.allOf(DispatcherType.class)); ++// final Injector parentInjector = injector; ++ ++// final ServletModule servletModule = getServletModule(parentInjector); ++ ++// ServletContextListener contextListener = new GuiceServletContextListener() { ++// ++// private final Injector childInjector = parentInjector.createChildInjector(servletModule); ++// ++// @Override ++// protected Injector getInjector() { ++// return childInjector; ++// } ++// }; ++// ++// context.addEventListener(contextListener); ++// context.addFilter(GuiceFilter.class, "/*", EnumSet.allOf(DispatcherType.class)); + context.addFilter(GzipFilter.class, "/webclient/*", EnumSet.allOf(DispatcherType.class)); + httpServer.setHandler(context); +- +- httpServer.start(); ++ try { ++ httpServer.start(); ++ // We add servlets here to override the DefaultServlet automatic registered by WebAppContext ++ // in path "/" with our WaveClientServlet. Any other way to do this? ++ // Related question (unanswered) http://web.archiveorange.com/archive/v/d0LdlXf1kN0OXyPNyQZp ++ for (Pair<String, ServletHolder> servlet : servletRegistry) { ++ context.addServlet(servlet.getSecond(), servlet.getFirst()); ++ } ++ ++ } catch (Exception e) { // yes, .start() throws "Exception" ++ LOG.severe("Fatal error starting http server.", e); ++ return; ++ } ++ ++ //httpServer.start(); + restoreSessions(); + + } catch (Exception e) { // yes, .start() throws "Exception" +@@ -419,14 +433,18 @@ public class ServerRpcProvider { + LOG.warning("Cannot restore sessions"); + } + } +- public void addWebSocketServlets() { ++ public void addWebSocketServlets(WebAppContext context) { + // Servlet where the websocket connection is served from. +- ServletHolder wsholder = addServlet("/socket", WaveWebSocketServlet.class); ++ //ServletHolder wsholder = addServlet("/socket", WaveWebSocketServlet.class); ++ ServletHolder wsholder = new ServletHolder(new WaveWebSocketServlet(this)); ++ context.addServlet(wsholder, "/socket"); + // TODO(zamfi): fix to let messages span frames. + wsholder.setInitParameter("bufferSize", "" + BUFFER_SIZE); + + // Servlet where the websocket connection is served from. +- ServletHolder sioholder = addServlet("/socket.io/*", WaveSocketIOServlet.class ); ++ //ServletHolder sioholder = addServlet("/socket.io/*", WaveSocketIOServlet.class ); ++ ServletHolder sioholder = new ServletHolder(new WaveSocketIOServlet(this)); ++ context.addServlet(sioholder, "/socket.io/*"); + // TODO(zamfi): fix to let messages span frames. + sioholder.setInitParameter("bufferSize", "" + BUFFER_SIZE); + // Set flash policy server parameters +@@ -457,30 +475,31 @@ public class ServerRpcProvider { + + // Serve the static content and GWT web client with the default servlet + // (acts like a standard file-based web server). +- addServlet("/static/*", DefaultServlet.class); +- addServlet("/webclient/*", DefaultServlet.class); ++ ServletHolder defaultServlet = new ServletHolder(new DefaultServlet()); ++ context.addServlet(defaultServlet, "/static/*"); ++ context.addServlet(defaultServlet, "/webclient/*"); + } + +- public ServletModule getServletModule(final Injector injector) { +- +- return new ServletModule() { +- @Override +- protected void configureServlets() { +- // We add servlets here to override the DefaultServlet automatic registered by WebAppContext +- // in path "/" with our WaveClientServlet. Any other way to do this? +- // Related question (unanswered 08-Apr-2011) +- // http://web.archiveorange.com/archive/v/d0LdlXf1kN0OXyPNyQZp +- for (Pair<String, ServletHolder> servlet : servletRegistry) { +- String url = servlet.getFirst(); +- @SuppressWarnings("unchecked") +- Class<HttpServlet> clazz = (Class<HttpServlet>) servlet.getSecond().getHeldClass(); +- Map<String,String> params = servlet.getSecond().getInitParameters(); +- serve(url).with(clazz,params); +- bind(clazz).in(Singleton.class); +- } +- } +- }; +- } ++// public ServletModule getServletModule(final Injector injector) { ++// ++// return new ServletModule() { ++// @Override ++// protected void configureServlets() { ++// // We add servlets here to override the DefaultServlet automatic registered by WebAppContext ++// // in path "/" with our WaveClientServlet. Any other way to do this? ++// // Related question (unanswered 08-Apr-2011) ++// // http://web.archiveorange.com/archive/v/d0LdlXf1kN0OXyPNyQZp ++// for (Pair<String, ServletHolder> servlet : servletRegistry) { ++// String url = servlet.getFirst(); ++// @SuppressWarnings("unchecked") ++// Class<HttpServlet> clazz = (Class<HttpServlet>) servlet.getSecond().getHeldClass(); ++// Map<String,String> params = servlet.getSecond().getInitParameters(); ++// serve(url).with(clazz,params); ++// bind(clazz).in(Singleton.class); ++// } ++// } ++// }; ++// } + + private static InetSocketAddress[] parseAddressList(List<String> addressList) { + if (addressList == null || addressList.size() == 0) { +@@ -665,7 +684,7 @@ public class ServerRpcProvider { + * @param initParams the map with init params, can be null or empty. + * @return the {@link ServletHolder} that holds the servlet. + */ +- public ServletHolder addServlet(String urlPattern, Class<? extends HttpServlet> servlet, ++ public ServletHolder addServlet(String urlPattern, HttpServlet servlet, + @Nullable Map<String, String> initParams) { + ServletHolder servletHolder = new ServletHolder(servlet); + if (initParams != null) { +@@ -675,14 +694,18 @@ public class ServerRpcProvider { + return servletHolder; + } + ++ + /** + * Add a servlet to the servlet registry. This servlet will be attached to the + * specified URL pattern when the server is started up. +- * @param urlPattern the URL pattern for paths. Eg, '/foo', '/foo/*'. +- * @param servlet the servlet class to bind to the specified paths. ++ * ++ * @param urlPattern URL pattern for paths. Eg, '/foo', '/foo/*' ++ * @param servlet The servlet object to bind to the specified paths + * @return the {@link ServletHolder} that holds the servlet. + */ +- public ServletHolder addServlet(String urlPattern, Class<? extends HttpServlet> servlet) { +- return addServlet(urlPattern, servlet, null); ++ public ServletHolder addServlet(String urlPattern, HttpServlet servlet) { ++ ServletHolder servletHolder = new ServletHolder(servlet); ++ servletRegistry.add(new Pair<String, ServletHolder>(urlPattern, servletHolder)); ++ return servletHolder; + } + } +diff --git a/src/org/waveprotocol/box/server/rpc/UserRegistrationServlet.java b/src/org/waveprotocol/box/server/rpc/UserRegistrationServlet.java +index 3e0fc9d..ad6c9bb 100644 +--- a/src/org/waveprotocol/box/server/rpc/UserRegistrationServlet.java ++++ b/src/org/waveprotocol/box/server/rpc/UserRegistrationServlet.java +@@ -28,7 +28,6 @@ import org.waveprotocol.box.server.authentication.PasswordDigest; + import org.waveprotocol.box.server.gxp.UserRegistrationPage; + import org.waveprotocol.box.server.persistence.AccountStore; + import org.waveprotocol.box.server.persistence.PersistenceException; +-import org.waveprotocol.box.server.robots.agent.welcome.WelcomeRobot; + import org.waveprotocol.wave.model.wave.InvalidParticipantAddress; + import org.waveprotocol.wave.model.wave.ParticipantId; + import org.waveprotocol.wave.util.logging.Log; +@@ -52,18 +51,17 @@ public final class UserRegistrationServlet extends HttpServlet { + + private final AccountStore accountStore; + private final String domain; +- private final WelcomeRobot welcomeBot; + private final boolean registrationDisabled; + + private final Log LOG = Log.get(UserRegistrationServlet.class); + + @Inject + public UserRegistrationServlet(AccountStore accountStore, +- @Named(CoreSettings.WAVE_SERVER_DOMAIN) String domain, WelcomeRobot welcomeBot, ++ @Named(CoreSettings.WAVE_SERVER_DOMAIN) String domain, + @Named(CoreSettings.DISABLE_REGISTRATION) boolean registrationDisabled) { + this.accountStore = accountStore; + this.domain = domain; +- this.welcomeBot = welcomeBot; ++ // this.welcomeBot = welcomeBot; + this.registrationDisabled = registrationDisabled; + } + +@@ -149,11 +147,11 @@ public final class UserRegistrationServlet extends HttpServlet { + LOG.severe("Failed to create new account for " + id, e); + return "An unexpected error occured while trying to create the account"; + } +- try { +- welcomeBot.greet(account.getId()); +- } catch (IOException e) { +- LOG.warning("Failed to create a welcome wavelet for " + id, e); +- } ++ // try { ++ // welcomeBot.greet(account.getId()); ++ // } catch (IOException e) { ++ // LOG.warning("Failed to create a welcome wavelet for " + id, e); ++ // } + return null; + } + +diff --git a/src/org/waveprotocol/box/webclient/search/SearchPanel.css b/src/org/waveprotocol/box/webclient/search/SearchPanel.css +index 665c2ec..dfb8c30 100644 +--- a/src/org/waveprotocol/box/webclient/search/SearchPanel.css ++++ b/src/org/waveprotocol/box/webclient/search/SearchPanel.css +@@ -26,6 +26,7 @@ + border-left: 1px solid #E4F1FE; + background-color: #c9e2fc; + overflow: hidden; ++ display: none; + } + + @sprite .toolbar { +diff --git a/src/org/waveprotocol/box/webclient/search/SearchPanelWidget.java b/src/org/waveprotocol/box/webclient/search/SearchPanelWidget.java +index 4402b8e..2b9d9f1 100644 +--- a/src/org/waveprotocol/box/webclient/search/SearchPanelWidget.java ++++ b/src/org/waveprotocol/box/webclient/search/SearchPanelWidget.java +@@ -72,7 +72,7 @@ public class SearchPanelWidget extends Composite implements SearchPanelView { + * Positioning constants for components of this panel. + */ + static class CssConstants { +- private static int SEARCH_HEIGHT_PX = 51; // To match wave panel. ++ private static int SEARCH_HEIGHT_PX = 0; // To match wave panel. + private static int TOOLBAR_HEIGHT_PX = + SearchPanelResourceLoader.getPanel().emptyToolbar().getHeight(); + private static int TOOLBAR_TOP_PX = 0 + SEARCH_HEIGHT_PX; +diff --git a/src/org/waveprotocol/box/webclient/search/SearchPresenter.java b/src/org/waveprotocol/box/webclient/search/SearchPresenter.java +index b136c88..9f1b2ab 100644 +--- a/src/org/waveprotocol/box/webclient/search/SearchPresenter.java ++++ b/src/org/waveprotocol/box/webclient/search/SearchPresenter.java +@@ -95,7 +95,7 @@ public final class SearchPresenter + private int querySize = DEFAULT_PAGE_SIZE; + /** Current selected digest. */ + private DigestView selected; +- ++ + /** The dispatcher of profiles events. */ + SourcesEvents<ProfileListener> profiles; + +@@ -160,7 +160,7 @@ public final class SearchPresenter + private void initToolbarMenu() { + GroupingToolbar.View toolbarUi = searchUi.getToolbar(); + ToolbarView group = toolbarUi.addGroup(); +- new ToolbarButtonViewBuilder().setText("New Wave").applyTo( ++ new ToolbarButtonViewBuilder().setText("New Message").setTooltip("Create a New Message (a Wave)").applyTo( + group.addClickButton(), new ToolbarClickButton.Listener() { + @Override + public void onClicked() { +diff --git a/src/org/waveprotocol/wave/client/doodad/link/Link.java b/src/org/waveprotocol/wave/client/doodad/link/Link.java +index f5fb0e4..6b7899c 100644 +--- a/src/org/waveprotocol/wave/client/doodad/link/Link.java ++++ b/src/org/waveprotocol/wave/client/doodad/link/Link.java +@@ -39,6 +39,14 @@ public final class Link { + + private static final ReadableStringSet WEB_SCHEMES = CollectionUtils.newStringSet( + "http", "https", "ftp", "mailto"); ++ /** ++ * http://en.wikipedia.org/wiki/Fragment_identifier ++ * http://tools.ietf.org/html/rfc3986#section-3.5 ++ * fragment = *( pchar / "/" / "?" ) ++ */ ++ private static final String COMMON_REGEX = "[\\w\\-:@!\\$&\'\$\$\\*\\+,;=\\/\\?\\.]+"; ++ private static final String FRAGMENT_URI_REGEX = "#(" + COMMON_REGEX + "|$)"; ++ private static final String QUERY_REGEX = "(\\?" + COMMON_REGEX +"|)($|"+ FRAGMENT_URI_REGEX + ")"; + + private static final String INVALID_LINK_MSG = + "Invalid link. Should either be a web url\n" + +@@ -125,7 +133,7 @@ public final class Link { + } + } + +- assert EscapeUtils.extractScheme(uri) != null; ++ assert uri.matches(QUERY_REGEX) || EscapeUtils.extractScheme(uri) != null; + + // Otherwise, just return the given link. + return uri; +@@ -145,7 +153,7 @@ public final class Link { + String scheme = parts != null ? parts[0] : null; + + // Normal web url +- if (scheme != null && WEB_SCHEMES.contains(scheme)) { ++ if (rawLinkValue.matches(QUERY_REGEX) || (scheme != null && WEB_SCHEMES.contains(scheme))) { + return rawLinkValue; + } + +diff --git a/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java b/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java +index 7088f80..1e38273 100644 +--- a/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java ++++ b/src/org/waveprotocol/wave/client/gadget/renderer/GadgetWidget.java +@@ -906,6 +906,7 @@ public class GadgetWidget extends ObservableSupplementedWave.ListenerImpl + String url = cleanUrl(metadata.getIframeUrl(view)); + if (url.equals(iframeUrl) && ((token == null) || token.isEmpty())) { + log("Received metadata matches the cached information."); ++ constructGadgetSizeFromMetadata(metadata, view, url); + return; + } + // NOTE(user): Technically we should not save iframe URLs for gadgets with security tokens, +@@ -921,6 +922,10 @@ public class GadgetWidget extends ObservableSupplementedWave.ListenerImpl + if ("".equals(ui.getTitleLabelText()) && metadata.hasTitle()) { + ui.setTitleLabelText(metadata.getTitle()); + } ++ constructGadgetSizeFromMetadata(metadata, view, url); ++ } ++ ++ private void constructGadgetSizeFromMetadata(GadgetMetadata metadata, String view, String url) { + int height = + (int) (metadata.hasHeight() ? metadata.getHeight() : metadata.getPreferredHeight(view)); + int width = +diff --git a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java +index 73a6cfc..b8d4428 100644 +--- a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java ++++ b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/EditToolbar.java +@@ -56,9 +56,11 @@ 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.DocHelper; + 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.Range; + import org.waveprotocol.wave.model.document.util.XmlStringBuilder; + import org.waveprotocol.wave.model.id.IdGenerator; + import org.waveprotocol.wave.model.id.WaveId; +@@ -425,18 +427,27 @@ public class EditToolbar { + Window.alert("Select some text to create a link."); + return; + } +- String rawLinkValue = +- Window.prompt("Enter link: URL or Wave ID.", WaveRefConstants.WAVE_URI_PREFIX); +- // user hit "ESC" or "cancel" +- if (rawLinkValue == null) { +- return; +- } + try { +- String linkAnnotationValue = Link.normalizeLink(rawLinkValue); ++ // We try to create a link with the current selection, if fails, we ask for a link ++ Range rg = range.asRange(); ++ String text = DocHelper.getText(editor.getDocument(), rg.getStart(), rg.getEnd()); ++ String linkAnnotationValue = Link.normalizeLink(text); + EditorAnnotationUtil.setAnnotationOverSelection(editor, Link.KEY, + linkAnnotationValue); + } catch (InvalidLinkException e) { +- Window.alert(e.getLocalizedMessage()); ++ String rawLinkValue = ++ Window.prompt("Enter link: URL or Wave ID.", "http://"); ++ // user hit "ESC" or "cancel" ++ if (rawLinkValue == null) { ++ return; ++ } ++ try { ++ String linkAnnotationValue = Link.normalizeLink(rawLinkValue); ++ EditorAnnotationUtil.setAnnotationOverSelection(editor, Link.KEY, ++ linkAnnotationValue); ++ } catch (InvalidLinkException e2) { ++ Window.alert(e2.getLocalizedMessage()); ++ } + } + } + }); +diff --git a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/GadgetInfoWidget.ui.xml b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/GadgetInfoWidget.ui.xml +index c8b7a81..5f41486 100644 +--- a/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/GadgetInfoWidget.ui.xml ++++ b/src/org/waveprotocol/wave/client/wavepanel/impl/toolbar/gadget/GadgetInfoWidget.ui.xml +@@ -17,7 +17,7 @@ + <ui:UiBinder + xmlns:ui="urn:ui:com.google.gwt.uibinder" + xmlns:w="urn:import:org.waveprotocol.wave.client.widget.common" > +- ++ + <ui:style> + .self { + overflow: hidden; +@@ -25,30 +25,32 @@ + border: 1px solid #ccc; + margin: 15px 0px; + } +- ++ + .self:hover { + background: #ddd; + } +- ++ + .img { + float: left; ++ display: none; + } +- ++ + .img img { +- width: 120px; +- height: 120px; ++ width: 0px; ++ height: 0px; + } +- ++ + .description { + overflow: hidden; + color: #888; + } +- +- .img, .description, .self h3 { ++ ++ .img, .description, .self h3 { + margin: 15px; + } ++ + </ui:style> +- ++ + <w:ImplPanel ui:field="self" styleName="{style.self}"> + <div class="{style.img}"> + <img ui:field="image"/> +diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/BlipMenuItemDomImpl.java b/src/org/waveprotocol/wave/client/wavepanel/view/dom/BlipMenuItemDomImpl.java +index 4b97489..1507f83 100644 +--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/BlipMenuItemDomImpl.java ++++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/BlipMenuItemDomImpl.java +@@ -36,7 +36,7 @@ public final class BlipMenuItemDomImpl implements DomView, IntrinsicBlipMenuItem + + /** The CSS classes used to manipulate style based on state changes. */ + private final BlipViewBuilder.Css css; +- ++ + BlipMenuItemDomImpl(Element self, BlipViewBuilder.Css css) { + this.self = self; + this.css = css; +@@ -63,13 +63,13 @@ public final class BlipMenuItemDomImpl implements DomView, IntrinsicBlipMenuItem + @Override + public void select() { + self.setAttribute(OPTION_SELECTED_ATTRIBUTE, "s"); +- self.setClassName(css.menuOption() + " " + css.menuOptionSelected()); ++ self.addClassName(css.menuOptionSelected()); + } + + @Override + public void deselect() { + self.removeAttribute(OPTION_SELECTED_ATTRIBUTE); +- self.setClassName(css.menuOption()); ++ self.removeClassName(css.menuOptionSelected()); + } + + @Override +diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/CollapsibleDomImpl.java b/src/org/waveprotocol/wave/client/wavepanel/view/dom/CollapsibleDomImpl.java +index c201793..5ab061d 100644 +--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/CollapsibleDomImpl.java ++++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/CollapsibleDomImpl.java +@@ -156,13 +156,13 @@ final class CollapsibleDomImpl implements DomView { + + public void setTotalBlipCount(int totalBlipCount) { + self.setAttribute(TOTAL_BLIPS_ATTRIBUTE, "" + totalBlipCount); +- getCountTotal().setInnerText("" + totalBlipCount); ++ getCountTotal().setInnerText("" + totalBlipCount + (totalBlipCount > 1? " replies": " reply")); + } + + public void setUnreadBlipCount(int unreadBlipCount) { + self.setAttribute(UNREAD_BLIPS_ATTRIBUTE, "" + unreadBlipCount); + Element unread = getCountUnread(); +- unread.setInnerText("(" + unreadBlipCount + ")"); ++ unread.setInnerText(" (" + unreadBlipCount + " unread)"); + if (unreadBlipCount > 0) { + unread.getStyle().clearDisplay(); + } else { +diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Blip.css b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Blip.css +index 57294ec..72b1a86 100644 +--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Blip.css ++++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/Blip.css +@@ -50,7 +50,7 @@ + * metabar element is positioned left by 0.3em with a 0.3em border. + */ + +-.blip { ++.blip { + /* Positioned container for focus frame. */ + position: relative; + padding: 3px; +@@ -139,7 +139,7 @@ + -moz-border-radius: 0.3em; + -webkit-border-radius: 0.3em; + cursor: pointer; +- padding: 0.3em; /* Matches metabar padding. */ ++ padding: 0.3em 0.5em 0.3em 1.4em; /* Matches metabar padding. */ + } + + .read .menuOption:hover { +@@ -168,7 +168,7 @@ + } + + .privateReplies { +- margin: 0 1em 1em 4.5em; ++ margin: 0 1em 1em 4.5em; + } + + .contentContainer, .replies, .privateReplies{word-wrap: break-word;} +diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java +index 9ec4aaf..6ccc1d1 100644 +--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java ++++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/BlipMetaViewBuilder.java +@@ -81,16 +81,26 @@ public final class BlipMetaViewBuilder implements UiBuilder, IntrinsicBlipMetaVi + private final static Map<MenuOption, SafeHtml> MENU_LABELS = + new EnumMap<MenuOption, SafeHtml>(MenuOption.class); + ++ private final static Map<MenuOption, SafeHtml> MENU_ICONS = ++ new EnumMap<MenuOption, SafeHtml>(MenuOption.class); ++ + private final static StringMap<MenuOption> MENU_OPTIONS = CollectionUtils.createStringMap(); + + public static final String OPTION_ID_ATTRIBUTE = "o"; + public static final String OPTION_SELECTED_ATTRIBUTE = "s"; + + static { ++ BlipIconResources.Css css = BlipIconResources.Loader.res.css(); ++ MENU_ICONS.put(MenuOption.EDIT, EscapeUtils.fromSafeConstant(css.edit())); ++ MENU_ICONS.put(MenuOption.REPLY, EscapeUtils.fromSafeConstant(css.reply())); ++ MENU_ICONS.put(MenuOption.DELETE, EscapeUtils.fromSafeConstant(css.delete())); ++ MENU_ICONS.put(MenuOption.LINK, EscapeUtils.fromSafeConstant(css.link())); ++ + MENU_CODES.put(MenuOption.EDIT, EscapeUtils.fromSafeConstant("e")); + MENU_CODES.put(MenuOption.REPLY, EscapeUtils.fromSafeConstant("r")); + MENU_CODES.put(MenuOption.DELETE, EscapeUtils.fromSafeConstant("d")); + MENU_CODES.put(MenuOption.LINK, EscapeUtils.fromSafeConstant("l")); ++ + MENU_LABELS.put(MenuOption.EDIT, EscapeUtils.fromSafeConstant("Edit")); + MENU_LABELS.put(MenuOption.REPLY, EscapeUtils.fromSafeConstant("Reply")); + MENU_LABELS.put(MenuOption.DELETE, EscapeUtils.fromSafeConstant("Delete")); +@@ -245,6 +255,7 @@ public final class BlipMetaViewBuilder implements UiBuilder, IntrinsicBlipMetaVi + out.append(EscapeUtils.fromSafeConstant("|")); + String style = selected.contains(option) // + ? css.menuOption() + css.menuOptionSelected() : css.menuOption(); ++ style += " " + MENU_ICONS.get(option).asString(); + String extra = OPTION_ID_ATTRIBUTE + "='" + MENU_CODES.get(option).asString() + "'" + + (selected.contains(option) ? " " + OPTION_SELECTED_ATTRIBUTE + "='s'" : ""); + openSpanWith(out, null, style, TypeCodes.kind(Type.MENU_ITEM), extra); +diff --git a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/CollapsibleBuilder.java b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/CollapsibleBuilder.java +index 8436997..8efe09f 100644 +--- a/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/CollapsibleBuilder.java ++++ b/src/org/waveprotocol/wave/client/wavepanel/view/dom/full/CollapsibleBuilder.java +@@ -226,11 +226,12 @@ public final class CollapsibleBuilder implements UiBuilder { + { + openSpan(output, Components.COUNT_TOTAL.getDomId(id), null, null); + output.append(totalBlipCount); ++ output.appendEscaped(totalBlipCount > 1? " replies": " reply"); + closeSpan(output); + + String unreadExtra = unreadBlipCount <= 0 ? " style='display: none;'" : ""; + openSpanWith(output, Components.COUNT_UNREAD.getDomId(id), null, null, unreadExtra); +- output.appendEscaped("(" + unreadBlipCount + ")"); ++ output.appendEscaped(" (" + unreadBlipCount + " unread)"); + closeSpan(output); + + openSpan(output, Components.DROP_CONTAINER.getDomId(id), css.dropContainer() + +diff --git a/test/org/waveprotocol/box/server/rpc/UserRegistrationServletTest.java b/test/org/waveprotocol/box/server/rpc/UserRegistrationServletTest.java +index 8b91e7b..100c90b 100644 +--- a/test/org/waveprotocol/box/server/rpc/UserRegistrationServletTest.java ++++ b/test/org/waveprotocol/box/server/rpc/UserRegistrationServletTest.java +@@ -33,7 +33,6 @@ import org.waveprotocol.box.server.account.HumanAccountDataImpl; + import org.waveprotocol.box.server.authentication.PasswordDigest; + import org.waveprotocol.box.server.persistence.AccountStore; + import org.waveprotocol.box.server.persistence.memory.MemoryStore; +-import org.waveprotocol.box.server.robots.agent.welcome.WelcomeRobot; + import org.waveprotocol.wave.model.wave.ParticipantId; + + import java.io.IOException; +@@ -55,8 +54,6 @@ public class UserRegistrationServletTest extends TestCase { + @Mock private HttpServletRequest req; + @Mock private HttpServletResponse resp; + +- @Mock private WelcomeRobot welcomeBot; +- + @Override + protected void setUp() throws Exception { + MockitoAnnotations.initMocks(this); +@@ -73,7 +70,6 @@ public class UserRegistrationServletTest extends TestCase { + AccountData account = store.getAccount(participantId); + assertNotNull(account); + assertTrue(account.asHuman().getPasswordDigest().verify("internet".toCharArray())); +- verify(welcomeBot).greet(eq(participantId)); + } + + public void testRegisterNewUserDisabled() throws Exception { +@@ -128,8 +124,8 @@ public class UserRegistrationServletTest extends TestCase { + HttpServletRequest req, HttpServletResponse resp, String address, + String password, boolean disabledRegistration) throws IOException { + +- UserRegistrationServlet enabledServlet = new UserRegistrationServlet(store, "example.com", welcomeBot, false); +- UserRegistrationServlet disabledServlet = new UserRegistrationServlet(store, "example.com", welcomeBot, true); ++ UserRegistrationServlet enabledServlet = new UserRegistrationServlet(store, "example.com", false); ++ UserRegistrationServlet disabledServlet = new UserRegistrationServlet(store, "example.com", true); + + when(req.getParameter("address")).thenReturn(address); + when(req.getParameter("password")).thenReturn(password); +diff --git a/test/org/waveprotocol/wave/client/doodad/link/LinkTest.java b/test/org/waveprotocol/wave/client/doodad/link/LinkTest.java +index 316717d..e68d63b 100644 +--- a/test/org/waveprotocol/wave/client/doodad/link/LinkTest.java ++++ b/test/org/waveprotocol/wave/client/doodad/link/LinkTest.java +@@ -47,6 +47,15 @@ public class LinkTest extends TestCase { + checkNormalize("https://example.com/abcd"); + checkNormalize("ftp://example.com/abcd"); + checkNormalize("mailto://example.com/abcd"); ++ checkNormalize("#"); ++ checkNormalize("#example.com/w+N0tgD7rctjA"); ++ checkNormalize("#fragment"); ++ checkNormalize("#fragment/?+-:@!$&'()*+,;="); ++ checkNormalize("?param=1&param2"); ++ checkNormalize("?param=1&param2#"); ++ checkNormalize("?param=1&param2#fragment/?+-:@!$&'()*+,;="); ++ checkNormalizeRejects("#fragment<>"); ++ checkNormalizeRejects("?param=1&param2<>"); + } + + public void testConvertUri() { +@@ -56,6 +65,12 @@ public class LinkTest extends TestCase { + + assertEquals("http://example.com/abcd", Link.toHrefFromUri("http://example.com/abcd")); + assertEquals("#example.com/abcd", Link.toHrefFromUri("wave://example.com/abcd")); ++ assertEquals("#", Link.toHrefFromUri("#")); ++ assertEquals("#fragment", Link.toHrefFromUri("#fragment")); ++ assertEquals("#fragment/?+-:@!$&'()*+,;=", Link.toHrefFromUri("#fragment/?+-:@!$&'()*+,;=")); ++ assertEquals("?param=1&param2", Link.toHrefFromUri("?param=1&param2")); ++ assertEquals("?param=1&param2#", Link.toHrefFromUri("?param=1&param2#")); ++ assertEquals("?param=1&param2#fragment/?+-:@!$&'()*+,;=", Link.toHrefFromUri("?param=1&param2#fragment/?+-:@!$&'()*+,;=")); + } + + Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -66,6 +66,7 @@ button.addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { + event.stopPropagation(); show(button); } }); Modified: trunk/src/main/java/cc/kune/core/server/UserSessionManager.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/core/server/UserSessionManager.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -81,9 +81,8 @@ return !isUserLoggedIn(); } - public void login(final Long userId, final String name, final String newUserHash) { + public void login(final Long userId, final String newUserHash) { getUserSession().setUserId(userId); - getUserSession().setUserName(name); getUserSession().setHash(newUserHash); updateLoggedUser(); } Modified: trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/core/server/manager/file/FileGwtUploadAbstractServlet.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -83,9 +83,13 @@ file = item; } } + final String response = createUploadedFile(userHash, stateToken, fileName, file, typeId); - return createUploadedFile(userHash, stateToken, fileName, file, typeId); + // Remove files from session because we have a copy of them + removeSessionFileItems(request); + return response; + } protected void logFileDel(final boolean delResult) { Modified: trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/core/server/manager/impl/UserManagerDefault.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -372,7 +372,6 @@ @Override public User login(final String nickOrEmail, final String passwd) { - final PasswordDigest passwdDigest = new PasswordDigest(passwd.toCharArray()); User user; try { user = userFinder.findByShortName(nickOrEmail); Modified: trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/core/server/rpc/UserRPC.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -181,7 +181,7 @@ private UserInfoDTO loginUser(final User user, final String waveToken) throws DefaultException { if (user != null) { - userSessionManager.login(user.getId(), user.getShortName(), waveToken); + userSessionManager.login(user.getId(), waveToken); return loadUserInfo(user); } else { throw new UserAuthException(); Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerOptionsMenu.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerOptionsMenu.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerOptionsMenu.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -23,7 +23,9 @@ import cc.kune.core.client.resources.CoreResources; import com.google.inject.Inject; +import com.google.inject.Singleton; +@Singleton public class ContentViewerOptionsMenu extends MenuDescriptor { private static final String ID = "k-cnt-viewer-opt-menu"; Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerShareMenu.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerShareMenu.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/gspace/client/actions/ContentViewerShareMenu.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -24,7 +24,9 @@ import cc.kune.core.client.state.AccessRightsClientManager; import com.google.inject.Inject; +import com.google.inject.Singleton; +@Singleton public class ContentViewerShareMenu extends MenuLoggedDescriptor { private static final String ID = "k-cnt-viewer-share-menu"; Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerAsTablePanel.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -40,8 +40,8 @@ import cc.kune.gspace.client.viewers.items.FolderItemDescriptor; import cc.kune.gspace.client.viewers.items.FolderItemWidget; +import com.calclab.emite.core.client.packet.TextUtils; import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.dom.client.DoubleClickHandler; import com.google.gwt.event.dom.client.MouseOutEvent; @@ -71,7 +71,6 @@ private final GuiProvider guiProvider; private final CoreResources res; - protected FolderItemWidget selected; @Inject public FolderViewerAsTablePanel(final GSpaceArmor gsArmor, final I18nTranslationService i18n, @@ -93,7 +92,7 @@ final DoubleClickHandler doubleClickHandler) { final int rowCount = flex.getRowCount(); final FolderItemWidget itemWidget = new FolderItemWidget((ImageResource) item.getIcon(), - item.getText(), item.getStateToken(), ITEM_ID + (flex.getRowCount() + 1)); + TextUtils.ellipsis(item.getText(), 70), item.getStateToken(), ITEM_ID + (flex.getRowCount() + 1)); final ActionSimplePanel toolbar = new ActionSimplePanel(guiProvider, i18n); final long modifiedOn = item.getModififiedOn(); if (modifiedOn != FolderViewerView.NO_DATE) { @@ -103,16 +102,7 @@ itemWidget.setMenu(toolbar); Tooltip.to(itemWidget, item.getTooltip()); // FIXME make this under demand - itemWidget.getRowClick().addClickHandler(new ClickHandler() { - @Override - public void onClick(final ClickEvent event) { - if (selected != null) { - selected.setSelect(false); - } - itemWidget.setSelect(true); - selected = itemWidget; - } - }); + itemWidget.getRowClick().addClickHandler(clickHandler); if (ContentStatus.inTheDustbin.equals(item.getContentStatus())) { itemWidget.getTitleWidget().addStyleName("k-line-through"); } @@ -121,9 +111,6 @@ @Override public void onMouseOut(final MouseOutEvent event) { itemWidget.setMenuVisible(false); - // menu.setVisible(false); - // itemWidget.setSelect(false); - // menu.hide(); } }); final MenuDescriptor menu = new MenuDescriptor(i18n.t("Actions")); @@ -151,7 +138,6 @@ init(item, itemWidget, toolbar); initialized = true; } - // menu.setVisible(true); itemWidget.setMenuVisible(true); } }); Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java =================================================================== --- trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/gspace/client/viewers/FolderViewerUtils.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -159,8 +159,8 @@ // Used for previews return null; } else { - return draggable ? i18n.t("Double click to open. Drag and drop to move this to another place") - : i18n.t("Double click to open"); + return draggable ? i18n.t("Click to open. Drag and drop to move this to another place") + : i18n.t("Click to open"); } } Modified: trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/lists/client/actions/ListsClientActions.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -36,9 +36,11 @@ import cc.kune.gspace.client.actions.AddAllMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddCollabMembersToContentMenuItem; import cc.kune.gspace.client.actions.AddPublicToContentMenuItem; +import cc.kune.gspace.client.actions.ContentViewerOptionsMenu; import cc.kune.gspace.client.actions.ContentViewerShareMenu; import cc.kune.gspace.client.actions.CopyContentMenuItem; import cc.kune.gspace.client.actions.ParticipateInContentBtn; +import cc.kune.gspace.client.actions.RefreshContentMenuItem; import cc.kune.gspace.client.actions.SetAsHomePageMenuItem; import cc.kune.gspace.client.actions.TutorialContainerBtn; import cc.kune.gspace.client.actions.WriteToParticipantsMenuItem; @@ -61,8 +63,9 @@ final Provider<NewListPostIconBtn> newPostIconBtn, final Provider<NewListMenuItem> newListMenuItem, final Provider<NewListBtn> newListBtn, final Provider<OpenFolderMenuItem> openContentMenuItem, - final Provider<RefreshListMenuItem> refresh, final Provider<SubscribeToListBtn> subscribeBtn, - final Provider<OptionsListMenu> optionsMenuContent, + final Provider<RefreshListMenuItem> refreshList, final Provider<SubscribeToListBtn> subscribeBtn, + final Provider<OptionsListMenu> optionsMenuContainer, + final Provider<ContentViewerOptionsMenu> optionsMenuContent, final Provider<ContentViewerShareMenu> shareMenuContent, final Provider<ShowSubscribersOfListBtn> subscribersCount, final Provider<TutorialContainerBtn> tutorialBtn, @@ -73,18 +76,21 @@ final Provider<SetListOpenessMenuItem> listOpenessMenuItem, final Provider<ParticipateInContentBtn> participateBtn, final Provider<CopyContentMenuItem> copyContent, + final Provider<RefreshContentMenuItem> refreshPost, final Provider<WriteToParticipantsMenuItem> writeToParticipants, final ListsNewMenu listNewMenu, final PostNewMenu postNewMenu, final NewMenusForTypeIdsRegistry newMenusRegistry, final Provider<ChatAboutContentBtn> chatAbout, final Provider<DelListMenuItem> delFolderMenuItem, final Provider<SetAsHomePageMenuItem> setAsHomePage) { super(session, stateManager, i18n, registry); - actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, all); + actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContainer, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, optionsMenuContent, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostIconBtn, noRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, newListBtn, TYPE_ROOT); actionsRegistry.addAction(ActionGroups.TOOLBAR, listNewMenu, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, postNewMenu, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, subscribeBtn, containersNoRoot); - actionsRegistry.addAction(ActionGroups.TOOLBAR, refresh, all); + actionsRegistry.addAction(ActionGroups.TOOLBAR, refreshList, containers); + actionsRegistry.addAction(ActionGroups.TOOLBAR, refreshPost, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, listOpenessMenuItem, containersNoRoot); actionsRegistry.addAction(ActionGroups.TOOLBAR, newPostItem, containersNoRoot); // actionsRegistry.addAction(ActionGroups.TOOLBAR, newListMenuItem, @@ -99,8 +105,8 @@ actionsRegistry.addAction(ActionGroups.TOOLBAR, addPublicMenuItem, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, participateBtn, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, subscribersCount, containersNoRoot); + actionsRegistry.addAction(ActionGroups.TOOLBAR, copyContent, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, chatAbout, contents); - actionsRegistry.addAction(ActionGroups.TOOLBAR, copyContent, contents); actionsRegistry.addAction(ActionGroups.TOOLBAR, writeToParticipants, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, contents); actionsRegistry.addAction(ActionGroups.ITEM_MENU, openContentMenuItem, containersNoRoot); Modified: trunk/src/main/java/cc/kune/lists/client/actions/OptionsListMenu.java =================================================================== --- trunk/src/main/java/cc/kune/lists/client/actions/OptionsListMenu.java 2012-03-17 21:01:21 UTC (rev 1766) +++ trunk/src/main/java/cc/kune/lists/client/actions/OptionsListMenu.java 2012-03-17 21:43:47 UTC (rev 1767) @@ -23,7 +23,9 @@ import cc.kune.core.client.resources.CoreResources; import com.google.inject.Inject; +import com.google.inject.Singleton; +@Singleton public class OptionsListMenu extends MenuDescriptor { @Inject Added: trunk/src/main/webapp/tutorials/lists.svg.2012_03_14_10_40_56.0.svg =================================================================== --- trunk/src/main/webapp/tutorials/lists.svg.2012_03_14_10_40_56.0.svg (rev 0) +++ trunk/src/main/webapp/tutorials/lists.svg.2012_03_14_10_40_56.0.svg 2012-03-17 21:43:47 UTC (rev 1767) @@ -0,0 +1,2176 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + xmlns:ns1="http://sozi.baierouge.fr" + xmlns:xhtml="http://www.w3.org/1999/xhtml" + 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="1052.3622" + height="1488.189" + id="svg2" + version="1.1" + inkscape:version="0.48.2 r9819" + sodipodi:docname="lists.svg"> +  + <script + id="kunelangtable"> + var idLangList = [ + {id: "layer7", layer: "es"}, + {id: "layer8", layer: "en"}, + {id: "layer9", layer: "fr"} + ]; + </script> + <script + xlink:href="lang.js" + id="kunelang" /> +  +  + <xhtml:link + href="http://fonts.googleapis.com/css?family=Ubuntu" + rel="stylesheet" + type="text/css" /> + <style + id="style3802"> + text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } + </style> +  + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="5.1629238" + inkscape:cx="174.94934" + inkscape:cy="1340.8534" + inkscape:document-units="px" + inkscape:current-layer="svg2" + showgrid="false" + showborder="true" + inkscape:showpageshadow="false" + inkscape:window-width="1078" + inkscape:window-height="919" + inkscape:window-x="0" + inkscape:window-y="24" + inkscape:window-maximized="0"> + <inkscape:grid + type="xygrid" + id="grid3793" /> + </sodipodi:namedview> + <defs + id="defs4"> + <marker + style="overflow:visible" + id="Arrow1Mstart" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mstart"> + <path + transform="matrix(0.4,0,0,0.4,4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path4730" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="Arrow1Mend" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mend"> + <path + transform="matrix(-0.4,0,0,-0.4,-4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path4733" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7815" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mstart"> + <path + transform="matrix(0.4,0,0,0.4,4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7817" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7819" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mend"> + <path + transform="matrix(-0.4,0,0,-0.4,-4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7821" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7823" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mstart"> + <path + transform="matrix(0.4,0,0,0.4,4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7825" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7827" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mend"> + <path + transform="matrix(-0.4,0,0,-0.4,-4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7829" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7831" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mstart"> + <path + transform="matrix(0.4,0,0,0.4,4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7833" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7835" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mend"> + <path + transform="matrix(-0.4,0,0,-0.4,-4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7837" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7839" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mstart"> + <path + transform="matrix(0.4,0,0,0.4,4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7841" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7843" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mend"> + <path + transform="matrix(-0.4,0,0,-0.4,-4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7845" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7847" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mstart"> + <path + transform="matrix(0.4,0,0,0.4,4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7849" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="marker7851" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mend"> + <path + transform="matrix(-0.4,0,0,-0.4,-4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path7853" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="Arrow1Mend-8" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mend"> + <path + transform="matrix(-0.4,0,0,-0.4,-4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path4733-7" + inkscape:connector-curvature="0" /> + </marker> + <marker + style="overflow:visible" + id="Arrow1Mend-1" + refX="0" + refY="0" + orient="auto" + inkscape:stockid="Arrow1Mend"> + <path + transform="matrix(-0.4,0,0,-0.4,-4,0)" + style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;marker-start:none" + d="M 0,0 5,-5 -12.5,0 5,5 0,0 z" + id="path4733-1" + inkscape:connector-curvature="0" /> + </marker> + </defs> + <metadata + id="metadata7"> + <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 /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + transform="translate(0,435.82679)" + id="layer1" + inkscape:groupmode="layer" + inkscape:label="layers" + style="display:inline"> + <rect + y="-403.77679" + x="30.756149" + height="295.13507" + width="424.69003" + id="rect4591" + style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635472;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> + <rect + style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.65257782;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" + id="rect4607" + width="262.71176" + height="148.65785" + x="-950.12659" + y="0.38178363" /> + <rect + y="0.38868061" + x="-1006.9199" + height="217.02725" + width="342.89246" + id="rect4609" + style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635478;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> + <g + id="g3425" + transform="translate(-1009.8665,-222.02045)" + style="display:inline"> + <path + sodipodi:nodetypes="ccccccccccccccccc" + inkscape:connector-curvature="0" + id="path3077-8-3" + d="m 100.68086,315.8408 -22.015998,0 0,32.023 c 13,0 19,0 31.999998,0 l 0,-22.015 z m 5.984,28.023 c -10.907568,0 -10.783438,0 -23.999998,0 0,0 0.006,-21.441 0.006,-24.084 2.1,0 7.807,0 12.006,0 l 0,12.01 12.009998,0 c -10e-4,2.733 -0.022,12.074 -0.022,12.074 z m -7.983998,-16.078 c 0,-1.543 0,-5.918 0,-8.006 1.614998,1.619 6.401998,6.404 8.005998,8.006 -2.047,0 -6.454,0 -8.005998,0 z" + style="fill:#231f20;display:inline" /> + <g + id="g7067-2-7" + transform="translate(-533.40886,132.49381)" + inkscape:export-filename="/home/vjrj/proyectos/ourproject.org/kune/svn/trunk/img/icons/step1.png" + inkscape:export-xdpi="89.910126" + inkscape:export-ydpi="89.910126" + style="display:inline"> + <path + transform="translate(835.07499,-335.32678)" + d="m -215,554.68896 a 11.5,11.5 0 1 1 -23,0 11.5,11.5 0 1 1 23,0 z" + sodipodi:ry="11.5" + sodipodi:rx="11.5" + sodipodi:cy="554.68896" + sodipodi:cx="-226.5" + id="path3311-8-9" + style="fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-opacity:1" + sodipodi:type="arc" /> + <text + sodipodi:linespacing="100%" + id="text3313-0-8" + y="225.77936" + x="608.74896" + style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;font-family:HoratioDMed" + xml:space="preserve"><tspan + style="font-size:19.25621223px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + y="225.77936" + x="608.74896" + sodipodi:role="line" + id="tspan3315-3-1">1</tspan></text> + </g> + </g> + <path + sodipodi:type="arc" + style="color:#000000;fill:none;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path6371" + sodipodi:cx="272.5" + sodipodi:cy="379.86218" + sodipodi:rx="17.5" + sodipodi:ry="12.5" + d="m 290,379.86218 a 17.5,12.5 0 1 1 -35,0 17.5,12.5 0 1 1 35,0 z" + transform="translate(-1008.4256,-287.55371)" /> + <g + id="g3313" + transform="translate(-992.70885,-208.53837)" + style="display:inline"> + <path + style="fill:#f9f9f9" + d="m 272.7667,388.08329 c -2.54143,-2.54142 -2.92308,-3.66126 -2.92308,-8.57692 0,-4.95443 0.37281,-6.02666 3.01371,-8.66755 l 3.01371,-3.01371 10.5747,0.34063 c 10.15723,0.32718 10.66991,0.4514 12.98629,3.14639 1.9188,2.23243 2.41159,3.93397 2.41159,8.32693 0,4.769 -0.39822,5.91937 -2.92308,8.44423 -2.84693,2.84693 -3.18758,2.92308 -13.07692,2.92308 -9.88934,0 -10.22999,-0.0762 -13.07692,-2.92308 z m 13.31587,-16.07692 c 7.30092,0 9.85583,-0.30522 9.07671,-1.08434 -0.59639,-0.59639 -3.72389,-1.31079 -6.95,-1.58756 -7.13954,-0.61251 -13.05029,1.20488 -15.1945,4.6719 l -1.54615,2.5 2.22645,-2.25 c 2.01829,-2.03963 3.17647,-2.25 12.38749,-2.25 z" + id="path3246" + inkscape:connector-curvature="0" /> + <path + style="fill:#f6f6f6" + d="m 274.61876,389.44757 c -3.65504,-1.98352 -4.77944,-4.37891 -4.7529,-10.12546 0.0235,-5.09011 1.74853,-8.19733 5.66202,-10.1987 2.90395,-1.48509 17.53345,-1.4306 20.84368,0.0777 3.39417,1.54648 5.47206,5.65566 5.47206,10.82139 0,8.42076 -3.82339,11.00359 -16.20034,10.94388 -5.3605,-0.0259 -9.26461,-0.5637 -11.02452,-1.51876 z m 12.90797,-12.6287 c -0.31922,-0.79773 -0.55618,-0.56078 -0.60416,0.60417 -0.0434,1.05416 0.19293,1.64479 0.52522,1.3125 0.33229,-0.33229 0.36782,-1.19479 0.0789,-1.91667 z m -1.63342,-2.8125 c 6.57267,0 11.95031,-0.34175 11.95031,-0.75945 0,-2.71445 -9.39855,-4.85775 -16.57952,-3.7809 -4.69383,0.70389 -9.45165,4.12143 -9.39007,6.7449 0.0183,0.78153 0.43477,0.60121 1.04969,-0.45455 0.88076,-1.51218 2.64331,-1.75 12.96959,-1.75 z" + id="path3244" + inkscape:connector-curvature="0" /> + <path + style="fill:#f1f1f1" + d="m 274.61876,389.44757 c -3.65504,-1.98352 -4.77944,-4.37891 -4.7529,-10.12546 0.0235,-5.09011 1.74853,-8.19733 5.66202,-10.1987 2.90395,-1.48509 17.53345,-1.4306 20.84368,0.0777 3.39417,1.54648 5.47206,5.65566 5.47206,10.82139 0,8.42076 -3.82339,11.00359 -16.20034,10.94388 -5.3605,-0.0259 -9.26461,-0.5637 -11.02452,-1.51876 z m 13.22486,-5.4412 c 0,-1.33333 0.66667,-2 2,-2 1.1,0 2,-0.3876 2,-0.86133 0,-0.47373 -1.08096,-0.65469 -2.40213,-0.40213 -1.55439,0.29714 -2.56419,1.30694 -2.86133,2.86133 -0.25256,1.32117 -0.0716,2.40213 0.40213,2.40213 0.47373,0 0.86133,-0.9 0.86133,-2 z m -3.27083,-2.60417 c -0.33229,-0.33229 -1.1948,-0.36782 -1.91667,-0.079 -0.79773,0.31923 -0.56078,0.55619 0.60417,0.60417 1.05416,0.0434 1.64479,-0.19293 1.3125,-0.52522 z m -6.22762,-5.39583 c 2.93418,0 6.04668,-0.27314 6.91666,-0.60699 1.15193,-0.44204 1.61331,0.0335 1.69779,1.75 0.0834,1.69473 0.2445,1.86528 0.57333,0.60699 0.37104,-1.41984 1.5821,-1.75 6.41918,-1.75 5.73268,0 5.91897,-0.0801 4.84618,-2.08466 -2.44374,-4.56617 -14.30311,-6.46791 -21.5228,-3.45133 -3.34507,1.39766 -6.56324,6.33861 -6.35294,9.75387 0.0434,0.70517 0.53092,0.0446 1.08333,-1.46788 0.92434,-2.53084 1.42955,-2.75 6.33927,-2.75 z" + id="path3242" + inkscape:connector-curvature="0" /> + <path + style="fill:#ededed" + d="m 274.95369,389.61086 c -6.97427,-3.86554 -6.73822,-17.17474 0.36199,-20.4098 3.39236,-1.54567 17.66352,-1.54567 21.05588,0 7.25704,3.30652 7.25704,17.3041 0,20.61063 -3.55107,1.61797 -18.38735,1.47886 -21.41787,-0.20083 z m 12.88993,-5.60449 c 0,-1.33333 0.66667,-2 2,-2 1.1,0 2,-0.3876 2,-0.86133 0,-0.47373 -1.08096,-0.65469 -2.40213,-0.40213 -1.55439,0.29714 -2.56419,1.30694 -2.86133,2.86133 -0.25256,1.32117 -0.0716,2.40213 0.40213,2.40213 0.47373,0 0.86133,-0.9 0.86133,-2 z m -3.27083,-2.60417 c -0.33229,-0.33229 -1.1948,-0.36782 -1.91667,-0.079 -0.79773,0.31923 -0.56078,0.55619 0.60417,0.60417 1.05416,0.0434 1.64479,-0.19293 1.3125,-0.52522 z m -6.14584,-2.39583 c 5.75,0 6.41667,-0.20779 6.41667,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.79487 0.66667,2 6.5,2 6.94488,0 7.76089,-0.77549 5.41951,-5.1504 -2.41042,-4.50391 -14.32005,-6.38039 -21.48762,-3.38559 -3.34507,1.39766 -6.56324,6.33861 -6.35294,9.75387 0.0618,1.00373 0.18846,1.0107 0.58333,0.0321 0.32996,-0.81773 2.72339,-1.25 6.92105,-1.25 z" + id="path3240" + inkscape:connector-curvature="0" /> + <path + style="fill:#e9e9e9" + d="m 274.95369,389.61086 c -3.33059,-1.846 -5.03308,-5.35338 -5.07463,-10.45449 -0.0296,-3.63828 0.52084,-4.90628 3.36456,-7.75 3.37391,-3.37391 3.47059,-3.4 12.6,-3.4 9.12941,0 9.22609,0.0261 12.6,3.4 2.90213,2.90213 3.4,4.08824 3.4,8.1 0,4.01177 -0.49787,5.19787 -3.4,8.1 -3.36179,3.36179 -3.49947,3.3996 -12.25,3.36457 -5.41249,-0.0217 -9.77829,-0.54995 -11.23993,-1.36008 z m 12.88993,-5.47949 c 0,-1.9604 3.40064,-3.125 9.125,-3.125 2.53731,0 2.875,-0.35771 2.875,-3.04545 0,-6.40647 -6.88048,-9.76274 -17.72043,-8.64395 -8.48291,0.87551 -12.48896,6.04429 -10.31422,13.30787 0.73509,2.45517 0.87546,2.54861 0.9487,0.63153 0.0743,-1.94401 0.62994,-2.25 4.08595,-2.25 2.2,0 4,-0.45 4,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.84754,1 -1.88342,1 -1.21488,0 -2.05307,0.88741 -2.36133,2.5 -0.26285,1.375 -0.0903,2.5 0.38342,2.5 0.47373,0 0.86133,-0.84375 0.86133,-1.875 z m -3.27083,-2.72917 c -0.33229,-0.33229 -1.1948,-0.36782 -1.91667,-0.079 -0.79773,0.31923 -0.56078,0.55619 0.60417,0.60417 1.05416,0.0434 1.64479,-0.19293 1.3125,-0.52522 z" + id="path3238" + inkscape:connector-curvature="0" /> + <path + style="fill:#e5e5e5" + d="m 274.95369,389.61086 c -3.33059,-1.846 -5.03308,-5.35338 -5.07463,-10.45449 -0.0296,-3.63828 0.52084,-4.90628 3.36456,-7.75 3.37391,-3.37391 3.47059,-3.4 12.6,-3.4 9.12941,0 9.22609,0.0261 12.6,3.4 2.90213,2.90213 3.4,4.08824 3.4,8.1 0,4.01177 -0.49787,5.19787 -3.4,8.1 -3.36179,3.36179 -3.49947,3.3996 -12.25,3.36457 -5.41249,-0.0217 -9.77829,-0.54995 -11.23993,-1.36008 z m 12.88993,-5.10449 c 0,-1.16336 1.32037,-1.5 5.88337,-1.5 6.56443,0 7.43908,-0.966 5.95902,-6.58133 -1.49553,-5.67401 -3.99016,-6.91867 -13.86681,-6.91867 -7.93793,0 -9.06954,0.23965 -11.37971,2.40993 -2.98579,2.80501 -4.14498,7.52837 -2.72168,11.09007 0.54947,1.375 1.02756,1.9375 1.06242,1.25 0.0433,-0.85407 1.96386,-1.25 6.06339,-1.25 3.33333,0 6,-0.44444 6,-1 0,-0.55 -0.9,-1 -2,-1 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.84754,1 -1.88342,1 -1.21488,0 -2.05307,0.88741 -2.36133,2.5 -0.26285,1.375 -0.0903,2.5 0.38342,2.5 0.47373,0 0.86133,-0.675 0.86133,-1.5 z" + id="path3236" + inkscape:connector-curvature="0" /> + <path + style="fill:#e1e1e1" + d="m 274.66961,389.29425 c -3.36162,-2.08548 -4.82599,-5.25179 -4.82599,-10.43493 0,-3.2759 0.65186,-4.70481 3.4,-7.45295 3.37391,-3.37391 3.47059,-3.4 12.6,-3.4 9.12941,0 9.22609,0.0261 12.6,3.4 2.90213,2.90213 3.4,4.08824 3.4,8.1 0,4.01177 -0.49787,5.19787 -3.4,8.1 -3.35996,3.35996 -3.50423,3.39969 -12.25,3.37339 -6.4656,-0.0194 -9.57044,-0.47356 -11.52401,-1.68551 z m 10.17401,-6.3767 c 0,-1.24451 -0.69765,-1.91118 -2,-1.91118 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.84754,1 -1.88342,1 -1.17145,0 -2.04971,0.86984 -2.32329,2.30103 -0.42654,2.23126 -0.25573,2.2886 5.63342,1.89125 3.34031,-0.22537 6.51529,-0.82534 7.05551,-1.33325 0.54023,-0.50791 0.93421,-2.75477 0.87552,-4.99301 -0.078,-2.97664 -0.8177,-4.78073 -2.75418,-6.71778 -2.4667,-2.46741 -3.25485,-2.64824 -11.54234,-2.64824 -8.02217,0 -9.14679,0.23644 -11.46273,2.40993 -2.96199,2.77982 -4.14919,7.5094 -2.78637,11.10048 0.88663,2.33632 1.32168,2.46873 7.06634,2.15077 5.24185,-0.29013 6.12154,-0.61347 6.12154,-2.25 z" + id="path3234" + inkscape:connector-curvature="0" /> + <path + style="fill:#dcdcdc" + d="m 275.22656,389.42308 c -3.73042,-1.84034 -5.38294,-5.08333 -5.38294,-10.56376 0,-3.2759 0.65186,-4.70481 3.4,-7.45295 3.37391,-3.37391 3.47059,-3.4 12.6,-3.4 9.12941,0 9.22609,0.0261 12.6,3.4 4.89855,4.89856 4.89855,11.30144 0,16.2 -3.32886,3.32886 -3.57472,3.39952 -11.75,3.37723 -5.45404,-0.0149 -9.43106,-0.55609 -11.46706,-1.56052 z m 23.32253,-4.08996 c 2.62172,-4.00124 2.1238,-9.95203 -1.10268,-13.17851 -2.47,-2.47 -3.25094,-2.64824 -11.60279,-2.64824 -8.45306,0 -9.10983,0.15528 -11.72727,2.77273 -3.45619,3.45618 -3.89097,10.28165 -0.86774,13.62228 1.7131,1.89296 2.99506,2.10499 12.72694,2.10499 10.62697,0 10.85352,-0.0482 12.57354,-2.67325 z m -13.70547,-2.32675 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z" + id="path3232" + inkscape:connector-curvature="0" /> + <path + style="fill:#d3d3d3" + d="m 276.23174,390.07419 c -6.74233,-2.8771 -8.58217,-12.5807 -3.47015,-18.30204 l 2.91797,-3.26578 10.0593,0 c 9.55886,0 10.19169,0.13238 12.72027,2.66096 1.94599,1.946 2.78866,3.98996 3.13623,7.60719 0.42579,4.43128 0.15974,5.29945 -2.5555,8.33904 -2.97123,3.32615 -3.20433,3.39742 -11.86351,3.62732 -4.858,0.12897 -9.78308,-0.17103 -10.94461,-0.66669 z m 20.15627,-2.50495 c 5.16707,-3.38559 5.61236,-11.18808 0.8916,-15.623 -2.03934,-1.91587 -3.87117,-2.45559 -9.39338,-2.76762 -9.20388,-0.52007 -13.40194,0.95786 -15.5442,5.47234 -2.99873,6.31936 -0.45732,12.27035 6.14414,14.38717 4.21561,1.35177 14.93996,0.47181 17.90184,-1.46889 z m -11.54439,-4.56287 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z" + id="path3230" + inkscape:connector-curvature="0" /> + <path + style="fill:#cacaca" + d="m 276.34362,390.1089 c -3.32573,-1.44083 -5.6417,-4.7347 -6.16978,-8.77491 -1.17583,-8.99611 3.91096,-13.32014 15.66978,-13.32014 8.57989,0 13.32692,2.11841 15.10996,6.74298 1.59988,4.14952 0.43075,10.16322 -2.55692,13.15212 -2.35114,2.35211 -3.42069,2.61957 -11.3247,2.83193 -4.80059,0.12897 -9.62834,-0.15541 -10.72834,-0.63198 z m 20.97569,-3.0797 c 5.13629,-4.82528 3.99128,-14.09412 -2.05306,-16.6196 -4.01896,-1.67923 -13.87697,-1.83801 -18.30379,-0.29481 -5.17185,1.80291 -7.69655,9.01593 -4.97286,14.20732 2.29231,4.36916 6.20726,5.69454 15.63159,5.29197 5.93089,-0.25335 7.72547,-0.73167 9.69812,-2.58488 z m -12.47569,-4.02283 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z" + id="path3228" + inkscape:connector-curvature="0" /> + <path + style="fill:#c3c3c3" + d="m 275.85753,389.25482 c -5.73027,-2.87402 -7.6127,-9.25604 -4.50356,-15.26847 1.46973,-2.84213 5.16543,-5.63753 6.15066,-4.65231 0.26934,0.26935 -0.44914,0.7877 -1.59662,1.15189 -2.48243,0.7879 -5.06439,5.38675 -5.06439,9.02044 0,4.11705 2.64823,8.18172 6.11884,9.39158 4.5965,1.60235 14.54047,1.36392 18.34147,-0.43977 5.27305,-2.50222 7.02439,-8.68003 4.07668,-14.38029 -1.8882,-3.65136 -3.37909,-4.23097 -13.03699,-5.06828 l -8,-0.69358 6.78212,-0.15483 c 8.24791,-0.18829 13.03112,1.61644 15.15146,5.71673 3.0026,5.80639 1.51103,11.97229 -3.65865,15.12424 -4.33677,2.64413 -15.71672,2.78261 -20.76102,0.25265 z m 8.98609,-6.24845 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z" + id="path3226" + inkscape:connector-curvature="0" /> + <path + style="fill:#b5b5b5" + d="m 286.34362,390.05352 c 8.79911,-0.70744 12.02529,-1.97612 13.02358,-5.12145 0.36247,-1.14203 0.8794,-1.85605 1.14875,-1.58671 0.26934,0.26935 -0.033,1.46635 -0.6718,2.66002 -1.75159,3.27288 -7.06078,5.02098 -14.71841,4.84616 l -6.78212,-0.15483 8,-0.64319 z m -12.63922,-2.1065 -2.36078,-2.05935 3,1.75669 c 3.94843,2.31206 4.00717,2.36201 2.77745,2.36201 -0.58073,0 -2.11823,-0.92671 -3.41667,-2.05935 z m 11.13922,-4.94065 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z m -14.80505,-3.5 c 0.0204,-1.65 0.2445,-2.20394 0.49804,-1.23097 0.25354,0.97297 0.23687,2.32297 -0.0371,3 -0.27393,0.67703 -0.48137,-0.11903 -0.46099,-1.76903 z m 31,0 c 0.0204,-1.65 0.2445,-2.20394 0.49804,-1.23097 0.25354,0.97297 0.23687,2.32297 -0.0371,3 -0.27393,0.67703 -0.48137,-0.11903 -0.46099,-1.76903 z m -1.69623,-5.50404 c -0.34984,-1.10223 -1.84266,-2.65921 -3.31739,-3.45997 -1.47473,-0.80075 -2.09838,-1.47393 -1.38588,-1.49595 1.53083,-0.0473 6.20455,4.40793 6.20455,5.91451 0,1.71269 -0.81953,1.18941 -1.50128,-0.95859 z m -27.49872,-1.37352 c 0,-0.20765 0.7875,-0.99515 1.75,-1.75 1.58606,-1.24387 1.62143,-1.2085 0.37756,0.37756 -1.30637,1.66575 -2.12756,2.19548 -2.12756,1.37244 z m 10.25,-4.35091 c 2.0625,-0.21574 5.4375,-0.21574 7.5,0 2.0625,0.21575 0.375,0.39226 -3.75,0.39226 -4.125,0 -5.8125,-0.17651 -3.75,-0.39226 z" + id="path3224" + inkscape:connector-curvature="0" /> + <path + style="fill:#aaaaaa" + d="m 282.59362,390.28297 c 1.7875,-0.22182 4.7125,-0.22182 6.5,0 1.7875,0.22183 0.325,0.40333 -3.25,0.40333 -3.575,0 -5.0375,-0.1815 -3.25,-0.40333 z m 14.25,-1.65415 c 0,-0.20766 0.7875,-0.99516 1.75,-1.75 1.58606,-1.24388 1.62143,-1.20851 0.37756,0.37755 -1.30637,1.66575 -2.12756,2.19548 -2.12756,1.37245 z m -12,-5.62245 c 0,-1.33333 -0.66667,-2 -2,-2 -1.1,0 -2,-0.45 -2,-1 0,-0.55 0.9,-1 2,-1 1.33333,0 2,-0.66667 2,-2 0,-1.1 0.45,-2 1,-2 0.55,0 1,0.9 1,2 0,1.33333 0.66667,2 2,2 1.1,0 2,0.45 2,1 0,0.55 -0.9,1 -2,1 -1.33333,0 -2,0.66667 -2,2 0,1.1 -0.45,2 -1,2 -0.55,0 -1,-0.9 -1,-2 z m -14.92105,-3.58333 c 0.048,-1.16495 0.28494,-1.4019 0.60416,-0.60417 0.28887,0.72188 0.25335,1.58438 -0.0789,1.91667 -0.3323,0.33229 -0.56864,-0.25834 -0.52522,-1.3125 z m 31,0 c 0.048,-1.16495 0.28494,-1.4019 0.60416,-0.60417 0.28888,0.72188 0.25335,1.58438 -0.079,1.91667 -0.33229,0.33229 -0.56864,-0.25834 -0.52522,-1.3125 z m -18.32895,-11.14007 c 1.7875,-0.22182 4.7125,-0.22182 6.5,0 1.7875,0.22183 0.325,0.40333 -3.25,0.40333 -3.575,0 -5.0375,-0.1815 -3.25,-0.40333 z" + id="path3222" + inkscape:connector-curvature="0" /> + <path + style="fill:#f7f7f7;fill-opacity:1;stroke:#f7f7f7;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 291.91157,381.00816 -9.98127,0" + id="path3271" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3273" + d="m 286.92093,376.01752 0,9.98127" + style="fill:#f7f7f7;fill-opacity:1;stroke:#f7f7f7;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + style="fill:none;stroke:#666666;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 285.92094,375.01753 0,9.98127" + id="path3267" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path3269" + d="m 290.91157,380.00816 -9.98127,0" + style="fill:none;stroke:#666666;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + </g> + <g + transform="translate(-1013.9918,-253.757)" + id="g3761" + style="display:inline"> + <g + id="g3697" + transform="matrix(0.32896515,0,0,0.32896515,-160.43506,33.34333)"> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-gen.png" + id="g3699" + transform="translate(350,0)"> + <path + inkscape:connector-curvature="0" + id="path3701" + d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path3703" + d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + style="fill:#d4dbe2" /> + <path + inkscape:connector-curvature="0" + id="path3705" + d="m 597.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" + style="fill:#a9b6c7;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3707" + d="m 595.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" + style="fill:#b6c5d8;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3709" + d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + style="fill:#c9cfd7" /> + <path + inkscape:connector-curvature="0" + id="path3711" + d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + style="fill:#b6c5d8" /> + <path + inkscape:connector-curvature="0" + id="path3713" + d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + style="fill:#89929e" /> + <path + inkscape:connector-curvature="0" + id="path3715" + d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + style="fill:#b4c3d5" /> + <path + inkscape:connector-curvature="0" + id="path3717" + d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + style="fill:#b3bcc9" /> + <path + inkscape:connector-curvature="0" + id="path3719" + d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path3721" + d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path3723" + d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path3725" + d="m 597.625,771.4375 c -3.21749,0.80995 -6.35889,1.89093 -9.49855,2.95674 -0.97154,0.37142 -1.85289,0.9729 -2.5952,1.69951 -0.85286,0.75372 -1.5183,1.68678 -2.24295,2.5579 -1.43359,1.82026 -2.70936,3.75542 -4.06955,5.6296 -0.88196,1.49498 -1.70097,3.03188 -2.28734,4.66945 -0.773,1.87386 -1.3796,3.81126 -2.03693,5.7276 -1.48856,4.58577 -2.86664,9.20755 -4.15527,13.85304 -0.38084,1.5389 -0.8175,3.06718 -1.11421,4.62491 -0.0983,1.32482 0.42765,2.57219 0.8125,3.8125 0.65443,1.89642 1.24797,3.81318 1.875,5.71875 0.4387,1.03708 1.53192,1.69185 2.625,1.8125 1.24203,-0.0193 2.52075,0.0375 3.71875,-0.34375 1.02063,-0.39402 1.60505,-1.36074 1.86562,-2.3781 0.73273,-2.56005 1.01952,-5.21766 1.50049,-7.83083 0.4005,-2.37627 0.77571,-4.75672 1.16514,-7.13482 0.60941,-2.21748 1.28797,-4.41783 2.03973,-6.59038 0.78279,-2.02938 1.71569,-3.99664 2.55402,-6.00337 0.89003,-1.89943 1.86665,-3.76562 3.01491,-5.52201 1.40777,-2.01133 3.33858,-3.57662 5.32812,-4.9803 1.23992,-0.75485 2.42213,-1.59957 3.68923,-2.3108 1.42795,-0.88217 2.95575,-1.58776 4.46774,-2.31189 0.99896,-0.30772 1.95269,-0.81445 2.99484,-0.95052 0.94868,-0.0968 1.93298,0.0577 2.84891,-0.26823 0.92455,-0.56794 0.73006,-1.98773 -0.15625,-2.5 -0.80724,-0.63096 -1.7434,-1.0782 -2.63346,-1.5793 -1.68129,-0.84475 -3.47432,-1.44213 -5.30345,-1.87163 -1.35714,-0.28247 -2.73917,-0.47084 -4.12559,-0.51782 l -0.18169,0.0202 -0.0996,0.0111 z" + style="fill:#99a5b4;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3727" + d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path3729" + d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + style="fill:#8a95a3;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3731" + d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + style="fill:#8a95a3" /> + </g> + <path + inkscape:connector-curvature="0" + id="path3733" + d="m 902.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path3735" + d="m 902.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + style="fill:#d4dbe2" /> + <path + inkscape:connector-curvature="0" + id="path3737" + d="m 947.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" + style="fill:#a9b6c7;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3739" + d="m 945.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" + style="fill:#b6c5d8;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3741" + d="m 903.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + style="fill:#c9cfd7" /> + <path + inkscape:connector-curvature="0" + id="path3743" + d="m 904.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + style="fill:#b6c5d8" /> + <path + inkscape:connector-curvature="0" + id="path3745" + d="m 955.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + style="fill:#89929e" /> + <path + inkscape:connector-curvature="0" + id="path3747" + d="m 905.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + style="fill:#b4c3d5" /> + <path + inkscape:connector-curvature="0" + id="path3749" + d="m 978.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + style="fill:#b3bcc9" /> + <path + inkscape:connector-curvature="0" + id="path3751" + d="m 979.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path3753" + d="m 981.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path3755" + d="m 984.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 947.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path3757" + d="m 987.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path3759" + d="m 988.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + style="fill:#8a95a3" /> + <path + inkscape:connector-curvature="0" + id="path3761" + d="m 954.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + style="fill:#8a95a3;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3763" + d="m 946.9375,772.125 c -9.56715,1.74839 -17.25457,9.64487 -19.96875,18.8125 -4.82877,10.88517 -7.07054,23.03246 -5.61836,34.90144 0.0198,1.07326 0.1459,2.15794 -0.0379,3.22356 3.75192,-4.50382 3.8025,-10.67156 5.9811,-15.89686 3.37158,-10.6816 8.79354,-21.17419 17.67515,-28.29064 4.36603,-3.68349 9.47725,-6.3808 14.71875,-8.59375 0.72214,-1.81857 -1.47582,-3.24498 -3.09375,-3.125 -3.11721,-0.92307 -6.41633,-1.23 -9.65625,-1.03125 z" + style="fill:#99a5b4;fill-opacity:1" + sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> + </g> + <g + id="g3678" + transform="translate(129.51923,31.279777)"> + <rect + style="color:#000000;fill:#008000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3680" + width="34.242748" + height="8.1750183" + x="4.0543771" + y="287.32199" + rx="1.6497765" + ry="1.6497765" /> + <text + xml:space="preserve" + style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="8.0973129" + y="294.16464" + id="text3682" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3684" + x="8.0973129" + y="294.16464">simone</tspan></text> + </g> + </g> + <g + transform="translate(-1031.1443,-263.46575)" + id="g3742" + style="display:inline"> + <g + id="g5773" + transform="matrix(0.32832475,0,0,0.32832475,85.879825,140.2387)"> + <path + style="fill:#dce2e8" + d="m 15.652276,526.89841 c -0.610306,-1.59043 1.679869,-11.36996 3.481806,-14.86804 3.193736,-6.19997 6.408908,-8.92653 16.688018,-14.15192 15.103201,-7.67772 14.080467,-6.32495 10.351016,-13.69128 -14.619009,-28.87514 0.626491,-58.97154 24.060007,-47.49727 13.579837,6.6494 16.194478,31.36184 5.166481,48.83132 C 74.079822,487.61189 73,489.56197 73,489.85473 c 0,0.96965 10.409081,7.10101 16,9.42463 10.938874,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.810704,0.4196 z" + id="path5775" + inkscape:connector-curvature="0" /> + <path + style="fill:#d4dbe2" + d="m 16,527.9114 c 0,-12.82229 7.444121,-22.89231 22.182697,-30.00761 12.879762,-6.21793 12.949565,-6.32177 9.035801,-13.4409 -14.220674,-25.86739 -1.36795,-55.39011 20.882279,-47.9666 14.595085,4.86946 18.104408,32.01735 6.356458,49.17313 -2.031924,2.96726 -2.353004,4.11342 -1.455316,5.19507 2.007816,2.41927 10.29052,7.29999 16.261866,9.58257 C 98.567144,504.00332 106,514.86317 106,524.89969 c 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" + id="path5777" + inkscape:connector-curvature="0" /> + <path + style="fill:#c9cfd7" + d="m 16.456704,526.61441 c 0.368875,-0.96127 1.119209,-3.83918 1.667409,-6.39535 2.216133,-10.33347 6.136986,-14.70774 18.826133,-21.00325 14.555889,-7.22166 14.803417,-7.54851 10.923343,-14.42362 -9.684632,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.784152,-11.11959 37.313196,18.96264 22.150804,45.86301 C 73.327781,486.9762 72,489.7139 72,490.18081 c 0,1.40694 10.137395,7.90103 15.78241,10.11034 9.778791,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.525159,9.96359 -42.526253,0 -45.068616,-0.1 -44.436307,-1.74777 z" + id="path5779" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8" + d="m 17.373092,526.61218 c 0.279327,-0.9625 1.031608,-3.77247 1.671735,-6.24438 2.783906,-10.75028 5.91216,-14.19465 18.510886,-20.3814 14.312213,-7.02817 14.766578,-7.73334 10.45997,-16.23375 -9.151893,-18.06407 -4.861359,-45.39047 7.126784,-45.39047 1.093959,0 2.932921,-0.50516 4.086582,-1.12258 17.687459,-9.46604 28.608915,25.64678 14.765412,47.47125 -2.432458,3.83481 -2.830287,5.14422 -1.902558,6.26207 2.544299,3.06569 11.034196,8.55209 15.595883,10.07848 10.544154,3.52818 15.517054,10.12038 17.773324,23.56078 0.62952,3.75 0.62952,3.75 -43.983185,3.75 -42.015093,0 -44.583129,-0.10189 -44.104833,-1.75 z" + id="path5781" + inkscape:connector-curvature="0" /> + <path + style="fill:#b4c3d5" + d="m 18.625,527.56443 c -0.271169,-0.43876 -0.07962,-1.45126 0.42567,-2.25 0.717286,-1.13386 0.922062,-0.95895 0.934017,0.79775 0.01574,2.31303 -0.49232,2.85568 -1.359687,1.45225 z M 56,527.42433 c 0,-0.51582 0.868825,-0.87241 1.930722,-0.79241 1.061897,0.08 1.710339,0.50202 1.440983,0.93785 C 58.686419,528.67858 56,528.5627 56,527.42433 z m 7.696917,-0.45528 c -0.409197,-1.04122 -0.508402,-2.12872 -0.220456,-2.41666 0.91206,-0.91206 1.714561,0.58256 1.332392,2.48152 -0.350243,1.74033 -0.403729,1.73721 -1.111936,-0.0649 z M 90.5,526.36218 c -0.591982,-1.86517 -1.736214,-2.47275 -3.897148,-2.06937 -0.493432,0.0921 -0.155932,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.167845,-5.58423 0.672148,-5.58423 -0.540872,0 -0.718644,-1.28178 -0.399256,-2.87872 0.692849,-3.46424 -1.332361,-5.24299 -3.1458,-2.76296 -1.080063,1.47707 -1.357435,1.49422 -2.47074,0.15277 -0.689752,-0.8311 -2.128577,-1.51109 -3.19739,-1.51109 -1.068813,0 -2.769543,-0.44219 -3.779399,-0.98265 -1.551676,-0.83043 -1.753393,-0.66637 -1.302178,1.05908 0.390745,1.49421 -0.0383,2.19137 -1.599905,2.59974 -1.278027,0.33421 -2.433926,1.71612 -2.882081,3.4456 -0.926234,3.57446 -2.640327,3.80366 -3.064627,0.4098 -0.239509,-1.91577 0.273933,-2.75503 2.113306,-3.45436 1.336324,-0.50807 2.68336,-1.89384 2.993412,-3.07948 0.451486,-1.72648 0.229815,-2.01748 -1.113305,-1.46147 -5.685387,2.35358 -8.400394,2.32578 -10.656986,-0.10913 -2.239511,-2.41647 -2.239511,-2.41647 -5.128955,0.26138 -2.847928,2.63937 -5.360813,0.88121 -2.63559,-1.84402 1.780268,-1.78026 -1.938125,-7.92517 -4.444221,-7.34438 -3.615262,0.83783 -3.517367,-1.10555 0.198459,-3.93974 4.186314,-3.19306 4.282774,-4.3519 0.84984,-10.20976 -3.029424,-5.16932 -5.077383,-19.22645 -3.004036,-20.61961 0.806655,-0.54203 0.627922,-1.16489 -0.605548,-2.11025 -3.325028,-2.54837 -2.212109,-5.47361 1.355956,-3.56404 2.689657,1.43946 9.562135,-2.54678 7.881678,-4.57161 -1.614969,-1.94592 0.543446,-2.81116 2.39466,-0.95995 1.932595,1.9326 0.234654,6.47485 -2.420364,6.47485 -2.390146,0 -4.051441,2.23713 -2.965777,3.99377 0.740689,1.19846 1.218594,1.12186 2.987344,-0.47884 3.406254,-3.08261 7.063255,-3.27149 3.920021,-0.20246 -1.321935,1.29073 -3.198156,2.63706 -4.169381,2.99186 -1.463856,0.53475 -1.653838,1.37626 -1.110841,4.92037 1.036819,6.76728 2.913385,6.57626 2.640423,-0.26877 -0.134821,-3.38089 0.142221,-3.95593 1.905896,-3.95593 1.571318,0 1.938872,0.47715 1.540636,2 -0.287656,1.1 -0.115141,2 0.383369,2 0.498509,0 0.96263,-0.45 1.03138,-1 0.238805,-1.91044 0.467909,-2.51699 2.115671,-5.60124 1.187834,-2.22337 1.350686,-3.4074 0.575302,-4.18279 -0.621603,-0.6216 -0.749078,-1.85432 -0.299757,-2.89875 1.303858,-3.03077 1.124261,-9.3161 -0.266216,-9.31669 -1.489085,-6.3e-4 -1.676094,-2.61915 -0.25,-3.50053 2.022248,-1.24982 1.004309,-3.5 -1.583333,-3.5 -1.628176,0 -2.425149,-0.46217 -2.155505,-1.25 0.8577,-2.50597 12.235836,-1.56907 15.262791,1.25676 9.369225,8.74672 9.558066,30.04723 0.394255,44.47037 -3.908079,6.15102 3.276749,13.99627 15.520797,16.94746 8.108519,1.9544 13.904595,10.2116 16.022105,22.82541 0.75747,4.5122 -13.553142,6.18611 -14.96111,1.75 z m -6.090775,-20.1003 c -1.883722,-2.0815 -5.196659,-3.05266 -5.996842,-1.75793 -1.215823,1.96724 0.488687,3.45823 3.953475,3.45823 3.308319,0 3.464506,-0.12996 2.043367,-1.7003 z M 49,465.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.772141,57.4647 c 2.492459,-3.37124 5.498463,-4.13134 3.801947,-0.96137 -1.115671,2.08465 -2.792239,3.38743 -4.740006,3.68324 -0.667664,0.1014 -0.247131,-1.11882 0.938059,-2.72187 z m 15.267776,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.984111,-1.62354 1.914649,-0.73472 2.981717,0.0749 2.061373,1.56407 -0.830379,1.34358 -2.234909,1.371 -3.045484,0.0595 z m 17.198218,0.36758 c -0.925629,-0.92563 0.189072,-2.36052 1.833779,-2.36052 0.842134,0 1.177876,0.60386 0.833994,1.5 -0.610368,1.59059 -1.613974,1.91432 -2.667773,0.86052 z M 24,522.37361 c 0,-1.24034 3.17723,-5.01143 4.222241,-5.01143 1.216405,0 0.911488,3.46627 -0.422241,4.8 -1.450736,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.563834,-1.56383 -1.523926,-3.97474 0.102613,-6.19917 1.129249,-1.54434 1.463614,-1.58743 2.512331,-0.32381 0.959725,1.1564 0.897189,1.717 -0.302613,2.71275 -1.953977,1.62165 -1.932441,3.01023 0.04669,3.01023 0.857459,0 1.280902,0.45 0.940983,1 -0.818297,1.32403 -1.837753,1.26225 -3.3,-0.2 z m 17.043786,-0.05 c 0.225748,-0.6875 1.725748,-1.37269 3.333333,-1.52264 2.788155,-0.26007 2.833407,-0.20246 0.981751,1.25 -2.346126,1.84032 -4.882473,2.00058 -4.315084,0.27264 z m 28.413426,-2.29909 c 0.680432,-1.77318 3.471169,-1.56926 4.093255,0.29909 0.260434,0.78218 -0.538884,1.25 -2.135749,1.25 -1.8935,0 -2.398572,-0.39969 -1.957506,-1.54909 z M 21,516.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.647568,-4.24293 c -0.841403,-3.14186 -0.799742,-3.81609 0.235801,-3.81609 1.240865,0 2.226771,4.28986 1.217791,5.29884 -0.458333,0.45833 -1.11245,-0.20891 -1.453592,-1.48275 z m 4.591902,-1.82793 c 0.691029,-1.10652 1.819842,-1.79564 2.508473,-1.53139 C 45.436575,509.0832 46,508.86353 46,508.3308 c 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.212109,0 1.824239,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.903813,0.88337 -2.008474,0.88337 -1.762089,0 -1.854346,-0.2468 -0.752056,-2.01184 z M 33,506.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.04125,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.429973,0.69664 c -0.606232,-0.98091 2.181599,-3.69502 2.977678,-2.89894 0.706368,0.70637 -0.591568,3.78563 -1.595677,3.78563 -0.458697,0 -1.080597,-0.39901 -1.382001,-0.88669 z M 44,453.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.273145,1.68903 0.606989,2.55901 0.398311,1.03799 0.05452,1.58179 -1,1.58179 C 44.682954,455.36218 44,454.53728 44,453.4212 z m 7,-4.85902 c 0,-3.04736 4.537474,-4.07671 5.289749,-1.2 0.434416,1.66121 0.03068,2 -2.383369,2 -1.598509,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.434447,-5.29196 7.396256,-2.78553 0.909842,2.37101 -0.318374,3.71929 -2.066485,2.26848 -1.165167,-0.967 -1.912674,-0.97579 -3.410972,-0.0401 C 50.863459,442.83989 50,443.0906 50,442.73795 z" + id="path5783" + inkscape:connector-curvature="0" /> + <path + style="fill:#b3bcc9" + d="m 92,525.56218 c 0,-1.54 -0.527793,-3.32779 -1.172874,-3.97287 -0.855295,-0.8553 -0.884251,-1.80634 -0.106941,-3.51235 1.75157,-3.84427 -0.705254,-11.42904 -4.802674,-14.82692 -4.086046,-3.38846 -2.898331,-3.60091 4.550449,-0.81396 13.71103,5.12995 20.56433,25.9261 8.543858,25.9261 -7.011818,0 -7.011818,0 -7.011818,-2.8 z M 59.910502,504.75434 c -0.635465,-0.76569 -1.955842,-1.39216 -2.934171,-1.39216 -0.978329,0 -2.708052,-1.575 -3.84383,-3.5 -1.135778,-1.925 -2.755227,-3.5 -3.598776,-3.5 -1.951918,0 -1.967601,-1.39503 -0.03372,-3 2.076834,-1.72362 1.890939,-3.35723 -1,-8.78785 -4.069166,-7.64391 -3.455289,-10.71763 1.420545,-7.11277 5.169207,3.82176 11.750544,-2.46804 15.52335,-14.83571 1.370596,-4.49296 0.796129,-18.89883 -0.883128,-22.14616 -1.612127,-3.11751 -1.612127,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.559878,46.61877 -3.518421,5.84292 -3.518421,5.84292 2.297632,11.07309 3.521616,3.16687 5.178879,5.24555 4.200912,5.26916 -0.888328,0.0214 -2.688328,0.8515 -4,1.84459 -4.749564,3.59595 -14.858241,5.13632 -16.974357,2.58655 z" + id="path5785" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7" + d="m 92.815054,521.61218 c 0.280763,-4.98157 -0.149325,-8.25644 -1.641625,-12.5 -2.022056,-5.75 -2.022056,-5.75 0.0199,-5.75 4.892222,0 12.116871,11.11379 14.138841,21.75 0.61783,3.25 0.61783,3.25 -6.139863,3.25 -6.757689,0 -6.757689,0 -6.377257,-6.75 z M 57.736081,502.60026 c -4.74666,-2.19188 -8.21023,-7.48361 -6.720339,-10.26749 0.787293,-1.47107 0.578728,-2.8552 -0.859855,-5.70638 -3.780683,-7.49305 -3.71844,-7.75193 1.891408,-7.86675 11.763399,-0.24076 19.607447,-21.36594 14.350292,-38.64746 -1.513683,-4.97583 8.15369,0.5478 11.171092,6.38281 4.79792,9.27815 2.757176,28.21359 -4.135306,38.37023 -3.248042,4.78626 -3.108843,5.61941 1.566627,9.37672 8.383493,6.73716 -5.850701,13.62864 -17.263919,8.35832 z" + id="path5787" + inkscape:connector-curvature="0" /> + <path + style="fill:#a5aeba" + d="m 95,519.94322 c 0,-6.15501 -0.465546,-9.23013 -1.731223,-11.43544 -2.129347,-3.71017 -1.162952,-4.96151 2.153516,-2.78847 3.134773,2.05398 7.071677,8.79205 8.555507,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z M 63,502.21435 c -5.613254,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.901534,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.482187,-6.12103 12.466652,3.12893 23.836582,-23.06489 17.885689,-41.20469 -1.768008,-5.38933 6.735063,1.04007 9.607989,7.26486 3.853849,8.35016 1.790957,26.18765 -4.142144,35.81645 -3.771821,6.12126 -3.726023,7.00345 0.532187,10.25135 4.268856,3.25601 4.328389,3.95246 0.506787,5.92869 -5.335159,2.75892 -7.429145,3.16975 -12.006787,2.35568 z" + id="path5789" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4" + d="m 97.580726,526.11218 c -0.251559,-1.2375 -0.72938,-5.35305 -1.061826,-9.14566 -0.332446,-3.79262 -1.069261,-7.76418 -1.637367,-8.8257 -0.934152,-1.74548 -0.829324,-1.82107 1.096284,-0.79051 2.819043,1.5087 5.542873,6.12588 6.994333,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.326202,0 -4.056171,-0.37006 -4.438324,-2.25 z M 60.5,500.40269 c -3.265642,-1.35967 -7.602087,-6.57417 -8.46488,-10.17887 -0.442539,-1.8489 -1.129624,-4.14914 -1.526857,-5.11164 -0.576601,-1.39711 -0.209671,-1.75 1.819649,-1.75 12.357308,0 23.416086,-23.45864 18.741894,-39.7566 -1.195778,-4.16943 -0.0374,-4.10946 3.740804,0.19368 7.79605,8.87921 6.233208,28.06127 -3.573583,43.86154 -1.72735,2.78303 -1.718871,2.81367 1.521988,5.5 6.506488,5.39319 -3.087271,11.06061 -12.259015,7.24189 z" + id="path5791" + inkscape:connector-curvature="0" /> + <path + style="fill:#929ca9" + d="m 100.78845,526.61218 c -2.135149,-2.45575 -3.345892,-15.95753 -1.276991,-14.24049 0.800071,0.664 2.186211,3.746 3.080301,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.756084,-31 c -5.277946,-5.08752 -5.842086,-9.34879 -1.362926,-10.29495 10.175676,-2.14947 19.086762,-19.27014 18.092621,-34.76096 -0.486107,-7.57459 -0.486107,-7.57459 1.781461,-4.93839 6.180155,7.18486 4.779027,27.36115 -2.676692,38.54443 -3.503817,5.25559 -3.542145,6.21682 -0.36683,9.19987 3.118955,2.93011 3.114395,3.39903 -0.04705,4.83949 -5.40941,2.46469 -11.183057,1.49515 -15.420584,-2.58949 z" + id="path5793" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="m 101.70717,525.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.065403,-31 c -4.91445,-3.9769 -5.748541,-5.95905 -2.891767,-6.87206 5.527572,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.933234,-2.88544 2.073853,-5.01359 2.414595,-4.50511 5.220373,-17.98198 4.375484,-21.01657 -0.461667,-1.65818 -0.368419,-1.7777 0.455976,-0.58445 4.302348,6.22731 1.172547,26.46135 -5.612772,36.28634 -2.614917,3.78635 -2.614917,3.78635 -0.365672,6.82862 1.237084,1.67324 2.097118,3.17093 1.911187,3.3282 -4.208579,3.5597 -8.799793,3.17382 -14.196289,-1.19316 z" + id="path5795" + inkscape:connector-curvature="0" /> + <path + style="fill:#89929e" + d="m 68.553851,495.44931 c -0.369537,-0.59792 -1.542351,-1.08713 -2.606255,-1.08713 -1.842561,0 -1.829965,-0.12007 0.265385,-2.52994 2.199755,-2.52994 2.199755,-2.52994 3.583106,0.11028 1.388266,2.6496 0.236851,5.90001 -1.242236,3.50679 z m -9.192225,-2.58713 c -0.316582,-0.825 -1.202459,-1.5 -1.968615,-1.5 -0.766156,0 -1.393011,-0.45 -1.393011,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.944645,-1.14465 0.859526,-0.85952 1.306427,-0.50004 1.794143,1.44317 0.99716,3.973 -1.799649,6.79122 -3.177162,3.20148 z m 8.279576,-8.19213 c -0.380672,-0.38067 0.492512,-1.63673 1.940409,-2.79125 1.907671,-1.52112 2.773627,-3.32052 3.144932,-6.53498 0.281816,-2.43973 1.077686,-4.89617 1.768601,-5.45875 0.690915,-0.56259 1.74847,-1.92289 2.350124,-3.02289 1.570686,-2.87168 1.407159,-0.26284 -0.427266,6.81644 -2.261098,8.72586 -6.159851,13.60838 -8.7768,10.99143 z" + id="path5797" + inkscape:connector-curvature="0" /> + </g> + <g + id="g3694" + transform="translate(84.950091,-5.8293697)"> + <rect + ry="1.6497765" + rx="1.6497765" + y="320.32199" + x="4.0543771" + height="8.1750183" + width="34.242748" + id="rect3696" + style="color:#000000;fill:#aa0088;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text3698" + y="327.16464" + x="9.8441248" + style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + y="327.16464" + x="9.8441248" + id="tspan3700" + sodipodi:role="line">luther</tspan></text> + </g> + </g> + <g + transform="translate(-1050.9742,-245.6861)" + id="g3841" + style="display:inline"> + <g + transform="matrix(0.32832475,0,0,0.32832475,43.184716,216.8905)" + id="g3310-3" + style="display:inline"> + <path + inkscape:connector-curvature="0" + id="path3334-5" + d="m 15.652276,526.89841 c -0.610306,-1.59043 1.679869,-11.36996 3.481806,-14.86804 3.193736,-6.19997 6.408908,-8.92653 16.688018,-14.15192 15.103201,-7.67772 14.080467,-6.32495 10.351016,-13.69128 -14.619009,-28.87514 0.626491,-58.97154 24.060007,-47.49727 13.579837,6.6494 16.194478,31.36184 5.166481,48.83132 C 74.079822,487.61189 73,489.56197 73,489.85473 c 0,0.96965 10.409081,7.10101 16,9.42463 10.938874,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.810704,0.4196 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path3332-9" + d="m 16,527.9114 c 0,-12.82229 7.444121,-22.89231 22.182697,-30.00761 12.879762,-6.21793 12.949565,-6.32177 9.035801,-13.4409 -14.220674,-25.86739 -1.36795,-55.39011 20.882279,-47.9666 14.595085,4.86946 18.104408,32.01735 6.356458,49.17313 -2.031924,2.96726 -2.353004,4.11342 -1.455316,5.19507 2.007816,2.41927 10.29052,7.29999 16.261866,9.58257 C 98.567144,504.00332 106,514.86317 106,524.89969 c 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" + style="fill:#d4dbe2" /> + <path + inkscape:connector-curvature="0" + id="path3330-6" + d="m 16.456704,526.61441 c 0.368875,-0.96127 1.119209,-3.83918 1.667409,-6.39535 2.216133,-10.33347 6.136986,-14.70774 18.826133,-21.00325 14.555889,-7.22166 14.803417,-7.54851 10.923343,-14.42362 -9.684632,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.784152,-11.11959 37.313196,18.96264 22.150804,45.86301 C 73.327781,486.9762 72,489.7139 72,490.18081 c 0,1.40694 10.137395,7.90103 15.78241,10.11034 9.778791,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.525159,9.96359 -42.526253,0 -45.068616,-0.1 -44.436307,-1.74777 z" + style="fill:#c9cfd7" /> + <path + inkscape:connector-curvature="0" + id="path3328-5" + d="m 17.373092,526.61218 c 0.279327,-0.9625 1.031608,-3.77247 1.671735,-6.24438 2.783906,-10.75028 5.91216,-14.19465 18.510886,-20.3814 14.312213,-7.02817 14.766578,-7.73334 10.45997,-16.23375 -9.151893,-18.06407 -4.861359,-45.39047 7.126784,-45.39047 1.093959,0 2.932921,-0.50516 4.086582,-1.12258 17.687459,-9.46604 28.608915,25.64678 14.765412,47.47125 -2.432458,3.83481 -2.830287,5.14422 -1.902558,6.26207 2.544299,3.06569 11.034196,8.55209 15.595883,10.07848 10.544154,3.52818 15.517054,10.12038 17.773324,23.56078 0.62952,3.75 0.62952,3.75 -43.983185,3.75 -42.015093,0 -44.583129,-0.10189 -44.104833,-1.75 z" + style="fill:#b6c5d8" /> + <path + inkscape:connector-curvature="0" + id="path3326-6" + d="m 18.625,527.56443 c -0.271169,-0.43876 -0.07962,-1.45126 0.42567,-2.25 0.717286,-1.13386 0.922062,-0.95895 0.934017,0.79775 0.01574,2.31303 -0.49232,2.85568 -1.359687,1.45225 z M 56,527.42433 c 0,-0.51582 0.868825,-0.87241 1.930722,-0.79241 1.061897,0.08 1.710339,0.50202 1.440983,0.93785 C 58.686419,528.67858 56,528.5627 56,527.42433 z m 7.696917,-0.45528 c -0.409197,-1.04122 -0.508402,-2.12872 -0.220456,-2.41666 0.91206,-0.91206 1.714561,0.58256 1.332392,2.48152 -0.350243,1.74033 -0.403729,1.73721 -1.111936,-0.0649 z M 90.5,526.36218 c -0.591982,-1.86517 -1.736214,-2.47275 -3.897148,-2.06937 -0.493432,0.0921 -0.155932,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.167845,-5.58423 0.672148,-5.58423 -0.540872,0 -0.718644,-1.28178 -0.399256,-2.87872 0.692849,-3.46424 -1.332361,-5.24299 -3.1458,-2.76296 -1.080063,1.47707 -1.357435,1.49422 -2.47074,0.15277 -0.689752,-0.8311 -2.128577,-1.51109 -3.19739,-1.51109 -1.068813,0 -2.769543,-0.44219 -3.779399,-0.98265 -1.551676,-0.83043 -1.753393,-0.66637 -1.302178,1.05908 0.390745,1.49421 -0.0383,2.19137 -1.599905,2.59974 -1.278027,0.33421 -2.433926,1.71612 -2.882081,3.4456 -0.926234,3.57446 -2.640327,3.80366 -3.064627,0.4098 -0.239509,-1.91577 0.273933,-2.75503 2.113306,-3.45436 1.336324,-0.50807 2.68336,-1.89384 2.993412,-3.07948 0.451486,-1.72648 0.229815,-2.01748 -1.113305,-1.46147 -5.685387,2.35358 -8.400394,2.32578 -10.656986,-0.10913 -2.239511,-2.41647 -2.239511,-2.41647 -5.128955,0.26138 -2.847928,2.63937 -5.360813,0.88121 -2.63559,-1.84402 1.780268,-1.78026 -1.938125,-7.92517 -4.444221,-7.34438 -3.615262,0.83783 -3.517367,-1.10555 0.198459,-3.93974 4.186314,-3.19306 4.282774,-4.3519 0.84984,-10.20976 -3.029424,-5.16932 -5.077383,-19.22645 -3.004036,-20.61961 0.806655,-0.54203 0.627922,-1.16489 -0.605548,-2.11025 -3.325028,-2.54837 -2.212109,-5.47361 1.355956,-3.56404 2.689657,1.43946 9.562135,-2.54678 7.881678,-4.57161 -1.614969,-1.94592 0.543446,-2.81116 2.39466,-0.95995 1.932595,1.9326 0.234654,6.47485 -2.420364,6.47485 -2.390146,0 -4.051441,2.23713 -2.965777,3.99377 0.740689,1.19846 1.218594,1.12186 2.987344,-0.47884 3.406254,-3.08261 7.063255,-3.27149 3.920021,-0.20246 -1.321935,1.29073 -3.198156,2.63706 -4.169381,2.99186 -1.463856,0.53475 -1.653838,1.37626 -1.110841,4.92037 1.036819,6.76728 2.913385,6.57626 2.640423,-0.26877 -0.134821,-3.38089 0.142221,-3.95593 1.905896,-3.95593 1.571318,0 1.938872,0.47715 1.540636,2 -0.287656,1.1 -0.115141,2 0.383369,2 0.498509,0 0.96263,-0.45 1.03138,-1 0.238805,-1.91044 0.467909,-2.51699 2.115671,-5.60124 1.187834,-2.22337 1.350686,-3.4074 0.575302,-4.18279 -0.621603,-0.6216 -0.749078,-1.85432 -0.299757,-2.89875 1.303858,-3.03077 1.124261,-9.3161 -0.266216,-9.31669 -1.489085,-6.3e-4 -1.676094,-2.61915 -0.25,-3.50053 2.022248,-1.24982 1.004309,-3.5 -1.583333,-3.5 -1.628176,0 -2.425149,-0.46217 -2.155505,-1.25 0.8577,-2.50597 12.235836,-1.56907 15.262791,1.25676 9.369225,8.74672 9.558066,30.04723 0.394255,44.47037 -3.908079,6.15102 3.276749,13.99627 15.520797,16.94746 8.108519,1.9544 13.904595,10.2116 16.022105,22.82541 0.75747,4.5122 -13.553142,6.18611 -14.96111,1.75 z m -6.090775,-20.1003 c -1.883722,-2.0815 -5.196659,-3.05266 -5.996842,-1.75793 -1.215823,1.96724 0.488687,3.45823 3.953475,3.45823 3.308319,0 3.464506,-0.12996 2.043367,-1.7003 z M 49,465.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.772141,57.4647 c 2.492459,-3.37124 5.498463,-4.13134 3.801947,-0.96137 -1.115671,2.08465 -2.792239,3.38743 -4.740006,3.68324 -0.667664,0.1014 -0.247131,-1.11882 0.938059,-2.72187 z m 15.267776,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.984111,-1.62354 1.914649,-0.73472 2.981717,0.0749 2.061373,1.56407 -0.830379,1.34358 -2.234909,1.371 -3.045484,0.0595 z m 17.198218,0.36758 c -0.925629,-0.92563 0.189072,-2.36052 1.833779,-2.36052 0.842134,0 1.177876,0.60386 0.833994,1.5 -0.610368,1.59059 -1.613974,1.91432 -2.667773,0.86052 z M 24,522.37361 c 0,-1.24034 3.17723,-5.01143 4.222241,-5.01143 1.216405,0 0.911488,3.46627 -0.422241,4.8 -1.450736,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.563834,-1.56383 -1.523926,-3.97474 0.102613,-6.19917 1.129249,-1.54434 1.463614,-1.58743 2.512331,-0.32381 0.959725,1.1564 0.897189,1.717 -0.302613,2.71275 -1.953977,1.62165 -1.932441,3.01023 0.04669,3.01023 0.857459,0 1.280902,0.45 0.940983,1 -0.818297,1.32403 -1.837753,1.26225 -3.3,-0.2 z m 17.043786,-0.05 c 0.225748,-0.6875 1.725748,-1.37269 3.333333,-1.52264 2.788155,-0.26007 2.833407,-0.20246 0.981751,1.25 -2.346126,1.84032 -4.882473,2.00058 -4.315084,0.27264 z m 28.413426,-2.29909 c 0.680432,-1.77318 3.471169,-1.56926 4.093255,0.29909 0.260434,0.78218 -0.538884,1.25 -2.135749,1.25 -1.8935,0 -2.398572,-0.39969 -1.957506,-1.54909 z M 21,516.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.647568,-4.24293 c -0.841403,-3.14186 -0.799742,-3.81609 0.235801,-3.81609 1.240865,0 2.226771,4.28986 1.217791,5.29884 -0.458333,0.45833 -1.11245,-0.20891 -1.453592,-1.48275 z m 4.591902,-1.82793 c 0.691029,-1.10652 1.819842,-1.79564 2.508473,-1.53139 C 45.436575,509.0832 46,508.86353 46,508.3308 c 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.212109,0 1.824239,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.903813,0.88337 -2.008474,0.88337 -1.762089,0 -1.854346,-0.2468 -0.752056,-2.01184 z M 33,506.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.04125,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.429973,0.69664 c -0.606232,-0.98091 2.181599,-3.69502 2.977678,-2.89894 0.706368,0.70637 -0.591568,3.78563 -1.595677,3.78563 -0.458697,0 -1.080597,-0.39901 -1.382001,-0.88669 z M 44,453.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.273145,1.68903 0.606989,2.55901 0.398311,1.03799 0.05452,1.58179 -1,1.58179 C 44.682954,455.36218 44,454.53728 44,453.4212 z m 7,-4.85902 c 0,-3.04736 4.537474,-4.07671 5.289749,-1.2 0.434416,1.66121 0.03068,2 -2.383369,2 -1.598509,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.434447,-5.29196 7.396256,-2.78553 0.909842,2.37101 -0.318374,3.71929 -2.066485,2.26848 -1.165167,-0.967 -1.912674,-0.97579 -3.410972,-0.0401 C 50.863459,442.83989 50,443.0906 50,442.73795 z" + style="fill:#b4c3d5" /> + <path + inkscape:connector-curvature="0" + id="path3324-3" + d="m 92,525.56218 c 0,-1.54 -0.527793,-3.32779 -1.172874,-3.97287 -0.855295,-0.8553 -0.884251,-1.80634 -0.106941,-3.51235 1.75157,-3.84427 -0.705254,-11.42904 -4.802674,-14.82692 -4.086046,-3.38846 -2.898331,-3.60091 4.550449,-0.81396 13.71103,5.12995 20.56433,25.9261 8.543858,25.9261 -7.011818,0 -7.011818,0 -7.011818,-2.8 z M 59.910502,504.75434 c -0.635465,-0.76569 -1.955842,-1.39216 -2.934171,-1.39216 -0.978329,0 -2.708052,-1.575 -3.84383,-3.5 -1.135778,-1.925 -2.755227,-3.5 -3.598776,-3.5 -1.951918,0 -1.967601,-1.39503 -0.03372,-3 2.076834,-1.72362 1.890939,-3.35723 -1,-8.78785 -4.069166,-7.64391 -3.455289,-10.71763 1.420545,-7.11277 5.169207,3.82176 11.750544,-2.46804 15.52335,-14.83571 1.370596,-4.49296 0.796129,-18.89883 -0.883128,-22.14616 -1.612127,-3.11751 -1.612127,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.559878,46.61877 -3.518421,5.84292 -3.518421,5.84292 2.297632,11.07309 3.521616,3.16687 5.178879,5.24555 4.200912,5.26916 -0.888328,0.0214 -2.688328,0.8515 -4,1.84459 -4.749564,3.59595 -14.858241,5.13632 -16.974357,2.58655 z" + style="fill:#b3bcc9" /> + <path + inkscape:connector-curvature="0" + id="path3322-0" + d="m 92.815054,521.61218 c 0.280763,-4.98157 -0.149325,-8.25644 -1.641625,-12.5 -2.022056,-5.75 -2.022056,-5.75 0.0199,-5.75 4.892222,0 12.116871,11.11379 14.138841,21.75 0.61783,3.25 0.61783,3.25 -6.139863,3.25 -6.757689,0 -6.757689,0 -6.377257,-6.75 z M 57.736081,502.60026 c -4.74666,-2.19188 -8.21023,-7.48361 -6.720339,-10.26749 0.787293,-1.47107 0.578728,-2.8552 -0.859855,-5.70638 -3.780683,-7.49305 -3.71844,-7.75193 1.891408,-7.86675 11.763399,-0.24076 19.607447,-21.36594 14.350292,-38.64746 -1.513683,-4.97583 8.15369,0.5478 11.171092,6.38281 4.79792,9.27815 2.757176,28.21359 -4.135306,38.37023 -3.248042,4.78626 -3.108843,5.61941 1.566627,9.37672 8.383493,6.73716 -5.850701,13.62864 -17.263919,8.35832 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path3320-2" + d="m 95,519.94322 c 0,-6.15501 -0.465546,-9.23013 -1.731223,-11.43544 -2.129347,-3.71017 -1.162952,-4.96151 2.153516,-2.78847 3.134773,2.05398 7.071677,8.79205 8.555507,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z M 63,502.21435 c -5.613254,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.901534,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.482187,-6.12103 12.466652,3.12893 23.836582,-23.06489 17.885689,-41.20469 -1.768008,-5.38933 6.735063,1.04007 9.607989,7.26486 3.853849,8.35016 1.790957,26.18765 -4.142144,35.81645 -3.771821,6.12126 -3.726023,7.00345 0.532187,10.25135 4.268856,3.25601 4.328389,3.95246 0.506787,5.92869 -5.335159,2.75892 -7.429145,3.16975 -12.006787,2.35568 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path3318-0" + d="m 97.580726,526.11218 c -0.251559,-1.2375 -0.72938,-5.35305 -1.061826,-9.14566 -0.332446,-3.79262 -1.069261,-7.76418 -1.637367,-8.8257 -0.934152,-1.74548 -0.829324,-1.82107 1.096284,-0.79051 2.819043,1.5087 5.542873,6.12588 6.994333,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.326202,0 -4.056171,-0.37006 -4.438324,-2.25 z M 60.5,500.40269 c -3.265642,-1.35967 -7.602087,-6.57417 -8.46488,-10.17887 -0.442539,-1.8489 -1.129624,-4.14914 -1.526857,-5.11164 -0.576601,-1.39711 -0.209671,-1.75 1.819649,-1.75 12.357308,0 23.416086,-23.45864 18.741894,-39.7566 -1.195778,-4.16943 -0.0374,-4.10946 3.740804,0.19368 7.79605,8.87921 6.233208,28.06127 -3.573583,43.86154 -1.72735,2.78303 -1.718871,2.81367 1.521988,5.5 6.506488,5.39319 -3.087271,11.06061 -12.259015,7.24189 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path3316-7" + d="m 100.78845,526.61218 c -2.135149,-2.45575 -3.345892,-15.95753 -1.276991,-14.24049 0.800071,0.664 2.186211,3.746 3.080301,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.756084,-31 c -5.277946,-5.08752 -5.842086,-9.34879 -1.362926,-10.29495 10.175676,-2.14947 19.086762,-19.27014 18.092621,-34.76096 -0.486107,-7.57459 -0.486107,-7.57459 1.781461,-4.93839 6.180155,7.18486 4.779027,27.36115 -2.676692,38.54443 -3.503817,5.25559 -3.542145,6.21682 -0.36683,9.19987 3.118955,2.93011 3.114395,3.39903 -0.04705,4.83949 -5.40941,2.46469 -11.183057,1.49515 -15.420584,-2.58949 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path3314-4" + d="m 101.70717,525.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.065403,-31 c -4.91445,-3.9769 -5.748541,-5.95905 -2.891767,-6.87206 5.527572,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.933234,-2.88544 2.073853,-5.01359 2.414595,-4.50511 5.220373,-17.98198 4.375484,-21.01657 -0.461667,-1.65818 -0.368419,-1.7777 0.455976,-0.58445 4.302348,6.22731 1.172547,26.46135 -5.612772,36.28634 -2.614917,3.78635 -2.614917,3.78635 -0.365672,6.82862 1.237084,1.67324 2.097118,3.17093 1.911187,3.3282 -4.208579,3.5597 -8.799793,3.17382 -14.196289,-1.19316 z" + style="fill:#8a95a3" /> + <path + inkscape:connector-curvature="0" + id="path3312-7" + d="m 68.553851,495.44931 c -0.369537,-0.59792 -1.542351,-1.08713 -2.606255,-1.08713 -1.842561,0 -1.829965,-0.12007 0.265385,-2.52994 2.199755,-2.52994 2.199755,-2.52994 3.583106,0.11028 1.388266,2.6496 0.236851,5.90001 -1.242236,3.50679 z m -9.192225,-2.58713 c -0.316582,-0.825 -1.202459,-1.5 -1.968615,-1.5 -0.766156,0 -1.393011,-0.45 -1.393011,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.944645,-1.14465 0.859526,-0.85952 1.306427,-0.50004 1.794143,1.44317 0.99716,3.973 -1.799649,6.79122 -3.177162,3.20148 z m 8.279576,-8.19213 c -0.380672,-0.38067 0.492512,-1.63673 1.940409,-2.79125 1.907671,-1.52112 2.773627,-3.32052 3.144932,-6.53498 0.281816,-2.43973 1.077686,-4.89617 1.768601,-5.45875 0.690915,-0.56259 1.74847,-1.92289 2.350124,-3.02289 1.570686,-2.87168 1.407159,-0.26284 -0.427266,6.81644 -2.261098,8.72586 -6.159851,13.60838 -8.7768,10.99143 z" + style="fill:#89929e" /> + </g> + <g + id="g3702" + transform="translate(42,82)"> + <rect + style="color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3704" + width="34.242748" + height="8.1750183" + x="4.0543771" + y="309.32199" + rx="1.6497765" + ry="1.6497765" /> + <text + xml:space="preserve" + style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="13.782688" + y="316.16464" + id="text3706" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3708" + x="13.782688" + y="316.16464">laila</tspan></text> + </g> + </g> + <g + transform="translate(-1051.2436,-269.08037)" + id="g3801" + style="display:inline"> + <g + id="g3629" + transform="matrix(0.32896515,0,0,0.32896515,-246.21372,55.85625)"> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-gen.png" + id="g3631" + transform="translate(350,0)"> + <path + inkscape:connector-curvature="0" + id="path3633" + d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path3635" + d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + style="fill:#d4dbe2" /> + <path + inkscape:connector-curvature="0" + id="path3637" + d="m 597.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" + style="fill:#a9b6c7;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3639" + d="m 595.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" + style="fill:#b6c5d8;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3641" + d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + style="fill:#c9cfd7" /> + <path + inkscape:connector-curvature="0" + id="path3643" + d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + style="fill:#b6c5d8" /> + <path + inkscape:connector-curvature="0" + id="path3645" + d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + style="fill:#89929e" /> + <path + inkscape:connector-curvature="0" + id="path3647" + d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + style="fill:#b4c3d5" /> + <path + inkscape:connector-curvature="0" + id="path3649" + d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + style="fill:#b3bcc9" /> + <path + inkscape:connector-curvature="0" + id="path3651" + d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path3653" + d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path3655" + d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path3657" + d="m 597.625,771.4375 c -3.21749,0.80995 -6.35889,1.89093 -9.49855,2.95674 -0.97154,0.37142 -1.85289,0.9729 -2.5952,1.69951 -0.85286,0.75372 -1.5183,1.68678 -2.24295,2.5579 -1.43359,1.82026 -2.70936,3.75542 -4.06955,5.6296 -0.88196,1.49498 -1.70097,3.03188 -2.28734,4.66945 -0.773,1.87386 -1.3796,3.81126 -2.03693,5.7276 -1.48856,4.58577 -2.86664,9.20755 -4.15527,13.85304 -0.38084,1.5389 -0.8175,3.06718 -1.11421,4.62491 -0.0983,1.32482 0.42765,2.57219 0.8125,3.8125 0.65443,1.89642 1.24797,3.81318 1.875,5.71875 0.4387,1.03708 1.53192,1.69185 2.625,1.8125 1.24203,-0.0193 2.52075,0.0375 3.71875,-0.34375 1.02063,-0.39402 1.60505,-1.36074 1.86562,-2.3781 0.73273,-2.56005 1.01952,-5.21766 1.50049,-7.83083 0.4005,-2.37627 0.77571,-4.75672 1.16514,-7.13482 0.60941,-2.21748 1.28797,-4.41783 2.03973,-6.59038 0.78279,-2.02938 1.71569,-3.99664 2.55402,-6.00337 0.89003,-1.89943 1.86665,-3.76562 3.01491,-5.52201 1.40777,-2.01133 3.33858,-3.57662 5.32812,-4.9803 1.23992,-0.75485 2.42213,-1.59957 3.68923,-2.3108 1.42795,-0.88217 2.95575,-1.58776 4.46774,-2.31189 0.99896,-0.30772 1.95269,-0.81445 2.99484,-0.95052 0.94868,-0.0968 1.93298,0.0577 2.84891,-0.26823 0.92455,-0.56794 0.73006,-1.98773 -0.15625,-2.5 -0.80724,-0.63096 -1.7434,-1.0782 -2.63346,-1.5793 -1.68129,-0.84475 -3.47432,-1.44213 -5.30345,-1.87163 -1.35714,-0.28247 -2.73917,-0.47084 -4.12559,-0.51782 l -0.18169,0.0202 -0.0996,0.0111 z" + style="fill:#99a5b4;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3659" + d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path3661" + d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + style="fill:#8a95a3;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3663" + d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + style="fill:#8a95a3" /> + </g> + <path + inkscape:connector-curvature="0" + id="path3665" + d="m 902.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path3667" + d="m 902.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + style="fill:#d4dbe2" /> + <path + inkscape:connector-curvature="0" + id="path3669" + d="m 947.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" + style="fill:#a9b6c7;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3671" + d="m 945.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" + style="fill:#b6c5d8;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3673" + d="m 903.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + style="fill:#c9cfd7" /> + <path + inkscape:connector-curvature="0" + id="path3675" + d="m 904.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + style="fill:#b6c5d8" /> + <path + inkscape:connector-curvature="0" + id="path3677" + d="m 955.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + style="fill:#89929e" /> + <path + inkscape:connector-curvature="0" + id="path3679" + d="m 905.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + style="fill:#b4c3d5" /> + <path + inkscape:connector-curvature="0" + id="path3681" + d="m 978.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + style="fill:#b3bcc9" /> + <path + inkscape:connector-curvature="0" + id="path3683" + d="m 979.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path3685" + d="m 981.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path3687" + d="m 984.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 947.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path3689" + d="m 987.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path3691" + d="m 988.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + style="fill:#8a95a3" /> + <path + inkscape:connector-curvature="0" + id="path3693" + d="m 954.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + style="fill:#8a95a3;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path3695" + d="m 946.9375,772.125 c -9.56715,1.74839 -17.25457,9.64487 -19.96875,18.8125 -4.82877,10.88517 -7.07054,23.03246 -5.61836,34.90144 0.0198,1.07326 0.1459,2.15794 -0.0379,3.22356 3.75192,-4.50382 3.8025,-10.67156 5.9811,-15.89686 3.37158,-10.6816 8.79354,-21.17419 17.67515,-28.29064 4.36603,-3.68349 9.47725,-6.3808 14.71875,-8.59375 0.72214,-1.81857 -1.47582,-3.24498 -3.09375,-3.125 -3.11721,-0.92307 -6.41633,-1.23 -9.65625,-1.03125 z" + style="fill:#99a5b4;fill-opacity:1" + sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> + </g> + <g + id="g3718" + transform="translate(44.271316,-1.2461478)"> + <rect + ry="1.6497765" + rx="1.6497765" + y="342.32199" + x="4.0543771" + height="8.1750183" + width="34.242748" + id="rect3720" + style="color:#000000;fill:#8d5fd3;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text3722" + y="349.16464" + x="8.4838123" + style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + y="349.16464" + x="8.4838123" + id="tspan3724" + sodipodi:role="line">richard</tspan></text> + </g> + </g> + <g + transform="translate(-1078.381,-239.13572)" + id="g3879" + style="display:inline"> + <g + id="g5522" + transform="matrix(0.32896515,0,0,0.32896515,-199.52174,148.10628)"> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/unknown-gen.png" + id="g32891" + transform="translate(350,0)"> + <path + inkscape:connector-curvature="0" + id="path32893" + d="m 552.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path32895" + d="m 552.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + style="fill:#d4dbe2" /> + <path + inkscape:connector-curvature="0" + id="path32897" + d="m 597.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" + style="fill:#a9b6c7;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path32899" + d="m 595.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" + style="fill:#b6c5d8;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path32901" + d="m 553.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + style="fill:#c9cfd7" /> + <path + inkscape:connector-curvature="0" + id="path32903" + d="m 554.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + style="fill:#b6c5d8" /> + <path + inkscape:connector-curvature="0" + id="path32905" + d="m 605.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + style="fill:#89929e" /> + <path + inkscape:connector-curvature="0" + id="path32907" + d="m 555.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + style="fill:#b4c3d5" /> + <path + inkscape:connector-curvature="0" + id="path32909" + d="m 628.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + style="fill:#b3bcc9" /> + <path + inkscape:connector-curvature="0" + id="path32911" + d="m 629.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path32913" + d="m 631.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path32915" + d="m 634.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 597.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path32917" + d="m 597.625,771.4375 c -3.21749,0.80995 -6.35889,1.89093 -9.49855,2.95674 -0.97154,0.37142 -1.85289,0.9729 -2.5952,1.69951 -0.85286,0.75372 -1.5183,1.68678 -2.24295,2.5579 -1.43359,1.82026 -2.70936,3.75542 -4.06955,5.6296 -0.88196,1.49498 -1.70097,3.03188 -2.28734,4.66945 -0.773,1.87386 -1.3796,3.81126 -2.03693,5.7276 -1.48856,4.58577 -2.86664,9.20755 -4.15527,13.85304 -0.38084,1.5389 -0.8175,3.06718 -1.11421,4.62491 -0.0983,1.32482 0.42765,2.57219 0.8125,3.8125 0.65443,1.89642 1.24797,3.81318 1.875,5.71875 0.4387,1.03708 1.53192,1.69185 2.625,1.8125 1.24203,-0.0193 2.52075,0.0375 3.71875,-0.34375 1.02063,-0.39402 1.60505,-1.36074 1.86562,-2.3781 0.73273,-2.56005 1.01952,-5.21766 1.50049,-7.83083 0.4005,-2.37627 0.77571,-4.75672 1.16514,-7.13482 0.60941,-2.21748 1.28797,-4.41783 2.03973,-6.59038 0.78279,-2.02938 1.71569,-3.99664 2.55402,-6.00337 0.89003,-1.89943 1.86665,-3.76562 3.01491,-5.52201 1.40777,-2.01133 3.33858,-3.57662 5.32812,-4.9803 1.23992,-0.75485 2.42213,-1.59957 3.68923,-2.3108 1.42795,-0.88217 2.95575,-1.58776 4.46774,-2.31189 0.99896,-0.30772 1.95269,-0.81445 2.99484,-0.95052 0.94868,-0.0968 1.93298,0.0577 2.84891,-0.26823 0.92455,-0.56794 0.73006,-1.98773 -0.15625,-2.5 -0.80724,-0.63096 -1.7434,-1.0782 -2.63346,-1.5793 -1.68129,-0.84475 -3.47432,-1.44213 -5.30345,-1.87163 -1.35714,-0.28247 -2.73917,-0.47084 -4.12559,-0.51782 l -0.18169,0.0202 -0.0996,0.0111 z" + style="fill:#99a5b4;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path32919" + d="m 637.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path32921" + d="m 604.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + style="fill:#8a95a3;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path32923" + d="m 638.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + style="fill:#8a95a3" /> + </g> + <path + inkscape:connector-curvature="0" + id="path32959" + d="m 902.51419,862.96792 c 0.0102,-5.30143 1.60593,-10.6248 3.78149,-15.43929 4.32123,-8.8444 14.216,-12.22658 22.33805,-16.5859 4.68059,-1.37584 9.07114,-5.52844 4.7426,-10.02046 -6.39489,-12.22902 -8.7729,-27.8219 -2.10653,-40.43961 3.65467,-7.37162 12.38903,-12.01132 20.49326,-9.67176 7.28637,1.44287 13.14475,7.15895 15.34035,14.18101 4.51436,13.20733 1.2153,28.11579 -6.53662,39.43979 -1.32968,3.95225 5.89572,5.24121 8.44,7.53545 5.40393,3.00388 11.60589,4.85759 15.86832,9.59775 5.12248,5.30858 9.79259,12.48585 8.66416,20.18284 -2.66598,2.93451 -8.40865,1.41927 -12.30136,2.20861 -23.95296,0.89934 -47.95935,1.13829 -71.90915,0.0384 -2.25654,-0.26203 -4.73152,-0.0739 -6.81457,-1.02681 z" + style="fill:#dce2e8" /> + <path + inkscape:connector-curvature="0" + id="path32961" + d="m 902.86191,863.98091 c -0.3001,-10.49202 6.03728,-20.13978 14.66257,-25.69496 5.51969,-4.0779 12.40955,-5.84192 17.80822,-10.06232 2.84965,-4.01312 -2.37245,-8.04948 -3.34535,-11.96125 -5.17334,-11.94737 -5.914,-27.08139 2.25625,-37.90341 5.89413,-8.20878 18.85242,-9.23957 26.20711,-2.50691 7.92198,7.8665 8.99588,20.23178 7.07876,30.70563 -1.07732,6.52092 -4.2598,12.37274 -7.80043,17.84376 -0.63942,4.72644 5.99701,6.29571 9.15658,8.71794 5.67067,3.14875 12.42699,4.70876 16.62391,10.05061 4.55195,5.13638 7.7383,11.97169 7.26449,18.94209 -3.42877,3.13676 -9.17326,1.57453 -13.56039,2.19728 -25.14284,0.17847 -50.29403,0.26439 -75.43326,-0.23791 l -0.91846,-0.0906 0,0 z" + style="fill:#d4dbe2" /> + <path + inkscape:connector-curvature="0" + id="path32963" + d="m 947.40625,773.21875 c -2.08437,0.0218 -4.06879,0.82425 -5.78008,1.97408 -1.79052,1.15879 -3.40619,2.56842 -5.10341,3.85771 -2.07314,1.7046 -4.13064,3.52243 -5.54313,5.83208 -1.4246,2.63374 -2.01431,5.62903 -2.3241,8.58199 -0.33035,2.74853 -0.32823,5.52241 -0.43678,8.28539 -0.005,3.82444 -0.15351,7.64782 -0.13884,11.4717 0.0859,5.10181 0.52206,10.19115 0.63884,15.29078 -0.0171,1.6471 0.0169,3.30988 -0.14185,4.94514 -0.24522,0.76103 -0.56607,2.26102 0.57466,2.38613 1.06002,-0.019 1.23511,-1.39535 1.15554,-2.21222 0.22952,-1.68105 1.32505,-3.13394 2.6304,-4.16278 0.85251,-0.49875 1.97306,-0.491 2.84375,-0.0625 1.32761,1.06993 2.37232,2.46316 3.74962,3.48406 1.78793,1.52488 3.51798,3.13357 5.27748,4.67984 0.9866,0.7019 2.27026,0.71795 3.42985,0.66919 1.06796,-0.16832 2.13534,-0.35487 3.21952,-0.36775 0.89406,0.16109 2.32802,-0.70942 1.38603,-1.62159 -0.8042,-0.70337 -1.88743,-0.23431 -2.83365,-0.39781 -1.84267,-0.0672 -3.62098,-1.11476 -4.59764,-2.66893 -1.00336,-1.75997 -1.59857,-3.7098 -2.42704,-5.55243 -1.66116,-3.95349 -2.91032,-8.07322 -3.85039,-12.25354 -0.4782,-2.16238 -0.94931,-4.33361 -1.04039,-6.55414 -0.44284,-5.17654 -0.0164,-10.36675 0.21786,-15.5419 0.43161,-2.80874 0.93864,-5.71235 2.52365,-8.13079 1.40946,-2.34955 3.21165,-4.47033 5.33501,-6.20561 1.34968,-1.17749 2.79007,-2.24805 4.17259,-3.38235 0.65717,-0.78426 0.12822,-2.21425 -0.93003,-2.28177 -0.66037,-0.14562 -1.33846,-0.0725 -2.00747,-0.062 z" + style="fill:#a9b6c7;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path32965" + d="m 945.0625,771.09375 c -3.49998,0.58518 -6.82593,1.96099 -9.87152,3.75664 -1.46593,0.9392 -2.89772,1.9504 -4.10149,3.21637 -2.26374,2.18699 -4.05772,4.84626 -5.3102,7.72931 -1.72442,4.45631 -3.18147,9.00923 -4.54622,13.58674 -1.17863,3.81878 -2.29249,7.66048 -3.58633,11.44147 -0.98068,2.31904 -2.25569,4.50522 -3.14674,6.86322 -0.0717,0.83217 -0.52076,1.71408 -0.15625,2.53125 0.34391,0.63556 0.61295,-0.72716 0.90409,-1.00196 0.70785,-1.17012 1.67865,-2.15857 2.50216,-3.24804 2.02564,-2.4413 4.09249,-4.85803 6.34375,-7.09375 0.89228,-0.67775 1.93115,-1.14621 3,-1.46875 0.9592,-0.27381 2.04572,-0.0942 2.7855,0.6034 0.79827,0.68845 1.05228,1.81659 0.92648,2.82928 -0.069,2.24614 -0.62186,4.43634 -0.94161,6.65146 -0.37717,1.50747 -0.59603,3.04826 -0.89537,4.57211 -0.0187,0.88489 0.803,1.89802 1.75,1.65625 1.2052,-0.41761 1.68611,-1.71186 2.01212,-2.83444 1.08092,-3.47552 1.16417,-7.147 1.31178,-10.75426 0.25256,-3.87574 0.43014,-7.76125 0.90064,-11.61815 0.52097,-3.65166 1.24649,-7.28074 2.27546,-10.8244 0.50779,-1.47275 1.28525,-2.82251 2.13241,-4.12255 1.04514,-1.54481 2.4259,-2.97532 4.21134,-3.62745 3.77193,-1.53211 7.85601,-2.03477 11.71875,-3.28125 0.85611,-0.41385 1.66942,-1.37746 1.34375,-2.375 -0.36579,-1.12201 -1.57323,-1.602 -2.61278,-1.89568 -2.30278,-0.66163 -4.68142,-1.03339 -7.06477,-1.2496 -0.62852,-0.0212 -1.25644,-0.11142 -1.88495,-0.0422 z" + style="fill:#b6c5d8;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path32967" + d="m 903.31861,862.68392 c 2.03973,-6.75845 2.62673,-14.59993 8.28246,-19.57905 6.86653,-6.55449 16.49277,-8.81781 23.9521,-14.46458 3.64474,-4.45932 -2.81051,-9.08083 -3.56202,-13.60484 -4.14323,-11.16786 -4.98166,-24.68811 1.49566,-35.15189 5.68463,-8.73332 19.85553,-10.9347 27.19403,-3.0481 8.41394,8.94249 8.77611,22.65299 5.27347,33.81426 -1.49442,5.581 -4.99844,10.28747 -7.0924,15.6006 2.76177,3.52771 7.14927,5.48724 10.93492,7.7964 6.119,3.22073 13.58338,5.02515 17.48348,11.27477 2.96987,4.63969 4.42192,10.08731 5.80917,15.35231 -1.50165,4.96315 -8.81816,2.91096 -12.85889,3.69351 -22.80335,0.12179 -45.61168,0.15756 -68.41429,-0.11428 -2.31171,-0.50334 -7.53241,0.74503 -8.49769,-1.56911 z" + style="fill:#c9cfd7" /> + <path + inkscape:connector-curvature="0" + id="path32969" + d="m 904.235,862.68169 c 2.05635,-7.41778 3.349,-16.08468 10.1767,-20.8097 6.61828,-5.16685 15.1606,-7.20405 21.59504,-12.59203 3.54453,-4.88336 -2.47561,-9.88767 -3.35341,-14.75239 -3.47406,-10.8555 -4.1294,-23.33186 0.8597,-33.82801 1.72632,-3.59701 5.23944,-6.62494 9.42916,-6.35645 4.19219,-1.15696 8.52724,-4.11292 12.93873,-1.76941 7.46152,3.81566 10.06429,12.7832 10.99601,20.5469 1.16372,10.51462 -1.47428,21.3696 -7.47449,30.09882 -3.05921,4.5826 3.82783,7.04871 6.59279,9.43949 4.45298,3.31782 9.92768,4.58376 14.70417,7.25683 7.68513,4.50047 10.74405,13.62794 11.74428,22.00374 -2.9167,3.42132 -8.87906,1.6959 -13.0442,2.37973 -23.01389,0.17734 -46.03587,0.29901 -69.04708,-0.12448 -1.47707,-0.46732 -5.78821,0.53078 -6.1174,-1.49304 z" + style="fill:#b6c5d8" /> + <path + inkscape:connector-curvature="0" + id="path32971" + d="m 955.41576,831.51882 c -6.51092,-0.17414 1.89613,-8.32488 2.10973,-2.13677 0.25514,1.05824 -0.90992,3.45218 -2.10973,2.13677 z m -9.19222,-2.58713 c -5.03005,-3.26087 3.80688,-5.55701 3.71501,-0.9855 -0.33166,1.64802 -2.69765,2.53253 -3.71501,0.9855 z m 8.27957,-8.19213 c 5.41236,-4.28675 4.18648,-12.49507 9.14189,-17.11237 0.29556,5.93898 -0.81537,13.05465 -6.06482,16.64412 -0.94557,0.45813 -2.03685,0.66185 -3.07707,0.46825 z" + style="fill:#89929e" /> + <path + inkscape:connector-curvature="0" + id="path32973" + d="m 905.48691,863.63394 c -0.70857,-2.12774 2.22704,-4.3804 1.34135,-0.66819 0.10193,0.98814 -0.65203,2.27111 -1.34135,0.66819 z m 37.375,-0.1401 c 1.38595,-2.43696 5.53173,0.89636 1.42887,0.91541 -0.49532,-0.004 -1.42499,-0.23332 -1.42887,-0.91541 z m 7.69692,-0.45528 c -1.76626,-3.1746 2.23873,-3.26451 1.11193,0.0649 -0.32817,2.3234 -0.6929,0.92535 -1.11193,-0.0649 z m 26.80308,-0.60687 c -0.14118,-3.37799 -6.35613,-0.78227 -3.14715,-4.41577 3.46144,-3.84128 -0.91256,-6.50536 0.32867,-10.70489 -1.35343,-4.87174 -4.44598,3.58742 -6.3126,-0.95498 -2.28645,-0.76047 -6.14616,-2.25962 -7.84378,-1.85811 1.7928,4.16671 -5.07612,3.88297 -4.6571,8.23859 -2.87822,4.77401 -4.21355,-5.23107 0.41677,-4.75641 3.01773,-1.66128 2.63528,-6.07232 -1.10546,-3.24125 -4.1035,2.38594 -8.10134,0.13188 -10.98005,-2.65973 -1.57462,1.027 -7.19053,5.94236 -6.22979,1.16697 3.10847,-2.66186 -0.58671,-8.92294 -4.2926,-8.18935 -5.10673,-0.52325 2.44631,-4.85414 3.57641,-6.66771 1.85925,-4.36472 -3.17296,-7.83742 -3.70804,-12.04941 -1.26507,-5.08051 -2.83005,-10.57026 -1.53095,-15.77259 2.64643,-1.80932 -6.03903,-6.34583 -0.12744,-6.57829 2.97426,2.18718 10.86096,-0.73904 8.66403,-4.74784 1.43269,-4.1299 6.02584,3.62463 2.18105,5.45085 -2.59742,0.10573 -7.4936,3.34663 -3.62767,5.54395 1.64345,-0.82217 6.49317,-5.71297 6.67294,-2.49044 -2.78532,3.31115 -8.67094,4.59991 -5.95043,10.09851 -0.14706,1.93717 2.22289,5.8417 2.38345,1.69036 -0.29174,-2.60942 -0.27466,-9.86038 3.64824,-6.05741 -1.55047,2.76367 1.65839,4.017 1.46611,0.70751 1.23126,-3.60319 4.16329,-6.90216 1.96148,-10.6292 1.08569,-3.44275 2.47527,-8.92278 -1.1456,-10.9983 -0.27587,-2.38485 4.39556,-5.73004 -0.72382,-6.12506 -5.30946,-0.90828 1.67648,-3.69288 4.04177,-2.6646 4.32549,0.22232 9.16923,1.37034 11.4584,5.44637 6.2849,9.7073 5.68438,22.38166 2.17074,32.98508 -0.92944,4.64278 -5.22217,8.12432 -5.20477,12.92114 1.20847,6.56432 8.01624,9.99242 13.78201,11.95844 5.17953,1.02044 10.13826,3.62424 13.03186,8.19359 3.20397,4.79647 5.21645,10.49318 5.73671,16.22196 -2.35585,3.8145 -7.90047,3.87439 -11.89521,3.17059 -1.22451,-0.32543 -2.60284,-0.92802 -3.03818,-2.23257 z m -6.09078,-20.1003 c -1.41893,-3.47946 -9.20211,-2.51084 -5.13746,1.1248 1.04916,0.55257 8.14925,1.55777 5.13746,-1.1248 z m -35.40922,-40.45872 c -2.16266,-4.30335 -2.56624,5.59099 0,0 z m -10.77214,57.4647 c 0.9739,-2.58634 6.2446,-4.23216 3.35785,-0.21672 -0.93252,2.57294 -7.05087,4.43368 -3.35785,0.21672 z m 15.26777,1.08726 c -0.46155,-3.123 5.92769,-1.79651 2.3333,0.70108 -0.7844,0.59532 -1.93502,0.11193 -2.3333,-0.70108 z m 17.19822,0.36758 c -1.40203,-3.70988 5.69463,-2.0316 1.50018,0.56139 l -0.7246,-0.0276 -0.77558,-0.53379 z m -46.69385,-2.34909 c 0.2511,-3.17228 6.70537,-7.64119 4.5997,-1.5241 -0.30291,1.59959 -3.88314,3.82735 -4.5997,1.5241 z m 56,-0.51143 c 2.51293,-5.65641 2.40656,5.5417 0,0 z m -47.8,-2.7 c -4.0511,-2.74409 2.86178,-11.29262 3.00074,-4.49156 -2.27342,1.19476 -2.94972,4.14273 0.2778,3.98531 0.44919,2.1979 -2.50337,1.86609 -3.27854,0.50625 z m 17.04379,-0.05 c 1.31653,-2.24916 8.58375,-2.15975 3.4328,0.33832 -0.75747,0.55533 -3.95209,1.81288 -3.4328,-0.33832 z m 28.41342,-2.29909 c 1.98887,-3.91758 6.85421,2.62004 1.31167,1.52967 -0.84991,0.0565 -1.92843,-0.52139 -1.31167,-1.52967 z m -56.65721,-0.39189 c 1.68789,-4.90927 2.99691,2.75221 0.0789,0.36537 l -0.0789,-0.36537 z m 16.64757,-4.24293 c -1.89148,-2.61234 0.84049,-5.75092 1.68838,-1.54504 0.84852,1.72586 -0.70234,5.1602 -1.68838,1.54504 z m 4.5919,-1.82793 c 1.60255,-1.85967 3.66348,-1.43607 5.26053,-2.98816 3.96262,1.46685 -2.62956,3.48646 -3.72862,4.9303 -1.99518,0.50428 -2.92151,-0.26884 -1.53191,-1.94214 z m -9.23947,-3.57149 c 0.59993,-5.93389 4.17587,2.63959 0.61172,2.37949 -0.52277,-0.66971 -0.58181,-1.56896 -0.61172,-2.37949 z m -5.42997,0.69664 c -0.36608,-3.22691 5.22742,-3.96176 2.51439,-0.12486 -0.51631,1.26584 -1.79625,1.28548 -2.51439,0.12486 z m 16.42997,-54.05429 c -0.30675,-2.8402 2.78573,-3.62344 2.3713,-0.3321 1.77753,2.89278 -2.53827,3.01913 -2.3713,0.3321 z m 7,-4.85902 c -0.4203,-5.12456 8.43626,-1.94337 4.35831,0.72111 -1.36922,0.0212 -3.34407,0.40232 -4.35831,-0.72111 z m -1,-5.82423 c 0.17102,-4.09108 9.38834,-5.68544 7.35975,-0.21811 -2.21937,0.24293 -4.55297,-2.11058 -6.7961,0.31894 l -0.41224,0.0536 -0.15141,-0.1544 0,0 z" + style="fill:#b4c3d5" /> + <path + inkscape:connector-curvature="0" + id="path32975" + d="m 978.86191,861.63169 c -0.6243,-3.55935 -2.69727,-6.3569 -0.72148,-9.98987 0.12528,-5.45244 -2.79115,-10.65923 -7.09669,-13.89447 -1.2068,-2.85452 5.32777,0.70573 6.92377,1.01004 7.6726,3.41307 13.86355,11.22205 14.0998,19.78329 0.20205,5.97005 -6.54891,6.42322 -10.9269,5.80556 -1.73227,0.15131 -2.58324,-1.0909 -2.2785,-2.71455 z m -32.0895,-20.80784 c -4.43403,-1.14416 -6.64242,-4.93813 -9.61832,-8.11599 -5.8032,-0.96373 3.57616,-5.23189 -0.12424,-8.64226 -1.28875,-3.82859 -5.19745,-7.73842 -3.91246,-11.88366 3.57632,0.77406 7.98145,4.56157 11.43042,0.4736 4.54424,-4.37751 7.17602,-10.57138 8.26123,-16.71192 0.40261,-6.44762 0.58793,-13.17942 -1.38634,-19.39442 -3.68525,-5.04182 5.4099,-3.08901 7.46282,-1.22179 7.18838,5.3533 8.70986,15.22614 8.49736,23.6257 -0.24925,8.4967 -3.14336,16.73146 -7.72751,23.84074 -2.88991,4.70712 3.78023,7.4172 6.17011,10.48571 2.37199,1.75978 2.7988,3.59039 -0.47087,3.94333 -4.93227,3.54041 -11.38158,5.84263 -17.44005,4.36937 l -0.65495,-0.33776 -0.48717,-0.43065 -3e-5,0 z" + style="fill:#b3bcc9" /> + <path + inkscape:connector-curvature="0" + id="path32977" + d="m 979.67696,857.68169 c 0.69544,-5.83229 -1.1934,-11.42869 -3.06233,-16.84619 1.70492,-4.06189 7.7076,2.15936 9.08169,4.7283 3.47472,5.23289 5.9898,11.23822 6.74935,17.4968 -2.74907,2.48603 -8.71268,1.53936 -12.25687,0.52734 -1.14099,-1.73296 -0.47804,-3.96643 -0.51184,-5.90625 z m -35.07897,-19.01192 c -4.35373,-1.9881 -8.73775,-7.05736 -6.26711,-11.96771 0.37899,-3.87987 -6.19721,-8.74866 -2.61552,-11.649 3.81737,-0.0455 7.92323,-0.57969 10.70088,-3.51648 7.53861,-7.6238 9.37318,-19.29758 8.11009,-29.5788 -0.29347,-2.73658 -3.48318,-10.05061 2.13834,-6.90166 5.59048,2.86145 9.3559,8.5583 9.95363,14.79053 1.45238,11.54814 -0.99935,23.83469 -7.78522,33.40876 -3.2246,5.24149 5.70344,6.58552 5.5499,11.37054 -1.14464,5.117 -7.75884,5.97682 -12.15638,5.8855 -2.62827,-0.12443 -5.23793,-0.7377 -7.62861,-1.84168 z" + style="fill:#a9b6c7" /> + <path + inkscape:connector-curvature="0" + id="path32979" + d="m 981.86191,856.01273 c 0.17627,-4.74944 -0.35601,-9.57132 -2.75943,-13.74195 1.4975,-4.03011 6.82738,2.83782 8.07858,5.41566 2.90201,4.84584 4.29026,10.45516 5.38214,15.90906 -3.35146,1.42092 -11.5911,2.28284 -10.66459,-3.67955 -0.043,-1.30058 -0.0346,-2.60214 -0.0367,-3.90322 z m -32,-17.72887 c -5.84776,-1.14965 -11.42672,-6.22518 -11.15451,-12.52353 -1.5003,-2.03434 -5.71528,-8.53816 -0.0642,-7.68024 6.73246,0.44741 11.31314,-5.91275 13.97222,-11.28778 4.52892,-9.55307 5.82631,-20.85993 2.53341,-31.00041 2.18117,-2.95131 6.79462,3.62386 8.51281,5.81939 4.3355,6.99236 3.55623,15.74508 2.3456,23.52395 -1.04534,6.26492 -3.43738,12.23617 -6.89396,17.55368 -4.11636,5.37273 4.86346,7.17375 5.40003,11.35344 -3.34598,2.78013 -7.84307,4.85802 -12.30072,4.56282 -0.78868,-0.0649 -1.57191,-0.18321 -2.35071,-0.32132 z" + style="fill:#a5aeba" /> + <path + inkscape:connector-curvature="0" + id="path32981" + d="m 984.44264,862.18169 c -1.18835,-6.44151 -0.7153,-13.29528 -3.22346,-19.40763 5.2155,1.71368 7.21913,7.68437 8.61488,12.50189 0.46756,3.74753 5.9571,10.77397 -1.54689,9.15113 -1.59711,0.0659 -3.7451,-0.21664 -3.84453,-2.24539 z M 947.36191,836.4722 c -5.21371,-2.6559 -8.38811,-8.12562 -9.45075,-13.73768 -3.02381,-5.26702 5.32539,-2.26568 7.46203,-5.22634 8.49017,-5.8936 12.46598,-16.48626 13.51852,-26.43011 1.08258,-4.83991 -1.47198,-10.13976 -0.95483,-14.48335 7.03021,4.3261 9.10897,13.3759 8.64448,21.14239 -0.4724,9.88319 -4.21327,19.33825 -9.42908,27.6489 0.19598,3.60522 8.59405,7.29794 2.21847,10.91971 -3.64557,2.02664 -8.25272,1.70657 -12.00884,0.16648 z" + style="fill:#99a5b4" /> + <path + inkscape:connector-curvature="0" + id="path32985" + d="m 987.65036,862.68169 c -2.12222,-4.15541 -2.62958,-9.16791 -2.11037,-13.77435 2.73632,-0.59646 3.48937,6.19672 4.61588,8.71136 0.50969,2.43464 4.44929,8.54497 -0.88647,6.29893 l -0.88201,-0.55645 -0.73703,-0.67949 0,0 z m -43.75608,-31 c -2.94588,-2.28349 -7.18933,-8.93795 -1.36293,-10.29495 8.07323,-2.18725 12.69247,-10.20871 15.48792,-17.52164 2.75397,-7.08868 3.00962,-14.78608 2.34575,-22.27209 0.57168,-3.73359 4.26846,3.25102 4.56293,4.83879 2.8335,10.0499 1.08542,21.07617 -3.26319,30.43572 -1.47318,3.78479 -7.24627,8.22354 -2.8605,12.027 4.90812,2.55146 1.57086,6.14222 -2.55813,6.40295 -4.41484,1.02741 -9.15214,-0.44638 -12.35185,-3.61578 z" + style="fill:#929ca9" /> + <path + inkscape:connector-curvature="0" + id="path32989" + d="m 988.56908,861.68169 c -1.01336,-1.80767 1.28793,-7.15927 1.24215,-2.50022 0.42403,2.21568 -0.44461,7.79222 -1.24215,2.50022 l 0,0 z m -43.0654,-31 c -2.9868,-1.67058 -7.00655,-6.75545 -1.26272,-7.50408 4.83247,-2.49559 9.8284,-5.69893 12.52164,-10.55778 1.11545,-4.62828 4.11893,-8.61975 4.84147,-13.41654 0.98527,-4.74585 2.52559,-9.7007 1.45289,-14.54866 3.4059,4.0618 2.72684,9.97803 2.40567,14.94875 -0.99576,8.63373 -3.58356,17.28503 -8.78479,24.35117 -2.28719,3.74841 7.19829,8.26089 -0.21265,9.84972 -3.91814,1.46539 -7.97066,-0.66912 -10.96151,-3.12258 z" + style="fill:#8a95a3" /> + <path + inkscape:connector-curvature="0" + id="path32987" + d="m 954.07679,778.57601 c -2.07993,0.18622 -4.16688,0.39931 -6.19063,0.93582 -1.96265,0.5268 -3.86859,1.26151 -5.67823,2.18771 -1.2785,0.72607 -2.59489,1.40817 -3.73224,2.35094 -1.87066,1.41739 -3.50157,3.11504 -5.0864,4.83803 -0.8029,1.1366 -1.66147,2.24315 -2.35815,3.44834 -1.04606,1.93489 -1.92687,3.96033 -2.55709,6.06935 -1.02826,3.17356 -1.89607,6.39655 -2.77337,9.61433 -0.79085,2.99079 -1.58802,5.98101 -2.3162,8.9875 -0.72532,3.0427 -1.21047,6.14099 -1.45053,9.25973 -0.0808,1.12348 -0.27816,2.24516 -0.13834,3.37206 0.0627,1.15775 0.14707,2.31618 0.28118,3.46744 0.0295,0.43529 0.64114,0.88693 0.8125,0.28125 0.43782,-0.93637 0.98489,-1.88776 2.03125,-2.21875 0.77048,-0.37522 1.64462,-0.58501 2.49468,-0.42232 0.99503,0.20928 2.02353,0.51766 2.87283,1.09107 1.15247,0.76152 2.17094,1.75918 2.82587,2.98452 0.67432,0.79355 0.86715,1.92774 1.49412,2.69048 0.55618,0.0517 0.46735,-0.84631 0.60893,-1.24468 0.20794,-1.87479 -0.22577,-3.73167 -0.54643,-5.56782 -0.32562,-1.64053 -0.80423,-3.25041 -0.99895,-4.91491 -0.27135,-1.81202 -0.60341,-3.6237 -0.59359,-5.46277 -0.0577,-1.99807 -0.16648,-3.99431 -0.14423,-5.99405 -0.0352,-1.23626 -10e-4,-2.47036 0.11341,-3.70195 0.24423,-2.90098 0.56334,-5.79741 0.99836,-8.67632 0.6275,-2.95685 1.33887,-5.92442 2.64286,-8.66725 0.61629,-1.36529 1.23898,-2.73456 1.95854,-4.04735 0.72079,-1.14986 1.59611,-2.22584 2.73697,-2.98238 1.71322,-1.17297 3.55581,-2.14034 5.44826,-2.98937 1.80419,-0.81317 3.6119,-1.62339 5.33837,-2.5949 0.82255,-0.40084 1.88367,-0.6713 2.3005,-1.56976 0.12731,-0.30615 0.0397,-0.72575 -0.39425,-0.52399 z" + style="fill:#8a95a3;fill-opacity:1" /> + <path + inkscape:connector-curvature="0" + id="path32983" + d="m 946.9375,772.125 c -9.56715,1.74839 -17.25457,9.64487 -19.96875,18.8125 -4.82877,10.88517 -7.07054,23.03246 -5.61836,34.90144 0.0198,1.07326 0.1459,2.15794 -0.0379,3.22356 3.75192,-4.50382 3.8025,-10.67156 5.9811,-15.89686 3.37158,-10.6816 8.79354,-21.17419 17.67515,-28.29064 4.36603,-3.68349 9.47725,-6.3808 14.71875,-8.59375 0.72214,-1.81857 -1.47582,-3.24498 -3.09375,-3.125 -3.11721,-0.92307 -6.41633,-1.23 -9.65625,-1.03125 z" + style="fill:#99a5b4;fill-opacity:1" + sodipodi:nodetypes="cccccccccccccccccccccccccccccc" /> + </g> + <g + id="g3726" + transform="translate(91,102)"> + <rect + style="color:#000000;fill:#d45500;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect3728" + width="34.242748" + height="8.1750183" + x="4.0543771" + y="331.32199" + rx="1.6497765" + ry="1.6497765" /> + <text + xml:space="preserve" + style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="5.1400628" + y="338.16464" + id="text3730" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan3732" + x="5.1400628" + y="338.16464">bertrand</tspan></text> + </g> + </g> + <g + transform="translate(-1065.2093,-213.69216)" + id="g3860" + style="display:inline"> + <g + id="g5773-9" + transform="matrix(0.32832475,0,0,0.32832475,152.67902,228.57631)" + style="display:inline"> + <path + style="fill:#dce2e8" + d="m 15.652276,526.89841 c -0.610306,-1.59043 1.679869,-11.36996 3.481806,-14.86804 3.193736,-6.19997 6.408908,-8.92653 16.688018,-14.15192 15.103201,-7.67772 14.080467,-6.32495 10.351016,-13.69128 -14.619009,-28.87514 0.626491,-58.97154 24.060007,-47.49727 13.579837,6.6494 16.194478,31.36184 5.166481,48.83132 C 74.079822,487.61189 73,489.56197 73,489.85473 c 0,0.96965 10.409081,7.10101 16,9.42463 10.938874,4.54628 20.11609,18.84024 17.46298,27.19945 -0.81757,2.57596 -89.82541,2.98723 -90.810704,0.4196 z" + id="path5775-3" + inkscape:connector-curvature="0" /> + <path + style="fill:#d4dbe2" + d="m 16,527.9114 c 0,-12.82229 7.444121,-22.89231 22.182697,-30.00761 12.879762,-6.21793 12.949565,-6.32177 9.035801,-13.4409 -14.220674,-25.86739 -1.36795,-55.39011 20.882279,-47.9666 14.595085,4.86946 18.104408,32.01735 6.356458,49.17313 -2.031924,2.96726 -2.353004,4.11342 -1.455316,5.19507 2.007816,2.41927 10.29052,7.29999 16.261866,9.58257 C 98.567144,504.00332 106,514.86317 106,524.89969 c 0,3.46249 0,3.46249 -45,3.46249 -24.75,0 -45,-0.20285 -45,-0.45078 z" + id="path5777-3" + inkscape:connector-curvature="0" /> + <path + style="fill:#c9cfd7" + d="m 16.456704,526.61441 c 0.368875,-0.96127 1.119209,-3.83918 1.667409,-6.39535 2.216133,-10.33347 6.136986,-14.70774 18.826133,-21.00325 14.555889,-7.22166 14.803417,-7.54851 10.923343,-14.42362 -9.684632,-17.16023 -7.20029,-40.63993 4.92623,-46.55817 22.784152,-11.11959 37.313196,18.96264 22.150804,45.86301 C 73.327781,486.9762 72,489.7139 72,490.18081 c 0,1.40694 10.137395,7.90103 15.78241,10.11034 9.778791,3.82716 13.64453,8.03488 16.63576,18.10744 3.27247,11.01959 7.88554,9.96359 -43.525159,9.96359 -42.526253,0 -45.068616,-0.1 -44.436307,-1.74777 z" + id="path5779-7" + inkscape:connector-curvature="0" /> + <path + style="fill:#b6c5d8" + d="m 17.373092,526.61218 c 0.279327,-0.9625 1.031608,-3.77247 1.671735,-6.24438 2.783906,-10.75028 5.91216,-14.19465 18.510886,-20.3814 14.312213,-7.02817 14.766578,-7.73334 10.45997,-16.23375 -9.151893,-18.06407 -4.861359,-45.39047 7.126784,-45.39047 1.093959,0 2.932921,-0.50516 4.086582,-1.12258 17.687459,-9.46604 28.608915,25.64678 14.765412,47.47125 -2.432458,3.83481 -2.830287,5.14422 -1.902558,6.26207 2.544299,3.06569 11.034196,8.55209 15.595883,10.07848 10.544154,3.52818 15.517054,10.12038 17.773324,23.56078 0.62952,3.75 0.62952,3.75 -43.983185,3.75 -42.015093,0 -44.583129,-0.10189 -44.104833,-1.75 z" + id="path5781-4" + inkscape:connector-curvature="0" /> + <path + style="fill:#b4c3d5" + d="m 18.625,527.56443 c -0.271169,-0.43876 -0.07962,-1.45126 0.42567,-2.25 0.717286,-1.13386 0.922062,-0.95895 0.934017,0.79775 0.01574,2.31303 -0.49232,2.85568 -1.359687,1.45225 z M 56,527.42433 c 0,-0.51582 0.868825,-0.87241 1.930722,-0.79241 1.061897,0.08 1.710339,0.50202 1.440983,0.93785 C 58.686419,528.67858 56,528.5627 56,527.42433 z m 7.696917,-0.45528 c -0.409197,-1.04122 -0.508402,-2.12872 -0.220456,-2.41666 0.91206,-0.91206 1.714561,0.58256 1.332392,2.48152 -0.350243,1.74033 -0.403729,1.73721 -1.111936,-0.0649 z M 90.5,526.36218 c -0.591982,-1.86517 -1.736214,-2.47275 -3.897148,-2.06937 -0.493432,0.0921 -0.155932,-0.96377 0.75,-2.3464 1.83229,-2.79643 2.167845,-5.58423 0.672148,-5.58423 -0.540872,0 -0.718644,-1.28178 -0.399256,-2.87872 0.692849,-3.46424 -1.332361,-5.24299 -3.1458,-2.76296 -1.080063,1.47707 -1.357435,1.49422 -2.47074,0.15277 -0.689752,-0.8311 -2.128577,-1.51109 -3.19739,-1.51109 -1.068813,0 -2.769543,-0.44219 -3.779399,-0.98265 -1.551676,-0.83043 -1.753393,-0.66637 -1.302178,1.05908 0.390745,1.49421 -0.0383,2.19137 -1.599905,2.59974 -1.278027,0.33421 -2.433926,1.71612 -2.882081,3.4456 -0.926234,3.57446 -2.640327,3.80366 -3.064627,0.4098 -0.239509,-1.91577 0.273933,-2.75503 2.113306,-3.45436 1.336324,-0.50807 2.68336,-1.89384 2.993412,-3.07948 0.451486,-1.72648 0.229815,-2.01748 -1.113305,-1.46147 -5.685387,2.35358 -8.400394,2.32578 -10.656986,-0.10913 -2.239511,-2.41647 -2.239511,-2.41647 -5.128955,0.26138 -2.847928,2.63937 -5.360813,0.88121 -2.63559,-1.84402 1.780268,-1.78026 -1.938125,-7.92517 -4.444221,-7.34438 -3.615262,0.83783 -3.517367,-1.10555 0.198459,-3.93974 4.186314,-3.19306 4.282774,-4.3519 0.84984,-10.20976 -3.029424,-5.16932 -5.077383,-19.22645 -3.004036,-20.61961 0.806655,-0.54203 0.627922,-1.16489 -0.605548,-2.11025 -3.325028,-2.54837 -2.212109,-5.47361 1.355956,-3.56404 2.689657,1.43946 9.562135,-2.54678 7.881678,-4.57161 -1.614969,-1.94592 0.543446,-2.81116 2.39466,-0.95995 1.932595,1.9326 0.234654,6.47485 -2.420364,6.47485 -2.390146,0 -4.051441,2.23713 -2.965777,3.99377 0.740689,1.19846 1.218594,1.12186 2.987344,-0.47884 3.406254,-3.08261 7.063255,-3.27149 3.920021,-0.20246 -1.321935,1.29073 -3.198156,2.63706 -4.169381,2.99186 -1.463856,0.53475 -1.653838,1.37626 -1.110841,4.92037 1.036819,6.76728 2.913385,6.57626 2.640423,-0.26877 -0.134821,-3.38089 0.142221,-3.95593 1.905896,-3.95593 1.571318,0 1.938872,0.47715 1.540636,2 -0.287656,1.1 -0.115141,2 0.383369,2 0.498509,0 0.96263,-0.45 1.03138,-1 0.238805,-1.91044 0.467909,-2.51699 2.115671,-5.60124 1.187834,-2.22337 1.350686,-3.4074 0.575302,-4.18279 -0.621603,-0.6216 -0.749078,-1.85432 -0.299757,-2.89875 1.303858,-3.03077 1.124261,-9.3161 -0.266216,-9.31669 -1.489085,-6.3e-4 -1.676094,-2.61915 -0.25,-3.50053 2.022248,-1.24982 1.004309,-3.5 -1.583333,-3.5 -1.628176,0 -2.425149,-0.46217 -2.155505,-1.25 0.8577,-2.50597 12.235836,-1.56907 15.262791,1.25676 9.369225,8.74672 9.558066,30.04723 0.394255,44.47037 -3.908079,6.15102 3.276749,13.99627 15.520797,16.94746 8.108519,1.9544 13.904595,10.2116 16.022105,22.82541 0.75747,4.5122 -13.553142,6.18611 -14.96111,1.75 z m -6.090775,-20.1003 c -1.883722,-2.0815 -5.196659,-3.05266 -5.996842,-1.75793 -1.215823,1.96724 0.488687,3.45823 3.953475,3.45823 3.308319,0 3.464506,-0.12996 2.043367,-1.7003 z M 49,465.80316 c 0,-0.85746 -0.45,-1.2809 -1,-0.94098 -0.55,0.33992 -1,1.04148 -1,1.55902 0,0.51754 0.45,0.94098 1,0.94098 0.55,0 1,-0.70156 1,-1.55902 z m -10.772141,57.4647 c 2.492459,-3.37124 5.498463,-4.13134 3.801947,-0.96137 -1.115671,2.08465 -2.792239,3.38743 -4.740006,3.68324 -0.667664,0.1014 -0.247131,-1.11882 0.938059,-2.72187 z m 15.267776,1.08726 c -0.34232,-0.55389 0.10053,-1.28448 0.984111,-1.62354 1.914649,-0.73472 2.981717,0.0749 2.061373,1.56407 -0.830379,1.34358 -2.234909,1.371 -3.045484,0.0595 z m 17.198218,0.36758 c -0.925629,-0.92563 0.189072,-2.36052 1.833779,-2.36052 0.842134,0 1.177876,0.60386 0.833994,1.5 -0.610368,1.59059 -1.613974,1.91432 -2.667773,0.86052 z M 24,522.37361 c 0,-1.24034 3.17723,-5.01143 4.222241,-5.01143 1.216405,0 0.911488,3.46627 -0.422241,4.8 -1.450736,1.45074 -3.8,1.58145 -3.8,0.21143 z m 56,-0.51143 c 0,-0.825 0.45,-1.5 1,-1.5 0.55,0 1,0.675 1,1.5 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-0.675 -1,-1.5 z m -47.8,-2.7 c -1.563834,-1.56383 -1.523926,-3.97474 0.102613,-6.19917 1.129249,-1.54434 1.463614,-1.58743 2.512331,-0.32381 0.959725,1.1564 0.897189,1.717 -0.302613,2.71275 -1.953977,1.62165 -1.932441,3.01023 0.04669,3.01023 0.857459,0 1.280902,0.45 0.940983,1 -0.818297,1.32403 -1.837753,1.26225 -3.3,-0.2 z m 17.043786,-0.05 c 0.225748,-0.6875 1.725748,-1.37269 3.333333,-1.52264 2.788155,-0.26007 2.833407,-0.20246 0.981751,1.25 -2.346126,1.84032 -4.882473,2.00058 -4.315084,0.27264 z m 28.413426,-2.29909 c 0.680432,-1.77318 3.471169,-1.56926 4.093255,0.29909 0.260434,0.78218 -0.538884,1.25 -2.135749,1.25 -1.8935,0 -2.398572,-0.39969 -1.957506,-1.54909 z M 21,516.4212 c 0,-0.51754 0.45,-1.2191 1,-1.55902 0.55,-0.33992 1,0.0835 1,0.94098 0,0.85746 -0.45,1.55902 -1,1.55902 -0.55,0 -1,-0.42344 -1,-0.94098 z m 16.647568,-4.24293 c -0.841403,-3.14186 -0.799742,-3.81609 0.235801,-3.81609 1.240865,0 2.226771,4.28986 1.217791,5.29884 -0.458333,0.45833 -1.11245,-0.20891 -1.453592,-1.48275 z m 4.591902,-1.82793 c 0.691029,-1.10652 1.819842,-1.79564 2.508473,-1.53139 C 45.436575,509.0832 46,508.86353 46,508.3308 c 0,-0.53274 0.675,-0.96862 1.5,-0.96862 2.212109,0 1.824239,2.10245 -0.5,2.71025 -1.1,0.28766 -2,0.92053 -2,1.40638 0,0.48585 -0.903813,0.88337 -2.008474,0.88337 -1.762089,0 -1.854346,-0.2468 -0.752056,-2.01184 z M 33,506.77885 c 0,-1.42084 0.48375,-2.42209 1.075,-2.225 0.59125,0.19708 1.04125,0.68458 1,1.08333 -0.04125,0.39875 -0.075,1.4 -0.075,2.225 0,0.825 -0.45,1.5 -1,1.5 -0.55,0 -1,-1.1625 -1,-2.58333 z m -5.429973,0.69664 c -0.606232,-0.98091 2.181599,-3.69502 2.977678,-2.89894 0.706368,0.70637 -0.591568,3.78563 -1.595677,3.78563 -0.458697,0 -1.080597,-0.39901 -1.382001,-0.88669 z M 44,453.4212 c 0,-1.06754 0.45,-2.2191 1,-2.55902 0.55,-0.33992 1,-0.17828 1,0.3592 0,0.53747 0.273145,1.68903 0.606989,2.55901 0.398311,1.03799 0.05452,1.58179 -1,1.58179 C 44.682954,455.36218 44,454.53728 44,453.4212 z m 7,-4.85902 c 0,-3.04736 4.537474,-4.07671 5.289749,-1.2 0.434416,1.66121 0.03068,2 -2.383369,2 -1.598509,0 -2.90638,-0.36 -2.90638,-0.8 z m -1,-5.82423 c 0,-2.86866 6.434447,-5.29196 7.396256,-2.78553 0.909842,2.37101 -0.318374,3.71929 -2.066485,2.26848 -1.165167,-0.967 -1.912674,-0.97579 -3.410972,-0.0401 C 50.863459,442.83989 50,443.0906 50,442.73795 z" + id="path5783-3" + inkscape:connector-curvature="0" /> + <path + style="fill:#b3bcc9" + d="m 92,525.56218 c 0,-1.54 -0.527793,-3.32779 -1.172874,-3.97287 -0.855295,-0.8553 -0.884251,-1.80634 -0.106941,-3.51235 1.75157,-3.84427 -0.705254,-11.42904 -4.802674,-14.82692 -4.086046,-3.38846 -2.898331,-3.60091 4.550449,-0.81396 13.71103,5.12995 20.56433,25.9261 8.543858,25.9261 -7.011818,0 -7.011818,0 -7.011818,-2.8 z M 59.910502,504.75434 c -0.635465,-0.76569 -1.955842,-1.39216 -2.934171,-1.39216 -0.978329,0 -2.708052,-1.575 -3.84383,-3.5 -1.135778,-1.925 -2.755227,-3.5 -3.598776,-3.5 -1.951918,0 -1.967601,-1.39503 -0.03372,-3 2.076834,-1.72362 1.890939,-3.35723 -1,-8.78785 -4.069166,-7.64391 -3.455289,-10.71763 1.420545,-7.11277 5.169207,3.82176 11.750544,-2.46804 15.52335,-14.83571 1.370596,-4.49296 0.796129,-18.89883 -0.883128,-22.14616 -1.612127,-3.11751 -1.612127,-3.11751 1.26567,-3.11751 14.78876,0 19.89294,27.79836 8.559878,46.61877 -3.518421,5.84292 -3.518421,5.84292 2.297632,11.07309 3.521616,3.16687 5.178879,5.24555 4.200912,5.26916 -0.888328,0.0214 -2.688328,0.8515 -4,1.84459 -4.749564,3.59595 -14.858241,5.13632 -16.974357,2.58655 z" + id="path5785-7" + inkscape:connector-curvature="0" /> + <path + style="fill:#a9b6c7" + d="m 92.815054,521.61218 c 0.280763,-4.98157 -0.149325,-8.25644 -1.641625,-12.5 -2.022056,-5.75 -2.022056,-5.75 0.0199,-5.75 4.892222,0 12.116871,11.11379 14.138841,21.75 0.61783,3.25 0.61783,3.25 -6.139863,3.25 -6.757689,0 -6.757689,0 -6.377257,-6.75 z M 57.736081,502.60026 c -4.74666,-2.19188 -8.21023,-7.48361 -6.720339,-10.26749 0.787293,-1.47107 0.578728,-2.8552 -0.859855,-5.70638 -3.780683,-7.49305 -3.71844,-7.75193 1.891408,-7.86675 11.763399,-0.24076 19.607447,-21.36594 14.350292,-38.64746 -1.513683,-4.97583 8.15369,0.5478 11.171092,6.38281 4.79792,9.27815 2.757176,28.21359 -4.135306,38.37023 -3.248042,4.78626 -3.108843,5.61941 1.566627,9.37672 8.383493,6.73716 -5.850701,13.62864 -17.263919,8.35832 z" + id="path5787-1" + inkscape:connector-curvature="0" /> + <path + style="fill:#a5aeba" + d="m 95,519.94322 c 0,-6.15501 -0.465546,-9.23013 -1.731223,-11.43544 -2.129347,-3.71017 -1.162952,-4.96151 2.153516,-2.78847 3.134773,2.05398 7.071677,8.79205 8.555507,14.64287 0.62768,2.475 1.36978,5.2875 1.64911,6.25 0.44052,1.51793 -0.23044,1.75 -5.05952,1.75 -5.56739,0 -5.56739,0 -5.56739,-8.41896 z M 63,502.21435 c -5.613254,-0.99824 -11,-6.2765 -11,-10.77847 0,-1.62561 -0.40569,-3.2064 -0.901534,-3.51284 -2.70283,-1.67044 -3.10529,-6.77939 -0.482187,-6.12103 12.466652,3.12893 23.836582,-23.06489 17.885689,-41.20469 -1.768008,-5.38933 6.735063,1.04007 9.607989,7.26486 3.853849,8.35016 1.790957,26.18765 -4.142144,35.81645 -3.771821,6.12126 -3.726023,7.00345 0.532187,10.25135 4.268856,3.25601 4.328389,3.95246 0.506787,5.92869 -5.335159,2.75892 -7.429145,3.16975 -12.006787,2.35568 z" + id="path5789-3" + inkscape:connector-curvature="0" /> + <path + style="fill:#99a5b4" + d="m 97.580726,526.11218 c -0.251559,-1.2375 -0.72938,-5.35305 -1.061826,-9.14566 -0.332446,-3.79262 -1.069261,-7.76418 -1.637367,-8.8257 -0.934152,-1.74548 -0.829324,-1.82107 1.096284,-0.79051 2.819043,1.5087 5.542873,6.12588 6.994333,11.85613 0.64861,2.56066 1.59521,5.43713 2.10357,6.39217 1.39547,2.62165 1.2385,2.76357 -3.05667,2.76357 -3.326202,0 -4.056171,-0.37006 -4.438324,-2.25 z M 60.5,500.40269 c -3.265642,-1.35967 -7.602087,-6.57417 -8.46488,-10.17887 -0.442539,-1.8489 -1.129624,-4.14914 -1.526857,-5.11164 -0.576601,-1.39711 -0.209671,-1.75 1.819649,-1.75 12.357308,0 23.416086,-23.45864 18.741894,-39.7566 -1.195778,-4.16943 -0.0374,-4.10946 3.740804,0.19368 7.79605,8.87921 6.233208,28.06127 -3.573583,43.86154 -1.72735,2.78303 -1.718871,2.81367 1.521988,5.5 6.506488,5.39319 -3.087271,11.06061 -12.259015,7.24189 z" + id="path5791-9" + inkscape:connector-curvature="0" /> + <path + style="fill:#929ca9" + d="m 100.78845,526.61218 c -2.135149,-2.45575 -3.345892,-15.95753 -1.276991,-14.24049 0.800071,0.664 2.186211,3.746 3.080301,6.84888 0.8941,3.10289 2.03053,6.42911 2.52541,7.39161 0.6997,1.36086 0.48762,1.75 -0.95371,1.75 -1.01942,0 -2.53817,-0.7875 -3.37501,-1.75 z m -43.756084,-31 c -5.277946,-5.08752 -5.842086,-9.34879 -1.362926,-10.29495 10.175676,-2.14947 19.086762,-19.27014 18.092621,-34.76096 -0.486107,-7.57459 -0.486107,-7.57459 1.781461,-4.93839 6.180155,7.18486 4.779027,27.36115 -2.676692,38.54443 -3.503817,5.25559 -3.542145,6.21682 -0.36683,9.19987 3.118955,2.93011 3.114395,3.39903 -0.04705,4.83949 -5.40941,2.46469 -11.183057,1.49515 -15.420584,-2.58949 z" + id="path5793-6" + inkscape:connector-curvature="0" /> + <path + style="fill:#8a95a3" + d="m 101.70717,525.61218 c -0.2893,-1.5125 -0.13044,-3.425 0.35301,-4.25 0.6049,-1.03225 0.88849,-0.17472 0.90941,2.75 0.0348,4.86979 -0.49702,5.50174 -1.26242,1.5 z m -43.065403,-31 c -4.91445,-3.9769 -5.748541,-5.95905 -2.891767,-6.87206 5.527572,-1.76659 14.25,-8.96693 14.25,-11.76333 0,-0.62933 0.933234,-2.88544 2.073853,-5.01359 2.414595,-4.50511 5.220373,-17.98198 4.375484,-21.01657 -0.461667,-1.65818 -0.368419,-1.7777 0.455976,-0.58445 4.302348,6.22731 1.172547,26.46135 -5.612772,36.28634 -2.614917,3.78635 -2.614917,3.78635 -0.365672,6.82862 1.237084,1.67324 2.097118,3.17093 1.911187,3.3282 -4.208579,3.5597 -8.799793,3.17382 -14.196289,-1.19316 z" + id="path5795-4" + inkscape:connector-curvature="0" /> + <path + style="fill:#89929e" + d="m 68.553851,495.44931 c -0.369537,-0.59792 -1.542351,-1.08713 -2.606255,-1.08713 -1.842561,0 -1.829965,-0.12007 0.265385,-2.52994 2.199755,-2.52994 2.199755,-2.52994 3.583106,0.11028 1.388266,2.6496 0.236851,5.90001 -1.242236,3.50679 z m -9.192225,-2.58713 c -0.316582,-0.825 -1.202459,-1.5 -1.968615,-1.5 -0.766156,0 -1.393011,-0.45 -1.393011,-1 0,-0.55 0.81,-1 1.8,-1 0.99,0 2.31509,-0.51509 2.944645,-1.14465 0.859526,-0.85952 1.306427,-0.50004 1.794143,1.44317 0.99716,3.973 -1.799649,6.79122 -3.177162,3.20148 z m 8.279576,-8.19213 c -0.380672,-0.38067 0.492512,-1.63673 1.940409,-2.79125 1.907671,-1.52112 2.773627,-3.32052 3.144932,-6.53498 0.281816,-2.43973 1.077686,-4.89617 1.768601,-5.45875 0.690915,-0.56259 1.74847,-1.92289 2.350124,-3.02289 1.570686,-2.87168 1.407159,-0.26284 -0.427266,6.81644 -2.261098,8.72586 -6.159851,13.60838 -8.7768,10.99143 z" + id="path5797-2" + inkscape:connector-curvature="0" /> + </g> + <g + id="g3734" + transform="translate(152,104.62758)"> + <rect + ry="1.6497765" + rx="1.6497765" + y="298.32199" + x="4.0543771" + height="8.1750183" + width="34.242748" + id="rect3736" + style="color:#000000;fill:#0044aa;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <text + sodipodi:linespacing="125%" + id="text3738" + y="305.16464" + x="10.072125" + style="font-size:8px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + y="305.16464" + x="10.072125" + id="tspan3740" + sodipodi:role="line">ursula</tspan></text> + </g> + </g> + <path + style="fill:#231f20;display:inline" + d="m -340.24786,55.781484 -22.016,0 0,32.023 c 13,0 19,0 32,0 l 0,-22.015 z m 5.984,28.023 c -10.90757,0 -10.78344,0 -24,0 0,0 0.006,-21.441 0.006,-24.084 2.1,0 7.807,0 12.006,0 l 0,12.01 12.01,0 c -0.001,2.733 -0.022,12.074 -0.022,12.074 z m -7.984,-16.078 c 0,-1.543 0,-5.918 0,-8.006 1.615,1.619 6.402,6.404 8.006,8.006 -2.047,0 -6.454,0 -8.006,0 z" + id="path3077-8-3-9" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccc" /> + <path + sodipodi:nodetypes="ccccccccccccccccc" + inkscape:connector-curvature="0" + id="path11222" + d="m -340.24786,95.781484 -22.016,0 0,32.022996 c 13,0 19,0 32,0 l 0,-22.015 z m 5.984,28.022996 c -10.90757,0 -10.78344,0 -24,0 0,0 0.006,-21.441 0.006,-24.083996 2.1,0 7.807,0 12.006,0 l 0,12.009996 12.01,0 c -0.001,2.733 -0.022,12.074 -0.022,12.074 z m -7.984,-16.078 c 0,-1.543 0,-5.918 0,-8.005996 1.615,1.618996 6.402,6.403996 8.006,8.005996 -2.047,0 -6.454,0 -8.006,0 z" + style="fill:#231f20;display:inline" /> + <path + inkscape:connector-curvature="0" + id="path11228" + d="m -406.0761,77.334524 23.30768,0 0,-48.73424 14.83216,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> + <path + inkscape:connector-curvature="0" + id="path11230" + d="m -385.89572,77.334524 17.51247,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> + <path + inkscape:connector-curvature="0" + id="path11232" + d="m -382.77891,77.395104 0,26.592096 14.45711,0" + style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;display:inline" /> + <g + id="g6400" + transform="translate(-1107.878,-266.45295)" + style="display:inline"> + <rect + y="285.06863" + x="749.5293" + height="25.397747" + width="9.1984463" + id="rect6396" + style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + y="292.81506" + x="749.21997" + height="18.093594" + width="26.767767" + id="rect6398" + style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00000119;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + sodipodi:nodetypes="ccccccccccccccccc" + inkscape:connector-curvature="0" + id="path6390" + d="m 745.98776,281.46637 c 0,10.69792 0,21.39583 0,32.09375 10.66667,0 21.33333,0 32,0 3.8e-4,-10.69792 8.2e-4,-21.39583 0,-32.09375 -10.66667,0 -21.33333,0 -32,0 z m 4,4 c 2.57307,0.0164 5.1453,0.11052 7.71875,0.0937 0.0104,2.65625 0.0208,5.3125 0.0312,7.96875 5.41667,-0.0208 10.83333,-0.0417 16.25,-0.0625 0,5.36458 0,10.72917 0,16.09375 -8.47194,-0.0641 -16.17572,0.01 -24,0 3e-5,-8.03119 -7e-5,-16.06271 5e-5,-24.0937 z m 11,0 c 4.33333,0 8.66667,0 13,0 0,1.33333 0,2.66667 0,4 -4.33333,0 -8.66667,0 -13,0 0,-1.33333 0,-2.66667 0,-4 z" + style="fill:#231f20;display:inline" /> + </g> + <g + transform="translate(-1188.1346,-218.36969)" + id="g6405" + style="display:inline"> + <rect + style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect6407" + width="9.1984463" + height="25.397747" + x="749.5293" + y="285.06863" /> + <rect + style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00000119;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="rect6409" + width="26.767767" + height="18.093594" + x="749.21997" + y="292.81506" /> + <path + style="fill:#231f20;display:inline" + d="m 745.98776,281.46637 c 0,10.69792 0,21.39583 0,32.09375 10.66667,0 21.33333,0 32,0 3.8e-4,-10.69792 8.2e-4,-21.39583 0,-32.09375 -10.66667,0 -21.33333,0 -32,0 z m 4,4 c 2.57307,0.0164 5.1453,0.11052 7.71875,0.0937 0.0104,2.65625 0.0208,5.3125 0.0312,7.96875 5.41667,-0.0208 10.83333,-0.0417 16.25,-0.0625 0,5.36458 0,10.72917 0,16.09375 -8.47194,-0.0641 -16.17572,0.01 -24,0 3e-5,-8.03119 -7e-5,-16.06271 5e-5,-24.0937 z m 11,0 c 4.33333,0 8.66667,0 13,0 0,1.33333 0,2.66667 0,4 -4.33333,0 -8.66667,0 -13,0 0,-1.33333 0,-2.66667 0,-4 z" + id="path6411" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccc" /> + </g> + <path + style="fill:#231f20;display:inline" + d="m -420.24786,22.781484 -22.016,0 0,32.023 c 13,0 19,0 32,0 l 0,-22.015 z m 5.984,28.023 c -10.90757,0 -10.78344,0 -24,0 0,0 0.006,-21.441 0.006,-24.084 2.1,0 7.807,0 12.006,0 l 0,12.01 12.01,0 c -0.001,2.733 -0.022,12.074 -0.022,12.074 z m -7.984,-16.078 c 0,-1.543 0,-5.918 0,-8.006 1.615,1.619 6.402,6.404 8.006,8.006 -2.047,0 -6.454,0 -8.006,0 z" + id="path6442" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccc" /> + <g + id="g14469" + transform="translate(-1188.1346,-177.36969)" + style="display:inline"> + <rect + y="285.06863" + x="749.5293" + height="25.397747" + width="9.1984463" + id="rect14471" + style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <rect + y="292.81506" + x="749.21997" + height="18.093594" + width="26.767767" + id="rect14473" + style="color:#000000;fill:#f3d347;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.00000119;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + sodipodi:nodetypes="ccccccccccccccccc" + inkscape:connector-curvature="0" + id="path14475" + d="m 745.98776,281.46637 c 0,10.69792 0,21.39583 0,32.09375 10.66667,0 21.33333,0 32,0 3.8e-4,-10.69792 8.2e-4,-21.39583 0,-32.09375 -10.66667,0 -21.33333,0 -32,0 z m 4,4 c 2.57307,0.0164 5.1453,0.11052 7.71875,0.0937 0.0104,2.65625 0.0208,5.3125 0.0312,7.96875 5.41667,-0.0208 10.83333,-0.0417 16.25,-0.0625 0,5.36458 0,10.72917 0,16.09375 -8.47194,-0.0641 -16.17572,0.01 -24,0 3e-5,-8.03119 -7e-5,-16.06271 5e-5,-24.0937 z m 11,0 c 4.33333,0 8.66667,0 13,0 0,1.33333 0,2.66667 0,4 -4.33333,0 -8.66667,0 -13,0 0,-1.33333 0,-2.66667 0,-4 z" + style="fill:#231f20;display:inline" /> + </g> + <path + inkscape:connector-curvature="0" + id="path5988" + d="m -924.86091,63.859844 2.9776,21.67033" + style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m -880.57616,78.271684 -14.73368,16.16751" + id="path6999" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path7001" + d="m -941.46332,152.74321 -14.04853,16.76629" + style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m -954.32745,126.04894 -21.71261,2.65179" + id="path7003" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path7005" + d="m -954.97098,92.860704 -19.77711,-9.34533" + style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-start:url(#Arrow1Mstart);marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m -908.90778,153.05708 6.86002,20.77041" + id="path7007" + inkscape:connector-curvature="0" /> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/world-90.png" + transform="matrix(0.55742735,0,0,0.55742735,-570.97575,136.86742)" + id="g6729" + style="display:inline"> + <path + inkscape:connector-curvature="0" + id="path4967-4" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + style="color:#000000;fill:#aaeeff;fill-opacity:1;fill-rule:nonzero;stroke:#b3b3b3;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="matrix(1.9,0,0,3.8,180.92883,-5.4644227)" /> + <path + sodipodi:nodetypes="cccccccc" + inkscape:connector-curvature="0" + id="path4969-0" + d="m 343.41091,82.102257 c -4.61208,1.27568 -8.4152,4.3488 -12.51252,6.67072 -2.35308,1.74788 -5.12984,6.52288 -1.96136,8.60572 2.50816,0.42204 4.52272,-1.71204 6.9918,-1.86684 2.88372,-0.66468 5.82796,-1.19016 8.56184,-2.36416 4.67024,-1.47172 4.67024,-1.47172 5.1476,-3.19456 0.2268,-2.594 -1.61708,-4.99872 -3.35792,-6.7716 -0.7942,-0.65116 -1.8022,-1.26156 -2.86944,-1.07928 z" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:nodetypes="cacccccccccc" + inkscape:connector-curvature="0" + id="path4983-6" + d="m 379.92883,107.51186 c -6.54148,3.33576 -14.24416,6.695 -17.08312,13.33832 -0.87308,2.04304 0.36,4.4522 0.66656,6.63188 1.24588,2.32204 -1.79852,4.3692 -0.89984,6.6998 1.0754,2.41996 4.1484,2.05532 6.18628,1.27852 2.07688,-0.71376 -0.86608,-2.75712 0,0 0.94212,2.20364 8.67396,2.87608 11.00512,1.87524 2.24192,-0.82204 3.76764,-1.20964 4.83784,-3.08096 3.5092,-7.13912 5.23236,-15.22316 4.6808,-23.17324 -0.172,-2.14232 -0.83076,-4.21536 -1.6044,-6.19228 -0.8002,-2.60864 -3.50284,0.028 -4.56584,1.10028 -0.97392,0.68904 -2.05424,1.25484 -3.2234,1.52244 z" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + sodipodi:nodetypes="cccccacccc" + style="color:#000000;fill:#2ca05a;fill-opacity:1;fill-rule:nonzero;stroke:#2ca05a;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 328.42251,109.20506 c -3.85116,1.46336 -8.01156,2.4666 -11.52748,4.61236 -2.9146,2.45496 -2.5518,6.93884 -1.0408,10.06404 1.85428,4 3.32528,8.1856 5.54108,12.01032 2.14308,2.82516 -0.1448,1.59612 2.45892,3.98968 0.73584,0.87624 5.32,5.30628 8,4 1.33596,-0.65116 1.00188,-2.62 0.8862,-4.3696 0.84188,-3.62872 -1.33312,-7.09848 -1.15972,-10.75332 -0.0936,-4.58884 0.80728,-9.12276 1.354,-13.6626 0.312,-2.51708 -1.10816,-7.20092 -4.5122,-5.89088 z" + id="path4985-4" + inkscape:connector-curvature="0" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" /> + <path + inkscape:connector-curvature="0" + id="path4987-7" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + style="color:#000000;fill:none;stroke:#002255;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + transform="matrix(1.9,0,0,3.8,180.92883,-5.4644227)" /> + </g> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/webapp/others/defgroup.png" + id="g3063" + transform="matrix(0.36909856,0,0,0.36909856,-837.85498,41.587354)" + style="display:inline"> + <g + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/grop-def-new.png" + transform="matrix(0.9,0,0,0.9,246.64216,77.109544)" + id="g3047"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + sodipodi:type="star" + style="color:#000000;fill:none;stroke:#28220b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + id="path3049" + sodipodi:sides="5" + sodipodi:cx="35" + sodipodi:cy="12.362183" + sodipodi:r1="5" + sodipodi:r2="4.045085" + sodipodi:arg1="1.5707963" + sodipodi:arg2="2.1991149" + inkscape:flatsided="true" + inkscape:rounded="0" + inkscape:randomized="0" + d="m 35,17.362183 -4.755283,-3.454915 1.816357,-5.5901703 5.877852,-10e-8 1.816357,5.5901694 z" + inkscape:transform-center-y="-0.21689042" + transform="matrix(4.71003,1.6779794,-1.6779794,4.71003,-33.10757,48.018455)" + inkscape:transform-center-x="2.1800737" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceEnabled.png" + transform="matrix(2.375,0,0,4.7499998,-102.75,10.817397)" + d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z" + sodipodi:ry="10" + sodipodi:rx="20" + sodipodi:cy="32.362183" + sodipodi:cx="90" + id="path3051" + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#800000;stroke-width:1.48864591;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,45.524372,-53.39817)" + d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path3053" + style="color:#000000;fill:#dd8a3d;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + sodipodi:type="arc" + style="color:#000000;fill:#69312f;fill-opacity:1;stroke:#69312f;stroke-width:0.5;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="path3055" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,18.680548,-64.20388)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,43.935022,-24.026857)" + d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path3057" + style="color:#000000;fill:#28220b;fill-opacity:1;stroke:#28220b;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + sodipodi:type="arc" + style="color:#000000;fill:#cc6633;fill-opacity:1;stroke:#cc6633;stroke-width:0.5;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="path3059" + sodipodi:cx="15" + sodipodi:cy="16.362183" + sodipodi:rx="1" + sodipodi:ry="1" + d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,16.336633,-16.494463)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" + transform="matrix(11.211448,3.9941526,-3.9941526,11.211448,-16.590722,-79.68006)" + d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" + sodipodi:ry="1" + sodipodi:rx="1" + sodipodi:cy="16.362183" + sodipodi:cx="15" + id="path3061" + style="color:#000000;fill:#ffdb6b;fill-opacity:1;stroke:#dd8a3d;stroke-width:0.1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + sodipodi:type="arc" /> + </g> + </g> + <text + sodipodi:linespacing="125%" + id="text3071-9" + y="69.533607" + x="-830.94623" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + id="tspan3545" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="69.533607" + x="-830.94623" + sodipodi:role="line">Por el contrario aquí</tspan><tspan + style="font-size:12px;font-weight:bold;fill:#aa4400" + y="84.533607" + x="-830.94623" + sodipodi:role="line" + id="tspan3932">un<tspan + style="font-weight:normal" + id="tspan3934"> mismo </tspan>documento</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="99.533607" + x="-830.94623" + sodipodi:role="line" + id="tspan6262">puede ser editado por </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="114.53361" + x="-830.94623" + sodipodi:role="line" + id="tspan6264">varias personas de</tspan><tspan + id="tspan13782" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="129.5336" + x="-830.94623" + sodipodi:role="line">tu grupos</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3071-9-9" + y="166.61867" + x="-829.6145" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="166.61867" + x="-829.6145" + sodipodi:role="line" + id="tspan6304">u otras a las que se </tspan><tspan + style="font-size:12px;font-weight:bold;fill:#aa4400" + y="181.61867" + x="-829.6145" + sodipodi:role="line" + id="tspan3563"><tspan + style="font-weight:normal" + id="tspan3565">lo </tspan>compartes</tspan></text> + <g + transform="matrix(1.9571643,0,0,1.9571643,-1631.0648,-1042.5543)" + id="text23658" + style="font-size:2.80011916px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"> + <path + inkscape:connector-curvature="0" + id="path23733" + style="font-weight:bold;marker:none" + d="m 612.83876,554.92091 0.43681,0 0,1.94048 -0.43681,0 0,-1.94048" /> + <path + inkscape:connector-curvature="0" + id="path23735" + style="font-weight:bold;marker:none" + d="m 613.69673,555.43893 c 0.0709,-0.0205 0.16241,-0.0392 0.27441,-0.056 0.11201,-0.0187 0.22961,-0.028 0.35282,-0.028 0.12507,0 0.22867,0.0168 0.31081,0.0504 0.084,0.0317 0.15027,0.0775 0.19881,0.1372 0.0485,0.0597 0.0831,0.13068 0.1036,0.21281 0.0205,0.0821 0.0308,0.17361 0.0308,0.27441 l 0,0.83164 -0.41721,0 0,-0.78123 c -1e-5,-0.13441 -0.0177,-0.22961 -0.0532,-0.28562 -0.0355,-0.056 -0.10173,-0.084 -0.1988,-0.084 -0.0299,0 -0.0616,0.002 -0.0952,0.006 -0.0336,0.002 -0.0635,0.005 -0.0896,0.008 l 0,1.13685 -0.41722,0 0,-1.42246" /> + <path + inkscape:connector-curvature="0" + id="path23737" + style="font-weight:bold;marker:none" + d="m 615.76558,556.86139 -0.41722,0 0,-1.47286 0.41722,0 0,1.47286 m 0.0392,-1.89848 c 0,0.0765 -0.0252,0.13721 -0.0756,0.18201 -0.0485,0.0429 -0.10641,0.0644 -0.17361,0.0644 -0.0672,0 -0.126,-0.0215 -0.17641,-0.0644 -0.0485,-0.0448 -0.0728,-0.10547 -0.0728,-0.18201 0,-0.0765 0.0243,-0.13627 0.0728,-0.17921 0.0504,-0.0448 0.10921,-0.0672 0.17641,-0.0672 0.0672,0 0.12507,0.0224 0.17361,0.0672 0.0504,0.0429 0.0756,0.10267 0.0756,0.17921" /> + <path + inkscape:connector-curvature="0" + id="path23739" + style="font-weight:bold;marker:none" + d="m 616.08777,556.12496 c 0,-0.10641 0.0168,-0.20628 0.0504,-0.29961 0.0355,-0.0952 0.0859,-0.17734 0.15121,-0.24642 0.0653,-0.0709 0.14467,-0.12693 0.23801,-0.168 0.0933,-0.0411 0.19974,-0.0616 0.31921,-0.0616 0.0784,10e-6 0.15027,0.007 0.21561,0.0224 0.0653,0.0131 0.1288,0.0327 0.19041,0.0588 l -0.0868,0.33321 c -0.0392,-0.0149 -0.0821,-0.028 -0.1288,-0.0392 -0.0467,-0.0112 -0.0989,-0.0168 -0.15681,-0.0168 -0.1232,0 -0.21561,0.0383 -0.27721,0.1148 -0.0597,0.0765 -0.0896,0.17735 -0.0896,0.30242 0,0.13254 0.028,0.23521 0.084,0.30801 0.0579,0.0728 0.15774,0.10921 0.29961,0.10921 0.0504,0 0.10454,-0.005 0.16241,-0.014 0.0579,-0.009 0.11107,-0.0243 0.15961,-0.0448 l 0.0588,0.34162 c -0.0485,0.0205 -0.10921,0.0383 -0.18201,0.0532 -0.0728,0.0149 -0.15307,0.0224 -0.24081,0.0224 -0.13441,0 -0.25014,-0.0196 -0.34721,-0.0588 -0.0971,-0.0411 -0.17734,-0.0961 -0.24081,-0.16521 -0.0616,-0.0691 -0.10734,-0.15027 -0.13721,-0.24361 -0.028,-0.0952 -0.042,-0.19787 -0.042,-0.30801" /> + <path + inkscape:connector-curvature="0" + id="path23741" + style="font-weight:bold;marker:none" + d="m 618.86439,556.12216 c 0,0.11574 -0.0168,0.22214 -0.0504,0.31921 -0.0336,0.0952 -0.0821,0.17734 -0.14561,0.24641 -0.0635,0.0672 -0.14,0.11947 -0.2296,0.15681 -0.0877,0.0373 -0.18668,0.056 -0.29682,0.056 -0.10827,0 -0.20721,-0.0187 -0.29681,-0.056 -0.0877,-0.0373 -0.16334,-0.0896 -0.22681,-0.15681 -0.0635,-0.0691 -0.11294,-0.1512 -0.14841,-0.24641 -0.0355,-0.0971 -0.0532,-0.20347 -0.0532,-0.31921 0,-0.11574 0.0177,-0.22121 0.0532,-0.31642 0.0373,-0.0952 0.0877,-0.1764 0.15121,-0.24361 0.0653,-0.0672 0.14187,-0.11947 0.22961,-0.1568 0.0896,-0.0373 0.18667,-0.056 0.29121,-0.056 0.10641,10e-6 0.20348,0.0187 0.29121,0.056 0.0896,0.0373 0.16614,0.0896 0.22961,0.1568 0.0635,0.0672 0.11294,0.14841 0.14841,0.24361 0.0355,0.0952 0.0532,0.20068 0.0532,0.31642 m -0.42561,0 c -10e-6,-0.12881 -0.0261,-0.22961 -0.0784,-0.30242 -0.0504,-0.0747 -0.1232,-0.112 -0.21841,-0.112 -0.0952,0 -0.16894,0.0373 -0.22121,0.112 -0.0523,0.0728 -0.0784,0.17361 -0.0784,0.30242 0,0.1288 0.0261,0.23147 0.0784,0.30801 0.0523,0.0747 0.12601,0.11201 0.22121,0.11201 0.0952,0 0.16801,-0.0373 0.21841,-0.11201 0.0523,-0.0765 0.0784,-0.17921 0.0784,-0.30801" /> + </g> + <g + transform="matrix(1.9571643,0,0,1.9571643,-1685.6366,-960.80361)" + id="text23670" + style="font-size:2.80011916px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"> + <path + inkscape:connector-curvature="0" + id="path23709" + style="font-weight:bold;marker:none" + d="m 641.27886,556.96227 c -0.10641,0 -0.21281,-0.004 -0.31922,-0.0112 -0.10453,-0.006 -0.21374,-0.0205 -0.32761,-0.0448 l 0,-1.88168 c 0.0896,-0.0168 0.18761,-0.0289 0.29401,-0.0364 0.10641,-0.009 0.20534,-0.014 0.29681,-0.014 0.12321,0 0.23615,0.009 0.33882,0.028 0.10454,0.0168 0.19414,0.0467 0.26881,0.0896 0.0747,0.0429 0.13254,0.0999 0.17361,0.17081 0.0429,0.0691 0.0644,0.15494 0.0644,0.25761 0,0.15494 -0.0747,0.27722 -0.22401,0.36682 0.1232,0.0467 0.20721,0.11014 0.25201,0.19041 0.0448,0.0803 0.0672,0.1708 0.0672,0.27161 0,0.20347 -0.0747,0.35655 -0.224,0.45922 -0.14748,0.10267 -0.36775,0.154 -0.66083,0.154 m -0.22121,-0.87083 0,0.50122 c 0.0317,0.004 0.0663,0.007 0.1036,0.008 0.0373,0.002 0.0784,0.003 0.12321,0.003 0.13067,0 0.23614,-0.0187 0.31641,-0.056 0.0803,-0.0373 0.1204,-0.10641 0.12041,-0.20721 -10e-6,-0.0896 -0.0336,-0.15308 -0.10081,-0.19041 -0.0672,-0.0392 -0.16334,-0.0588 -0.28841,-0.0588 l -0.27441,0 m 0,-0.33322 0.21281,0 c 0.1344,0 0.23054,-0.0168 0.28841,-0.0504 0.0579,-0.0355 0.0868,-0.0915 0.0868,-0.16801 0,-0.0784 -0.0299,-0.13347 -0.0896,-0.1652 -0.0597,-0.0317 -0.14748,-0.0476 -0.26321,-0.0476 -0.0373,10e-6 -0.0775,9.4e-4 -0.12041,0.003 -0.0429,1e-5 -0.0812,0.002 -0.1148,0.006 l 0,0.42282" /> + <path + inkscape:connector-curvature="0" + id="path23711" + style="font-weight:bold;marker:none" + d="m 643.07338,556.96507 c -0.12134,-0.002 -0.22027,-0.0149 -0.29681,-0.0392 -0.0747,-0.0243 -0.13441,-0.0579 -0.17921,-0.1008 -0.0429,-0.0448 -0.0728,-0.098 -0.0896,-0.15961 -0.0149,-0.0635 -0.0224,-0.1344 -0.0224,-0.21281 l 0,-1.62127 0.41722,-0.0672 0,1.60447 c 0,0.0373 0.003,0.0709 0.008,0.1008 0.006,0.0299 0.0159,0.0551 0.0308,0.0756 0.0168,0.0205 0.0401,0.0373 0.07,0.0504 0.0299,0.0131 0.07,0.0215 0.12041,0.0252 l -0.0588,0.34441" /> + <path + inkscape:connector-curvature="0" + id="path23713" + style="font-weight:bold;marker:none" + d="m 644.74899,556.19784 c 0,0.11574 -0.0168,0.22214 -0.0504,0.31921 -0.0336,0.0952 -0.0821,0.17735 -0.14561,0.24642 -0.0635,0.0672 -0.14,0.11947 -0.22961,0.1568 -0.0877,0.0373 -0.18667,0.056 -0.29681,0.056 -0.10827,0 -0.20721,-0.0187 -0.29681,-0.056 -0.0877,-0.0373 -0.16334,-0.0896 -0.22681,-0.1568 -0.0635,-0.0691 -0.11294,-0.15121 -0.14841,-0.24642 -0.0355,-0.0971 -0.0532,-0.20347 -0.0532,-0.31921 0,-0.11574 0.0177,-0.22121 0.0532,-0.31641 0.0373,-0.0952 0.0877,-0.17641 0.15121,-0.24361 0.0653,-0.0672 0.14187,-0.11947 0.22961,-0.15681 0.0896,-0.0373 0.18667,-0.056 0.29121,-0.056 0.1064,0 0.20348,0.0187 0.29121,0.056 0.0896,0.0373 0.16614,0.0896 0.22961,0.15681 0.0635,0.0672 0.11294,0.1484 0.14841,0.24361 0.0355,0.0952 0.0532,0.20067 0.0532,0.31641 m -0.42562,0 c 0,-0.1288 -0.0261,-0.22961 -0.0784,-0.30241 -0.0504,-0.0747 -0.12321,-0.11201 -0.21841,-0.11201 -0.0952,0 -0.16894,0.0373 -0.22121,0.11201 -0.0523,0.0728 -0.0784,0.17361 -0.0784,0.30241 0,0.12881 0.0261,0.23148 0.0784,0.30801 0.0523,0.0747 0.12601,0.11201 0.22121,0.11201 0.0952,0 0.16801,-0.0373 0.21841,-0.11201 0.0523,-0.0765 0.0784,-0.1792 0.0784,-0.30801" /> + <path + inkscape:connector-curvature="0" + id="path23715" + style="font-weight:bold;marker:none" + d="m 645.4278,556.15304 c 0,0.23334 0.0943,0.35001 0.28281,0.35001 0.0429,0 0.0831,-0.006 0.12041,-0.0168 0.0373,-0.0112 0.0691,-0.0243 0.0952,-0.0392 l 0,-0.66643 c -0.0205,-0.004 -0.0448,-0.007 -0.0728,-0.008 -0.028,-0.004 -0.0607,-0.006 -0.098,-0.006 -0.11014,0 -0.19228,0.0364 -0.24641,0.10921 -0.0541,0.0728 -0.0812,0.16521 -0.0812,0.27721 m 0.91564,0.59922 c 0,0.24082 -0.0616,0.41909 -0.18481,0.53483 -0.12134,0.1176 -0.30988,0.1764 -0.56562,0.17641 -0.0896,-10e-6 -0.17921,-0.008 -0.26881,-0.0252 -0.0896,-0.0149 -0.17268,-0.0355 -0.24921,-0.0616 l 0.0728,-0.35001 c 0.0653,0.0261 0.13347,0.0467 0.20441,0.0616 0.0728,0.0149 0.15494,0.0224 0.24641,0.0224 0.11947,0 0.20347,-0.0261 0.25201,-0.0784 0.0504,-0.0523 0.0756,-0.11947 0.0756,-0.20161 l 0,-0.0532 c -0.0448,0.0205 -0.0915,0.0364 -0.14,0.0476 -0.0467,0.009 -0.098,0.014 -0.15401,0.014 -0.20347,0 -0.35935,-0.0597 -0.46762,-0.17921 -0.10827,-0.12134 -0.16241,-0.29028 -0.16241,-0.50682 0,-0.10827 0.0168,-0.20628 0.0504,-0.29401 0.0336,-0.0896 0.0821,-0.16614 0.1456,-0.22961 0.0653,-0.0635 0.14467,-0.11201 0.23801,-0.14561 0.0933,-0.0355 0.19881,-0.0532 0.31642,-0.0532 0.0504,0 0.10173,0.003 0.154,0.008 0.0541,0.004 0.10734,0.009 0.15961,0.0168 0.0523,0.007 0.10174,0.0168 0.14841,0.028 0.0485,0.009 0.0915,0.0196 0.1288,0.0308 l 0,1.23765" /> + </g> + <g + transform="matrix(1.9571643,0,0,1.9571643,-1654.8196,-1001.6789)" + id="text23674" + style="font-size:2.80011916px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"> + <path + inkscape:connector-curvature="0" + id="path23718" + style="font-weight:bold;marker:none" + d="m 624.13801,556.86139 c -0.0205,-0.0672 -0.0439,-0.13627 -0.07,-0.20721 -0.0243,-0.0709 -0.0485,-0.14187 -0.0728,-0.21281 l -0.75603,0 c -0.0243,0.0709 -0.0495,0.14187 -0.0756,0.21281 -0.0243,0.0709 -0.0467,0.14001 -0.0672,0.20721 l -0.45362,0 c 0.0728,-0.20908 0.14187,-0.40228 0.20721,-0.57963 0.0653,-0.17734 0.1288,-0.34441 0.1904,-0.50122 0.0635,-0.1568 0.12508,-0.30521 0.18481,-0.44522 0.0616,-0.14187 0.12507,-0.28001 0.19041,-0.41441 l 0.41722,0 c 0.0635,0.1344 0.126,0.27254 0.18761,0.41441 0.0616,0.14001 0.1232,0.28842 0.1848,0.44522 0.0635,0.15681 0.12787,0.32388 0.19321,0.50122 0.0653,0.17735 0.13441,0.37055 0.20721,0.57963 l -0.46762,0 m -0.52362,-1.50086 c -0.009,0.028 -0.0233,0.0663 -0.042,0.1148 -0.0187,0.0485 -0.0401,0.10454 -0.0644,0.16801 -0.0243,0.0635 -0.0513,0.13347 -0.0812,0.21001 -0.028,0.0765 -0.0569,0.1568 -0.0868,0.24081 l 0.55162,0 c -0.0299,-0.084 -0.0588,-0.16428 -0.0868,-0.24081 -0.028,-0.0765 -0.0551,-0.14654 -0.0812,-0.21001 -0.0243,-0.0635 -0.0457,-0.11947 -0.0644,-0.16801 -0.0187,-0.0485 -0.0336,-0.0868 -0.0448,-0.1148" /> + <path + inkscape:connector-curvature="0" + id="path23720" + style="font-weight:bold;marker:none" + d="m 625.71645,555.75814 c -0.0373,-0.009 -0.0812,-0.0187 -0.13161,-0.028 -0.0504,-0.0112 -0.10454,-0.0168 -0.16241,-0.0168 -0.0261,0 -0.0579,0.003 -0.0952,0.008 -0.0355,0.004 -0.0625,0.008 -0.0812,0.014 l 0,1.12565 -0.41722,0 0,-1.39446 c 0.0747,-0.0261 0.16241,-0.0504 0.26321,-0.0728 0.10267,-0.0243 0.21654,-0.0364 0.34161,-0.0364 0.0224,0 0.0495,0.002 0.0812,0.006 0.0317,0.002 0.0635,0.006 0.0952,0.0112 0.0317,0.004 0.0635,0.009 0.0952,0.0168 0.0317,0.006 0.0588,0.0131 0.0812,0.0224 l -0.07,0.34441" /> + <path + inkscape:connector-curvature="0" + id="path23722" + style="font-weight:bold;marker:none" + d="m 625.91276,556.12496 c 0,-0.10641 0.0168,-0.20628 0.0504,-0.29961 0.0355,-0.0952 0.0859,-0.17734 0.15121,-0.24642 0.0653,-0.0709 0.14467,-0.12693 0.23801,-0.168 0.0933,-0.0411 0.19974,-0.0616 0.31921,-0.0616 0.0784,10e-6 0.15028,0.007 0.21561,0.0224 0.0653,0.0131 0.12881,0.0327 0.19041,0.0588 l -0.0868,0.33321 c -0.0392,-0.0149 -0.0821,-0.028 -0.12881,-0.0392 -0.0467,-0.0112 -0.0989,-0.0168 -0.1568,-0.0168 -0.12321,0 -0.21561,0.0383 -0.27722,0.1148 -0.0597,0.0765 -0.0896,0.17735 -0.0896,0.30242 0,0.13254 0.028,0.23521 0.084,0.30801 0.0579,0.0728 0.15774,0.10921 0.29962,0.10921 0.0504,0 0.10453,-0.005 0.1624,-0.014 0.0579,-0.009 0.11107,-0.0243 0.15961,-0.0448 l 0.0588,0.34162 c -0.0485,0.0205 -0.1092,0.0383 -0.18201,0.0532 -0.0728,0.0149 -0.15307,0.0224 -0.24081,0.0224 -0.1344,0 -0.25014,-0.0196 -0.34721,-0.0588 -0.0971,-0.0411 -0.17734,-0.0961 -0.24081,-0.16521 -0.0616,-0.0691 -0.10734,-0.15027 -0.13721,-0.24361 -0.028,-0.0952 -0.042,-0.19787 -0.042,-0.30801" /> + <path + inkscape:connector-curvature="0" + id="path23724" + style="font-weight:bold;marker:none" + d="m 627.38282,556.86139 0,-2.10569 0.41722,-0.0672 0,0.70563 c 0.028,-0.009 0.0635,-0.0177 0.10641,-0.0252 0.0448,-0.009 0.0877,-0.014 0.1288,-0.014 0.11947,0 0.21841,0.0168 0.29681,0.0504 0.0803,0.0317 0.14374,0.0775 0.19041,0.1372 0.0485,0.0597 0.0821,0.13068 0.10081,0.21281 0.0205,0.0821 0.0308,0.17361 0.0308,0.27441 l 0,0.83164 -0.41722,0 0,-0.78123 c 0,-0.13441 -0.0177,-0.22961 -0.0532,-0.28562 -0.0336,-0.056 -0.0971,-0.084 -0.19041,-0.084 -0.0373,0 -0.0728,0.004 -0.1064,0.0112 -0.0317,0.006 -0.0607,0.0121 -0.0868,0.0196 l 0,1.12005 -0.41722,0" /> + <path + inkscape:connector-curvature="0" + id="path23726" + style="font-weight:bold;marker:none" + d="m 629.45167,556.86139 -0.41721,0 0,-1.47286 0.41721,0 0,1.47286 m 0.0392,-1.89848 c 0,0.0765 -0.0252,0.13721 -0.0756,0.18201 -0.0485,0.0429 -0.1064,0.0644 -0.1736,0.0644 -0.0672,0 -0.12601,-0.0215 -0.17641,-0.0644 -0.0485,-0.0448 -0.0728,-0.10547 -0.0728,-0.18201 -1e-5,-0.0765 0.0243,-0.13627 0.0728,-0.17921 0.0504,-0.0448 0.1092,-0.0672 0.17641,-0.0672 0.0672,0 0.12507,0.0224 0.1736,0.0672 0.0504,0.0429 0.0756,0.10267 0.0756,0.17921" /> + <path + inkscape:connector-curvature="0" + id="path23728" + style="font-weight:bold;marker:none" + d="m 630.20053,556.86139 c -0.0952,-0.18668 -0.19227,-0.40508 -0.29121,-0.65523 -0.0971,-0.25014 -0.18948,-0.52269 -0.27721,-0.81763 l 0.44242,0 c 0.0187,0.0728 0.0401,0.15214 0.0644,0.23801 0.0261,0.084 0.0523,0.16987 0.0784,0.25761 0.028,0.0859 0.0551,0.16987 0.0812,0.25201 0.028,0.0821 0.0551,0.15681 0.0812,0.22401 0.0243,-0.0672 0.0504,-0.14187 0.0784,-0.22401 0.028,-0.0821 0.0551,-0.16614 0.0812,-0.25201 0.028,-0.0877 0.0541,-0.17361 0.0784,-0.25761 0.0261,-0.0859 0.0485,-0.16521 0.0672,-0.23801 l 0.43122,0 c -0.0877,0.29494 -0.18108,0.56749 -0.28001,0.81763 -0.0971,0.25015 -0.19321,0.46855 -0.28841,0.65523 l -0.34722,0" /> + <path + inkscape:connector-curvature="0" + id="path23730" + style="font-weight:bold;marker:none" + d="m 632.68174,556.12216 c 0,0.11574 -0.0168,0.22214 -0.0504,0.31921 -0.0336,0.0952 -0.0821,0.17734 -0.14561,0.24641 -0.0635,0.0672 -0.14,0.11947 -0.22961,0.15681 -0.0877,0.0373 -0.18667,0.056 -0.29681,0.056 -0.10827,0 -0.20721,-0.0187 -0.29681,-0.056 -0.0877,-0.0373 -0.16334,-0.0896 -0.22681,-0.15681 -0.0635,-0.0691 -0.11294,-0.1512 -0.14841,-0.24641 -0.0355,-0.0971 -0.0532,-0.20347 -0.0532,-0.31921 0,-0.11574 0.0177,-0.22121 0.0532,-0.31642 0.0373,-0.0952 0.0877,-0.1764 0.15121,-0.24361 0.0653,-0.0672 0.14187,-0.11947 0.22961,-0.1568 0.0896,-0.0373 0.18667,-0.056 0.29121,-0.056 0.10641,10e-6 0.20348,0.0187 0.29121,0.056 0.0896,0.0373 0.16614,0.0896 0.22961,0.1568 0.0635,0.0672 0.11294,0.14841 0.14841,0.24361 0.0355,0.0952 0.0532,0.20068 0.0532,0.31642 m -0.42562,0 c 0,-0.12881 -0.0261,-0.22961 -0.0784,-0.30242 -0.0504,-0.0747 -0.1232,-0.112 -0.21841,-0.112 -0.0952,0 -0.16894,0.0373 -0.22121,0.112 -0.0523,0.0728 -0.0784,0.17361 -0.0784,0.30242 0,0.1288 0.0261,0.23147 0.0784,0.30801 0.0523,0.0747 0.12601,0.11201 0.22121,0.11201 0.0952,0 0.16801,-0.0373 0.21841,-0.11201 0.0523,-0.0765 0.0784,-0.17921 0.0784,-0.30801" /> + </g> + <rect + style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635472;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" + id="rect8725" + width="249.10905" + height="164.02649" + x="30.756149" + y="-87.776787" /> + <rect + y="922.49878" + x="101.90163" + height="100.40426" + width="220.28499" + id="rect14204" + style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" /> + <rect + style="opacity:0.5;fill:none;stroke:#ff5555;stroke-width:0.66635466;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" + id="rect6444" + width="212.24748" + height="91.091072" + x="73.813522" + y="821.78479" /> + </g> + <g + style="display:inline" + inkscape:label="graphics" + id="layer6" + inkscape:groupmode="layer"> + <g + id="g3781" + transform="matrix(1.5625,0,0,1.5636219,-179.60041,-93.377544)"> + <polygon + transform="matrix(-1,0,0,1,240.06426,148.07327)" + style="fill:#231f20" + points="32,4 0,4 0,0 32,0 32,4 " + id="polygon5" /> + <polygon + transform="matrix(-1.4,0,0,1,240.06426,148.07327)" + style="fill:#231f20" + points="0,8 20,8 20,12 20,12 0,12 " + id="polygon7" /> + <polygon + transform="matrix(-0.875,0,0,1,240.06426,148.07327)" + style="fill:#231f20" + points="0,20 32,20 32,24 32,24 0,24 " + id="polygon9" /> + <polygon + transform="matrix(-1,0,0,1,240.06426,148.07327)" + style="fill:#231f20" + points="24,32 0,32 0,28 24,28 24,32 " + id="polygon11" /> + </g> + <path + style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" + d="m 163.01082,1415.7865 c -36.78501,6.5326 -42.5348,26.8357 -42.5348,26.8357 l -2.47152,7.1281" + id="path14206" + inkscape:connector-curvature="0" /> + <path + inkscape:connector-curvature="0" + id="path5858-1" + d="M 134.07077,1295.6357 C 97.285756,1289.1031 91.535966,1268.8 91.535966,1268.8 l -2.47152,-7.1281" + style="color:#000000;fill:none;stroke:#000000;stroke-width:0.92025012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;marker-end:url(#Arrow1Mend);visibility:visible;display:inline;overflow:visible;enable-background:accumulate" /> + <path + id="path3-6" + d="m 110.34936,428.52925 v -8 h -4.734 c -0.141,-0.391 -0.289,-0.771 -0.469,-1.146 l 3.344,-3.339 -5.656,-5.661 -3.344,3.344 c -0.364,-0.172 -0.766,-0.265 -1.141,-0.406 v -4.792 h -8 v 4.792 c -0.383,0.141 -0.781,0.234 -1.145,0.406 l -3.34,-3.344 -5.66,5.661 3.34,3.339 c -0.175,0.375 -0.324,0.755 -0.461,1.146 h -4.734 v 8 h 4.734 c 0.137,0.391 0.285,0.771 0.461,1.146 l -3.34,3.339 5.66,5.661 3.34,-3.344 c 0.363,0.172 0.762,0.266 1.145,0.406 v 4.792 h 8 v -4.792 c 0.375,-0.141 0.777,-0.234 1.141,-0.406 l 3.344,3.344 5.656,-5.661 -3.344,-3.339 c 0.18,-0.375 0.328,-0.755 0.469,-1.146 h 4.734 z m -16,0.083 c -2.211,0 -4,-1.791 -4,-4 0,-2.208 1.789,-4 4,-4 2.207,0 4,1.792 4,4 0,2.209 -1.793,4 -4,4 z" + style="fill:#231f20;display:inline" + inkscape:connector-curvature="0" /> + </g> + <g + style="display:inline" + inkscape:label="es" + id="layer7" + inkscape:groupmode="layer"> + <g + transform="translate(106.00677,59.44173)" + id="g21408" + style="display:inline"> + <text + transform="scale(0.99912117,1.0008796)" + sodipodi:linespacing="125%" + id="text3067" + y="122.68937" + x="101.1684" + style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + id="tspan8721" + style="font-size:32px;font-weight:bold;fill:#aa4400" + y="122.68937" + x="101.1684" + sodipodi:role="line">listas</tspan></text> + <text + xml:space="preserve" + style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="101.42439" + y="95.114334" + id="text21398" + sodipodi:linespacing="125%" + transform="scale(0.99912117,1.0008796)"><tspan + sodipodi:role="line" + x="101.42439" + y="95.114334" + style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan21402">explicando las</tspan></text> + </g> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="149.85907" + y="-168.92439" + id="text18351" + sodipodi:linespacing="125%" + transform="translate(0,435.82679)"><tspan + y="-168.92439" + x="149.85907" + id="tspan18363" + sodipodi:role="line" + style="font-style:italic">pulsa con tu ratón para continuar</tspan></text> + <text + sodipodi:linespacing="125%" + id="text3071-9-1" + y="406.39865" + x="135.67761" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + id="tspan13782-8" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="406.39865" + x="135.67761" + sodipodi:role="line">Lo siento, estamos</tspan><tspan + id="tspan8780" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="421.39865" + x="135.67761" + sodipodi:role="line">diseñando este</tspan><tspan + id="tspan8782" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="436.39865" + x="135.67761" + sodipodi:role="line">tutorial.</tspan><tspan + id="tspan8870" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="451.39865" + x="135.67761" + sodipodi:role="line">Mientras tanto...</tspan><tspan + id="tspan8784" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="466.39865" + x="135.67761" + sodipodi:role="line" /></text> + <text + sodipodi:linespacing="125%" + id="text14208" + y="1375.6914" + x="170.81166" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1375.6914" + x="170.81166" + sodipodi:role="line" + id="tspan14210" /><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1390.6914" + x="170.81166" + sodipodi:role="line" + id="tspan14214">...darnos tu <tspan + id="tspan14216" + style="font-weight:bold">feedback </tspan></tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1405.6914" + x="170.81166" + sodipodi:role="line" + id="tspan14218">y participar para </tspan><tspan + id="tspan14220" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1420.6914" + x="170.81166" + sodipodi:role="line">mejorar esta </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1435.6914" + x="170.81166" + sodipodi:role="line" + id="tspan14222">herramienta...</tspan></text> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="143.14952" + y="1291.6486" + id="text6446" + sodipodi:linespacing="125%"><tspan + id="tspan14200" + sodipodi:role="line" + x="143.14952" + y="1291.6486" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...aquí puedes crear </tspan><tspan + id="tspan14247" + sodipodi:role="line" + x="143.14952" + y="1306.6486" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">nuevas <tspan + style="font-weight:bold" + id="tspan18194">listas</tspan> y </tspan><tspan + id="tspan14251" + sodipodi:role="line" + x="143.14952" + y="1321.6486" + style="font-size:12px;font-style:normal;font-weight:bold;fill:#aa4400"><tspan + id="tspan8937" + style="font-weight:normal"><tspan + style="font-weight:bold" + id="tspan18196">mensajes</tspan>...</tspan></tspan></text> + </g> + <g + style="display:none" + inkscape:label="en" + id="layer8" + inkscape:groupmode="layer"> + <text + transform="scale(0.99912117,1.0008796)" + sodipodi:linespacing="125%" + id="text11705" + y="166.0929" + x="207.26842" + style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + id="tspan11707" + style="font-size:32px;font-weight:bold;fill:#aa4400" + y="166.0929" + x="207.26842" + sodipodi:role="line">lists</tspan></text> + <text + transform="translate(0,435.82679)" + sodipodi:linespacing="125%" + id="text11713" + y="-168.92439" + x="149.85907" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + style="font-style:italic" + sodipodi:role="line" + id="tspan11715" + x="149.85907" + y="-168.92439">click to continue</tspan></text> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="134.0341" + y="409.18921" + id="text11717" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="134.0341" + y="409.18921" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan11719">Sorry, we are</tspan><tspan + id="tspan11791" + sodipodi:role="line" + x="134.0341" + y="424.18921" + style="font-size:12px;font-weight:normal;fill:#aa4400">still designing </tspan><tspan + id="tspan11793" + sodipodi:role="line" + x="134.0341" + y="439.18921" + style="font-size:12px;font-weight:normal;fill:#aa4400">this tutorial.</tspan><tspan + sodipodi:role="line" + x="134.0341" + y="454.18921" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan11725">Meanwhile...</tspan><tspan + sodipodi:role="line" + x="134.0341" + y="469.18921" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan11727" /></text> + <text + xml:space="preserve" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + x="170.81166" + y="1375.6914" + id="text11729" + sodipodi:linespacing="125%"><tspan + id="tspan11731" + sodipodi:role="line" + x="170.81166" + y="1375.6914" + style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan + id="tspan11733" + sodipodi:role="line" + x="170.81166" + y="1390.6914" + style="font-size:12px;font-weight:normal;fill:#aa4400">...give us your <tspan + style="font-weight:bold" + id="tspan11735">feedback </tspan></tspan><tspan + sodipodi:role="line" + x="170.81166" + y="1405.6914" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan11739">and participate</tspan><tspan + id="tspan11741" + sodipodi:role="line" + x="170.81166" + y="1420.6914" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">to improve this tool...</tspan></text> + <text + sodipodi:linespacing="125%" + id="text11743" + y="1291.6486" + x="143.14952" + style="font-size:12px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1291.6486" + x="143.14952" + sodipodi:role="line" + id="tspan11745">...here you can create</tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1306.6486" + x="143.14952" + sodipodi:role="line" + id="tspan11751">your new <tspan + style="font-weight:bold" + id="tspan18192">lists</tspan> and</tspan><tspan + id="tspan11814" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1321.6486" + x="143.14952" + sodipodi:role="line"><tspan + id="tspan11816" + style="font-weight:bold">posts</tspan>...</tspan></text> + <text + transform="scale(0.99912117,1.0008796)" + sodipodi:linespacing="125%" + id="text11787" + y="184.92917" + x="207.5244" + style="font-size:32px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#aa4400;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:24;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + xml:space="preserve"><tspan + id="tspan11789" + style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" + y="184.92917" + x="207.5244" + sodipodi:role="line">explained</tspan></text> + </g> + <g + style="display:none" + inkscape:label="fr" + id="layer9" + inkscape:groupmode="layer" /> + <script + ns1:version="11.11-07001323" + id="sozi-script">var sozi=sozi||{};(function(){var a=sozi.events=sozi.events||{},b={};a.listen=function(d,e){var c=b[d];if(!c){c=b[d]=[]}c.push(e)};a.fire=function(g){var d=b[g],c,f,e=Array.prototype.slice.call(arguments,1);if(d){c=d.length;for(f=0;f<c;f+=1){d[f].apply(null,e)}}}}());var sozi=sozi||{};(function(){var w=sozi.framelist=sozi.framelist||{},k=this,r=k.document,q,m,c,j=0,d=5,i,u,b… h(A){return function(B){sozi.player.previewFrame(A);B.stopPropagation()}}function l(A){A.stopPropagation()}function p(B){var A=B.relatedTarget;while(A!==m&&A!==q){A=A.parentNode}if(A===q){w.hide();sozi.player.restart();B.stopPropagation()}}function t(B){var A=c.getCTM().f;if(A<=-k.innerHeight/2){A+=k.innerHeight/2}else{if(A<0){A=0}}c.setAttribute("transform","translate(0,"+A+")");B.stopPropagation()}function e(B){var A=c.getCTM().f;if(A+j>=k.innerHeight*3/2){A-=k.innerHeight/2}else{if(A+j>k.innerHeight+2*d){A=k.innerHeight-j-4*d}}c.setAttribute("transform","translate(0,"+A+")");B.stopPropagation()}function s(A){var C=sozi.animation.profiles[g](A),B=1-C;z=y*C+b*B;m.setAttribute("transform","translate("+z+",0)")}function x(){}function o(){var G=r.createElementNS(a,"rect"),A=r.createElementNS(a,"path"),E=r.createElementNS(a,"path"),H=0,F,C=sozi.document.frames.length,B=sozi.location.getFrameIndex(),D,I;q=r.documentElement;m=r.createElementNS(a,"g");m.setAttribute("id","sozi-toc");q.appendChild(m);c=r.createElementNS(a,"g");m.appendChild(c);G.setAttribute("id","sozi-toc-background");G.setAttribute("x",d);G.setAttribute("y",d);G.setAttribute("rx",d);G.setAttribute("ry",d);G.addEventListener("click",l,false);G.addEventListener("mousedown",l,false);G.addEventListener("mouseout",p,false);c.appendChild(G);for(D=0;D<C;D+=1){I=r.createElementNS(a,"text");I.appendChild(r.createTextNode(sozi.document.frames[D].title));c.appendChild(I);if(D===B){I.setAttribute("class","sozi-toc-current")}F=I.getBBox().width;j+=I.getBBox().height;if(F>H){H=F}I.setAttribute("x",2*d);I.setAttribute("y",j+d);I.addEventListener("click",h(D),false);I.addEventListener("mousedown",l,false)}A.setAttribute("class","sozi-toc-arrow");A.setAttribute("d","M"+(H+3*d)+","+(5*d)+" l"+(4*d)+",0 l-"+(2*d)+",-"+(3*d)+" z");A.addEventListener("click",t,false);A.addEventListener("mousedown",l,false);m.appendChild(A);E.setAttribute("class","sozi-toc-arrow");E.setAttribute("d","M"+(H+3*d)+","+(7*d)+" l"+(4*d)+",0 l-"+(2*d)+","+(3*d)+" z");E.addEventListener("click",e,false);E.addEventListener("mousedown",l,false);m.appendChild(E);G.setAttribute("width",H+7*d);G.setAttribute("height",j+2*d);i=-H-9*d;u=0;z=y=i;m.setAttribute("transform","translate("+i+",0)");v=new sozi.animation.Animator(s,x)}function n(A){var D=r.getElementsByClassName("sozi-toc-current"),C=c.getElementsByTagName("text"),B;for(B=0;B<D.length;B+=1){D[B].removeAttribute("class")}C[A].setAttribute("class","sozi-toc-current")}w.show=function(){b=z;y=u;v.start(f)};w.hide=function(){b=z;y=i;v.start(f)};w.isVisible=function(){return y===u};sozi.events.listen("displayready",o);sozi.events.listen("cleanup",w.hide);sozi.events.listen("framechange",n)}());var sozi=sozi||{};(function(){var t=sozi.player=sozi.player||{},u=sozi.display=sozi.display||{},j=this,o=j.document,p=0,v=1,s=1.05,x=5,c=false,l=false,g=0,e=0;function a(A,z,B){t.stop();u.zoom(A>0?s:1/s,z,B)}function w(y){t.stop();u.rotate(y>0?x:-x)}function r(){if(sozi.framelist.isVisible()){sozi.framelist.hide();t.restart()}else{t.stop();sozi.framelist.show()}}function i(y){if(y.button===p){c=true;l=false;g=y.clientX;e=y.clientY}else{if(y.button===v){r()}}y.stopPropagation()}function m(y){if(c){t.stop();l=true;sozi.events.fire("cleanup");u.drag(y.clientX-g,y.clientY-e);g=y.clientX;e=y.clientY}y.stopPropagation()}function f(y){if(y.button===p){c=false}y.stopPropagation()}function q(y){t.moveToPrevious();y.stopPropagation();y.preventDefault()}function h(y){if(!l&&y.button!==v){t.moveToNext()}y.stopPropagation()}function k(y){var z=0;if(!y){y=j.event}if(y.wheelDelta){z=y.wheelDelta;if(j.opera){z=-z}}else{if(y.detail){z=-y.detail}}if(z!==0){if(y.shiftKey){w(z)}else{a(z,y.clientX,y.clientY)}}y.stopPropagation();y.preventDefault()}function n(y){switch(y.charCode){case 43:a(1,j.innerWidth/2,j.innerHeight/2);break;case 45:a(-1,j.innerWidth/2,j.innerHeight/2);break;case 61:t.moveToCurrent();break;case 70:case 102:t.showAll();break;case 84:case 116:r();break;case 82:w(-1);break;case 114:w(1);break}y.stopPropagation()}function d(y){switch(y.keyCode){case 36:t.moveToFirst();break;case 35:t.moveToLast();break;case 38:t.jumpToPrevious();break;case 33:case 37:t.moveToPrevious();break;case 40:t.jumpToNext();break;case 34:case 39:case 13:case 32:t.moveToNext();break}y.stopPropagation()}function b(){var y=o.documentElement;y.addEventListener("click",h,false);y.addEventListener("mousedown",i,false);y.addEventListener("mouseup",f,false);y.addEventListener("mousemove",m,false);y.addEventListener("keypress",n,false);y.addEventListener("keydown",d,false);y.addEventListener("contextmenu",q,false);y.addEventListener("DOMMouseScroll",k,false);j.onmousewheel=k}j.addEventListener("load",b,false)}());var sozi=sozi||{};(function(){var e=sozi.animation=sozi.animation||{},h=this,j=40,d=[],b,i=h.mozRequestAnimationFrame||h.webkitRequestAnimationFrame||h.msRequestAnimationFrame||h.oRequestAnimationFrame;function c(){if(i){i(f)}else{b=h.setInterval(function(){f(Date.now())},j)}}function f(l){var k;if(d.length>0){if(i){i(f)}for(k=0;k<d.length;k+=1){d[k].step(l)}}else{if(!i){h.clearInterval(b)}}}function a(k){d.push(k);if(d.length===1){c()}}function g(k){d.splice(d.indexOf(k),1)}e.Animator=function(k,l){this.onStep=k;this.onDone=l;this.durationMs=0;this.data={};this.initialTime=0;this.started=false};e.Animator.prototype.start=function(k,l){this.durationMs=k;this.data=l;this.initialTime=Date.now();this.onStep(0,this.data);if(!this.started){this.started=true;a(this)}};e.Animator.prototype.stop=function(){if(this.started){g(this);this.started=false}};e.Animator.prototype.step=function(l){var k=l-this.initialTime;if(k>=this.durationMs){this.stop();this.onStep(1,this.data);this.onDone()}else{this.onStep(k/this.durationMs,this.data)}};e.profiles={linear:function(k){return k},accelerate:function(k){return Math.pow(k,3)},"strong-accelerate":function(k){return Math.pow(k,5)},decelerate:function(k){return 1-Math.pow(1-k,3)},"strong-decelerate":function(k){return 1-Math.pow(1-k,5)},"accelerate-decelerate":function(k){var l=k<=0.5?k:1-k,m=Math.pow(2*l,3)/2;return k<=0.5?m:1-m},"strong-accelerate-decelerate":function(k){var l=k<=0.5?k:1-k,m=Math.pow(2*l,5)/2;return k<=0.5?m:1-m},"decelerate-accelerate":function(k){var l=k<=0.5?k:1-k,m=(1-Math.pow(1-2*l,2))/2;return k<=0.5?m:1-m},"strong-decelerate-accelerate":function(k){var l=k<=0.5?k:1-k,m=(1-Math.pow(1-2*l,3))/2;return k<=0.5?m:1-m}}}());var sozi=sozi||{};(function(){var d=sozi.player=sozi.player||{},j=sozi.display=sozi.display||{},h=this,c,k,e=500,q=-10,l="linear",g=0,n=0,o=false,p=false;function f(t,w){var v=1-t,u=w.profile(t),s=1-u,r,x;for(r in w.initialState){if(w.initialState.hasOwnProperty(r)){if(typeof w.initialState[r]==="number"&&typeof w.finalState[r]==="number"){j.geometry[r]=w.finalState[r]*u+w.initialState[r]*s}}}if(w.zoomWidth&&w.zoomWidth.k!==0){x=t-w.zoomWidth.ts;j.geometry.width=w.zoomWidth.k*x*x+w.zoomWidth.ss}if(w.zoomHeight&&w.zoomHeight.k!==0){x=t-w.zoomHeight.ts;j.geometry.height=w.zoomHeight.k*x*x+w.zoomHeight.ss}j.clip=w.finalState.clip;j.update()}function i(){var r;if(sozi.document.frames[n].timeoutEnable){p=true;r=(n+1)%sozi.document.frames.length;k=h.setTimeout(function(){d.moveToFrame(r)},sozi.document.frames[n].timeoutMs)}}function m(){g=n;if(o){i()}}d.startFromIndex=function(r){o=true;p=false;g=r;n=r;j.showFrame(sozi.document.frames[r]);i()};d.restart=function(){d.startFromIndex(n)};d.stop=function(){c.stop();if(p){h.clearTimeout(k);p=false}o=false;g=n};function b(r,B,z){var C={ss:((r<0)?Math.max(B,z):Math.min(B,z))*(100-r)/100,ts:0.5,k:0},x,w,t,s,A,y;if(r!==0){x=B-z;w=B-C.ss;t=z-C.ss;if(x!==0){s=Math.sqrt(w*t);A=(w-s)/x;y=(w+s)/x;C.ts=(A>0&&A<=1)?A:y}C.k=w/C.ts/C.ts}return C}d.jumpToFrame=function(r){d.stop();sozi.events.fire("cleanup");g=r;n=r;j.showFrame(sozi.document.frames[r]);sozi.events.fire("framechange",r)};d.previewFrame=function(s){var u=sozi.document.frames[s].geometry,r,t;if(q!==0){r=b(q,j.geometry.width,u.width);t=b(q,j.geometry.height,u.height)}n=s;c.start(e,{initialState:j.getCurrentGeometry(),finalState:u,profile:sozi.animation.profiles[l],zoomWidth:r,zoomHeight:t});sozi.events.fire("framechange",s)};d.moveToFrame=function(t){var s=e,w=q,u=sozi.animation.profiles[l],r,v;if(p){h.clearTimeout(k);p=false}if(t===(n+1)%sozi.document.frames.length){s=sozi.document.frames[t].transitionDurationMs;w=sozi.document.frames[t].transitionZoomPercent;u=sozi.document.frames[t].transitionProfile}sozi.events.fire("cleanup");if(w!==0){r=b(w,j.geometry.width,sozi.document.frames[t].geometry.width);v=b(w,j.geometry.height,sozi.document.frames[t].geometry.height)}o=true;n=t;c.start(s,{initialState:j.getCurrentGeometry(),finalState:sozi.document.frames[n].geometry,profile:u,zoomWidth:r,zoomHeight:v});sozi.events.fire("framechange",t)};d.moveToFirst=function(){d.moveToFrame(0)};d.jumpToPrevious=function(){var r=n;if(!c.started||g<=n){r-=1}if(r>=0){d.jumpToFrame(r)}};d.moveToPrevious=function(){var r=n,s;for(r-=1;r>=0;r-=1){s=sozi.document.frames[r];if(!s.timeoutEnable||s.timeoutMs!==0){d.moveToFrame(r);break}}};d.jumpToNext=function(){var r=n;if(!c.started||g>=n){r+=1}if(r<sozi.document.frames.length){d.jumpToFrame(r)}};d.moveToNext=function(){if(n<sozi.document.frames.length-1||sozi.document.frames[n].timeoutEnable){d.moveToFrame((n+1)%sozi.document.frames.length)}};d.moveToLast=function(){d.moveToFrame(sozi.document.frames.length-1)};d.moveToCurrent=function(){d.moveToFrame(n)};d.showAll=function(){d.stop();sozi.events.fire("cleanup");c.start(e,{initialState:j.getCurrentGeometry(),finalState:j.getDocumentGeometry(),profile:sozi.animation.profiles[l]})};function a(){d.startFromIndex(sozi.location.getFrameIndex())}c=new sozi.animation.Animator(f,m);sozi.events.listen("displayready",a)}());var sozi=sozi||{};(function(){var d=sozi.display=sozi.display||{},h=this,i=h.document,j,c,k,a,g="http://… f(){var o,l=i.createElementNS(g,"g"),m=i.createElementNS(g,"clipPath");j=i.documentElement;k=j.getBBox();a=i.createElementNS(g,"g");while(true){o=j.firstChild;if(!o){break}j.removeChild(o);a.appendChild(o)}c=i.createElementNS(g,"rect");c.setAttribute("id","sozi-clip-rect");m.setAttribute("id","sozi-clip-path");m.appendChild(c);j.appendChild(m);l.setAttribute("clip-path","url(#sozi-clip-path)");l.appendChild(a);j.appendChild(l);j.setAttribute("width",h.innerWidth);j.setAttribute("height",h.innerHeight);sozi.events.fire("displayready")}function b(){j.setAttribute("width",h.innerWidth);j.setAttribute("height",h.innerHeight);d.update()}function e(){var l={};l.scale=Math.min(h.innerWidth/d.geometry.width,h.innerHeight/d.geometry.height);l.width=d.geometry.width*l.scale;l.height=d.geometry.height*l.scale;l.x=(h.innerWidth-l.width)/2;l.y=(h.innerHeight-l.height)/2;return l}d.getElementGeometry=function(l){var s,p,t,n,q,o,r=l.getCTM(),m=Math.sqrt(r.a*r.a+r.b*r.b);if(l.nodeName==="rect"){s=l.x.baseVal.value;p=l.y.baseVal.value;t=l.width.baseVal.value;n=l.height.baseVal.value}else{q=l.getBBox();s=q.x;p=q.y;t=q.width;n=q.height}o=i.documentElement.createSVGPoint();o.x=s+t/2;o.y=p+n/2;o=o.matrixTransform(r);return{cx:o.x,cy:o.y,width:t*m,height:n*m,rotate:Math.atan2(r.b,r.a)*180/Math.PI}};d.getDocumentGeometry=function(){return{cx:k.x+k.width/2,cy:k.y+k.height/2,width:k.width,height:k.height,rotate:0,clip:false}};d.getCurrentGeometry=function(){return{cx:d.geometry.cx,cy:d.geometry.cy,width:d.geometry.width,height:d.geometry.height,rotate:d.geometry.rotate,clip:d.geometry.clip}};d.update=function(){var l=e(),n=-d.geometry.cx+d.geometry.width/2+l.x/l.scale,m=-d.geometry.cy+d.geometry.height/2+l.y/l.scale;a.setAttribute("transform","scale("+l.scale+")translate("+n+","+m+")rotate("+(-d.geometry.rotate)+","+d.geometry.cx+","+d.geometry.cy+")");c.setAttribute("x",d.geometry.clip?l.x:0);c.setAttribute("y",d.geometry.clip?l.y:0);c.setAttribute("width",d.geometry.clip?l.width:h.innerWidth);c.setAttribute("height",d.geometry.clip?l.height:h.innerHeight)};d.showFrame=function(m){var l;for(l in m.geometry){if(m.geometry.hasOwnProperty(l)){d.geometry[l]=m.geometry[l]}}d.update()};d.drag=function(m,l){var n=e(),o=d.geometry.rotate*Math.PI/180;d.geometry.cx-=(m*Math.cos(o)-l*Math.sin(o))/n.scale;d.geometry.cy-=(m*Math.sin(o)+l*Math.cos(o))/n.scale;d.geometry.clip=false;d.update()};d.zoom=function(o,m,p){var n=(1-o)*(m-h.innerWidth/2),l=(1-o)*(p-h.innerHeight/2);d.geometry.width/=o;d.geometry.height/=o;d.drag(n,l)};d.rotate=function(l){d.geometry.rotate+=l;d.geometry.rotate%=360;d.update()};sozi.events.listen("documentready",f);h.addEventListener("resize",b,false)}());var sozi=sozi||{};(function(){var c=sozi.document=sozi.document||{},g=this,a=g.document,f="http://sozi.baierouge.fr",d={title:"Untitled",sequence:"0",hide:"true",clip:"true","timeout-enable":"false","timeout-ms":"5000","transition-duration-ms":"1000","transition-zoom-percent":"0","transition-profile":"linear"};c.frames=[];function h(j,i){var k=j.getAttributeNS(f,i);return k===""?d[i]:k}function b(){var j=a.getElementsByTagNameNS(f,"frame"),k=j.length,m,l,n;for(l=0;l<k;l+=1){m=a.getElementById(j[l].getAttributeNS(f,"refid"));if(m){n={geometry:sozi.display.getElementGeometry(m),title:h(j[l],"title"),sequence:parseInt(h(j[l],"sequence"),10),hide:h(j[l],"hide")==="true",timeoutEnable:h(j[l],"timeout-enable")==="true",timeoutMs:parseInt(h(j[l],"timeout-ms"),10),transitionDurationMs:parseInt(h(j[l],"transition-duration-ms"),10),transitionZoomPercent:parseInt(h(j[l],"transition-zoom-percent"),10),transitionProfile:sozi.animation.profiles[h(j[l],"transition-profile")||"linear"]};if(n.hide){m.setAttribute("visibility","hidden")}n.geometry.clip=h(j[l],"clip")==="true";c.frames.push(n)}}c.frames.sort(function(o,i){return o.sequence-i.sequence})}function e(){a.documentElement.removeAttribute("viewBox");b();sozi.events.fire("documentready")}g.addEventListener("load",e,false)}());var sozi=sozi||{};(function(){var a=sozi.location=sozi.location||{},e=this,c=false;a.getFrameIndex=function(){var g=e.location.hash?parseInt(e.location.hash.slice(1),10)-1:0;if(isNaN(g)||g<0){return 0}else{if(g>=sozi.document.frames.length){return sozi.document.frames.length-1}else{return g}}};function f(){var g=a.getFrameIndex();if(!c){sozi.player.moveToFrame(g)}c=false}function d(g){c=true;e.location.hash="#"+(g+1)}function b(){confLang();sozi.events.listen("framechange",d)}e.addEventListener("hashchange",f,false);e.addEventListener("load",b,false)}());</script> + <style + ns1:version="11.11-07001323" + id="sozi-style">#sozi-toc text{fill:#eff;font-family:Verdana,sans-serif;font-size:12pt}#sozi-toc text:hover{fill:#0cf;cursor:pointer}#sozi-toc text.sozi-toc-current{fill:#fa4}#sozi-toc-background{stroke:#222;stroke-opacity:.1;stroke-width:10;fill:#222;fill-opacity:.9}.sozi-toc-arrow{fill:#eff;fill-opacity:.75;stroke:none}.sozi-toc-arrow:hover{fill:#0cf}</style> + <ns1:frame + ns1:transition-profile="linear" + ns1:timeout-enable="false" + ns1:timeout-ms="5000" + ns1:transition-zoom-percent="0" + ns1:title="Intro" + ns1:clip="true" + ns1:hide="true" + ns1:transition-duration-ms="1000" + ns1:sequence="1" + ns1:refid="rect4591" /> + <ns1:frame + ns1:refid="rect8725" + ns1:sequence="2" + ns1:transition-duration-ms="1000" + ns1:hide="true" + ns1:clip="true" + ns1:title="under construction" + ns1:transition-zoom-percent="0" + ns1:timeout-ms="5000" + ns1:timeout-enable="false" + ns1:transition-profile="linear" /> + <ns1:frame + ns1:transition-profile="linear" + ns1:timeout-enable="false" + ns1:timeout-ms="5000" + ns1:transition-zoom-percent="0" + ns1:title="new" + ns1:clip="true" + ns1:hide="true" + ns1:transition-duration-ms="1000" + ns1:sequence="3" + ns1:refid="rect6444" /> + <ns1:frame + ns1:transition-profile="linear" + ns1:timeout-enable="false" + ns1:timeout-ms="5000" + ns1:transition-zoom-percent="0" + ns1:title="feedback" + ns1:clip="true" + ns1:hide="true" + ns1:transition-duration-ms="1000" + ns1:sequence="4" + ns1:refid="rect14204" /> +</svg>

1 0

r1766 - openfireauth
by Vicente J. Ruiz Jurado 17 Mar '12

17 Mar '12

Author: vjrj_ Date: 2012-03-17 22:01:21 +0100 (Sat, 17 Mar 2012) New Revision: 1766 Added: openfireauth/README Log: Added accounts and more improvements Added: openfireauth/README =================================================================== --- openfireauth/README (rev 0) +++ openfireauth/README 2012-03-17 21:01:21 UTC (rev 1766) @@ -0,0 +1,3 @@ +Build the jar with: + mvn assembly:assembly -DdescriptorId=jar-with-dependencies +put in /usr/share/openfire/lib/ \ No newline at end of file

1 0

r1765 - in openfireauth: . src/main/java/cc/kune/core/server/auth/openfire src/main/resources src/test/java/cc/kune/core/server/auth/openfire target
by Vicente J. Ruiz Jurado 17 Mar '12

17 Mar '12

Author: vjrj_ Date: 2012-03-17 21:59:43 +0100 (Sat, 17 Mar 2012) New Revision: 1765 Added: openfireauth/src/main/resources/wave-server.properties Modified: openfireauth/.classpath openfireauth/pom.xml openfireauth/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java openfireauth/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java openfireauth/target/ Log: Added accounts and more improvements Modified: openfireauth/.classpath =================================================================== --- openfireauth/.classpath 2012-03-15 00:10:53 UTC (rev 1764) +++ openfireauth/.classpath 2012-03-17 20:59:43 UTC (rev 1765) @@ -1,10 +1,21 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> - <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> - <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"/> - <classpathentry kind="output" path="target/classes"/> -</classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <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/protobuf/protobuf-java/2.3.0/protobuf-java-2.3.0.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"/> + <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/igniterealtime/openfire/3.7.0/openfire-3.7.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box/0.3.13/box-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/box-src/0.3.13/box-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/box-src/0.3.13/box-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model/0.3.13/model-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/model-src/0.3.13/model-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/model-src/0.3.13/model-src-0.3.13-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto/0.3.13/proto-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/proto-src/0.3.13/proto-src-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util/0.3.13/util-0.3.13.jar"/> + <classpathentry kind="var" path="M2_REPO/org/waveprotocol/util-src/0.3.13/util-src-0.3.13.jar" sourcepath="M2_REPO/org/waveprotocol/util-src/0.3.13/util-src-0.3.13-sources.jar"/> +</classpath> \ No newline at end of file Modified: openfireauth/pom.xml =================================================================== --- openfireauth/pom.xml 2012-03-15 00:10:53 UTC (rev 1764) +++ openfireauth/pom.xml 2012-03-17 20:59:43 UTC (rev 1765) @@ -4,13 +4,13 @@ <groupId>cc.kune</groupId> <artifactId>kune-openfireauth</artifactId> <version>0.0.1-SNAPSHOT</version> - <name>Kuen Openfire Auth Lib</name> + <name>Kune Openfire Auth Lib</name> <description>The jar generated, can be installed in /lib/ directory and allow to auth openfire users throw kune session tokens (see HybridAuthProvider)</description> <properties> <maven.compiler.source>1.6</maven.compiler.source> <maven.compiler.target>1.6</maven.compiler.target> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <wiab.version>0.3.12</wiab.version> + <wiab.version>0.3.13</wiab.version> </properties> <repositories> <repository> @@ -20,6 +20,16 @@ </repositories> <dependencies> <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + <version>r09</version> + </dependency> + <dependency> + <groupId>com.google.protobuf</groupId> + <artifactId>protobuf-java</artifactId> + <version>2.3.0</version> + </dependency> + <dependency> <groupId>org.waveprotocol</groupId> <artifactId>model</artifactId> <version>${wiab.version}</version> @@ -30,15 +40,69 @@ <version>${wiab.version}</version> </dependency> <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>box</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>box-src</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> <groupId>org.igniterealtime</groupId> <artifactId>openfire</artifactId> <version>3.7.0</version> </dependency> <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>proto</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>proto-src</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>4.9</version> <scope>test</scope> </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>util</artifactId> + <version>${wiab.version}</version> + </dependency> + <dependency> + <groupId>org.waveprotocol</groupId> + <artifactId>util-src</artifactId> + <version>${wiab.version}</version> + </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <archive> + <manifest> + <mainClass>cc.kune.core.server.auth.openfire.KuneAuthProvider</mainClass> + </manifest> + </archive> + <fileSets> + <fileSet> + <excludes> + <exclude> + ./wave-server.properties + </exclude> + </excludes> + </fileSet> + </fileSets> + </configuration> + </plugin> + </plugins> + </build> </project> \ No newline at end of file Modified: openfireauth/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java =================================================================== --- openfireauth/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java 2012-03-15 00:10:53 UTC (rev 1764) +++ openfireauth/src/main/java/cc/kune/core/server/auth/openfire/KuneAuthProvider.java 2012-03-17 20:59:43 UTC (rev 1765) @@ -3,9 +3,10 @@ import java.io.DataInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; +import java.io.InputStream; import java.io.ObjectInputStream; +import java.util.Properties; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -14,6 +15,10 @@ import org.jivesoftware.openfire.auth.InternalUnauthenticatedException; import org.jivesoftware.openfire.auth.UnauthorizedException; import org.jivesoftware.openfire.user.UserNotFoundException; +import org.waveprotocol.box.server.CoreSettings; +import org.waveprotocol.box.server.account.AccountData; +import org.waveprotocol.box.server.persistence.PersistenceException; +import org.waveprotocol.box.server.persistence.file.FileAccountStore; import org.waveprotocol.wave.model.wave.ParticipantId; public class KuneAuthProvider implements AuthProvider { @@ -44,58 +49,103 @@ } } + private static final String INCORRECT_USERNAME = "Incorrect username"; public static final Log LOG = LogFactory.getLog(KuneAuthProvider.class); - private static final String USER_NOT_LOGGED = "User not logged"; + private final FileAccountStore accountStore; + private final Properties prop; + public KuneAuthProvider() { + prop = new Properties(); + try { + final InputStream is = this.getClass().getClassLoader().getResourceAsStream( + "wave-server.properties"); + + // final String location = + // getClass().getProtectionDomain().getCodeSource().getLocation().toString(); + // LOG.info("Location: " + location); + // final String path = location.substring(5); + // final FileInputStream fis = new FileInputStream(new File(path + + // "wave-server.properties")); + prop.load(is); + } catch (final IOException e) { + LOG.error("Error openning property files", e); + } + final String acStoreLocation = getProp(CoreSettings.ACCOUNT_STORE_DIRECTORY); + LOG.warn("Account store location: " + acStoreLocation); + accountStore = new FileAccountStore(acStoreLocation); + } + @Override @SuppressWarnings("unused") - public void authenticate(final String username, final String token) throws UnauthorizedException, - ConnectionException, InternalUnauthenticatedException { + public void authenticate(final String username, final String passwdOrToken) + throws UnauthorizedException, ConnectionException, InternalUnauthenticatedException { try { - final File session = new File("/var/lib/kune/_sessions/" + token); - boolean logged = false; - if (session.exists()) { - final FileInputStream is = new FileInputStream(session); - final DataInputStream in = new DataInputStream(is); + final String accountName = username + ParticipantId.DOMAIN_PREFIX + + getProp(CoreSettings.WAVE_SERVER_DOMAIN); + // LOG.warn("Trying to check account " + accountName); + final AccountData account = accountStore.getAccount(ParticipantId.ofUnsafe(accountName)); + if (account.asHuman().getPasswordDigest().verify(passwdOrToken.toCharArray())) { + // Great ... authenticated + } else { + boolean logged = false; + final String sessionName = getProp(CoreSettings.SESSIONS_STORE_DIRECTORY) + File.separator + + passwdOrToken; + // LOG.warn("Session name: " + sessionName); + try { + final File session = new File(sessionName); + if (session.exists()) { + final FileInputStream is = new FileInputStream(session); + final DataInputStream in = new DataInputStream(is); - final String clusterId = in.readUTF(); - in.readUTF(); // nodeId - final long created = in.readLong(); - final long accessed = in.readLong(); - final int requests = in.readInt(); + final String clusterId = in.readUTF(); + in.readUTF(); // nodeId + final long created = in.readLong(); + final long accessed = in.readLong(); + final int requests = in.readInt(); - final int size = in.readInt(); - if (size > 0) { - final ClassLoadingObjectInputStream ois = new ClassLoadingObjectInputStream(in); - for (int i = 0; i < size; i++) { - final String key = ois.readUTF(); - try { - final Object value = ois.readObject(); - if (value instanceof ParticipantId) { - if (((ParticipantId) value).getAddress().startsWith(username + "@")) { - logged = true; - break; + final int size = in.readInt(); + if (size > 0) { + final ClassLoadingObjectInputStream ois = new ClassLoadingObjectInputStream(in); + for (int i = 0; i < size; i++) { + try { + final String key = ois.readUTF(); + final Object value = ois.readObject(); + if (value instanceof ParticipantId) { + if (((ParticipantId) value).getAddress().startsWith(username + "@")) { + // LOG.warn("Participation id found in session"); + logged = true; + break; + } + } + } catch (final ClassNotFoundException e) { + } catch (final IOException e) { + LOG.warn("Persisted in kune session unexpected object: " + e.getMessage()); } } - } catch (final ClassNotFoundException e) { - LOG.warn("Persisted in kune session unexpected object: " + e.getMessage()); + ois.close(); } + in.close(); + is.close(); + if (!logged) { + // LOG.warn("Participation id not found in session"); + throw new UnauthorizedException(INCORRECT_USERNAME); + } else { + // LOG.warn("Participation id found in session"); + // Great ... authenticated + } + } else { + // LOG.warn("Session file doesn't exists"); + throw new UnauthorizedException(USER_NOT_LOGGED); } - ois.close(); + } catch (final IOException e) { + LOG.warn("File session io error", e); + throw new UnauthorizedException(USER_NOT_LOGGED, e); } - in.close(); - is.close(); - if (!logged) { - throw new UnauthorizedException("Incorrect username"); - } - } else { - throw new UnauthorizedException(USER_NOT_LOGGED); } - } catch (final FileNotFoundException e) { - throw new UnauthorizedException(USER_NOT_LOGGED, e); - } catch (final IOException e) { - throw new UnauthorizedException(USER_NOT_LOGGED, e); + } catch (final PersistenceException e) { + LOG.warn("File session persistence error"); + throw new UnauthorizedException(INCORRECT_USERNAME, e); } } @@ -111,6 +161,10 @@ throw new UnsupportedOperationException(); } + private String getProp(final String key) { + return (String) prop.get(key); + } + @Override public boolean isDigestSupported() { return false; Added: openfireauth/src/main/resources/wave-server.properties =================================================================== --- openfireauth/src/main/resources/wave-server.properties (rev 0) +++ openfireauth/src/main/resources/wave-server.properties 2012-03-17 20:59:43 UTC (rev 1765) @@ -0,0 +1,112 @@ +# Core Configuration for the Wave in a Box server +# + +# Domain name of the wave server +# Default value: local.net (without .domain zone some things will be broken) +wave_server_domain = localhost + +# A comma separated list of address on which to listen for connections. +# Each address is a comma separated host:port pair. +# Default value: localhost:9898 +http_frontend_public_address = localhost:8888 + +# Default value: values passed to http_frontend_public_address. +http_frontend_addresses = ${http_frontend_public_address} + +# A comma separated list of webApp source directories +# Default value: ./war +resource_bases = target/kune-0.1.0-SNAPSHOT/,src/main/webapp/ + +### Server-specific variables +### + +# Settings for the different persistence stores. Currently supported: memory, file, mongodb +signer_info_store_type = file + +# The location where signer info certificate data is stored on disk. This should be changed. +# Note: This is only used when using the file signer info store. It is ignored +# for other data store types. +# Default value: _certificates +signer_info_store_directory = /var/lib/kune/_certificates + +# Currently supported attachment types: mongodb, disk +# Default value: disk +attachment_store_type = disk + +# The location where attachments are stored on disk. This should be changed. +# Note: This is only used when using the disk attachment store. It is ignored +# for other data store types. +attachment_store_directory = /var/lib/kune/_attachments + +# Currently supported account store types: fake, memory, file, mongodb +account_store_type = file + +# The location where accounts are stored on disk. This should be changed. +# Note: This is only used when using the file account store. It is ignored +# for other data store types. +account_store_directory = /var/lib/kune/_accounts + +# Currently supported delta store types: memory, file +delta_store_type = file + +# The location where deltas are stored on disk. This should be changed. +# Note: This is only used when using the file delta store. It is ignored +# for other data store types. +# Default value: _deltas +delta_store_directory = /var/lib/kune/_deltas + +# The location where user sessions are persisted on disk. This allow to restore user sessions +# between restarts. +# Default value: _sessions +sessions_store_directory = /var/lib/kune/_sessions + +# Set false to use raw WebSockets instead of Socket.IO (still a bit experimental) in the webclient +# Default value: true +use_socketio = true + +# Note: the default value for admin is an invalid user id that cannot be registered. +# To become an admin: Register a user and set its address as the value below. +# Admin has a privilege to change passwords of other users using an agent robot. +# Default value: @${wave_server_domain} +admin_user = @localhost + +# The wave id of the welcome template wave. (Without domain, for example: w+Fxjs_-ZPmmA). +# If filled in then a copy of this wave (actually only the root blip) will be +# automatically added to the inbox of every new user. +# Default value: "" (empty) +welcome_wave_id = + +# Thread counts +#The number of threads to listen on wavelet updates. Default value: 1 +listener_executor_thread_count = 1 +#The number of threads for loading wavelets. Default value: 1 +wavelet_load_executor_thread_count = 1 +#The number of threads to persist deltas. Default value: 1 +delta_persist_executor_thread_count = 1 + +# To enable federation, edit the server.federation.config file and include it here. +#include = server.federation.config + +# These two parameters MUST appear in this file AFTER the above include of the +# federation config file. This is necesary so that the federation config file +# can override these two values. + +# Set true to disable the verification of signed deltas +waveserver_disable_verification = true + +# Set true to disable the verification of signers (certificates) +waveserver_disable_signer_verification = true + +# Set true to prevent anyone registering on your server. +# When true, only the admin user can use the RegistrationRobot to add new accounts +# Default value: false +disable_registration = false + +# Enable SSL for all address/port combinations listed (makes the next 2 settings non-optional) +enable_ssl = false + +# Path to keystore containg the ssl certificates to server +ssl_keystore_path = src/main/resources/wiab.ks + +#Password to the keystore +ssl_keystore_password = fafafa Modified: openfireauth/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java =================================================================== --- openfireauth/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java 2012-03-15 00:10:53 UTC (rev 1764) +++ openfireauth/src/test/java/cc/kune/core/server/auth/openfire/KuneAuthProviderTest.java 2012-03-17 20:59:43 UTC (rev 1765) @@ -11,7 +11,32 @@ public void maintest() throws UnauthorizedException, ConnectionException, InternalUnauthenticatedException { final KuneAuthProvider auth = new KuneAuthProvider(); + auth.authenticate("admin", "easyeasy"); auth.authenticate("vjrj", "6rzonw7n39p01td1p0rfujvu3"); auth.authenticate("admin", "x04c5575ycquu96k4kajldaq"); + // Only usersession!!! + // auth.authenticate("vjrj", "1006oh5apswj81tl4vcsk1gqpj"); } + + @Test(expected = UnauthorizedException.class) + public void wrongFileSession() throws UnauthorizedException, ConnectionException, + InternalUnauthenticatedException { + final KuneAuthProvider auth = new KuneAuthProvider(); + auth.authenticate("admin", "6rzonw7n39p01td1p0rfujvu3a"); + } + + @Test(expected = UnauthorizedException.class) + public void wrongPass() throws UnauthorizedException, ConnectionException, + InternalUnauthenticatedException { + final KuneAuthProvider auth = new KuneAuthProvider(); + auth.authenticate("admin", "easyeasy2"); + } + + @Test(expected = UnauthorizedException.class) + public void wrongSession() throws UnauthorizedException, ConnectionException, + InternalUnauthenticatedException { + final KuneAuthProvider auth = new KuneAuthProvider(); + auth.authenticate("admin", "6rzonw7n39p01td1p0rfujvu3"); + } + } Property changes on: openfireauth/target ___________________________________________________________________ Name: svn:ignore - classes kune-openfireauth-0.0.1-SNAPSHOT.jar maven-archiver mvn-eclipse-cache.properties surefire-reports test-classes + archive-tmp *jar classes kune-openfireauth-0.0.1-SNAPSHOT.jar maven-archiver mvn-eclipse-cache.properties surefire-reports test-classes

1 0

← Newer
1
2
3
4
5
6
7
8
9
Older →