[kune-commits] r1835 - in trunk/src: main/java/cc/kune/core/client main/java/cc/kune/core/client/actions main/java/cc/kune/core/client/auth main/java/cc/kune/core/client/groups/newgroup main/java/cc/kune/core/client/state main/java/cc/kune/core/client/state/impl main/java/cc/kune/gspace/client/actions main/java/cc/kune/gspace/client/viewers main/webapp/tutorials test/java/cc/kune/core/client/state/impl
Vicente J. Ruiz Jurado
vjrj_ at ourproject.org
Tue Apr 10 20:51:59 CEST 2012
Author: vjrj_
Date: 2012-04-10 20:51:56 +0200 (Tue, 10 Apr 2012)
New Revision: 1835
Modified:
trunk/src/main/java/cc/kune/core/client/CoreParts.java
trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java
trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java
trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java
trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java
trunk/src/main/java/cc/kune/core/client/state/TokenUtils.java
trunk/src/main/java/cc/kune/core/client/state/impl/StateManagerDefault.java
trunk/src/main/java/cc/kune/gspace/client/actions/ShowHelpContainerEvent.java
trunk/src/main/java/cc/kune/gspace/client/actions/TutorialContainerBtn.java
trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java
trunk/src/main/java/cc/kune/gspace/client/viewers/TutorialViewer.java
trunk/src/main/webapp/tutorials/barters.svg
trunk/src/main/webapp/tutorials/blogs.svg
trunk/src/main/webapp/tutorials/chats.svg
trunk/src/main/webapp/tutorials/docs.svg
trunk/src/main/webapp/tutorials/events.svg
trunk/src/main/webapp/tutorials/lists.svg
trunk/src/main/webapp/tutorials/tasks.svg
trunk/src/test/java/cc/kune/core/client/state/impl/StateManagerDefaultTest.java
Log:
NEW - # 193: Add a tool intro tutorial instead of the sample contents
http://kune.ourproject.org/issues/ticket/193
Modified: trunk/src/main/java/cc/kune/core/client/CoreParts.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/CoreParts.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/core/client/CoreParts.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -107,6 +107,12 @@
register.get().doRegister();
}
});
+ tokenListener.put(SiteTokens.TUTORIAL, new HistoryTokenAuthNotNeededCallback() {
+ @Override
+ public void onHistoryToken(final String token) {
+ // Do nothing (move SMD part here?)
+ }
+ });
tokenListener.put(SiteTokens.NEW_GROUP,
new HistoryTokenMustBeAuthCallback(i18n.t(CoreMessages.REGISTER_TO_CREATE_A_GROUP)) {
@Override
@@ -185,7 +191,6 @@
}
}
});
-
}
});
tokenListener.put(SiteTokens.RESET_PASSWD, new HistoryTokenAuthNotNeededCallback() {
Modified: trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/core/client/actions/ActionRegistryByType.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -29,7 +29,6 @@
import cc.kune.common.client.actions.ui.descrip.GuiActionDescCollection;
import cc.kune.common.client.actions.ui.descrip.GuiActionDescProviderCollection;
import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip;
-import cc.kune.common.client.log.Log;
import cc.kune.core.client.registry.IdGenerator;
import cc.kune.core.shared.domain.ContentStatus;
import cc.kune.core.shared.domain.utils.AccessRights;
@@ -123,7 +122,8 @@
final GuiActionDescrip descrip = descripProv.get();
final AbstractAction action = descrip.getAction();
if (action instanceof RolAction) {
- Log.debug("Must add action?: " + action + ", isLogged: " + isLogged + ", r: " + rights);
+ // Log.debug("Must add action?: " + action + ", isLogged: " + isLogged +
+ // ", r: " + rights);
if (mustAdd((RolAction) action, isLogged, rights)) {
add(collection, descrip, targetItem);
}
Modified: trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/core/client/auth/RegisterPresenter.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -204,8 +204,7 @@
new Timer() {
@Override
public void run() {
- ShowHelpContainerEvent.fire(getEventBus(),
- session.getCurrentStateToken().getTool());
+ ShowHelpContainerEvent.fire(getEventBus());
}
}.schedule(2000);
}
Modified: trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -212,7 +212,7 @@
new Timer() {
@Override
public void run() {
- ShowHelpContainerEvent.fire(getEventBus(), state.getStateToken().getTool());
+ ShowHelpContainerEvent.fire(getEventBus());
}
}.schedule(2000);
}
Modified: trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/core/client/state/SiteTokens.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -41,6 +41,7 @@
public final static String SIGN_IN = "signin";
public final static String SUBTITLES = "sub";
public final static String TRANSLATE = "translate";
+ public static final String TUTORIAL = "tutorial";
public final static String VERIFY_EMAIL = "verifyemail";
public final static String WAVE_INBOX = "inbox";
@@ -51,6 +52,7 @@
reserverdWords.add(HOME);
reserverdWords.add(NEW_GROUP);
reserverdWords.add(PREVIEW);
+ reserverdWords.add(TUTORIAL);
reserverdWords.add(REGISTER);
reserverdWords.add(SIGN_IN);
reserverdWords.add(TRANSLATE);
Modified: trunk/src/main/java/cc/kune/core/client/state/TokenUtils.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/TokenUtils.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/core/client/state/TokenUtils.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -45,4 +45,8 @@
compose(Base64Utils.toBase64(title.getBytes()), Base64Utils.toBase64(description.getBytes()),
redirect));
}
+
+ public static String tutorial(final String token) {
+ return addRedirect(SiteTokens.TUTORIAL, token);
+ }
}
Modified: trunk/src/main/java/cc/kune/core/client/state/impl/StateManagerDefault.java
===================================================================
--- trunk/src/main/java/cc/kune/core/client/state/impl/StateManagerDefault.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/core/client/state/impl/StateManagerDefault.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -62,6 +62,8 @@
import cc.kune.core.shared.domain.utils.StateToken;
import cc.kune.core.shared.dto.SocialNetworkDataDTO;
import cc.kune.core.shared.dto.StateAbstractDTO;
+import cc.kune.gspace.client.actions.ShowHelpContainerEvent;
+import cc.kune.gspace.client.viewers.TutorialViewer;
import com.google.gwt.event.logical.shared.ValueChangeEvent;
import com.google.gwt.event.logical.shared.ValueChangeHandler;
@@ -89,17 +91,20 @@
private final Provider<SignIn> signIn;
private final SiteTokenListeners siteTokens;
private final TokenMatcher tokenMatcher;
+ private final Provider<TutorialViewer> tutorialViewer;
@Inject
public StateManagerDefault(final ContentCache contentProvider, final Session session,
final HistoryWrapper history, final TokenMatcher tokenMatcher, final EventBus eventBus,
- final SiteTokenListeners siteTokens, final Provider<SignIn> signIn) {
+ final SiteTokenListeners siteTokens, final Provider<SignIn> signIn,
+ final Provider<TutorialViewer> tutorialViewer) {
this.tokenMatcher = tokenMatcher;
this.eventBus = eventBus;
this.contentCache = contentProvider;
this.session = session;
this.history = history;
this.signIn = signIn;
+ this.tutorialViewer = tutorialViewer;
this.previousGroupToken = null;
this.previousHash = null;
this.resumedHistoryToken = null;
@@ -362,6 +367,17 @@
SpaceConfEvent.fire(eventBus, Space.groupSpace, sndToken);
SpaceConfEvent.fire(eventBus, Space.publicSpace, TokenUtils.preview(sndToken));
getContent(new StateToken(sndToken));
+ // Don't continue
+ return;
+ } else if (firstToken.equals(SiteTokens.TUTORIAL)) {
+ getContent(new StateToken(sndToken), true, new OnFinishGetContent() {
+ @Override
+ public void finish() {
+ ShowHelpContainerEvent.fire(eventBus);
+ }
+ });
+ // Don't continue
+ return;
} else {
final HistoryTokenCallback tokenWithRedirect = siteTokens.get(firstToken);
if (tokenWithRedirect != null) {
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/ShowHelpContainerEvent.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/ShowHelpContainerEvent.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/ShowHelpContainerEvent.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -36,18 +36,15 @@
private static final Type<ShowHelpContainerHandler> TYPE = new Type<ShowHelpContainerHandler>();
- public static void fire(final HasHandlers source, final String tool) {
- source.fireEvent(new ShowHelpContainerEvent(tool));
+ public static void fire(final HasHandlers source) {
+ source.fireEvent(new ShowHelpContainerEvent());
}
public static Type<ShowHelpContainerHandler> getType() {
return TYPE;
}
- private final String tool;
-
- public ShowHelpContainerEvent(final String tool) {
- this.tool = tool;
+ public ShowHelpContainerEvent() {
}
@Override
@@ -65,10 +62,6 @@
return TYPE;
}
- public String getTool() {
- return tool;
- }
-
@Override
public int hashCode() {
return super.hashCode();
Modified: trunk/src/main/java/cc/kune/gspace/client/actions/TutorialContainerBtn.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/actions/TutorialContainerBtn.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/gspace/client/actions/TutorialContainerBtn.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -49,7 +49,7 @@
@Override
public void actionPerformed(final ActionEvent event) {
- ShowHelpContainerEvent.fire(bus, session.getCurrentStateToken().getTool());
+ ShowHelpContainerEvent.fire(bus);
}
}
Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/AbstractFolderViewerPanel.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -181,6 +181,6 @@
resizeTutorialFrame();
docContainer.add(tutorialViewer);
docContainer.showWidget(tutorialViewer);
- tutorialViewer.setTutorialCloseHandler(onTutorialClose);
+ tutorialViewer.setOnTutorialCloseHandler(onTutorialClose);
}
}
Modified: trunk/src/main/java/cc/kune/gspace/client/viewers/TutorialViewer.java
===================================================================
--- trunk/src/main/java/cc/kune/gspace/client/viewers/TutorialViewer.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/java/cc/kune/gspace/client/viewers/TutorialViewer.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -109,7 +109,7 @@
frame.setUrl(FileConstants.TUTORIALS_PREFIX + tool + ".svg" + "#" + currentLang);
}
- public void setTutorialCloseHandler(final OnTutorialClose onTutorialClose) {
+ public void setOnTutorialCloseHandler(final OnTutorialClose onTutorialClose) {
this.onTutorialClose = onTutorialClose;
}
Modified: trunk/src/main/webapp/tutorials/barters.svg
===================================================================
--- trunk/src/main/webapp/tutorials/barters.svg 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/webapp/tutorials/barters.svg 2012-04-10 18:51:56 UTC (rev 1835)
@@ -25,7 +25,7 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.5916065"
+ inkscape:zoom="1.6856453"
inkscape:cx="243.10117"
inkscape:cy="1308.5714"
inkscape:document-units="px"
@@ -398,8 +398,7 @@
inkscape:groupmode="layer"
id="layer6"
inkscape:label="graphics"
- style="display:inline"
- sodipodi:insensitive="true">
+ style="display:inline">
<g
transform="matrix(1.5625,0,0,1.5636219,145.37648,136.864)"
id="fullscreen_x5F_exit_x5F_32x32">
@@ -409,22 +408,22 @@
style="fill:#231f20"
transform="matrix(-1,0,0,1,52,0)"
id="polygon8"
- points="29.172,32 32,29.172 27.414,24.586 32,20 20,20 20,32 24.586,27.414 " />
+ points="27.414,24.586 32,20 20,20 20,32 24.586,27.414 29.172,32 32,29.172 " />
<polygon
style="fill:#231f20"
transform="matrix(-1,0,0,-1,32,12)"
id="polygon10"
- points="12,12 12,0 7.414,4.586 2.875,0.043 0.047,2.871 4.586,7.414 0,12 " />
+ points="7.414,4.586 2.875,0.043 0.047,2.871 4.586,7.414 0,12 12,12 12,0 " />
<polygon
transform="matrix(1,0,0,-1,0,52)"
style="fill:#231f20"
id="polygon12"
- points="12,32 12,20 0,20 4.586,24.586 0,29.172 2.828,32 7.414,27.414 " />
+ points="0,20 4.586,24.586 0,29.172 2.828,32 7.414,27.414 12,32 12,20 " />
<polygon
style="fill:#231f20"
transform="translate(-20,0)"
id="polygon14"
- points="24.586,4.586 20,0 20,12 32,12 27.414,7.414 31.961,2.871 29.133,0.043 " />
+ points="20,12 32,12 27.414,7.414 31.961,2.871 29.133,0.043 24.586,4.586 20,0 " />
</g>
</g>
<path
@@ -1125,11 +1124,11 @@
sodipodi:cy="3.6610169"
sodipodi:rx="5.1525426"
sodipodi:ry="5.1525426"
- d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z"
+ d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z"
transform="matrix(0.97867296,0,0,0.97867295,24.91469,3.3744077)" />
<path
transform="matrix(0.97867296,0,0,0.97867295,24.91469,21.374408)"
- d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z"
+ d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z"
sodipodi:ry="5.1525426"
sodipodi:rx="5.1525426"
sodipodi:cy="3.6610169"
@@ -1145,7 +1144,7 @@
sodipodi:cy="3.6610169"
sodipodi:rx="5.1525426"
sodipodi:ry="5.1525426"
- d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z"
+ d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z"
transform="matrix(0.97867296,0,0,0.97867295,42.914691,12.417062)" />
<path
style="fill:none;stroke:#231f20;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
Modified: trunk/src/main/webapp/tutorials/blogs.svg
===================================================================
--- trunk/src/main/webapp/tutorials/blogs.svg 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/webapp/tutorials/blogs.svg 2012-04-10 18:51:56 UTC (rev 1835)
@@ -25,7 +25,7 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.9641555"
+ inkscape:zoom="1.6856453"
inkscape:cx="243.10117"
inkscape:cy="1308.5714"
inkscape:document-units="px"
@@ -33,8 +33,8 @@
showgrid="false"
showborder="true"
inkscape:showpageshadow="false"
- inkscape:window-width="1280"
- inkscape:window-height="776"
+ inkscape:window-width="1080"
+ inkscape:window-height="1868"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1" />
@@ -439,7 +439,7 @@
sodipodi:nodetypes="ccccsccc" />
<path
transform="matrix(5.1206514,0,0,5.1193287,442.04803,71.008174)"
- d="m 21.480664,21.282667 a 2.7403326,2.7403326 0 1 1 -5.480665,0 2.7403326,2.7403326 0 1 1 5.480665,0 z"
+ d="m 21.480664,21.282667 c 0,1.513444 -1.226888,2.740333 -2.740332,2.740333 -1.513444,0 -2.740333,-1.226889 -2.740333,-2.740333 0,-1.513444 1.226889,-2.740332 2.740333,-2.740332 1.513444,0 2.740332,1.226888 2.740332,2.740332 z"
sodipodi:ry="2.7403326"
sodipodi:rx="2.7403326"
sodipodi:cy="21.282667"
@@ -546,7 +546,7 @@
sodipodi:nodetypes="ccccsccc" />
<path
transform="matrix(5.1206514,0,0,5.1193287,81.774111,45.386804)"
- d="m 21.480664,21.282667 a 2.7403326,2.7403326 0 1 1 -5.480665,0 2.7403326,2.7403326 0 1 1 5.480665,0 z"
+ d="m 21.480664,21.282667 c 0,1.513444 -1.226888,2.740333 -2.740332,2.740333 -1.513444,0 -2.740333,-1.226889 -2.740333,-2.740333 0,-1.513444 1.226889,-2.740332 2.740333,-2.740332 1.513444,0 2.740332,1.226888 2.740332,2.740332 z"
sodipodi:ry="2.7403326"
sodipodi:rx="2.7403326"
sodipodi:cy="21.282667"
@@ -589,7 +589,7 @@
sodipodi:cy="21.282667"
sodipodi:rx="2.7403326"
sodipodi:ry="2.7403326"
- d="m 21.480664,21.282667 a 2.7403326,2.7403326 0 1 1 -5.480665,0 2.7403326,2.7403326 0 1 1 5.480665,0 z"
+ d="m 21.480664,21.282667 c 0,1.513444 -1.226888,2.740333 -2.740332,2.740333 -1.513444,0 -2.740333,-1.226889 -2.740333,-2.740333 0,-1.513444 1.226889,-2.740332 2.740333,-2.740332 1.513444,0 2.740332,1.226888 2.740332,2.740332 z"
transform="matrix(5.1206514,0,0,5.1193287,81.774111,45.386804)" />
</g>
</g>
@@ -5519,7 +5519,7 @@
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/proyectos/movecommons/images/colors-added.png"
transform="matrix(0,-1.6074117,-1.472652,0,4373.6108,999.18218)"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
sodipodi:ry="6.4900241"
sodipodi:rx="5.9459252"
sodipodi:cy="1351.6404"
@@ -5567,7 +5567,7 @@
sodipodi:cy="1351.6404"
sodipodi:rx="5.9459252"
sodipodi:ry="6.4900241"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
transform="matrix(0,-1.6074117,-1.472652,0,4373.6108,999.18218)"
inkscape:export-filename="/home/vjrj/proyectos/movecommons/images/colors-added.png"
inkscape:export-xdpi="90"
@@ -5603,7 +5603,7 @@
sodipodi:cy="1351.6404"
sodipodi:rx="5.9459252"
sodipodi:ry="6.4900241"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
transform="matrix(1.0848531,0,0,0.99393348,2923.6547,371.109)" />
<path
sodipodi:nodetypes="cc"
@@ -5616,7 +5616,7 @@
inkscape:connector-curvature="0" />
<path
transform="matrix(1.0848531,0,0,0.99393348,2923.6547,371.109)"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
sodipodi:ry="6.4900241"
sodipodi:rx="5.9459252"
sodipodi:cy="1351.6404"
@@ -5638,7 +5638,7 @@
inkscape:connector-curvature="0" />
<path
transform="matrix(1.0848531,0,0,0.99393348,2923.6547,371.109)"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
sodipodi:ry="6.4900241"
sodipodi:rx="5.9459252"
sodipodi:cy="1351.6404"
@@ -5669,7 +5669,7 @@
sodipodi:cy="1351.6404"
sodipodi:rx="5.9459252"
sodipodi:ry="6.4900241"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
transform="matrix(1.0848531,0,0,0.99393348,2923.6547,371.109)" />
<path
inkscape:connector-curvature="0"
@@ -5685,7 +5685,7 @@
inkscape:export-xdpi="90"
inkscape:export-filename="/home/vjrj/Desktop/disenyo/ac.icons-0.2.png"
transform="matrix(1.0293155,-0.42883249,0.39288082,0.9430216,2331.4074,249.53804)"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
sodipodi:ry="6.4900241"
sodipodi:rx="5.9459252"
sodipodi:cy="1351.6404"
@@ -5715,7 +5715,7 @@
sodipodi:cy="1351.6404"
sodipodi:rx="5.9459252"
sodipodi:ry="6.4900241"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
transform="matrix(1.0293155,-0.42883249,0.39288082,0.9430216,2331.4295,249.53804)"
inkscape:export-filename="/home/vjrj/Desktop/disenyo/ac.icons-0.2.png"
inkscape:export-xdpi="90"
@@ -5756,7 +5756,7 @@
sodipodi:cy="1351.6404"
sodipodi:rx="5.9459252"
sodipodi:ry="6.4900241"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
transform="matrix(1.0848538,0,0,0.99390488,2905.3819,371.14766)" />
<path
style="color:#000000;fill:none;stroke:#000000;stroke-width:0.94606751;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"
@@ -5823,7 +5823,7 @@
inkscape:connector-curvature="0" />
<path
transform="matrix(1.0848538,0,0,0.99390488,2905.3819,371.14766)"
- d="m -438.01651,1351.6404 a 5.9459252,6.4900241 0 1 1 -11.89185,0 5.9459252,6.4900241 0 1 1 11.89185,0 z"
+ d="m -438.01651,1351.6404 c 0,3.5843 -2.66208,6.49 -5.94592,6.49 -3.28385,0 -5.94593,-2.9057 -5.94593,-6.49 0,-3.5844 2.66208,-6.49 5.94593,-6.49 3.28384,0 5.94592,2.9056 5.94592,6.49 z"
sodipodi:ry="6.4900241"
sodipodi:rx="5.9459252"
sodipodi:cy="1351.6404"
@@ -5997,7 +5997,7 @@
sodipodi:cy="21.282667"
sodipodi:rx="2.7403326"
sodipodi:ry="2.7403326"
- d="m 21.480664,21.282667 a 2.7403326,2.7403326 0 1 1 -5.480665,0 2.7403326,2.7403326 0 1 1 5.480665,0 z"
+ d="m 21.480664,21.282667 c 0,1.513444 -1.226888,2.740333 -2.740332,2.740333 -1.513444,0 -2.740333,-1.226889 -2.740333,-2.740333 0,-1.513444 1.226889,-2.740332 2.740333,-2.740332 1.513444,0 2.740332,1.226888 2.740332,2.740332 z"
transform="matrix(5.1206514,0,0,5.1193287,81.774111,45.386804)" />
</g>
</g>
@@ -6028,7 +6028,7 @@
sodipodi:nodetypes="ccccsccc" />
<path
transform="matrix(5.1206514,0,0,5.1193287,81.774111,45.386804)"
- d="m 21.480664,21.282667 a 2.7403326,2.7403326 0 1 1 -5.480665,0 2.7403326,2.7403326 0 1 1 5.480665,0 z"
+ d="m 21.480664,21.282667 c 0,1.513444 -1.226888,2.740333 -2.740332,2.740333 -1.513444,0 -2.740333,-1.226889 -2.740333,-2.740333 0,-1.513444 1.226889,-2.740332 2.740333,-2.740332 1.513444,0 2.740332,1.226888 2.740332,2.740332 z"
sodipodi:ry="2.7403326"
sodipodi:rx="2.7403326"
sodipodi:cy="21.282667"
Modified: trunk/src/main/webapp/tutorials/chats.svg
===================================================================
--- trunk/src/main/webapp/tutorials/chats.svg 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/webapp/tutorials/chats.svg 2012-04-10 18:51:56 UTC (rev 1835)
@@ -25,7 +25,7 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.5916065"
+ inkscape:zoom="1.6856453"
inkscape:cx="243.10117"
inkscape:cy="1308.5714"
inkscape:document-units="px"
@@ -402,11 +402,11 @@
sodipodi:cy="3.6610169"
sodipodi:rx="5.1525426"
sodipodi:ry="5.1525426"
- d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z"
+ d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z"
transform="matrix(1.7017328,0,0,1.7017328,109.33073,517.00513)" />
<path
transform="matrix(1.7017328,0,0,1.7017328,109.33073,548.30382)"
- d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z"
+ d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z"
sodipodi:ry="5.1525426"
sodipodi:rx="5.1525426"
sodipodi:cy="3.6610169"
@@ -422,7 +422,7 @@
sodipodi:cy="3.6610169"
sodipodi:rx="5.1525426"
sodipodi:ry="5.1525426"
- d="m -13.152542,3.6610169 a 5.1525426,5.1525426 0 1 1 -10.305085,0 5.1525426,5.1525426 0 1 1 10.305085,0 z"
+ d="m -13.152542,3.6610169 c 0,2.8456707 -2.306872,5.1525426 -5.152542,5.1525426 -2.845671,0 -5.152543,-2.3068719 -5.152543,-5.1525426 0,-2.84567065 2.306872,-5.1525426 5.152543,-5.1525426 2.84567,0 5.152542,2.30687195 5.152542,5.1525426 z"
transform="matrix(1.7017328,0,0,1.7017328,140.62945,532.72866)" />
<path
style="fill:none;stroke:#231f20;stroke-width:6.95526648;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
Modified: trunk/src/main/webapp/tutorials/docs.svg
===================================================================
--- trunk/src/main/webapp/tutorials/docs.svg 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/webapp/tutorials/docs.svg 2012-04-10 18:51:56 UTC (rev 1835)
@@ -25,11 +25,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.311261"
+ inkscape:zoom="1.3887358"
inkscape:cx="292.56466"
inkscape:cy="1317.1764"
inkscape:document-units="px"
- inkscape:current-layer="layer5"
+ inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1080"
inkscape:window-height="1868"
@@ -12752,307 +12752,10 @@
</g>
<g
inkscape:groupmode="layer"
- id="layer3"
- inkscape:label="en-old"
- style="display:none"
- transform="translate(0,435.8268)"
- sodipodi:insensitive="true">
- <text
- xml:space="preserve"
- style="font-size:45.60454559px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#782121;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 Bold"
- x="125.833"
- y="93.220833"
- id="text3124"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- id="tspan3126"
- x="125.833"
- y="93.220833">en</tspan></text>
- <g
- style="font-size:2.41406918px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;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"
- id="text5604">
- <path
- d="m 608.63485,562.3761 c -0.0177,-0.0579 -0.0378,-0.11749 -0.0604,-0.17864 -0.0209,-0.0612 -0.0418,-0.12232 -0.0628,-0.18347 l -0.6518,0 c -0.0209,0.0611 -0.0426,0.12231 -0.0652,0.18347 -0.0209,0.0611 -0.0402,0.1207 -0.0579,0.17864 l -0.39108,0 c 0.0628,-0.18025 0.12232,-0.34682 0.17865,-0.49971 0.0563,-0.15289 0.11104,-0.29693 0.16415,-0.43212 0.0547,-0.13519 0.10783,-0.26313 0.15933,-0.38384 0.0531,-0.12231 0.10783,-0.2414 0.16416,-0.35728 l 0.35969,0 c 0.0547,0.11588 0.10864,0.23497 0.16175,0.35728 0.0531,0.12071 0.10621,0.24865 0.15933,0.38384 0.0547,0.13519 0.11024,0.27923 0.16657,0.43212 0.0563,0.15289 0.11587,0.31946 0.17864,0.49971 l -0.40315,0 m -0.45143,-1.29394 c -0.008,0.0241 -0.0201,0.0571 -0.0362,0.099 -0.0161,0.0418 -0.0346,0.0901 -0.0555,0.14485 -0.0209,0.0547 -0.0443,0.11507 -0.07,0.18105 -0.0241,0.066 -0.0491,0.13519 -0.0748,0.20761 l 0.47557,0 c -0.0258,-0.0724 -0.0507,-0.14162 -0.0748,-0.20761 -0.0241,-0.066 -0.0475,-0.12633 -0.07,-0.18105 -0.0209,-0.0547 -0.0394,-0.103 -0.0555,-0.14485 -0.0161,-0.0418 -0.029,-0.0748 -0.0386,-0.099"
- style="font-weight:bold;marker:none"
- id="path12955"
- inkscape:connector-curvature="0" />
- <path
- d="m 610.04395,561.73154 c 0,-0.23175 -0.0853,-0.34762 -0.25589,-0.34762 -0.037,0 -0.074,0.005 -0.11105,0.0145 -0.0354,0.01 -0.0644,0.0217 -0.0869,0.0362 l 0,0.65421 c 0.0177,0.003 0.0402,0.006 0.0676,0.01 0.0274,0.002 0.0571,0.002 0.0893,0.002 0.0982,10e-6 0.1722,-0.0338 0.22209,-0.10139 0.0499,-0.0676 0.0748,-0.15691 0.0748,-0.26796 m 0.36694,0.01 c -10e-6,0.10139 -0.0153,0.19312 -0.0459,0.2752 -0.029,0.0821 -0.0716,0.15209 -0.12795,0.21003 -0.0563,0.0579 -0.12553,0.103 -0.20761,0.13518 -0.0821,0.0306 -0.17542,0.0459 -0.28003,0.0459 -0.0435,0 -0.0893,-0.002 -0.1376,-0.007 -0.0467,-0.003 -0.0934,-0.008 -0.14002,-0.0145 -0.0451,-0.006 -0.0885,-0.0137 -0.13036,-0.0217 -0.0418,-0.01 -0.0789,-0.0193 -0.11104,-0.029 l 0,-1.77434 0.35969,-0.0579 0,0.63249 c 0.0402,-0.0177 0.0821,-0.0314 0.12553,-0.041 0.0435,-0.01 0.0901,-0.0145 0.14002,-0.0145 0.0901,0 0.16979,0.0161 0.23899,0.0483 0.0692,0.0306 0.12714,0.0748 0.17382,0.13278 0.0467,0.0579 0.0821,0.12795 0.10622,0.21002 0.0241,0.0805 0.0362,0.1706 0.0362,0.27038"
- style="font-weight:bold;marker:none"
- id="path12957"
- inkscape:connector-curvature="0" />
- <path
- d="m 611.87506,561.73878 c 0,0.0998 -0.0145,0.19152 -0.0435,0.27521 -0.029,0.0821 -0.0708,0.15289 -0.12553,0.21244 -0.0547,0.0579 -0.1207,0.103 -0.19795,0.13518 -0.0756,0.0322 -0.16094,0.0483 -0.25589,0.0483 -0.0934,0 -0.17864,-0.0161 -0.25589,-0.0483 -0.0756,-0.0322 -0.14083,-0.0773 -0.19554,-0.13518 -0.0547,-0.0596 -0.0974,-0.13036 -0.12795,-0.21244 -0.0306,-0.0837 -0.0459,-0.17542 -0.0459,-0.27521 0,-0.0998 0.0153,-0.19071 0.0459,-0.27279 0.0322,-0.0821 0.0756,-0.15208 0.13036,-0.21002 0.0563,-0.0579 0.12231,-0.103 0.19795,-0.13519 0.0772,-0.0322 0.16094,-0.0483 0.25107,-0.0483 0.0917,0 0.17542,0.0161 0.25106,0.0483 0.0773,0.0322 0.14323,0.0773 0.19795,0.13519 0.0547,0.0579 0.0974,0.12795 0.12795,0.21002 0.0306,0.0821 0.0459,0.17301 0.0459,0.27279 m -0.36694,0 c 0,-0.11104 -0.0225,-0.19795 -0.0676,-0.26072 -0.0435,-0.0644 -0.10622,-0.0966 -0.18829,-0.0966 -0.0821,0 -0.14565,0.0322 -0.19071,0.0966 -0.0451,0.0628 -0.0676,0.14968 -0.0676,0.26072 0,0.11105 0.0225,0.19957 0.0676,0.26555 0.0451,0.0644 0.10863,0.0966 0.19071,0.0966 0.0821,1e-5 0.14484,-0.0322 0.18829,-0.0966 0.0451,-0.066 0.0676,-0.1545 0.0676,-0.26555"
- style="font-weight:bold;marker:none"
- id="path12959"
- inkscape:connector-curvature="0" />
- <path
- d="m 613.23761,562.33265 c -0.0612,0.0177 -0.14002,0.0338 -0.23658,0.0483 -0.0966,0.0161 -0.19795,0.0241 -0.30417,0.0241 -0.10783,0 -0.19796,-0.0145 -0.27038,-0.0435 -0.0708,-0.029 -0.12714,-0.0692 -0.16898,-0.1207 -0.0419,-0.0531 -0.0716,-0.11587 -0.0893,-0.1883 -0.0177,-0.0724 -0.0266,-0.15208 -0.0266,-0.23899 l 0,-0.70732 0.3597,0 0,0.66387 c 0,0.11587 0.0153,0.19956 0.0459,0.25106 0.0306,0.0515 0.0877,0.0773 0.1714,0.0773 0.0257,0 0.0531,-8e-4 0.0821,-0.002 0.029,-0.003 0.0547,-0.006 0.0773,-0.01 l 0,-0.98011 0.3597,0 0,1.22635"
- style="font-weight:bold;marker:none"
- id="path12961"
- inkscape:connector-curvature="0" />
- <path
- d="m 613.56555,560.79006 0.35969,-0.0579 0,0.37418 0.43212,0 0,0.29934 -0.43212,0 0,0.44661 c 0,0.0756 0.0129,0.13599 0.0386,0.18105 0.0274,0.0451 0.0813,0.0676 0.16174,0.0676 0.0386,10e-6 0.078,-0.003 0.11829,-0.01 0.0418,-0.008 0.0797,-0.0185 0.11346,-0.0314 l 0.0507,0.28003 c -0.0435,0.0177 -0.0917,0.033 -0.14485,0.0459 -0.0531,0.0129 -0.11829,0.0193 -0.19554,0.0193 -0.0982,0 -0.17944,-0.0129 -0.24382,-0.0386 -0.0644,-0.0274 -0.11587,-0.0644 -0.1545,-0.11104 -0.0386,-0.0483 -0.066,-0.10622 -0.0821,-0.17382 -0.0145,-0.0676 -0.0217,-0.14243 -0.0217,-0.22451 l 0,-1.06701"
- style="font-weight:bold;marker:none"
- id="path12963"
- inkscape:connector-curvature="0" />
- <path
- d="m 616.31178,562.33265 c -0.0612,0.0177 -0.14002,0.0338 -0.23658,0.0483 -0.0966,0.0161 -0.19796,0.0241 -0.30417,0.0241 -0.10783,0 -0.19796,-0.0145 -0.27038,-0.0435 -0.0708,-0.029 -0.12714,-0.0692 -0.16899,-0.1207 -0.0418,-0.0531 -0.0716,-0.11587 -0.0893,-0.1883 -0.0177,-0.0724 -0.0266,-0.15208 -0.0266,-0.23899 l 0,-0.70732 0.3597,0 0,0.66387 c -10e-6,0.11587 0.0153,0.19956 0.0459,0.25106 0.0306,0.0515 0.0877,0.0773 0.1714,0.0773 0.0258,0 0.0531,-8e-4 0.0821,-0.002 0.029,-0.003 0.0547,-0.006 0.0773,-0.01 l 0,-0.98011 0.3597,0 0,1.22635"
- style="font-weight:bold;marker:none"
- id="path12965"
- inkscape:connector-curvature="0" />
- <path
- d="m 617.01631,562.11779 c 0.066,0 0.11265,-0.006 0.14001,-0.0193 0.0274,-0.0129 0.041,-0.0378 0.041,-0.0748 0,-0.029 -0.0177,-0.0539 -0.0531,-0.0748 -0.0354,-0.0225 -0.0893,-0.0475 -0.16174,-0.0748 -0.0563,-0.0209 -0.10783,-0.0426 -0.1545,-0.0652 -0.0451,-0.0225 -0.0837,-0.0491 -0.11587,-0.0797 -0.0322,-0.0322 -0.0571,-0.07 -0.0748,-0.11346 -0.0177,-0.0435 -0.0266,-0.0958 -0.0266,-0.15692 0,-0.11909 0.0443,-0.21324 0.13278,-0.28244 0.0885,-0.0692 0.21002,-0.10381 0.36452,-0.10381 0.0773,0 0.15128,0.007 0.2221,0.0217 0.0708,0.0129 0.12714,0.0274 0.16898,0.0435 l -0.0628,0.28003 c -0.0419,-0.0145 -0.0877,-0.0274 -0.13761,-0.0386 -0.0483,-0.0113 -0.103,-0.0169 -0.16415,-0.0169 -0.11266,0 -0.16899,0.0314 -0.16899,0.0941 0,0.0145 0.002,0.0274 0.007,0.0386 0.005,0.0113 0.0145,0.0225 0.029,0.0338 0.0145,0.01 0.0338,0.0209 0.0579,0.0338 0.0258,0.0113 0.0579,0.0241 0.0966,0.0386 0.0789,0.029 0.14404,0.0579 0.19554,0.0869 0.0515,0.0274 0.0917,0.0579 0.12071,0.0917 0.0306,0.0322 0.0515,0.0684 0.0628,0.10864 0.0129,0.0402 0.0193,0.0869 0.0193,0.14001 -10e-6,0.12553 -0.0475,0.22049 -0.14243,0.28486 -0.0934,0.0644 -0.22612,0.0966 -0.39833,0.0966 -0.11265,0 -0.2068,-0.01 -0.28244,-0.029 -0.074,-0.0193 -0.12553,-0.0354 -0.1545,-0.0483 l 0.0603,-0.29211 c 0.0612,0.0241 0.12392,0.0435 0.1883,0.0579 0.0644,0.0129 0.12794,0.0193 0.19071,0.0193"
- style="font-weight:bold;marker:none"
- id="path12967"
- inkscape:connector-curvature="0" />
- </g>
- <g
- style="font-size:2.41406918px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;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"
- id="text5756"
- transform="translate(15,0)">
- <path
- d="m 626.07237,562.39783 c -0.0917,0 -0.18347,-0.003 -0.2752,-0.01 -0.0901,-0.005 -0.18428,-0.0177 -0.28245,-0.0386 l 0,-1.62225 c 0.0772,-0.0145 0.16174,-0.0249 0.25348,-0.0314 0.0917,-0.008 0.17703,-0.0121 0.25589,-0.0121 0.10622,0 0.20358,0.008 0.2921,0.0241 0.0901,0.0145 0.16738,0.0402 0.23175,0.0772 0.0644,0.037 0.11427,0.0861 0.14967,0.14726 0.037,0.0595 0.0555,0.13358 0.0555,0.22209 0,0.13358 -0.0644,0.23899 -0.19313,0.31624 0.10622,0.0402 0.17864,0.095 0.21727,0.16416 0.0386,0.0692 0.0579,0.14726 0.0579,0.23416 -10e-6,0.17543 -0.0644,0.3074 -0.19313,0.39591 -0.12714,0.0885 -0.31705,0.13278 -0.56972,0.13278 m -0.19071,-0.75078 0,0.43212 c 0.0274,0.003 0.0571,0.006 0.0893,0.007 0.0322,0.002 0.0676,0.002 0.10622,0.002 0.11265,0 0.20358,-0.0161 0.27279,-0.0483 0.0692,-0.0322 0.1038,-0.0917 0.1038,-0.17864 0,-0.0772 -0.029,-0.13197 -0.0869,-0.16415 -0.0579,-0.0338 -0.14083,-0.0507 -0.24865,-0.0507 l -0.23658,0 m 0,-0.28727 0.18347,0 c 0.11587,0 0.19875,-0.0145 0.24865,-0.0435 0.0499,-0.0306 0.0748,-0.0789 0.0748,-0.14484 0,-0.0676 -0.0258,-0.11507 -0.0772,-0.14243 -0.0515,-0.0274 -0.12714,-0.041 -0.22692,-0.041 -0.0322,0 -0.0668,8e-4 -0.1038,0.002 -0.037,0 -0.07,0.002 -0.099,0.005 l 0,0.36453"
- style="font-weight:bold;marker:none"
- id="path12946"
- inkscape:connector-curvature="0" />
- <path
- d="m 627.61949,562.40024 c -0.10461,-0.002 -0.18991,-0.0129 -0.25589,-0.0338 -0.0644,-0.0209 -0.11588,-0.0499 -0.15451,-0.0869 -0.037,-0.0386 -0.0628,-0.0845 -0.0772,-0.13761 -0.0129,-0.0547 -0.0193,-0.11587 -0.0193,-0.18347 l 0,-1.39774 0.3597,-0.0579 0,1.38326 c 0,0.0322 0.002,0.0612 0.007,0.0869 0.005,0.0258 0.0137,0.0475 0.0266,0.0652 0.0145,0.0177 0.0346,0.0322 0.0603,0.0435 0.0258,0.0113 0.0603,0.0185 0.1038,0.0217 l -0.0507,0.29693"
- style="font-weight:bold;marker:none"
- id="path12948"
- inkscape:connector-curvature="0" />
- <path
- d="m 629.06408,561.73878 c 0,0.0998 -0.0145,0.19152 -0.0435,0.27521 -0.029,0.0821 -0.0708,0.15289 -0.12553,0.21244 -0.0547,0.0579 -0.12071,0.103 -0.19796,0.13518 -0.0756,0.0322 -0.16094,0.0483 -0.25589,0.0483 -0.0933,0 -0.17864,-0.0161 -0.25589,-0.0483 -0.0756,-0.0322 -0.14082,-0.0773 -0.19554,-0.13518 -0.0547,-0.0596 -0.0974,-0.13036 -0.12795,-0.21244 -0.0306,-0.0837 -0.0459,-0.17542 -0.0459,-0.27521 0,-0.0998 0.0153,-0.19071 0.0459,-0.27279 0.0322,-0.0821 0.0756,-0.15208 0.13036,-0.21002 0.0563,-0.0579 0.12232,-0.103 0.19796,-0.13519 0.0772,-0.0322 0.16093,-0.0483 0.25106,-0.0483 0.0917,0 0.17542,0.0161 0.25106,0.0483 0.0772,0.0322 0.14324,0.0773 0.19796,0.13519 0.0547,0.0579 0.0974,0.12795 0.12794,0.21002 0.0306,0.0821 0.0459,0.17301 0.0459,0.27279 m -0.36694,0 c 0,-0.11104 -0.0225,-0.19795 -0.0676,-0.26072 -0.0435,-0.0644 -0.10622,-0.0966 -0.1883,-0.0966 -0.0821,0 -0.14565,0.0322 -0.19071,0.0966 -0.0451,0.0628 -0.0676,0.14968 -0.0676,0.26072 -10e-6,0.11105 0.0225,0.19957 0.0676,0.26555 0.0451,0.0644 0.10863,0.0966 0.19071,0.0966 0.0821,1e-5 0.14484,-0.0322 0.1883,-0.0966 0.0451,-0.066 0.0676,-0.1545 0.0676,-0.26555"
- style="font-weight:bold;marker:none"
- id="path12950"
- inkscape:connector-curvature="0" />
- <path
- d="m 629.6493,561.70016 c 0,0.20117 0.0813,0.30176 0.24382,0.30176 0.037,0 0.0716,-0.005 0.10381,-0.0145 0.0322,-0.01 0.0595,-0.0209 0.0821,-0.0338 l 0,-0.57455 c -0.0177,-0.003 -0.0386,-0.006 -0.0628,-0.007 -0.0241,-0.003 -0.0523,-0.005 -0.0845,-0.005 -0.0949,0 -0.16577,0.0314 -0.21244,0.0942 -0.0467,0.0628 -0.07,0.14243 -0.07,0.23899 m 0.7894,0.51661 c 0,0.20761 -0.0531,0.36131 -0.15932,0.46109 -0.10461,0.10139 -0.26716,0.15208 -0.48765,0.15208 -0.0773,0 -0.1545,-0.007 -0.23175,-0.0217 -0.0773,-0.0129 -0.14886,-0.0306 -0.21485,-0.0531 l 0.0628,-0.30176 c 0.0563,0.0225 0.11507,0.0402 0.17622,0.0531 0.0628,0.0129 0.13358,0.0193 0.21244,0.0193 0.103,0 0.17542,-0.0225 0.21727,-0.0676 0.0435,-0.0451 0.0652,-0.103 0.0652,-0.17382 l 0,-0.0459 c -0.0386,0.0177 -0.0789,0.0314 -0.12071,0.041 -0.0402,0.008 -0.0845,0.0121 -0.13277,0.0121 -0.17542,0 -0.30981,-0.0515 -0.40315,-0.1545 -0.0933,-0.10461 -0.14001,-0.25026 -0.14001,-0.43695 0,-0.0933 0.0145,-0.17784 0.0435,-0.25348 0.029,-0.0773 0.0708,-0.14323 0.12553,-0.19795 0.0563,-0.0547 0.12473,-0.0966 0.2052,-0.12553 0.0805,-0.0306 0.17139,-0.0459 0.27279,-0.0459 0.0435,0 0.0877,0.002 0.13277,0.007 0.0467,0.003 0.0925,0.008 0.1376,0.0145 0.0451,0.006 0.0877,0.0145 0.12795,0.0241 0.0418,0.008 0.0789,0.0169 0.11104,0.0266 l 0,1.06702"
- style="font-weight:bold;marker:none"
- id="path12952"
- inkscape:connector-curvature="0" />
- </g>
- <g
- style="font-size:2.41406918px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;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"
- id="text5760"
- transform="translate(-15.764465,0)">
- <path
- d="m 641.63485,562.3761 c -0.0177,-0.0579 -0.0378,-0.11749 -0.0604,-0.17864 -0.0209,-0.0612 -0.0418,-0.12232 -0.0628,-0.18347 l -0.6518,0 c -0.0209,0.0611 -0.0426,0.12231 -0.0652,0.18347 -0.0209,0.0611 -0.0402,0.1207 -0.0579,0.17864 l -0.39108,0 c 0.0628,-0.18025 0.12232,-0.34682 0.17865,-0.49971 0.0563,-0.15289 0.11104,-0.29693 0.16415,-0.43212 0.0547,-0.13519 0.10783,-0.26313 0.15933,-0.38384 0.0531,-0.12231 0.10783,-0.2414 0.16416,-0.35728 l 0.35969,0 c 0.0547,0.11588 0.10864,0.23497 0.16175,0.35728 0.0531,0.12071 0.10621,0.24865 0.15933,0.38384 0.0547,0.13519 0.11024,0.27923 0.16657,0.43212 0.0563,0.15289 0.11587,0.31946 0.17864,0.49971 l -0.40315,0 m -0.45143,-1.29394 c -0.008,0.0241 -0.0201,0.0571 -0.0362,0.099 -0.0161,0.0418 -0.0346,0.0901 -0.0555,0.14485 -0.0209,0.0547 -0.0443,0.11507 -0.07,0.18105 -0.0241,0.066 -0.0491,0.13519 -0.0748,0.20761 l 0.47557,0 c -0.0258,-0.0724 -0.0507,-0.14162 -0.0748,-0.20761 -0.0241,-0.066 -0.0475,-0.12633 -0.07,-0.18105 -0.0209,-0.0547 -0.0394,-0.103 -0.0555,-0.14485 -0.0161,-0.0418 -0.029,-0.0748 -0.0386,-0.099"
- style="font-weight:bold;marker:none"
- id="path12931"
- inkscape:connector-curvature="0" />
- <path
- d="m 642.99567,561.42496 c -0.0322,-0.008 -0.07,-0.0161 -0.11347,-0.0242 -0.0435,-0.01 -0.0901,-0.0145 -0.14001,-0.0145 -0.0225,0 -0.0499,0.002 -0.0821,0.007 -0.0306,0.003 -0.0539,0.007 -0.07,0.0121 l 0,0.97046 -0.35969,0 0,-1.20221 c 0.0644,-0.0225 0.14001,-0.0435 0.22692,-0.0628 0.0885,-0.0209 0.18669,-0.0314 0.29452,-0.0314 0.0193,0 0.0426,0.002 0.07,0.005 0.0274,0.002 0.0547,0.005 0.0821,0.01 0.0274,0.003 0.0547,0.008 0.0821,0.0145 0.0274,0.005 0.0507,0.0113 0.07,0.0193 l -0.0603,0.29694"
- style="font-weight:bold;marker:none"
- id="path12933"
- inkscape:connector-curvature="0" />
- <path
- d="m 643.16492,561.7412 c 0,-0.0917 0.0145,-0.17784 0.0434,-0.25831 0.0306,-0.0821 0.074,-0.15289 0.13036,-0.21244 0.0563,-0.0611 0.12472,-0.10943 0.20519,-0.14484 0.0805,-0.0354 0.17221,-0.0531 0.27521,-0.0531 0.0676,0 0.12955,0.006 0.18588,0.0193 0.0563,0.0113 0.11105,0.0282 0.16416,0.0507 l -0.0748,0.28727 c -0.0338,-0.0129 -0.0708,-0.0241 -0.11105,-0.0338 -0.0402,-0.01 -0.0853,-0.0145 -0.13518,-0.0145 -0.10622,0 -0.18589,0.033 -0.239,0.099 -0.0515,0.066 -0.0773,0.15289 -0.0773,0.26072 0,0.11426 0.0241,0.20278 0.0724,0.26555 0.0499,0.0628 0.13599,0.0942 0.2583,0.0941 0.0435,10e-6 0.0901,-0.004 0.14002,-0.0121 0.0499,-0.008 0.0957,-0.0209 0.1376,-0.0386 l 0.0507,0.29452 c -0.0418,0.0177 -0.0942,0.033 -0.15691,0.0459 -0.0628,0.0129 -0.13197,0.0193 -0.20761,0.0193 -0.11588,0 -0.21566,-0.0169 -0.29934,-0.0507 -0.0837,-0.0354 -0.1529,-0.0829 -0.20761,-0.14243 -0.0531,-0.0595 -0.0925,-0.12955 -0.11829,-0.21002 -0.0241,-0.0821 -0.0362,-0.1706 -0.0362,-0.26555"
- style="font-weight:bold;marker:none"
- id="path12935"
- inkscape:connector-curvature="0" />
- <path
- d="m 644.4323,562.3761 0,-1.81538 0.3597,-0.0579 0,0.60835 c 0.0241,-0.008 0.0547,-0.0153 0.0917,-0.0217 0.0386,-0.008 0.0756,-0.0121 0.11105,-0.0121 0.103,0 0.1883,0.0145 0.25589,0.0435 0.0692,0.0274 0.12392,0.0668 0.16416,0.11829 0.0418,0.0515 0.0708,0.11266 0.0869,0.18347 0.0177,0.0708 0.0266,0.14967 0.0266,0.23658 l 0,0.71698 -0.3597,0 0,-0.67353 c 0,-0.11587 -0.0153,-0.19795 -0.0459,-0.24623 -0.029,-0.0483 -0.0837,-0.0724 -0.16416,-0.0724 -0.0322,0 -0.0628,0.003 -0.0917,0.01 -0.0274,0.005 -0.0523,0.0105 -0.0748,0.0169 l 0,0.96563 -0.3597,0"
- style="font-weight:bold;marker:none"
- id="path12937"
- inkscape:connector-curvature="0" />
- <path
- d="m 646.21592,562.3761 -0.3597,0 0,-1.2698 0.3597,0 0,1.2698 m 0.0338,-1.63674 c 0,0.066 -0.0217,0.11829 -0.0652,0.15691 -0.0418,0.037 -0.0917,0.0555 -0.14967,0.0555 -0.0579,0 -0.10864,-0.0185 -0.15209,-0.0555 -0.0418,-0.0386 -0.0628,-0.0909 -0.0628,-0.15691 0,-0.066 0.0209,-0.11748 0.0628,-0.1545 0.0435,-0.0386 0.0942,-0.0579 0.15209,-0.0579 0.0579,0 0.10782,0.0193 0.14967,0.0579 0.0435,0.037 0.0652,0.0885 0.0652,0.1545"
- style="font-weight:bold;marker:none"
- id="path12939"
- inkscape:connector-curvature="0" />
- <path
- d="m 646.86153,562.3761 c -0.0821,-0.16094 -0.16576,-0.34924 -0.25106,-0.56489 -0.0837,-0.21566 -0.16335,-0.45063 -0.23899,-0.70491 l 0.38142,0 c 0.0161,0.0628 0.0346,0.13116 0.0555,0.20519 0.0225,0.0724 0.0451,0.14646 0.0676,0.2221 0.0241,0.074 0.0475,0.14645 0.07,0.21726 0.0241,0.0708 0.0475,0.13519 0.07,0.19313 0.0209,-0.0579 0.0435,-0.12231 0.0676,-0.19313 0.0241,-0.0708 0.0475,-0.14323 0.07,-0.21726 0.0241,-0.0756 0.0467,-0.14967 0.0676,-0.2221 0.0225,-0.074 0.0418,-0.14242 0.0579,-0.20519 l 0.37176,0 c -0.0756,0.25428 -0.15611,0.48925 -0.2414,0.70491 -0.0837,0.21565 -0.16657,0.40395 -0.24865,0.56489 l -0.29935,0"
- style="font-weight:bold;marker:none"
- id="path12941"
- inkscape:connector-curvature="0" />
- <path
- d="m 647.75259,561.75085 c 0,-0.11265 0.0169,-0.21082 0.0507,-0.29451 0.0354,-0.0853 0.0813,-0.15611 0.13761,-0.21244 0.0563,-0.0563 0.1207,-0.099 0.19312,-0.12795 0.074,-0.029 0.14967,-0.0435 0.22692,-0.0435 0.18025,0 0.32268,0.0555 0.42729,0.16657 0.10461,0.10944 0.15692,0.27118 0.15692,0.48523 0,0.0209 -8.1e-4,0.0443 -0.002,0.07 -0.002,0.0241 -0.003,0.0459 -0.005,0.0652 l -0.81596,0 c 0.008,0.074 0.0426,0.13277 0.10381,0.17622 0.0611,0.0435 0.14323,0.0652 0.24623,0.0652 0.066,10e-6 0.13036,-0.006 0.19313,-0.0169 0.0644,-0.0129 0.11668,-0.0282 0.15691,-0.0459 l 0.0483,0.2921 c -0.0193,0.01 -0.0451,0.0193 -0.0773,0.029 -0.0322,0.01 -0.0684,0.0177 -0.10863,0.0241 -0.0386,0.008 -0.0805,0.0145 -0.12553,0.0193 -0.0451,0.005 -0.0901,0.007 -0.13519,0.007 -0.11427,0 -0.21405,-0.0169 -0.29934,-0.0507 -0.0837,-0.0338 -0.1537,-0.0797 -0.21003,-0.1376 -0.0547,-0.0595 -0.0958,-0.12956 -0.12312,-0.21003 -0.0258,-0.0805 -0.0386,-0.16737 -0.0386,-0.26072 m 0.84492,-0.1376 c -0.002,-0.0306 -0.007,-0.0603 -0.0169,-0.0893 -0.008,-0.029 -0.0217,-0.0547 -0.041,-0.0772 -0.0177,-0.0225 -0.041,-0.041 -0.07,-0.0555 -0.0274,-0.0145 -0.062,-0.0217 -0.10381,-0.0217 -0.0402,0 -0.0748,0.007 -0.1038,0.0217 -0.029,0.0129 -0.0531,0.0306 -0.0724,0.0531 -0.0193,0.0225 -0.0346,0.0491 -0.0459,0.0797 -0.01,0.029 -0.0169,0.0588 -0.0217,0.0893 l 0.47557,0"
- style="font-weight:bold;marker:none"
- id="path12943"
- inkscape:connector-curvature="0" />
- </g>
- <g
- transform="matrix(1.843328,0,0,1.843328,-507.89634,-699.78754)"
- style="font-size:2.41406918px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;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"
- id="text5604-9">
- <path
- inkscape:connector-curvature="0"
- d="m 608.63485,562.3761 c -0.0177,-0.0579 -0.0378,-0.11749 -0.0604,-0.17864 -0.0209,-0.0612 -0.0418,-0.12232 -0.0628,-0.18347 l -0.6518,0 c -0.0209,0.0611 -0.0426,0.12231 -0.0652,0.18347 -0.0209,0.0611 -0.0402,0.1207 -0.0579,0.17864 l -0.39108,0 c 0.0628,-0.18025 0.12232,-0.34682 0.17865,-0.49971 0.0563,-0.15289 0.11104,-0.29693 0.16415,-0.43212 0.0547,-0.13519 0.10783,-0.26313 0.15933,-0.38384 0.0531,-0.12231 0.10783,-0.2414 0.16416,-0.35728 l 0.35969,0 c 0.0547,0.11588 0.10864,0.23497 0.16175,0.35728 0.0531,0.12071 0.10621,0.24865 0.15933,0.38384 0.0547,0.13519 0.11024,0.27923 0.16657,0.43212 0.0563,0.15289 0.11587,0.31946 0.17864,0.49971 l -0.40315,0 m -0.45143,-1.29394 c -0.008,0.0241 -0.0201,0.0571 -0.0362,0.099 -0.0161,0.0418 -0.0346,0.0901 -0.0555,0.14485 -0.0209,0.0547 -0.0443,0.11507 -0.07,0.18105 -0.0241,0.066 -0.0491,0.13519 -0.0748,0.20761 l 0.47557,0 c -0.0258,-0.0724 -0.0507,-0.14162 -0.0748,-0.20761 -0.0241,-0.066 -0.0475,-0.12633 -0.07,-0.18105 -0.0209,-0.0547 -0.0394,-0.103 -0.0555,-0.14485 -0.0161,-0.0418 -0.029,-0.0748 -0.0386,-0.099"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12955-7" />
- <path
- inkscape:connector-curvature="0"
- d="m 610.04395,561.73154 c 0,-0.23175 -0.0853,-0.34762 -0.25589,-0.34762 -0.037,0 -0.074,0.005 -0.11105,0.0145 -0.0354,0.01 -0.0644,0.0217 -0.0869,0.0362 l 0,0.65421 c 0.0177,0.003 0.0402,0.006 0.0676,0.01 0.0274,0.002 0.0571,0.002 0.0893,0.002 0.0982,10e-6 0.1722,-0.0338 0.22209,-0.10139 0.0499,-0.0676 0.0748,-0.15691 0.0748,-0.26796 m 0.36694,0.01 c -10e-6,0.10139 -0.0153,0.19312 -0.0459,0.2752 -0.029,0.0821 -0.0716,0.15209 -0.12795,0.21003 -0.0563,0.0579 -0.12553,0.103 -0.20761,0.13518 -0.0821,0.0306 -0.17542,0.0459 -0.28003,0.0459 -0.0435,0 -0.0893,-0.002 -0.1376,-0.007 -0.0467,-0.003 -0.0934,-0.008 -0.14002,-0.0145 -0.0451,-0.006 -0.0885,-0.0137 -0.13036,-0.0217 -0.0418,-0.01 -0.0789,-0.0193 -0.11104,-0.029 l 0,-1.77434 0.35969,-0.0579 0,0.63249 c 0.0402,-0.0177 0.0821,-0.0314 0.12553,-0.041 0.0435,-0.01 0.0901,-0.0145 0.14002,-0.0145 0.0901,0 0.16979,0.0161 0.23899,0.0483 0.0692,0.0306 0.12714,0.0748 0.17382,0.13278 0.0467,0.0579 0.0821,0.12795 0.10622,0.21002 0.0241,0.0805 0.0362,0.1706 0.0362,0.27038"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12957-3" />
- <path
- inkscape:connector-curvature="0"
- d="m 611.87506,561.73878 c 0,0.0998 -0.0145,0.19152 -0.0435,0.27521 -0.029,0.0821 -0.0708,0.15289 -0.12553,0.21244 -0.0547,0.0579 -0.1207,0.103 -0.19795,0.13518 -0.0756,0.0322 -0.16094,0.0483 -0.25589,0.0483 -0.0934,0 -0.17864,-0.0161 -0.25589,-0.0483 -0.0756,-0.0322 -0.14083,-0.0773 -0.19554,-0.13518 -0.0547,-0.0596 -0.0974,-0.13036 -0.12795,-0.21244 -0.0306,-0.0837 -0.0459,-0.17542 -0.0459,-0.27521 0,-0.0998 0.0153,-0.19071 0.0459,-0.27279 0.0322,-0.0821 0.0756,-0.15208 0.13036,-0.21002 0.0563,-0.0579 0.12231,-0.103 0.19795,-0.13519 0.0772,-0.0322 0.16094,-0.0483 0.25107,-0.0483 0.0917,0 0.17542,0.0161 0.25106,0.0483 0.0773,0.0322 0.14323,0.0773 0.19795,0.13519 0.0547,0.0579 0.0974,0.12795 0.12795,0.21002 0.0306,0.0821 0.0459,0.17301 0.0459,0.27279 m -0.36694,0 c 0,-0.11104 -0.0225,-0.19795 -0.0676,-0.26072 -0.0435,-0.0644 -0.10622,-0.0966 -0.18829,-0.0966 -0.0821,0 -0.14565,0.0322 -0.19071,0.0966 -0.0451,0.0628 -0.0676,0.14968 -0.0676,0.26072 0,0.11105 0.0225,0.19957 0.0676,0.26555 0.0451,0.0644 0.10863,0.0966 0.19071,0.0966 0.0821,1e-5 0.14484,-0.0322 0.18829,-0.0966 0.0451,-0.066 0.0676,-0.1545 0.0676,-0.26555"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12959-1" />
- <path
- inkscape:connector-curvature="0"
- d="m 613.23761,562.33265 c -0.0612,0.0177 -0.14002,0.0338 -0.23658,0.0483 -0.0966,0.0161 -0.19795,0.0241 -0.30417,0.0241 -0.10783,0 -0.19796,-0.0145 -0.27038,-0.0435 -0.0708,-0.029 -0.12714,-0.0692 -0.16898,-0.1207 -0.0419,-0.0531 -0.0716,-0.11587 -0.0893,-0.1883 -0.0177,-0.0724 -0.0266,-0.15208 -0.0266,-0.23899 l 0,-0.70732 0.3597,0 0,0.66387 c 0,0.11587 0.0153,0.19956 0.0459,0.25106 0.0306,0.0515 0.0877,0.0773 0.1714,0.0773 0.0257,0 0.0531,-8e-4 0.0821,-0.002 0.029,-0.003 0.0547,-0.006 0.0773,-0.01 l 0,-0.98011 0.3597,0 0,1.22635"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12961-4" />
- <path
- inkscape:connector-curvature="0"
- d="m 613.56555,560.79006 0.35969,-0.0579 0,0.37418 0.43212,0 0,0.29934 -0.43212,0 0,0.44661 c 0,0.0756 0.0129,0.13599 0.0386,0.18105 0.0274,0.0451 0.0813,0.0676 0.16174,0.0676 0.0386,10e-6 0.078,-0.003 0.11829,-0.01 0.0418,-0.008 0.0797,-0.0185 0.11346,-0.0314 l 0.0507,0.28003 c -0.0435,0.0177 -0.0917,0.033 -0.14485,0.0459 -0.0531,0.0129 -0.11829,0.0193 -0.19554,0.0193 -0.0982,0 -0.17944,-0.0129 -0.24382,-0.0386 -0.0644,-0.0274 -0.11587,-0.0644 -0.1545,-0.11104 -0.0386,-0.0483 -0.066,-0.10622 -0.0821,-0.17382 -0.0145,-0.0676 -0.0217,-0.14243 -0.0217,-0.22451 l 0,-1.06701"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12963-8" />
- <path
- inkscape:connector-curvature="0"
- d="m 616.31178,562.33265 c -0.0612,0.0177 -0.14002,0.0338 -0.23658,0.0483 -0.0966,0.0161 -0.19796,0.0241 -0.30417,0.0241 -0.10783,0 -0.19796,-0.0145 -0.27038,-0.0435 -0.0708,-0.029 -0.12714,-0.0692 -0.16899,-0.1207 -0.0418,-0.0531 -0.0716,-0.11587 -0.0893,-0.1883 -0.0177,-0.0724 -0.0266,-0.15208 -0.0266,-0.23899 l 0,-0.70732 0.3597,0 0,0.66387 c -10e-6,0.11587 0.0153,0.19956 0.0459,0.25106 0.0306,0.0515 0.0877,0.0773 0.1714,0.0773 0.0258,0 0.0531,-8e-4 0.0821,-0.002 0.029,-0.003 0.0547,-0.006 0.0773,-0.01 l 0,-0.98011 0.3597,0 0,1.22635"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12965-6" />
- <path
- inkscape:connector-curvature="0"
- d="m 617.01631,562.11779 c 0.066,0 0.11265,-0.006 0.14001,-0.0193 0.0274,-0.0129 0.041,-0.0378 0.041,-0.0748 0,-0.029 -0.0177,-0.0539 -0.0531,-0.0748 -0.0354,-0.0225 -0.0893,-0.0475 -0.16174,-0.0748 -0.0563,-0.0209 -0.10783,-0.0426 -0.1545,-0.0652 -0.0451,-0.0225 -0.0837,-0.0491 -0.11587,-0.0797 -0.0322,-0.0322 -0.0571,-0.07 -0.0748,-0.11346 -0.0177,-0.0435 -0.0266,-0.0958 -0.0266,-0.15692 0,-0.11909 0.0443,-0.21324 0.13278,-0.28244 0.0885,-0.0692 0.21002,-0.10381 0.36452,-0.10381 0.0773,0 0.15128,0.007 0.2221,0.0217 0.0708,0.0129 0.12714,0.0274 0.16898,0.0435 l -0.0628,0.28003 c -0.0419,-0.0145 -0.0877,-0.0274 -0.13761,-0.0386 -0.0483,-0.0113 -0.103,-0.0169 -0.16415,-0.0169 -0.11266,0 -0.16899,0.0314 -0.16899,0.0941 0,0.0145 0.002,0.0274 0.007,0.0386 0.005,0.0113 0.0145,0.0225 0.029,0.0338 0.0145,0.01 0.0338,0.0209 0.0579,0.0338 0.0258,0.0113 0.0579,0.0241 0.0966,0.0386 0.0789,0.029 0.14404,0.0579 0.19554,0.0869 0.0515,0.0274 0.0917,0.0579 0.12071,0.0917 0.0306,0.0322 0.0515,0.0684 0.0628,0.10864 0.0129,0.0402 0.0193,0.0869 0.0193,0.14001 -10e-6,0.12553 -0.0475,0.22049 -0.14243,0.28486 -0.0934,0.0644 -0.22612,0.0966 -0.39833,0.0966 -0.11265,0 -0.2068,-0.01 -0.28244,-0.029 -0.074,-0.0193 -0.12553,-0.0354 -0.1545,-0.0483 l 0.0603,-0.29211 c 0.0612,0.0241 0.12392,0.0435 0.1883,0.0579 0.0644,0.0129 0.12794,0.0193 0.19071,0.0193"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12967-3" />
- </g>
- <g
- transform="matrix(2.2383603,0,0,2.2383603,-821.48089,-882.53647)"
- style="font-size:2.41406918px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;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"
- id="text5760-6">
- <path
- inkscape:connector-curvature="0"
- d="m 641.63485,562.3761 c -0.0177,-0.0579 -0.0378,-0.11749 -0.0604,-0.17864 -0.0209,-0.0612 -0.0418,-0.12232 -0.0628,-0.18347 l -0.6518,0 c -0.0209,0.0611 -0.0426,0.12231 -0.0652,0.18347 -0.0209,0.0611 -0.0402,0.1207 -0.0579,0.17864 l -0.39108,0 c 0.0628,-0.18025 0.12232,-0.34682 0.17865,-0.49971 0.0563,-0.15289 0.11104,-0.29693 0.16415,-0.43212 0.0547,-0.13519 0.10783,-0.26313 0.15933,-0.38384 0.0531,-0.12231 0.10783,-0.2414 0.16416,-0.35728 l 0.35969,0 c 0.0547,0.11588 0.10864,0.23497 0.16175,0.35728 0.0531,0.12071 0.10621,0.24865 0.15933,0.38384 0.0547,0.13519 0.11024,0.27923 0.16657,0.43212 0.0563,0.15289 0.11587,0.31946 0.17864,0.49971 l -0.40315,0 m -0.45143,-1.29394 c -0.008,0.0241 -0.0201,0.0571 -0.0362,0.099 -0.0161,0.0418 -0.0346,0.0901 -0.0555,0.14485 -0.0209,0.0547 -0.0443,0.11507 -0.07,0.18105 -0.0241,0.066 -0.0491,0.13519 -0.0748,0.20761 l 0.47557,0 c -0.0258,-0.0724 -0.0507,-0.14162 -0.0748,-0.20761 -0.0241,-0.066 -0.0475,-0.12633 -0.07,-0.18105 -0.0209,-0.0547 -0.0394,-0.103 -0.0555,-0.14485 -0.0161,-0.0418 -0.029,-0.0748 -0.0386,-0.099"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12931-7" />
- <path
- inkscape:connector-curvature="0"
- d="m 642.99567,561.42496 c -0.0322,-0.008 -0.07,-0.0161 -0.11347,-0.0242 -0.0435,-0.01 -0.0901,-0.0145 -0.14001,-0.0145 -0.0225,0 -0.0499,0.002 -0.0821,0.007 -0.0306,0.003 -0.0539,0.007 -0.07,0.0121 l 0,0.97046 -0.35969,0 0,-1.20221 c 0.0644,-0.0225 0.14001,-0.0435 0.22692,-0.0628 0.0885,-0.0209 0.18669,-0.0314 0.29452,-0.0314 0.0193,0 0.0426,0.002 0.07,0.005 0.0274,0.002 0.0547,0.005 0.0821,0.01 0.0274,0.003 0.0547,0.008 0.0821,0.0145 0.0274,0.005 0.0507,0.0113 0.07,0.0193 l -0.0603,0.29694"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12933-7" />
- <path
- inkscape:connector-curvature="0"
- d="m 643.16492,561.7412 c 0,-0.0917 0.0145,-0.17784 0.0434,-0.25831 0.0306,-0.0821 0.074,-0.15289 0.13036,-0.21244 0.0563,-0.0611 0.12472,-0.10943 0.20519,-0.14484 0.0805,-0.0354 0.17221,-0.0531 0.27521,-0.0531 0.0676,0 0.12955,0.006 0.18588,0.0193 0.0563,0.0113 0.11105,0.0282 0.16416,0.0507 l -0.0748,0.28727 c -0.0338,-0.0129 -0.0708,-0.0241 -0.11105,-0.0338 -0.0402,-0.01 -0.0853,-0.0145 -0.13518,-0.0145 -0.10622,0 -0.18589,0.033 -0.239,0.099 -0.0515,0.066 -0.0773,0.15289 -0.0773,0.26072 0,0.11426 0.0241,0.20278 0.0724,0.26555 0.0499,0.0628 0.13599,0.0942 0.2583,0.0941 0.0435,10e-6 0.0901,-0.004 0.14002,-0.0121 0.0499,-0.008 0.0957,-0.0209 0.1376,-0.0386 l 0.0507,0.29452 c -0.0418,0.0177 -0.0942,0.033 -0.15691,0.0459 -0.0628,0.0129 -0.13197,0.0193 -0.20761,0.0193 -0.11588,0 -0.21566,-0.0169 -0.29934,-0.0507 -0.0837,-0.0354 -0.1529,-0.0829 -0.20761,-0.14243 -0.0531,-0.0595 -0.0925,-0.12955 -0.11829,-0.21002 -0.0241,-0.0821 -0.0362,-0.1706 -0.0362,-0.26555"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12935-4" />
- <path
- inkscape:connector-curvature="0"
- d="m 644.4323,562.3761 0,-1.81538 0.3597,-0.0579 0,0.60835 c 0.0241,-0.008 0.0547,-0.0153 0.0917,-0.0217 0.0386,-0.008 0.0756,-0.0121 0.11105,-0.0121 0.103,0 0.1883,0.0145 0.25589,0.0435 0.0692,0.0274 0.12392,0.0668 0.16416,0.11829 0.0418,0.0515 0.0708,0.11266 0.0869,0.18347 0.0177,0.0708 0.0266,0.14967 0.0266,0.23658 l 0,0.71698 -0.3597,0 0,-0.67353 c 0,-0.11587 -0.0153,-0.19795 -0.0459,-0.24623 -0.029,-0.0483 -0.0837,-0.0724 -0.16416,-0.0724 -0.0322,0 -0.0628,0.003 -0.0917,0.01 -0.0274,0.005 -0.0523,0.0105 -0.0748,0.0169 l 0,0.96563 -0.3597,0"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12937-7" />
- <path
- inkscape:connector-curvature="0"
- d="m 646.21592,562.3761 -0.3597,0 0,-1.2698 0.3597,0 0,1.2698 m 0.0338,-1.63674 c 0,0.066 -0.0217,0.11829 -0.0652,0.15691 -0.0418,0.037 -0.0917,0.0555 -0.14967,0.0555 -0.0579,0 -0.10864,-0.0185 -0.15209,-0.0555 -0.0418,-0.0386 -0.0628,-0.0909 -0.0628,-0.15691 0,-0.066 0.0209,-0.11748 0.0628,-0.1545 0.0435,-0.0386 0.0942,-0.0579 0.15209,-0.0579 0.0579,0 0.10782,0.0193 0.14967,0.0579 0.0435,0.037 0.0652,0.0885 0.0652,0.1545"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12939-0" />
- <path
- inkscape:connector-curvature="0"
- d="m 646.86153,562.3761 c -0.0821,-0.16094 -0.16576,-0.34924 -0.25106,-0.56489 -0.0837,-0.21566 -0.16335,-0.45063 -0.23899,-0.70491 l 0.38142,0 c 0.0161,0.0628 0.0346,0.13116 0.0555,0.20519 0.0225,0.0724 0.0451,0.14646 0.0676,0.2221 0.0241,0.074 0.0475,0.14645 0.07,0.21726 0.0241,0.0708 0.0475,0.13519 0.07,0.19313 0.0209,-0.0579 0.0435,-0.12231 0.0676,-0.19313 0.0241,-0.0708 0.0475,-0.14323 0.07,-0.21726 0.0241,-0.0756 0.0467,-0.14967 0.0676,-0.2221 0.0225,-0.074 0.0418,-0.14242 0.0579,-0.20519 l 0.37176,0 c -0.0756,0.25428 -0.15611,0.48925 -0.2414,0.70491 -0.0837,0.21565 -0.16657,0.40395 -0.24865,0.56489 l -0.29935,0"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12941-1" />
- <path
- inkscape:connector-curvature="0"
- d="m 647.75259,561.75085 c 0,-0.11265 0.0169,-0.21082 0.0507,-0.29451 0.0354,-0.0853 0.0813,-0.15611 0.13761,-0.21244 0.0563,-0.0563 0.1207,-0.099 0.19312,-0.12795 0.074,-0.029 0.14967,-0.0435 0.22692,-0.0435 0.18025,0 0.32268,0.0555 0.42729,0.16657 0.10461,0.10944 0.15692,0.27118 0.15692,0.48523 0,0.0209 -8.1e-4,0.0443 -0.002,0.07 -0.002,0.0241 -0.003,0.0459 -0.005,0.0652 l -0.81596,0 c 0.008,0.074 0.0426,0.13277 0.10381,0.17622 0.0611,0.0435 0.14323,0.0652 0.24623,0.0652 0.066,10e-6 0.13036,-0.006 0.19313,-0.0169 0.0644,-0.0129 0.11668,-0.0282 0.15691,-0.0459 l 0.0483,0.2921 c -0.0193,0.01 -0.0451,0.0193 -0.0773,0.029 -0.0322,0.01 -0.0684,0.0177 -0.10863,0.0241 -0.0386,0.008 -0.0805,0.0145 -0.12553,0.0193 -0.0451,0.005 -0.0901,0.007 -0.13519,0.007 -0.11427,0 -0.21405,-0.0169 -0.29934,-0.0507 -0.0837,-0.0338 -0.1537,-0.0797 -0.21003,-0.1376 -0.0547,-0.0595 -0.0958,-0.12956 -0.12312,-0.21003 -0.0258,-0.0805 -0.0386,-0.16737 -0.0386,-0.26072 m 0.84492,-0.1376 c -0.002,-0.0306 -0.007,-0.0603 -0.0169,-0.0893 -0.008,-0.029 -0.0217,-0.0547 -0.041,-0.0772 -0.0177,-0.0225 -0.041,-0.041 -0.07,-0.0555 -0.0274,-0.0145 -0.062,-0.0217 -0.10381,-0.0217 -0.0402,0 -0.0748,0.007 -0.1038,0.0217 -0.029,0.0129 -0.0531,0.0306 -0.0724,0.0531 -0.0193,0.0225 -0.0346,0.0491 -0.0459,0.0797 -0.01,0.029 -0.0169,0.0588 -0.0217,0.0893 l 0.47557,0"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12943-4" />
- </g>
- <g
- transform="matrix(2.163589,0,0,2.163589,-737.5277,-800.24115)"
- style="font-size:2.41406918px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:100%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;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"
- id="text5756-9">
- <path
- inkscape:connector-curvature="0"
- d="m 626.07237,562.39783 c -0.0917,0 -0.18347,-0.003 -0.2752,-0.01 -0.0901,-0.005 -0.18428,-0.0177 -0.28245,-0.0386 l 0,-1.62225 c 0.0772,-0.0145 0.16174,-0.0249 0.25348,-0.0314 0.0917,-0.008 0.17703,-0.0121 0.25589,-0.0121 0.10622,0 0.20358,0.008 0.2921,0.0241 0.0901,0.0145 0.16738,0.0402 0.23175,0.0772 0.0644,0.037 0.11427,0.0861 0.14967,0.14726 0.037,0.0595 0.0555,0.13358 0.0555,0.22209 0,0.13358 -0.0644,0.23899 -0.19313,0.31624 0.10622,0.0402 0.17864,0.095 0.21727,0.16416 0.0386,0.0692 0.0579,0.14726 0.0579,0.23416 -10e-6,0.17543 -0.0644,0.3074 -0.19313,0.39591 -0.12714,0.0885 -0.31705,0.13278 -0.56972,0.13278 m -0.19071,-0.75078 0,0.43212 c 0.0274,0.003 0.0571,0.006 0.0893,0.007 0.0322,0.002 0.0676,0.002 0.10622,0.002 0.11265,0 0.20358,-0.0161 0.27279,-0.0483 0.0692,-0.0322 0.1038,-0.0917 0.1038,-0.17864 0,-0.0772 -0.029,-0.13197 -0.0869,-0.16415 -0.0579,-0.0338 -0.14083,-0.0507 -0.24865,-0.0507 l -0.23658,0 m 0,-0.28727 0.18347,0 c 0.11587,0 0.19875,-0.0145 0.24865,-0.0435 0.0499,-0.0306 0.0748,-0.0789 0.0748,-0.14484 0,-0.0676 -0.0258,-0.11507 -0.0772,-0.14243 -0.0515,-0.0274 -0.12714,-0.041 -0.22692,-0.041 -0.0322,0 -0.0668,8e-4 -0.1038,0.002 -0.037,0 -0.07,0.002 -0.099,0.005 l 0,0.36453"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12946-2" />
- <path
- inkscape:connector-curvature="0"
- d="m 627.61949,562.40024 c -0.10461,-0.002 -0.18991,-0.0129 -0.25589,-0.0338 -0.0644,-0.0209 -0.11588,-0.0499 -0.15451,-0.0869 -0.037,-0.0386 -0.0628,-0.0845 -0.0772,-0.13761 -0.0129,-0.0547 -0.0193,-0.11587 -0.0193,-0.18347 l 0,-1.39774 0.3597,-0.0579 0,1.38326 c 0,0.0322 0.002,0.0612 0.007,0.0869 0.005,0.0258 0.0137,0.0475 0.0266,0.0652 0.0145,0.0177 0.0346,0.0322 0.0603,0.0435 0.0258,0.0113 0.0603,0.0185 0.1038,0.0217 l -0.0507,0.29693"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12948-3" />
- <path
- inkscape:connector-curvature="0"
- d="m 629.06408,561.73878 c 0,0.0998 -0.0145,0.19152 -0.0435,0.27521 -0.029,0.0821 -0.0708,0.15289 -0.12553,0.21244 -0.0547,0.0579 -0.12071,0.103 -0.19796,0.13518 -0.0756,0.0322 -0.16094,0.0483 -0.25589,0.0483 -0.0933,0 -0.17864,-0.0161 -0.25589,-0.0483 -0.0756,-0.0322 -0.14082,-0.0773 -0.19554,-0.13518 -0.0547,-0.0596 -0.0974,-0.13036 -0.12795,-0.21244 -0.0306,-0.0837 -0.0459,-0.17542 -0.0459,-0.27521 0,-0.0998 0.0153,-0.19071 0.0459,-0.27279 0.0322,-0.0821 0.0756,-0.15208 0.13036,-0.21002 0.0563,-0.0579 0.12232,-0.103 0.19796,-0.13519 0.0772,-0.0322 0.16093,-0.0483 0.25106,-0.0483 0.0917,0 0.17542,0.0161 0.25106,0.0483 0.0772,0.0322 0.14324,0.0773 0.19796,0.13519 0.0547,0.0579 0.0974,0.12795 0.12794,0.21002 0.0306,0.0821 0.0459,0.17301 0.0459,0.27279 m -0.36694,0 c 0,-0.11104 -0.0225,-0.19795 -0.0676,-0.26072 -0.0435,-0.0644 -0.10622,-0.0966 -0.1883,-0.0966 -0.0821,0 -0.14565,0.0322 -0.19071,0.0966 -0.0451,0.0628 -0.0676,0.14968 -0.0676,0.26072 -10e-6,0.11105 0.0225,0.19957 0.0676,0.26555 0.0451,0.0644 0.10863,0.0966 0.19071,0.0966 0.0821,1e-5 0.14484,-0.0322 0.1883,-0.0966 0.0451,-0.066 0.0676,-0.1545 0.0676,-0.26555"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12950-3" />
- <path
- inkscape:connector-curvature="0"
- d="m 629.6493,561.70016 c 0,0.20117 0.0813,0.30176 0.24382,0.30176 0.037,0 0.0716,-0.005 0.10381,-0.0145 0.0322,-0.01 0.0595,-0.0209 0.0821,-0.0338 l 0,-0.57455 c -0.0177,-0.003 -0.0386,-0.006 -0.0628,-0.007 -0.0241,-0.003 -0.0523,-0.005 -0.0845,-0.005 -0.0949,0 -0.16577,0.0314 -0.21244,0.0942 -0.0467,0.0628 -0.07,0.14243 -0.07,0.23899 m 0.7894,0.51661 c 0,0.20761 -0.0531,0.36131 -0.15932,0.46109 -0.10461,0.10139 -0.26716,0.15208 -0.48765,0.15208 -0.0773,0 -0.1545,-0.007 -0.23175,-0.0217 -0.0773,-0.0129 -0.14886,-0.0306 -0.21485,-0.0531 l 0.0628,-0.30176 c 0.0563,0.0225 0.11507,0.0402 0.17622,0.0531 0.0628,0.0129 0.13358,0.0193 0.21244,0.0193 0.103,0 0.17542,-0.0225 0.21727,-0.0676 0.0435,-0.0451 0.0652,-0.103 0.0652,-0.17382 l 0,-0.0459 c -0.0386,0.0177 -0.0789,0.0314 -0.12071,0.041 -0.0402,0.008 -0.0845,0.0121 -0.13277,0.0121 -0.17542,0 -0.30981,-0.0515 -0.40315,-0.1545 -0.0933,-0.10461 -0.14001,-0.25026 -0.14001,-0.43695 0,-0.0933 0.0145,-0.17784 0.0435,-0.25348 0.029,-0.0773 0.0708,-0.14323 0.12553,-0.19795 0.0563,-0.0547 0.12473,-0.0966 0.2052,-0.12553 0.0805,-0.0306 0.17139,-0.0459 0.27279,-0.0459 0.0435,0 0.0877,0.002 0.13277,0.007 0.0467,0.003 0.0925,0.008 0.1376,0.0145 0.0451,0.006 0.0877,0.0145 0.12795,0.0241 0.0418,0.008 0.0789,0.0169 0.11104,0.0266 l 0,1.06702"
- style="font-weight:bold;fill:#000000;marker:none"
- id="path12952-4" />
- </g>
- <g
- style="display:inline"
- transform="translate(110,-384.99005)"
- id="g9672">
- <text
- transform="scale(0.99912117,1.0008796)"
- sodipodi:linespacing="125%"
- id="text9674"
- 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="tspan9676"
- style="font-size:32px;font-weight:bold;fill:#aa4400"
- y="122.68937"
- x="101.1684"
- sodipodi:role="line">documents</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="text9678"
- 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="tspan9680">explaining</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="207.24385"
- y="-222.27373"
- id="text11717"
- sodipodi:linespacing="125%"><tspan
- sodipodi:role="line"
- x="207.24385"
- y="-222.27373"
- style="font-size:12px;font-weight:normal;fill:#aa4400"
- id="tspan11719">Sorry, we are</tspan><tspan
- id="tspan11791"
- sodipodi:role="line"
- x="207.24385"
- y="-207.27373"
- style="font-size:12px;font-weight:normal;fill:#aa4400">still designing </tspan><tspan
- id="tspan11793"
- sodipodi:role="line"
- x="207.24385"
- y="-192.27373"
- style="font-size:12px;font-weight:normal;fill:#aa4400">this tutorial.</tspan><tspan
- sodipodi:role="line"
- x="207.24385"
- y="-177.27373"
- style="font-size:12px;font-weight:normal;fill:#aa4400"
- id="tspan11725">Meanwhile...</tspan><tspan
- sodipodi:role="line"
- x="207.24385"
- y="-162.27373"
- style="font-size:12px;font-weight:normal;fill:#aa4400"
- id="tspan11727" /></text>
- <path
- id="path3-6"
- d="m 183.55909,-202.93369 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
- inkscape:groupmode="layer"
id="layer4"
inkscape:label="fr"
style="display:none"
- transform="translate(0,435.8268)"
- sodipodi:insensitive="true">
+ transform="translate(0,435.8268)">
<path
style="font-size:12px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.5;color:#000000;fill:#782121;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 Bold"
d="m 143.60498,108.01879 c 2.04159,-0.0175 4.06723,0.4352 5.9742,1.14011 -0.44085,1.80898 -0.88169,3.61796 -1.32253,5.42694 -2.1242,-0.80207 -4.75305,-1.33989 -6.80649,-0.0684 -1.57683,1.11893 -1.45699,3.1843 -1.44794,4.90247 2.79708,0 5.59416,0 8.39124,0 0,1.88499 0,3.76998 0,5.65496 -2.79708,0 -5.59416,0 -8.39124,0 0,6.11101 0,12.22202 0,18.33303 -2.26502,0 -4.53005,0 -6.79507,0 0.0148,-8.70663 -0.03,-17.4143 0.0228,-26.12026 0.0705,-3.57781 2.09251,-7.2899 5.60748,-8.49659 1.51727,-0.57543 3.15277,-0.77082 4.76751,-0.77227 z m 23.29823,17.42094 c -2.49258,-0.6558 -5.12922,-1.02618 -7.66157,-0.36484 0,6.11101 0,12.22202 0,18.33303 -2.26502,0 -4.53005,0 -6.79508,0 0,-7.57036 0,-15.14071 0,-22.71107 4.6756,-1.62642 9.78131,-2.38439 14.64761,-1.1572 1.39003,-0.10482 0.74225,1.05173 0.63264,1.84794 -0.27454,1.35071 -0.54907,2.70142 -0.8236,4.05214 z"
Modified: trunk/src/main/webapp/tutorials/events.svg
===================================================================
--- trunk/src/main/webapp/tutorials/events.svg 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/webapp/tutorials/events.svg 2012-04-10 18:51:56 UTC (rev 1835)
@@ -25,7 +25,7 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1.4481974"
+ inkscape:zoom="1.6856453"
inkscape:cx="243.10117"
inkscape:cy="1308.5714"
inkscape:document-units="px"
Modified: trunk/src/main/webapp/tutorials/lists.svg
===================================================================
--- trunk/src/main/webapp/tutorials/lists.svg 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/webapp/tutorials/lists.svg 2012-04-10 18:51:56 UTC (rev 1835)
@@ -25,16 +25,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.39040741"
- inkscape:cx="526.18109"
- inkscape:cy="744.09448"
+ inkscape:zoom="1.6856453"
+ inkscape:cx="243.10117"
+ inkscape:cy="1308.5714"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
showborder="true"
inkscape:showpageshadow="false"
- inkscape:window-width="1280"
- inkscape:window-height="776"
+ inkscape:window-width="1080"
+ inkscape:window-height="1868"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1">
Modified: trunk/src/main/webapp/tutorials/tasks.svg
===================================================================
--- trunk/src/main/webapp/tutorials/tasks.svg 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/main/webapp/tutorials/tasks.svg 2012-04-10 18:51:56 UTC (rev 1835)
@@ -25,16 +25,16 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.39040741"
- inkscape:cx="526.18109"
- inkscape:cy="744.09448"
+ inkscape:zoom="1.6856453"
+ inkscape:cx="243.10117"
+ inkscape:cy="1308.5714"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
showborder="true"
inkscape:showpageshadow="false"
- inkscape:window-width="1280"
- inkscape:window-height="776"
+ inkscape:window-width="1080"
+ inkscape:window-height="1868"
inkscape:window-x="0"
inkscape:window-y="24"
inkscape:window-maximized="1" />
@@ -48,8 +48,8 @@
];
</script>
<script
- id="kunelang"
- xlink:href="lang.js" />
+ xlink:href="lang.js"
+ id="kunelang" />
<!-- End kune i18n part -->
<!-- Start kune font part -->
<xhtml:link
Modified: trunk/src/test/java/cc/kune/core/client/state/impl/StateManagerDefaultTest.java
===================================================================
--- trunk/src/test/java/cc/kune/core/client/state/impl/StateManagerDefaultTest.java 2012-04-10 16:13:34 UTC (rev 1834)
+++ trunk/src/test/java/cc/kune/core/client/state/impl/StateManagerDefaultTest.java 2012-04-10 18:51:56 UTC (rev 1835)
@@ -108,7 +108,7 @@
}).when(session).onAppStart(anyBoolean(), (AppStartHandler) Mockito.anyObject());
state = Mockito.mock(StateAbstractDTO.class);
stateManager = new StateManagerDefault(contentProvider, session, history, tokenMatcher, eventBus,
- siteTokens, null);
+ siteTokens, null, null);
stateChangeHandler = Mockito.mock(StateChangedHandler.class);
groupChangeHandler = Mockito.mock(GroupChangedHandler.class);
toolChangeHandler = Mockito.mock(ToolChangedHandler.class);
More information about the kune-commits
mailing list