kune-commits

Download

[email protected]

1587 discussions

r1778 - trunk/src/main/webapp/tutorials
by Vicente J. Ruiz Jurado 25 Mar '12

25 Mar '12

Author: vjrj_ Date: 2012-03-25 12:52:26 +0200 (Sun, 25 Mar 2012) New Revision: 1778 Modified: trunk/src/main/webapp/tutorials/wiki.svg Log: wiki tutorial Modified: trunk/src/main/webapp/tutorials/wiki.svg =================================================================== --- trunk/src/main/webapp/tutorials/wiki.svg 2012-03-24 23:15:23 UTC (rev 1777) +++ trunk/src/main/webapp/tutorials/wiki.svg 2012-03-25 10:52:26 UTC (rev 1778) @@ -18,6 +18,26 @@ version="1.1" inkscape:version="0.48.2 r9819" sodipodi:docname="wiki.svg"> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1.5869046" + 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="1078" + inkscape:window-height="919" + inkscape:window-x="0" + inkscape:window-y="972" + inkscape:window-maximized="0" />  <script id="kunelangtable"> @@ -41,26 +61,6 @@ 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="0.9126846" - inkscape:cx="150.93944" - inkscape:cy="990.73615" - inkscape:document-units="px" - inkscape:current-layer="g27812" - 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" /> <defs id="defs4"> <marker @@ -318,7 +318,7 @@ style="display:inline"> <path transform="translate(835.07499,-335.32678)" - d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" + 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" @@ -348,7 +348,7 @@ sodipodi:cy="379.86218" sodipodi:rx="17.5" sodipodi:ry="12.5" - d="m 290,379.86218 c 0,6.90356 -7.83502,12.5 -17.5,12.5 -9.66498,0 -17.5,-5.59644 -17.5,-12.5 0,-6.90356 7.83502,-12.5 17.5,-12.5 9.66498,0 17.5,5.59644 17.5,12.5 z" + 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" @@ -1548,7 +1548,7 @@ 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 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" + 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" @@ -1561,7 +1561,7 @@ 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 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + 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" @@ -1580,14 +1580,14 @@ sodipodi:cy="16.362183" sodipodi:rx="1" sodipodi:ry="1" - d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + 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 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + 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" @@ -1606,14 +1606,14 @@ sodipodi:cy="16.362183" sodipodi:rx="1" sodipodi:ry="1" - d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + 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 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + 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" @@ -1771,15 +1771,13 @@ 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 + <path 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" + d="m 81.706985,-51.809563 c 134.694835,0 269.389665,0 404.084505,0 0,43.3530887 0,86.706177 0,130.059265 -134.69484,0 -269.38967,0 -404.084505,0 0,-43.353088 0,-86.7061763 0,-130.059265 z" id="rect8725" - width="249.10905" - height="164.02649" - x="30.756149" - y="-87.776787" /> + inkscape:connector-curvature="0" /> <rect - y="197.10745" + y="417.10745" x="112.92581" height="100.40426" width="220.28499" @@ -1791,13 +1789,21 @@ width="212.24748" height="91.091072" x="84.837708" - y="96.393478" /> + y="316.39349" /> + <rect + y="134.43634" + x="68.969276" + height="125.81336" + width="338.27298" + id="rect7368" + 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" /> </g> <g style="display:inline" inkscape:label="graphics" id="layer6" - inkscape:groupmode="layer"> + inkscape:groupmode="layer" + sodipodi:insensitive="true"> <path style="fill:#231f20" d="m 180.78414,137.99559 c 0,0 -18.75938,0 -29.70235,-0.0359 0,12.53593 -6.25313,50.0359 -6.25313,50.0359 20.32266,0 33.61056,0 43.77189,0 4.68984,-18.74999 4.68984,-21.87498 6.22811,-34.36247 -6.22811,-4.7 -14.04452,-15.63749 -14.04452,-15.63749 z m 3.12656,43.74997 c -17.0516,0 -21.74834,0.15 -32.07894,0.15 2.37659,-11.08741 3.93987,-25.1499 4.68984,-37.64989 3.28289,0 8.31863,0 14.88285,0 0,0 0,14.06249 -1.54452,18.63436 7.79764,0.88857 17.17733,0.11563 17.17733,0.11563 -0.002,4.27031 -3.12656,18.74998 -3.12656,18.74998 z m -7.14144,-23.96219 c 1.53826,-6.12813 0.88831,-10.27529 0.88831,-13.53778 1.56329,3.12499 8.46986,9.875 10.97737,12.37812 -4.72424,1.68437 -9.43947,1.15966 -11.86568,1.15966 z" @@ -1806,19 +1812,44 @@ sodipodi:nodetypes="ccccccccccccccccc" /> <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 174.035,690.39519 c -36.78501,6.53254 -42.5348,26.83565 -42.5348,26.83565 l -2.47152,7.12811" + d="m 174.035,910.39519 c -36.78501,6.53254 -42.5348,26.83565 -42.5348,26.83565 l -2.47152,7.12806" id="path14206" inkscape:connector-curvature="0" /> <path inkscape:connector-curvature="0" id="path5858-1" - d="m 145.09495,570.24435 c -36.78501,-6.53253 -42.5348,-26.83565 -42.5348,-26.83565 l -2.47152,-7.1281" + d="m 145.09495,790.24435 c -36.78501,-6.53253 -42.5348,-26.83565 -42.5348,-26.83565 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:#e6e6e6;display:inline" + d="m 146.0621,605.59957 c 0,0 -18.75938,0 -29.70235,-0.0359 0,12.53593 -6.25313,50.0359 -6.25313,50.0359 20.32266,0 33.61056,0 43.77189,0 4.68984,-18.74999 4.68984,-21.87498 6.22811,-34.36247 -6.22811,-4.7 -14.04452,-15.63749 -14.04452,-15.63749 z m 3.12656,43.74997 c -17.0516,0 -21.74834,0.15 -32.07894,0.15 2.37659,-11.08741 3.93987,-25.1499 4.68984,-37.64989 3.28289,0 8.31863,0 14.88285,0 0,0 0,14.06249 -1.54452,18.63436 7.79764,0.88857 17.17733,0.11563 17.17733,0.11563 -0.002,4.27031 -3.12656,18.74998 -3.12656,18.74998 z m -7.14144,-23.96219 c 1.53826,-6.12813 0.88831,-10.27529 0.88831,-13.53778 1.56329,3.12499 8.46986,9.875 10.97737,12.37812 -4.72424,1.68437 -9.43947,1.15966 -11.86568,1.15966 z" + id="path7366" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccc" /> + <path + sodipodi:nodetypes="ccccccccccccccccc" + inkscape:connector-curvature="0" + id="path7360" + d="m 155.0621,605.59957 c 0,0 -18.75938,0 -29.70235,-0.0359 0,12.53593 -6.25313,50.0359 -6.25313,50.0359 20.32266,0 33.61056,0 43.77189,0 4.68984,-18.74999 4.68984,-21.87498 6.22811,-34.36247 -6.22811,-4.7 -14.04452,-15.63749 -14.04452,-15.63749 z m 3.12656,43.74997 c -17.0516,0 -21.74834,0.15 -32.07894,0.15 2.37659,-11.08741 3.93987,-25.1499 4.68984,-37.64989 3.28289,0 8.31863,0 14.88285,0 0,0 0,14.06249 -1.54452,18.63436 7.79764,0.88857 17.17733,0.11563 17.17733,0.11563 -0.002,4.27031 -3.12656,18.74998 -3.12656,18.74998 z m -7.14144,-23.96219 c 1.53826,-6.12813 0.88831,-10.27529 0.88831,-13.53778 1.56329,3.12499 8.46986,9.875 10.97737,12.37812 -4.72424,1.68437 -9.43947,1.15966 -11.86568,1.15966 z" + style="fill:#cccccc;display:inline" /> + <path + style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:4;stroke-linecap:round;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 141.25926,608.85563 c -2.3626,0.59743 -4.43169,2.38001 -4.75976,4.88048 0.18133,2.41344 -0.40978,4.6659 -1.49859,6.81876 -0.79905,2.56206 -1.1344,5.00636 -0.40661,7.80026 0.48076,2.3032 -0.18594,4.8876 -0.707,7.37652 -0.55353,3.63511 0.26395,6.24579 -1.62426,9.39815 -1.37747,2.22812 -1.29318,4.93043 0.73464,5.26476 2.09694,1.72725 4.49318,1.12588 6.90463,0.76975 3.76328,-0.32872 7.65224,-0.36726 11.04497,1.07308 2.68008,0.41565 5.19366,1.03612 7.67053,-0.006 1.98158,-1.66948 4.48353,-0.59481 6.73599,-1.60039 2.54762,-0.22486 3.24128,-2.79328 4.28614,-4.70047 0.79048,-2.23145 2.18741,-4.71816 1.7666,-7.00199 -0.0711,-2.42191 2.04389,-4.53553 1.73478,-7.14406 0.89354,-2.16873 -1.01303,-4.01416 -0.67817,-6.0459 -0.81582,-2.34184 -0.52512,-4.41894 -2.41062,-6.24075 -1.08663,-2.15154 -2.31711,-4.29195 -4.39913,-5.43773 -1.84555,-1.27428 -3.47827,-2.89738 -5.43053,-3.87353 -2.89913,-1.18449 -6.0781,-1.11374 -9.12783,-1.57246 -3.26722,0.17414 -6.6094,-0.34865 -9.82244,-0.016 -0.0464,0.31755 -0.31707,0.40962 -0.60534,0.32897" + id="path7362" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccccccc" /> + <path style="fill:#231f20;display:inline" - inkscape:connector-curvature="0" /> + d="m 163.0621,605.59957 c 0,0 -18.75938,0 -29.70235,-0.0359 0,12.53593 -6.25313,50.0359 -6.25313,50.0359 20.32266,0 33.61056,0 43.77189,0 4.68984,-18.74999 4.68984,-21.87498 6.22811,-34.36247 -6.22811,-4.7 -14.04452,-15.63749 -14.04452,-15.63749 z m 3.12656,43.74997 c -17.0516,0 -21.74834,0.15 -32.07894,0.15 2.37659,-11.08741 3.93987,-25.1499 4.68984,-37.64989 3.28289,0 8.31863,0 14.88285,0 0,0 0,14.06249 -1.54452,18.63436 7.79764,0.88857 17.17733,0.11563 17.17733,0.11563 -0.002,4.27031 -3.12656,18.74998 -3.12656,18.74998 z m -7.14144,-23.96219 c 1.53826,-6.12813 0.88831,-10.27529 0.88831,-13.53778 1.56329,3.12499 8.46986,9.875 10.97737,12.37812 -4.72424,1.68437 -9.43947,1.15966 -11.86568,1.15966 z" + id="path3-8-4" + inkscape:connector-curvature="0" + sodipodi:nodetypes="ccccccccccccccccc" /> + <path + sodipodi:nodetypes="ccccccccccccccccc" + inkscape:connector-curvature="0" + id="path3" + d="m 161.50662,419.14479 -34.4,0 0,50.03594 c 20.3125,0 29.6875,0 50,0 l 0,-34.39844 z m 9.35,43.78594 c -17.04308,0 -16.84912,0 -37.5,0 0,0 0.009,-33.50157 0.009,-37.63126 3.28125,0 12.19844,0 18.75938,0 l 0,18.76563 18.76562,0 c -0.001,4.27031 -0.0344,18.86563 -0.0344,18.86563 z m -12.475,-25.12188 c 0,-2.41094 0,-9.24687 0,-12.50938 2.52344,2.52969 10.00312,10.00626 12.50937,12.50938 -3.19844,0 -10.08437,0 -12.50937,0 z" + style="fill:#231f20;display:inline" /> </g> <g style="display:none" @@ -1871,67 +1902,35 @@ 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="650.30011" + y="870.30011" x="181.83585" 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="650.30011" + y="870.30011" x="181.83585" sodipodi:role="line" id="tspan14210" /><tspan style="font-size:12px;font-weight:normal;fill:#aa4400" - y="665.30011" + y="885.30011" x="181.83585" 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="680.30011" + y="900.30011" x="181.83585" 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="695.30011" + y="915.30011" x="181.83585" sodipodi:role="line">mejorar esta </tspan><tspan style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - y="710.30011" + y="930.30011" x="181.83585" sodipodi:role="line" id="tspan14222">herramienta...</tspan></text> @@ -1939,23 +1938,75 @@ 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="154.17371" - y="566.2572" + y="786.2572" id="text6446" sodipodi:linespacing="125%"><tspan id="tspan14200" sodipodi:role="line" x="154.17371" - y="566.2572" + y="786.2572" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...aquí puedes crear </tspan><tspan id="tspan14251" sodipodi:role="line" x="154.17371" - y="581.2572" + y="801.2572" style="font-size:12px;font-style:normal;font-weight:bold;fill:#aa4400"><tspan id="tspan19321" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">nuevas </tspan>páginas wiki<tspan id="tspan8937" style="font-weight:normal">...</tspan></tspan></text> + <text + sodipodi:linespacing="125%" + id="text3071-9-1-8" + y="428.0531" + x="201.14296" + 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 + sodipodi:role="line" + id="tspan3420" + x="201.14296" + y="428.0531">Las páginas Wiki son similares </tspan><tspan + sodipodi:role="line" + x="201.14296" + y="443.0531" + id="tspan3468">a los documentos pero a diferencia de estos</tspan><tspan + sodipodi:role="line" + x="201.14296" + y="458.0531" + id="tspan6492">las wikis <tspan + style="font-weight:bold" + id="tspan6498">pueden ser editadas por cualquiera</tspan></tspan><tspan + sodipodi:role="line" + x="201.14296" + y="473.0531" + id="tspan6496">no solo por los miembros del grupo</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="197.81267" + y="608.20825" + id="text3430" + sodipodi:linespacing="125%"><tspan + y="608.20825" + x="197.81267" + id="tspan3434" + sodipodi:role="line" /><tspan + y="623.20825" + x="197.81267" + id="tspan3436" + sodipodi:role="line">Esto acelera su actualización</tspan><tspan + y="638.20825" + x="197.81267" + sodipodi:role="line" + id="tspan3466">y construcción</tspan><tspan + y="653.20825" + x="197.81267" + id="tspan3438" + sodipodi:role="line" /><tspan + y="668.20825" + x="197.81267" + id="tspan3440" + sodipodi:role="line" /></text> </g> <g style="display:none" @@ -1976,94 +2027,49 @@ x="207.26842" sodipodi:role="line">wiki</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="181.83585" - y="650.30011" + y="870.30011" id="text11729" sodipodi:linespacing="125%"><tspan id="tspan11731" sodipodi:role="line" x="181.83585" - y="650.30011" + y="870.30011" style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan id="tspan11733" sodipodi:role="line" x="181.83585" - y="665.30011" + y="885.30011" 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="181.83585" - y="680.30011" + y="900.30011" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" id="tspan11739">and participate</tspan><tspan id="tspan11741" sodipodi:role="line" x="181.83585" - y="695.30011" + y="915.30011" 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="566.2572" + y="786.2572" x="154.17371" 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="566.2572" + y="786.2572" x="154.17371" sodipodi:role="line" id="tspan11745">...here you can create</tspan><tspan id="tspan11814" style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" - y="581.2572" + y="801.2572" x="154.17371" sodipodi:role="line">your new <tspan style="font-weight:bold" @@ -2081,6 +2087,48 @@ y="184.92917" x="207.5244" sodipodi:role="line">explained</tspan></text> + <text + sodipodi:linespacing="125%" + id="text11717-5" + y="235.79573" + x="172.0498" + 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="tspan11719-7" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="235.79573" + x="172.0498" + sodipodi:role="line">Sorry, we are</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="250.79573" + x="172.0498" + sodipodi:role="line" + id="tspan11791-7">still designing </tspan><tspan + id="tspan11725-4" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="265.79572" + x="172.0498" + sodipodi:role="line">this tutorial.</tspan><tspan + id="tspan11727-0" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="280.79572" + x="172.0498" + sodipodi:role="line" /></text> + <g + id="g16880" + transform="matrix(0.75024247,0,0,0.75024247,140.39504,225.44945)" + style="display:inline"> + <g + id="Layer_1-8" /> + <g + id="cog_x5F_alt_x5F_32x32"> + <path + id="path16872" + d="m 32,17.969 v -4 L 27.219,11.977 C 27.086,11.602 26.946,11.24 26.774,10.883 L 28.704,6.078 25.875,3.25 21.112,5.211 C 20.75,5.036 20.378,4.888 19.995,4.75 L 17.969,0 h -4 L 11.992,4.734 C 11.594,4.875 11.211,5.023 10.831,5.203 L 6.078,3.294 3.25,6.122 5.188,10.833 C 5,11.219 4.847,11.614 4.703,12.021 L 0,14.031 v 4 l 4.706,1.961 c 0.146,0.406 0.302,0.802 0.489,1.188 l -1.903,4.742 2.828,2.828 4.724,-1.945 c 0.378,0.18 0.766,0.325 1.164,0.461 L 14.031,32 h 4 l 1.979,-4.758 c 0.38,-0.141 0.755,-0.289 1.114,-0.461 l 4.797,1.922 2.828,-2.828 -1.969,-4.773 c 0.167,-0.359 0.305,-0.722 0.438,-1.094 L 32,17.969 z M 15.969,22 c -3.312,0 -6,-2.688 -6,-6 0,-3.312 2.688,-6 6,-6 3.312,0 6,2.688 6,6 0,3.312 -2.688,6 -6,6 z" + inkscape:connector-curvature="0" + style="fill:#231f20" /> + </g> + </g> </g> <g inkscape:groupmode="layer" @@ -2235,7 +2283,7 @@ ns1:transition-duration-ms="1000" ns1:hide="true" ns1:clip="true" - ns1:title="under construction" + ns1:title="like docs" ns1:transition-zoom-percent="0" ns1:timeout-ms="5000" ns1:timeout-enable="false" @@ -2249,7 +2297,7 @@ ns1:clip="true" ns1:hide="true" ns1:transition-duration-ms="1000" - ns1:sequence="3" + ns1:sequence="4" ns1:refid="rect6444" /> <ns1:frame ns1:transition-profile="linear" @@ -2260,6 +2308,17 @@ ns1:clip="true" ns1:hide="true" ns1:transition-duration-ms="1000" - ns1:sequence="4" + ns1:sequence="5" ns1:refid="rect14204" /> + <ns1:frame + ns1:transition-profile="linear" + ns1:timeout-enable="false" + ns1:timeout-ms="5000" + ns1:transition-zoom-percent="0" + ns1:title="fast" + ns1:clip="true" + ns1:hide="true" + ns1:transition-duration-ms="1000" + ns1:sequence="3" + ns1:refid="rect7368" /> </svg>

1 0

r1777 - in trunk: script src/main/java/cc/kune/chat/client src/main/java/cc/kune/common/client/actions/gwtui src/main/java/cc/kune/common/client/actions/ui src/main/java/cc/kune/core/client/sitebar src/main/java/cc/kune/core/client/sitebar/spaces src/main/java/cc/kune/core/client/sn/actions/registry src/main/java/cc/kune/core/server/notifier src/main/java/cc/kune/core/server/rpc src/main/java/cc/kune/core/shared/utils src/main/webapp/tutorials
by Vicente J. Ruiz Jurado 24 Mar '12

24 Mar '12

Author: vjrj_ Date: 2012-03-25 00:15:23 +0100 (Sun, 25 Mar 2012) New Revision: 1777 Added: trunk/script/kgrep Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java trunk/src/main/java/cc/kune/core/server/notifier/NotificationSenderDefault.java trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java trunk/src/main/java/cc/kune/core/server/notifier/PendingNotification.java trunk/src/main/java/cc/kune/core/server/notifier/PendingNotificationSender.java trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java trunk/src/main/java/cc/kune/core/shared/utils/SharedFileDownloadUtils.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/main/webapp/tutorials/wiki.svg Log: Minor fixes. Tutorials ready to translate Added: trunk/script/kgrep =================================================================== --- trunk/script/kgrep (rev 0) +++ trunk/script/kgrep 2012-03-24 23:15:23 UTC (rev 1777) @@ -0,0 +1 @@ +egrep -ri "$*" src/main/java/cc | egrep -v "\.properties|svn-base" Property changes on: trunk/script/kgrep ___________________________________________________________________ Name: svn:executable + * Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -206,7 +206,6 @@ }); kuneEventBus.addHandler(AvatarChangedEvent.getType(), new AvatarChangedEvent.AvatarChangedHandler() { - @Override public void onAvatarChanged(final AvatarChangedEvent event) { setAvatar(event.getPhotoBinary()); 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-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -56,6 +56,7 @@ if (notStandAlone) { button = new Button(); button.removeStyleName("gwt-Button"); + descriptor.putValue(MenuDescriptor.MENU_SHOW_NEAR_TO, button); iconLabel = new IconLabel(""); final ImageResource rightIcon = ((MenuDescriptor) descriptor).getRightIcon(); if (rightIcon != null) { @@ -66,7 +67,7 @@ @Override public void onClick(final ClickEvent event) { event.stopPropagation(); - show(); + showRelativeTo(button); } }); final String id = descriptor.getId(); @@ -155,11 +156,7 @@ @Override protected void show() { - if (notStandAlone) { - showRelativeTo(button); - } else { - showRelativeTo(descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO)); - } + showRelativeTo(descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO)); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -22,6 +22,7 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.ui.IconLabel; import cc.kune.common.shared.utils.TextUtils; @@ -108,6 +109,6 @@ @Override protected void show() { parentMenu.show(); - // FIXME: item.selectItem + ((MenuDescriptor) descriptor.getParent()).selectMenu((MenuItemDescriptor) descriptor); } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -30,6 +30,7 @@ import cc.kune.common.client.errors.NotImplementedException; import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.shared.utils.TextUtils; +import cc.kune.common.shared.utils.Url; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Composite; @@ -137,6 +138,8 @@ private void setIcon(final Object icon) { if (icon instanceof ImageResource) { setIconResource((ImageResource) icon); + } else if (icon instanceof Url) { + setIconUrl(((Url) icon).toString()); } else if (icon instanceof String) { final String iconS = (String) icon; if (iconS.startsWith("http")) { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -6,6 +6,7 @@ import cc.kune.common.client.actions.ui.descrip.MenuShowAction; import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.common.shared.utils.Url; import cc.kune.core.client.events.MyGroupsChangedEvent; import cc.kune.core.client.events.UserSignInOrSignOutEvent; import cc.kune.core.client.events.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; @@ -41,7 +42,7 @@ this.session = session; this.newGroupAction = newGroupAction; this.siteOptions = siteOptions; - // menuShowAction.setMenu(this); + menuShowAction.setMenu(this); setId(MENU_ID); setParent(siteOptions.getRightToolbar()); setStyles("k-no-backimage, k-btn-sitebar"); @@ -69,11 +70,10 @@ } private void addPartipationToMenu(final GroupDTO group) { - // FIXME, better user URL in GuiDescritors... - final String logoImageUrl = session.getSiteUrl() + "/" + downloadProvider.get().getGroupLogo(group); final MenuItemDescriptor participant = new MenuItemDescriptor(gotoGroupAction); participant.setTarget(group); - participant.withText(group.getLongName()).withIcon(logoImageUrl).setParent(this, true); + participant.withText(group.getLongName()).withIcon( + new Url(downloadProvider.get().getGroupLogo(group))).setParent(this, true); } private void regenerateMenu(final boolean isLogged) { Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPanel.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -67,7 +67,8 @@ homeSpaceTooltip = Tooltip.to(homeButton, i18n.t("Your home page in [%s]", siteCommonName)); userSpaceTooltip = Tooltip.to( userButton, - i18n.t("User space: it shows a list of all documents and contents " + "in which you participate")); + i18n.t("User space: it shows a list of all documents and contents " + "in which you participate") + + " (Alt+I)"); groupSpaceTooltip = Tooltip.to(groupButton, i18n.t("Group and personal space: Where you can create " + "and publish contents for your personal or group web spaces")); publicSpaceTooltip = Tooltip.to(publicButton, Modified: trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/client/sitebar/spaces/SpaceSelectorPresenter.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -19,8 +19,13 @@ */ package cc.kune.core.client.sitebar.spaces; +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.KeyStroke; +import cc.kune.common.client.actions.Shortcut; import cc.kune.common.client.log.Log; import cc.kune.common.client.notify.NotifyLevel; +import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import cc.kune.common.client.ui.MaskWidgetView; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.SignIn; @@ -117,7 +122,8 @@ public SpaceSelectorPresenter(final EventBus eventBus, final StateManager stateManager, final SpaceSelectorView view, final SpaceSelectorProxy proxy, final GSpaceArmor armor, final Session session, final Provider<SignIn> signIn, final GSpaceBackManager backManager, - final I18nTranslationService i18n, final MaskWidgetView mask) { + final I18nTranslationService i18n, final MaskWidgetView mask, + final GlobalShortcutRegister shortcutRegister) { super(eventBus, view, proxy); this.stateManager = stateManager; this.armor = armor; @@ -140,11 +146,7 @@ view.getUserBtn().addClickHandler(new ClickHandler() { @Override public void onClick(final ClickEvent event) { - signIn.get().setGotoTokenOnCancel(stateManager.getCurrentToken()); - restoreToken(inboxToken); - if (session.isLogged()) { - setDown(Space.userSpace); - } + onUserBtnClick(stateManager, session, signIn); } }); view.getGroupBtn().addClickHandler(new ClickHandler() { @@ -182,6 +184,13 @@ getView().setPublicVisible(event.getInitData().isPublicSpaceVisible()); } }); + final KeyStroke shortcut = Shortcut.getShortcut(false, true, false, false, Character.valueOf('I')); + shortcutRegister.put(shortcut, new AbstractExtendedAction() { + @Override + public void actionPerformed(final ActionEvent event) { + onUserBtnClick(stateManager, session, signIn); + } + }); } @ProxyEvent @@ -206,6 +215,10 @@ getView().setWindowTitle(i18n.t("Home")); } + private void onPublicClick() { + + } + private void onPublicSpaceSelect(final boolean shouldRestoreToken) { restoreToken(shouldRestoreToken, inboxToken); armor.selectPublicSpace(); @@ -258,6 +271,15 @@ } } + private void onUserBtnClick(final StateManager stateManager, final Session session, + final Provider<SignIn> signIn) { + signIn.get().setGotoTokenOnCancel(stateManager.getCurrentToken()); + restoreToken(inboxToken); + if (session.isLogged()) { + setDown(Space.userSpace); + } + } + @ProxyEvent public void onUserSignOut(final UserSignOutEvent event) { if (currentSpace == Space.userSpace) { Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/registry/GroupSNConfActions.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -23,6 +23,7 @@ import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.events.StateChangedEvent; @@ -87,10 +88,11 @@ final MenuRadioItemDescriptor openItem = membersModeration.get().withModeration(AdmissionType.Open); addImpl(optionsMenu); + new MenuSeparatorDescriptor(optionsMenu); new MenuTitleItemDescriptor(i18n.t("Options")).withParent(optionsMenu); new MenuItemDescriptor(addEntityToThisGroupAction).withParent(optionsMenu).setPosition(0); new MenuItemDescriptor(unJoinGroupAction).withParent(optionsMenu).setPosition(1); - + // new MenuSeparatorDescriptor(optionsMenu).setPosition(2); visibilitySubMenu.withText(i18n.t("Users who can view this member list")).withParent(optionsMenu); moderationSubMenu.withText(i18n.t("New members policy")).withParent(optionsMenu); anyoneItem.withParent(visibilitySubMenu).withText(i18n.t("anyone")); Modified: trunk/src/main/java/cc/kune/core/server/notifier/NotificationSenderDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/NotificationSenderDefault.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/server/notifier/NotificationSenderDefault.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -25,9 +25,10 @@ public class NotificationSenderDefault implements NotificationSender { public static final Log LOG = LogFactory.getLog(NotificationSenderDefault.class); private final String emailTemplate; + @SuppressWarnings("unused") private final I18nTranslationServiceMultiLang i18n; private final MailService mailService; - private final String subjectPrefix; + private final String siteName; private final UsersOnline usersOnline; private final KuneWaveService waveService; private final XmppManager xmppManager; @@ -45,10 +46,13 @@ kuneProperties.get(KuneProperties.SITE_EMAIL_TEMPLATE))); Preconditions.checkNotNull(emailTemplate); Preconditions.checkArgument(TextUtils.notEmpty(emailTemplate)); - subjectPrefix = new StringBuffer("[").append(kuneProperties.get(KuneProperties.SITE_NAME)).append( - "] ").toString(); + siteName = kuneProperties.get(KuneProperties.SITE_NAME); } + private String addBraquet(final String subjectPrefix) { + return new StringBuffer("[").append(subjectPrefix).append("] ").toString(); + } + private boolean noOnline(final String username) { final boolean logged = usersOnline.isLogged(username); LOG.debug(String.format("User '%s' is online for notifications? %s", username, logged)); @@ -62,8 +66,10 @@ final NotificationType notifyType = notification.getNotifyType(); final boolean forceSend = notification.isForceSend(); final boolean isHtml = notification.isHtml(); - - subject.setTemplate(subjectPrefix + subject.getTemplate()); + final String subjectPrefix = notification.getSubjectPrefix(); + final String subjectWithoutBra = subjectPrefix.equals(PendingNotification.DEFAULT_SUBJECT_PREFIX) ? siteName + : subjectPrefix; + subject.setTemplate(addBraquet(subjectWithoutBra) + subject.getTemplate()); if (subject.shouldBeTranslated()) { // Translate per recipient language // final String subjectTranslation = i18n.tWithNT(user.getLanguage(), @@ -111,5 +117,4 @@ } } - } Modified: trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/server/notifier/NotificationService.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -33,13 +33,6 @@ return FormatedString.build(subject); } - public void notifyGroup(final Group groupToNotify, final Group groupSender, final String subject, - final String message) { - final Set<User> members = new HashSet<User>(); - GroupServerUtils.getAllUserMembers(members, groupToNotify, SocialNetworkSubGroup.ALL_GROUP_MEMBERS); - notifyToAll(groupSender, subject, message, members); - } - public void notifyGroupAdmins(final Group groupToNotify, final Group groupSender, final String subject, final String message) { final Set<User> adminMembers = new HashSet<User>(); @@ -47,23 +40,31 @@ notifyToAll(groupSender, subject, message, adminMembers); } + public void notifyGroupMembers(final Group groupToNotify, final Group groupSender, + final String subject, final String message) { + final Set<User> members = new HashSet<User>(); + GroupServerUtils.getAllUserMembers(members, groupToNotify, SocialNetworkSubGroup.ALL_GROUP_MEMBERS); + notifyToAll(groupSender, subject, message, members); + } + public void notifyGroupToUser(final Group group, final User to, final String subject, final String message) { - sender.add(NotificationType.email, createPlainSubject(subject), + sender.add(NotificationType.email, group.getShortName(), createPlainSubject(subject), helper.groupNotification(group.getShortName(), group.hasLogo(), message), true, false, to); } private void notifyToAll(final Group groupSender, final String subject, final String message, final Collection<User> users) { for (final User to : users) { - sender.add(NotificationType.email, createPlainSubject(subject), + sender.add(NotificationType.email, groupSender.getShortName(), createPlainSubject(subject), helper.groupNotification(groupSender.getShortName(), groupSender.hasLogo(), message), true, true, to); } } public void notifyUserToUser(final User from, final User to, final String subject, final String message) { - sender.add(NotificationType.email, createPlainSubject(subject), + sender.add(NotificationType.email, PendingNotification.DEFAULT_SUBJECT_PREFIX, + createPlainSubject(subject), helper.userNotification(from.getShortName(), from.hasLogo(), message), true, false, to); } @@ -83,7 +84,7 @@ */ public void sendEmailToWithLink(final User to, final String subject, final String body, final String hash) { - sender.add(NotificationType.email, createPlainSubject(subject), helper.userNotification(body, hash), - true, true, to); + sender.add(NotificationType.email, PendingNotification.DEFAULT_SUBJECT_PREFIX, + createPlainSubject(subject), helper.userNotification(body, hash), true, true, to); } } Modified: trunk/src/main/java/cc/kune/core/server/notifier/PendingNotification.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/PendingNotification.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/server/notifier/PendingNotification.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -8,12 +8,14 @@ */ public class PendingNotification { + public static final String DEFAULT_SUBJECT_PREFIX = new String(); + /** * The Constant NONE is used when for instance, all the destinations are not * local, so, we should not notify them by email */ - public static final PendingNotification NONE = new PendingNotification(null, null, null, false, false, - null); + public static final PendingNotification NONE = new PendingNotification(null, null, null, null, false, + false, null); /** The body. */ private final FormatedString body; @@ -33,6 +35,9 @@ /** The subject. */ private final FormatedString subject; + /** The subject prefix [sitename] */ + private final String subjectPrefix; + /** * Instantiates a new pending notification * @@ -52,7 +57,30 @@ public PendingNotification(final NotificationType notifyType, final FormatedString subject, final FormatedString body, final boolean isHtml, final boolean forceSend, final DestinationProvider destProvider) { + this(notifyType, DEFAULT_SUBJECT_PREFIX, subject, body, isHtml, forceSend, destProvider); + } + + /** + * Instantiates a new pending notification + * + * @param notifyType + * the notify type + * @param subject + * the subject + * @param body + * the body + * @param isHtml + * the is html + * @param forceSend + * the force send + * @param destProvider + * the dest provider + */ + public PendingNotification(final NotificationType notifyType, final String subjectPrefix, + final FormatedString subject, final FormatedString body, final boolean isHtml, + final boolean forceSend, final DestinationProvider destProvider) { this.notifyType = notifyType; + this.subjectPrefix = subjectPrefix; this.subject = subject; this.body = body; this.isHtml = isHtml; @@ -141,6 +169,10 @@ return subject; } + public String getSubjectPrefix() { + return subjectPrefix; + } + @Override public int hashCode() { final int prime = 31; Modified: trunk/src/main/java/cc/kune/core/server/notifier/PendingNotificationSender.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/notifier/PendingNotificationSender.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/server/notifier/PendingNotificationSender.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -54,12 +54,12 @@ // LinkedHashSet<PendingNotificationProvider>()); } - public void add(final NotificationType type, final FormatedString subject, final FormatedString body, - final boolean isHtml, final boolean forceSend, final User to) { + public void add(final NotificationType type, final String subjectPrefix, final FormatedString subject, + final FormatedString body, final boolean isHtml, final boolean forceSend, final User to) { add(new PendingNotificationProvider() { @Override public PendingNotification get() { - return new PendingNotification(type, subject, body, isHtml, forceSend, + return new PendingNotification(type, subjectPrefix, subject, body, isHtml, forceSend, new SimpleDestinationProvider(to)); } }); Modified: trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java =================================================================== --- trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/server/rpc/SocialNetworkRPC.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -31,6 +31,7 @@ import cc.kune.core.server.notifier.NotificationService; import cc.kune.core.server.persist.KuneTransactional; import cc.kune.core.shared.domain.AccessRol; +import cc.kune.core.shared.domain.AdmissionType; import cc.kune.core.shared.domain.utils.StateToken; import cc.kune.core.shared.dto.SocialNetworkDataDTO; import cc.kune.core.shared.dto.SocialNetworkRequestResult; @@ -72,8 +73,13 @@ checkIsNotPersonalGroup(group); final Group groupToAccept = groupManager.findByShortName(groupToAcceptShortName); socialNetworkManager.acceptJoinGroup(userLogged, groupToAccept, group); - notifyService.notifyGroup(groupToAccept, group, "Accepted as member", + notifyService.notifyGroupMembers(groupToAccept, group, "Accepted as member", "You are now member of this group"); + // notifyService.notifyGroupAdmins(group, group, hash, + // groupToAcceptShortName) + // "%admin approved the membership of the %user in the group %group". + // notifyService.notifyGroupAdmins(group, group, "Collaborator accepted", + // "There is a pending collaborator in this group. Please accept or deny him/her"); return generateResponse(userLogged, group); } @@ -88,7 +94,7 @@ checkIsNotPersonalGroup(group); final Group groupToAdd = groupManager.findByShortName(groupToAddShortName); socialNetworkManager.addGroupToAdmins(userLogged, groupToAdd, group); - notifyService.notifyGroup(groupToAdd, group, "Added as administrator", + notifyService.notifyGroupMembers(groupToAdd, group, "Added as administrator", "You are now admin of this group"); return generateResponse(userLogged, group); } @@ -113,7 +119,7 @@ checkIsNotPersonalGroup(group); final Group groupToAdd = groupManager.findByShortName(groupToAddShortName); socialNetworkManager.addGroupToCollabs(userLogged, groupToAdd, group); - notifyService.notifyGroup(groupToAdd, group, "Added as collaborator", + notifyService.notifyGroupMembers(groupToAdd, group, "Added as collaborator", "You are now a collaborator of this group"); return generateResponse(userLogged, group); } @@ -150,7 +156,7 @@ checkIsNotPersonalGroup(group); final Group groupToDelete = groupManager.findByShortName(groupToDeleleShortName); socialNetworkManager.deleteMember(userLogged, groupToDelete, group); - notifyService.notifyGroup(groupToDelete, group, "Removed as collaborator", + notifyService.notifyGroupMembers(groupToDelete, group, "Removed as collaborator", "You have been remove as collaborator of this group"); return generateResponse(userLogged, group); } @@ -166,7 +172,7 @@ checkIsNotPersonalGroup(group); final Group groupToDenyJoin = groupManager.findByShortName(groupToDenyShortName); socialNetworkManager.denyJoinGroup(userLogged, groupToDenyJoin, group); - notifyService.notifyGroup(groupToDenyJoin, group, "Membership denied", + notifyService.notifyGroupMembers(groupToDenyJoin, group, "Membership denied", "Your membership to this group has been rejected"); return generateResponse(userLogged, group); } @@ -196,8 +202,10 @@ final User user = userSessionManager.getUser(); final Group group = groupManager.findByShortName(groupToken.getGroup()); checkIsNotPersonalGroup(group); - notifyService.notifyGroupAdmins(group, group, "Pending collaborator", - "There is a pending collaborator in this group. Please accept or deny him/her"); + if (!group.getAdmissionType().equals(AdmissionType.Open)) { + notifyService.notifyGroupAdmins(group, group, "Pending collaborator", + "There is a pending collaborator in this group. Please accept or deny him/her"); + } return socialNetworkManager.requestToJoin(user, group); } @@ -212,7 +220,7 @@ checkIsNotPersonalGroup(group); final Group groupToSetCollab = groupManager.findByShortName(groupToSetCollabShortName); socialNetworkManager.setAdminAsCollab(userLogged, groupToSetCollab, group); - notifyService.notifyGroup(groupToSetCollab, group, "Membership changed", + notifyService.notifyGroupMembers(groupToSetCollab, group, "Membership changed", "Your membership to this group have changed. You are now a collaborator of this group"); return generateResponse(userLogged, group); } @@ -228,7 +236,7 @@ checkIsNotPersonalGroup(group); final Group groupToSetAdmin = groupManager.findByShortName(groupToSetAdminShortName); socialNetworkManager.setCollabAsAdmin(userLogged, groupToSetAdmin, group); - notifyService.notifyGroup(groupToSetAdmin, group, "Membership changed", + notifyService.notifyGroupMembers(groupToSetAdmin, group, "Membership changed", "Your membership to this group have changed. You are now an admin of this group"); return generateResponse(userLogged, group); } Modified: trunk/src/main/java/cc/kune/core/shared/utils/SharedFileDownloadUtils.java =================================================================== --- trunk/src/main/java/cc/kune/core/shared/utils/SharedFileDownloadUtils.java 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/java/cc/kune/core/shared/utils/SharedFileDownloadUtils.java 2012-03-24 23:15:23 UTC (rev 1777) @@ -20,9 +20,8 @@ public String getGroupLogo(final GroupDTO group) { return prefix - + (group.hasLogo() ? getLogoImageUrl(group.getShortName()) - : group.isPersonal() ? FileConstants.PERSON_NO_AVATAR_IMAGE - : FileConstants.GROUP_NO_AVATAR_IMAGE); + + (group.hasLogo() ? getLogoImageUrl(group.getShortName()) : group.isPersonal() ? "/" + + FileConstants.PERSON_NO_AVATAR_IMAGE : "/" + FileConstants.GROUP_NO_AVATAR_IMAGE); } public String getLogoAvatarHtml(final String groupName, final boolean groupHasLogo, Modified: trunk/src/main/webapp/tutorials/barters.svg =================================================================== --- trunk/src/main/webapp/tutorials/barters.svg 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/webapp/tutorials/barters.svg 2012-03-24 23:15:23 UTC (rev 1777) @@ -25,7 +25,7 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.5869046" + inkscape:zoom="1.6245201" inkscape:cx="243.10117" inkscape:cy="1308.5714" inkscape:document-units="px" @@ -48,8 +48,8 @@ ]; </script> <script - id="kunelang" - xlink:href="lang.js" /> + xlink:href="lang.js" + id="kunelang" />   <xhtml:link @@ -398,7 +398,8 @@ inkscape:groupmode="layer" id="layer6" inkscape:label="graphics" - style="display:inline"> + style="display:inline" + sodipodi:insensitive="true"> <g transform="matrix(1.5625,0,0,1.5636219,145.37648,136.864)" id="fullscreen_x5F_exit_x5F_32x32"> @@ -408,22 +409,22 @@ style="fill:#231f20" transform="matrix(-1,0,0,1,52,0)" id="polygon8" - points="32,29.172 27.414,24.586 32,20 20,20 20,32 24.586,27.414 29.172,32 " /> + points="32,20 20,20 20,32 24.586,27.414 29.172,32 32,29.172 27.414,24.586 " /> <polygon style="fill:#231f20" transform="matrix(-1,0,0,-1,32,12)" id="polygon10" - points="12,0 7.414,4.586 2.875,0.043 0.047,2.871 4.586,7.414 0,12 12,12 " /> + points="2.875,0.043 0.047,2.871 4.586,7.414 0,12 12,12 12,0 7.414,4.586 " /> <polygon transform="matrix(1,0,0,-1,0,52)" style="fill:#231f20" id="polygon12" - points="12,20 0,20 4.586,24.586 0,29.172 2.828,32 7.414,27.414 12,32 " /> + points="4.586,24.586 0,29.172 2.828,32 7.414,27.414 12,32 12,20 0,20 " /> <polygon style="fill:#231f20" transform="translate(-20,0)" id="polygon14" - points="20,0 20,12 32,12 27.414,7.414 31.961,2.871 29.133,0.043 24.586,4.586 " /> + points="32,12 27.414,7.414 31.961,2.871 29.133,0.043 24.586,4.586 20,0 20,12 " /> </g> </g> <path @@ -2062,6 +2063,431 @@ sodipodi:role="line">u otra cosa que acordemos</tspan></text> </g> <g + style="display:none" + inkscape:label="en-working" + id="g15142" + inkscape:groupmode="layer"> + <g + transform="translate(106.00677,59.44173)" + id="g15144" + style="display:inline"> + <text + transform="scale(0.99912117,1.0008796)" + sodipodi:linespacing="125%" + id="text15146" + 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="tspan15148" + style="font-size:32px;font-weight:bold;fill:#aa4400" + y="122.68937" + x="101.1684" + sodipodi:role="line">troco<tspan + style="font-size:10px;font-weight:normal" + id="tspan15150"> (trueque)</tspan></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="text15152" + 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="tspan15154">explicando los</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="text15156" + sodipodi:linespacing="125%" + transform="translate(0,435.82679)"><tspan + y="-168.92439" + x="149.85907" + id="tspan15158" + sodipodi:role="line" + style="font-style:italic">pulsa con tu ratón para continuar</tspan></text> + <text + sodipodi:linespacing="125%" + id="text15160" + y="1065.2544" + x="586.51654" + 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="1065.2544" + x="586.51654" + sodipodi:role="line" + id="tspan15162">Nuestro sistema (aún experimental)</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1080.2544" + x="586.51654" + sodipodi:role="line" + id="tspan15164">de trueque permite intercambiar bienes </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1095.2544" + x="586.51654" + sodipodi:role="line" + id="tspan15166">y servicios de forma <tspan + style="font-weight:bold" + id="tspan15168">descentralizada </tspan></tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1110.2544" + x="586.51654" + sodipodi:role="line" + id="tspan15170">entre sistemas similares, al contrario </tspan><tspan + id="tspan15172" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1125.2544" + x="586.51654" + sodipodi:role="line">que otros servicios centralizados </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1140.2544" + x="586.51654" + sodipodi:role="line" + id="tspan15174">como ebay</tspan></text> + <text + sodipodi:linespacing="125%" + id="text15176" + y="1310.3" + x="181.83585" + 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="1310.3" + x="181.83585" + sodipodi:role="line" + id="tspan15178" /><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1325.3" + x="181.83585" + sodipodi:role="line" + id="tspan15180">...darnos tu <tspan + id="tspan15182" + style="font-weight:bold">feedback </tspan></tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1340.3" + x="181.83585" + sodipodi:role="line" + id="tspan15184">y participar para </tspan><tspan + id="tspan15186" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1355.3" + x="181.83585" + sodipodi:role="line">mejorar esta </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1370.3" + x="181.83585" + sodipodi:role="line" + id="tspan15188">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="154.17371" + y="1226.2572" + id="text15190" + sodipodi:linespacing="125%"><tspan + id="tspan15192" + sodipodi:role="line" + x="154.17371" + y="1226.2572" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...aquí puedes crear </tspan><tspan + id="tspan15194" + sodipodi:role="line" + x="154.17371" + y="1241.2572" + style="font-size:12px;font-style:normal;font-weight:bold;fill:#aa4400"><tspan + id="tspan15196" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">nuevos </tspan>trocos<tspan + style="font-weight:normal" + id="tspan15198"> y </tspan></tspan><tspan + sodipodi:role="line" + x="154.17371" + y="1256.2572" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan15200">compartirlos</tspan></text> + <text + sodipodi:linespacing="125%" + id="text15202" + y="644.05975" + x="514.38214" + 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="tspan15204" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="644.05975" + x="514.38214" + sodipodi:role="line">Con nuestro <tspan + style="font-weight:bold" + id="tspan15206">troco</tspan>, ofreces los bienes</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="659.05975" + x="514.38214" + sodipodi:role="line" + id="tspan15208"><tspan + style="font-weight:bold" + id="tspan15210">o servicios</tspan>que quieres compartir, </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="674.05975" + x="514.38214" + sodipodi:role="line" + id="tspan15212">a tus contactos, o a tus grupos, o incluso </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="689.05975" + x="514.38214" + sodipodi:role="line" + id="tspan15214">al público en general y esta información </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="704.05975" + x="514.38214" + sodipodi:role="line" + id="tspan15216">es una comunicación <tspan + style="font-weight:bold" + id="tspan15218">persona a persona</tspan></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="113.608" + y="415.48599" + id="text15220" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="113.608" + y="415.48599" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15222">Imaginemos que tienes un bien </tspan><tspan + sodipodi:role="line" + x="113.608" + y="430.48599" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15224">que quieres <tspan + style="font-weight:bold" + id="tspan15226">ofrecer</tspan> a tus contactos, </tspan><tspan + sodipodi:role="line" + x="113.608" + y="445.48599" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15228">grupos o al público en general</tspan><tspan + sodipodi:role="line" + x="113.608" + y="460.48599" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15230" /></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="122.75532" + y="565.22272" + id="text15232" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="122.75532" + y="565.22272" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15234">en un sistema <tspan + style="font-weight:bold" + id="tspan15236">centralizado</tspan> como ebay, </tspan><tspan + sodipodi:role="line" + x="122.75532" + y="580.22272" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15238">tú publicitas en su sitio lo que ofreces, </tspan><tspan + sodipodi:role="line" + x="122.75532" + y="595.22272" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15240">y otras personas buscan y te contactan </tspan><tspan + sodipodi:role="line" + x="122.75532" + y="610.22272" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15242">para adquirirlo</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="545.91241" + y="765.43542" + id="text15244" + sodipodi:linespacing="125%"><tspan + id="tspan15246" + sodipodi:role="line" + x="545.91241" + y="765.43542" + style="font-size:12px;font-weight:normal;fill:#aa4400">y en todo momento, este <tspan + style="font-weight:bold" + id="tspan15248">troco</tspan>, este documento</tspan><tspan + sodipodi:role="line" + x="545.91241" + y="780.43542" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15250">de trueque, te muestra el estado de la </tspan><tspan + sodipodi:role="line" + x="545.91241" + y="795.43542" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15252">operación y va cambiando según esta se completa</tspan><tspan + sodipodi:role="line" + x="545.91241" + y="810.43542" + style="font-size:12px;font-weight:bold;fill:#aa4400" + id="tspan15254">sin generar múltiples correos</tspan></text> + <text + sodipodi:linespacing="125%" + id="text15256" + y="694.94836" + x="128.6837" + 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="694.94836" + x="128.6837" + sodipodi:role="line" + id="tspan15258">todo esto genera muchos<tspan + style="font-weight:bold" + id="tspan15260"> correos</tspan>, </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="709.94836" + x="128.6837" + sodipodi:role="line" + id="tspan15262">con las facturas, notificaciones </tspan><tspan + id="tspan15264" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="724.94836" + x="128.6837" + sodipodi:role="line">con cada operación</tspan></text> + <text + sodipodi:linespacing="125%" + id="text15266" + y="971.59229" + x="529.80432" + 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="tspan15268" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="971.59229" + x="529.80432" + sodipodi:role="line">además, dispone de un servicio de <tspan + style="font-weight:bold" + id="tspan15270">karma</tspan>,</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="986.59229" + x="529.80432" + sodipodi:role="line" + id="tspan15272">que permite puntuar a las personas, y así evitar </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1001.5923" + x="529.80432" + sodipodi:role="line" + id="tspan15274">malos usos generando una <tspan + style="font-weight:bold" + id="tspan15276">red de confianza</tspan></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="111.73485" + y="855.74518" + id="text15278" + sodipodi:linespacing="125%"><tspan + id="tspan15280" + sodipodi:role="line" + x="111.73485" + y="855.74518" + style="font-size:12px;font-weight:normal;fill:#aa4400">y todo está <tspan + style="font-weight:bold" + id="tspan15282">centralizado</tspan> en un sitio</tspan><tspan + sodipodi:role="line" + x="111.73485" + y="870.74518" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15284">que cobra por cada transacción y que </tspan><tspan + sodipodi:role="line" + x="111.73485" + y="885.74518" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15286">dispone de toda la información</tspan></text> + <text + xml:space="preserve" + style="font-size:46px;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;color:#000000;fill:#ffe680;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:8.70400047;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + x="875.87854" + y="940.35016" + id="text15288" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan15290" + x="875.87854" + y="940.35016" /></text> + <text + xml:space="preserve" + style="font-size:10px;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: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="656.94574" + y="840.91876" + id="text15292" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + id="tspan15294" + x="656.94574" + y="840.91876">Ofrezco clases de español</tspan><tspan + sodipodi:role="line" + x="656.94574" + y="853.41876" + id="tspan15296">a cambio de clases de </tspan><tspan + sodipodi:role="line" + x="656.94574" + y="865.91876" + id="tspan15298">árabe</tspan></text> + <text + sodipodi:linespacing="125%" + id="text15300" + y="888.56079" + x="657.36047" + style="font-size:10px;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: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="tspan15302" + y="888.56079" + x="657.36047" + sodipodi:role="line">acepto</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="459.61835" + y="1214.7278" + id="text15304" + sodipodi:linespacing="125%"><tspan + id="tspan15306" + sodipodi:role="line" + x="459.61835" + y="1214.7278" + style="font-size:12px;font-weight:normal;fill:#aa4400">Se basa en un sistema ancestral japonés</tspan><tspan + sodipodi:role="line" + x="459.61835" + y="1229.7278" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15308">de <tspan + style="font-weight:bold" + id="tspan15310">intercambio de arroz</tspan>: te ofrezco </tspan><tspan + sodipodi:role="line" + x="459.61835" + y="1244.7278" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15312">mis semillas a cambio que me devuelvas </tspan><tspan + sodipodi:role="line" + x="459.61835" + y="1259.7278" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15314">en cierto tiempo, la misma cantidad de semillas </tspan><tspan + sodipodi:role="line" + x="459.61835" + y="1274.7278" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan15316">u otra cosa que acordemos</tspan></text> + </g> + <g inkscape:groupmode="layer" id="layer8" inkscape:label="en" Modified: trunk/src/main/webapp/tutorials/blogs.svg =================================================================== --- trunk/src/main/webapp/tutorials/blogs.svg 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/webapp/tutorials/blogs.svg 2012-03-24 23:15:23 UTC (rev 1777) @@ -3,6 +3,7 @@ <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#" @@ -31,8 +32,12 @@ id="kunelang" />   - <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> - <style> + <xhtml:link + href="http://fonts.googleapis.com/css?family=Ubuntu" + rel="stylesheet" + type="text/css" /> + <style + id="style20569"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } </style>  @@ -44,10 +49,10 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.8253692" - inkscape:cx="195.61284" + inkscape:cx="126.03787" inkscape:cy="1271.6673" inkscape:document-units="px" - inkscape:current-layer="layer6" + inkscape:current-layer="g20936" showgrid="false" showborder="true" inkscape:showpageshadow="false" @@ -313,7 +318,7 @@ 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" + d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" sodipodi:ry="11.5" sodipodi:rx="11.5" sodipodi:cy="554.68896" @@ -343,7 +348,7 @@ 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" + d="m 290,379.86218 c 0,6.90356 -7.83502,12.5 -17.5,12.5 -9.66498,0 -17.5,-5.59644 -17.5,-12.5 0,-6.90356 7.83502,-12.5 17.5,-12.5 9.66498,0 17.5,5.59644 17.5,12.5 z" transform="translate(-1008.4256,-287.55371)" /> <g id="g3313" @@ -1543,7 +1548,7 @@ 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" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" sodipodi:ry="10" sodipodi:rx="20" sodipodi:cy="32.362183" @@ -1556,7 +1561,7 @@ 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -1575,14 +1580,14 @@ 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -1601,14 +1606,14 @@ 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -2105,6 +2110,138 @@ sodipodi:role="line">explained</tspan></text> </g> <g + inkscape:groupmode="layer" + id="g20936" + inkscape:label="en-working" + style="display:none"> + <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="207.26842" + y="166.0929" + id="text20938" + sodipodi:linespacing="125%" + transform="scale(0.99912117,1.0008796)"><tspan + sodipodi:role="line" + x="207.26842" + y="166.0929" + style="font-size:32px;font-weight:bold;fill:#aa4400" + id="tspan20940">blogs</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="149.85907" + y="-168.92439" + id="text20942" + sodipodi:linespacing="125%" + transform="translate(0,435.82679)"><tspan + y="-168.92439" + x="149.85907" + id="tspan20944" + sodipodi:role="line" + style="font-style:italic">click to continue</tspan></text> + <text + sodipodi:linespacing="125%" + id="text20946" + y="409.18921" + x="134.0341" + 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="tspan20948" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="409.18921" + x="134.0341" + sodipodi:role="line">Sorry, we are</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="424.18921" + x="134.0341" + sodipodi:role="line" + id="tspan20950">still designing </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="439.18921" + x="134.0341" + sodipodi:role="line" + id="tspan20952">this tutorial.</tspan><tspan + id="tspan20954" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="454.18921" + x="134.0341" + sodipodi:role="line">Meanwhile...</tspan><tspan + id="tspan20956" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="469.18921" + x="134.0341" + sodipodi:role="line" /></text> + <text + sodipodi:linespacing="125%" + id="text20958" + y="650.30011" + x="181.83585" + 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="650.30011" + x="181.83585" + sodipodi:role="line" + id="tspan20960" /><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="665.30011" + x="181.83585" + sodipodi:role="line" + id="tspan20962">...give us your <tspan + id="tspan20964" + style="font-weight:bold">feedback </tspan></tspan><tspan + id="tspan20966" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="680.30011" + x="181.83585" + sodipodi:role="line">and participate</tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="695.30011" + x="181.83585" + sodipodi:role="line" + id="tspan20968">to improve this tool...</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="154.17371" + y="566.2572" + id="text20970" + sodipodi:linespacing="125%"><tspan + id="tspan20972" + sodipodi:role="line" + x="154.17371" + y="566.2572" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...here you can create</tspan><tspan + id="tspan20974" + sodipodi:role="line" + x="154.17371" + y="581.2572" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">your new <tspan + style="font-weight:bold" + id="tspan20976">blogs</tspan> and</tspan><tspan + sodipodi:role="line" + x="154.17371" + y="596.2572" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan20978"><tspan + style="font-weight:bold" + id="tspan20980">posts</tspan>...</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="207.5244" + y="184.92917" + id="text20982" + sodipodi:linespacing="125%" + transform="scale(0.99912117,1.0008796)"><tspan + sodipodi:role="line" + x="207.5244" + y="184.92917" + style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan20984">explained</tspan></text> + </g> + <g style="display:none" inkscape:label="fr" id="layer9" Modified: trunk/src/main/webapp/tutorials/chats.svg =================================================================== --- trunk/src/main/webapp/tutorials/chats.svg 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/webapp/tutorials/chats.svg 2012-03-24 23:15:23 UTC (rev 1777) @@ -25,7 +25,7 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.6151162" + inkscape:zoom="1.629222" inkscape:cx="243.10117" inkscape:cy="1308.5714" inkscape:document-units="px" @@ -48,8 +48,8 @@ ]; </script> <script - id="kunelang" - xlink:href="lang.js" /> + xlink:href="lang.js" + id="kunelang" />   <xhtml:link @@ -680,6 +680,243 @@ style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">las notas sobre el encuentro</tspan></text> </g> <g + style="display:none" + inkscape:label="en-working" + id="g19891" + inkscape:groupmode="layer"> + <g + transform="translate(106.00677,59.44173)" + id="g19893" + style="display:inline"> + <text + transform="scale(0.99912117,1.0008796)" + sodipodi:linespacing="125%" + id="text19895" + 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="tspan19897" + style="font-size:32px;font-weight:bold;fill:#aa4400" + y="122.68937" + x="101.1684" + sodipodi:role="line">Chats</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="text19899" + 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="tspan19901">explicando los</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="text19903" + sodipodi:linespacing="125%" + transform="translate(0,435.82679)"><tspan + y="-168.92439" + x="149.85907" + id="tspan19905" + sodipodi:role="line" + style="font-style:italic">pulsa con tu ratón para continuar</tspan></text> + <text + sodipodi:linespacing="125%" + id="text19907" + y="1176.7134" + x="149.82024" + 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="1176.7134" + x="149.82024" + sodipodi:role="line" + id="tspan19909" /><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="1191.7134" + x="149.82024" + sodipodi:role="line" + id="tspan19911">...darnos tu <tspan + id="tspan19913" + style="font-weight:bold">feedback </tspan></tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1206.7134" + x="149.82024" + sodipodi:role="line" + id="tspan19915">y participar para </tspan><tspan + id="tspan19917" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1221.7134" + x="149.82024" + sodipodi:role="line">mejorar esta </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1236.7134" + x="149.82024" + sodipodi:role="line" + id="tspan19919">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="122.1581" + y="1092.6705" + id="text19921" + sodipodi:linespacing="125%"><tspan + id="tspan19923" + sodipodi:role="line" + x="122.1581" + y="1092.6705" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...aquí puedes crear </tspan><tspan + id="tspan19925" + sodipodi:role="line" + x="122.1581" + y="1107.6705" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">nuevas<tspan + style="font-weight:bold" + id="tspan19927"> salas de chat</tspan></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="155.08841" + y="419.41821" + id="text19929" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="155.08841" + y="419.41821" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19931">Mientras modificas contenidos, </tspan><tspan + sodipodi:role="line" + x="155.08841" + y="434.41821" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19933">puedes chatear con colegas o</tspan><tspan + sodipodi:role="line" + x="155.08841" + y="449.41821" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19935">tener <tspan + style="font-weight:bold" + id="tspan19937">charlas en grupo</tspan> con usuarios/as </tspan><tspan + sodipodi:role="line" + x="155.08841" + y="464.41821" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19939">de este sitio, pero también de otros</tspan><tspan + sodipodi:role="line" + x="155.08841" + y="479.41821" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19941"><tspan + style="font-weight:bold" + id="tspan19943">sistemas compatibles</tspan> (como gmail)</tspan></text> + <text + sodipodi:linespacing="125%" + id="text19945" + y="590.00122" + x="119.05811" + 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="tspan19947" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="590.00122" + x="119.05811" + sodipodi:role="line">Y lo puedes hacer incluso, <tspan + style="font-weight:bold" + id="tspan19949">mientras navegas </tspan></tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="605.00122" + x="119.05811" + sodipodi:role="line" + id="tspan19951">por este sitio (prueba a navegar entre páginas </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="620.00122" + x="119.05811" + sodipodi:role="line" + id="tspan19953">mientras chateas), sin perder las conversaciones. </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="635.00122" + x="119.05811" + sodipodi:role="line" + id="tspan19955">Puedes pulsar sin miedo <tspan + style="font-weight:bold" + id="tspan19957">atrás</tspan> y <tspan + style="font-weight:bold" + id="tspan19959">delante</tspan> en tu </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="650.00122" + x="119.05811" + sodipodi:role="line" + id="tspan19961">navegador</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="127.9239" + y="939.13818" + id="text19963" + sodipodi:linespacing="125%"><tspan + id="tspan19965" + sodipodi:role="line" + x="127.9239" + y="939.13818" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">Más ventajas: este es un sistema <tspan + style="font-weight:bold" + id="tspan19967">descentralizado</tspan>, </tspan><tspan + sodipodi:role="line" + x="127.9239" + y="954.13818" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19969">es decir, que pones los datos de tus contactos </tspan><tspan + sodipodi:role="line" + x="127.9239" + y="969.13818" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19971">en un sitio que te de confianza (como quizás este) </tspan><tspan + sodipodi:role="line" + x="127.9239" + y="984.13818" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19973">mientras que a la vez te comunicas con usuarios/as </tspan><tspan + sodipodi:role="line" + x="127.9239" + y="999.13818" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan19975">de otros sitios similares</tspan></text> + <text + sodipodi:linespacing="125%" + id="text19977" + y="784.43695" + x="116.10284" + 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="784.43695" + x="116.10284" + sodipodi:role="line" + id="tspan19979">Puede tener asambleas virtuales o reuniones, </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="799.43695" + x="116.10284" + sodipodi:role="line" + id="tspan19981">y por ejemplo, <tspan + style="font-weight:bold" + id="tspan19983">editar <tspan + id="tspan19985" + style="font-weight:normal">entre todos/as</tspan> el acta</tspan> o </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="814.43695" + x="116.10284" + sodipodi:role="line" + id="tspan19987">las notas sobre el encuentro</tspan></text> + </g> + <g inkscape:groupmode="layer" id="layer8" inkscape:label="en" Modified: trunk/src/main/webapp/tutorials/docs.svg =================================================================== --- trunk/src/main/webapp/tutorials/docs.svg 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/webapp/tutorials/docs.svg 2012-03-24 23:15:23 UTC (rev 1777) @@ -25,7 +25,7 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.3073873" + inkscape:zoom="1.3383772" inkscape:cx="292.56466" inkscape:cy="1317.1764" inkscape:document-units="px" @@ -621,7 +621,8 @@ inkscape:groupmode="layer" inkscape:label="graphics" style="display:inline" - transform="translate(0,435.8268)"> + transform="translate(0,435.8268)" + sodipodi:insensitive="true"> <path sodipodi:nodetypes="ccccccccccccccccc" inkscape:connector-curvature="0" @@ -663,7 +664,7 @@ sodipodi:cy="554.68896" sodipodi:rx="11.5" sodipodi:ry="11.5" - d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" + 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" transform="translate(835.07499,-335.32678)" /> <text xml:space="preserve" @@ -681,7 +682,7 @@ </g> <path transform="translate(38.818054,1.52666)" - d="m 290,379.86218 c 0,6.90356 -7.83502,12.5 -17.5,12.5 -9.66498,0 -17.5,-5.59644 -17.5,-12.5 0,-6.90356 7.83502,-12.5 17.5,-12.5 9.66498,0 17.5,5.59644 17.5,12.5 z" + 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" sodipodi:ry="12.5" sodipodi:rx="17.5" sodipodi:cy="379.86218" @@ -812,7 +813,7 @@ style="display:inline"> <path transform="translate(835.07499,-335.32678)" - d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" + 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" @@ -2638,7 +2639,7 @@ style="display:inline"> <path transform="translate(835.07499,-335.32678)" - d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" + 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" @@ -2678,7 +2679,7 @@ id="g7072-9-2"> <path transform="translate(865.07499,-335.32678)" - d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" + 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" @@ -2724,7 +2725,7 @@ sodipodi:cy="554.68896" sodipodi:rx="11.5" sodipodi:ry="11.5" - d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" + 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" transform="translate(895.07499,-335.32678)" /> <text xml:space="preserve" @@ -2758,7 +2759,7 @@ inkscape:export-ydpi="89.910126"> <path transform="translate(925.07499,-335.32678)" - d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" + 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" @@ -2804,7 +2805,7 @@ sodipodi:cy="554.68896" sodipodi:rx="11.5" sodipodi:ry="11.5" - d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" + 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" transform="translate(925.07499,-335.32678)" /> <text xml:space="preserve" @@ -2838,7 +2839,7 @@ inkscape:export-ydpi="89.910126"> <path transform="translate(925.07499,-335.32678)" - d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" + 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" @@ -3609,7 +3610,7 @@ sodipodi:cy="471.12656" sodipodi:rx="7.9457998" sodipodi:ry="7.9457998" - d="m 887.81073,471.12656 c 0,4.38834 -3.55746,7.9458 -7.9458,7.9458 -4.38834,0 -7.9458,-3.55746 -7.9458,-7.9458 0,-4.38835 3.55746,-7.9458 7.9458,-7.9458 4.38834,0 7.9458,3.55745 7.9458,7.9458 z" + d="m 887.81073,471.12656 a 7.9457998,7.9457998 0 1 1 -15.8916,0 7.9457998,7.9457998 0 1 1 15.8916,0 z" transform="matrix(0.65591101,-0.75483823,0.75483823,0.65591101,-4.5492357,387.52051)" /> <path style="fill:#f2f2f2;fill-rule:evenodd;stroke:#999999;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" @@ -3618,7 +3619,7 @@ inkscape:connector-curvature="0" /> <path transform="translate(373.49066,-125.04248)" - d="m 290,379.86218 c 0,6.90356 -7.83502,12.5 -17.5,12.5 -9.66498,0 -17.5,-5.59644 -17.5,-12.5 0,-6.90356 7.83502,-12.5 17.5,-12.5 9.66498,0 17.5,5.59644 17.5,12.5 z" + 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" sodipodi:ry="12.5" sodipodi:rx="17.5" sodipodi:cy="379.86218" @@ -4715,7 +4716,7 @@ sodipodi:cy="32.362183" sodipodi:rx="20" sodipodi:ry="10" - d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" + d="m 110,32.362183 a 20,10 0 1 1 -40,0 20,10 0 1 1 40,0 z" transform="matrix(2.375,0,0,4.7499998,-102.75,10.817397)" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/src/main/java/cc/kune/wspace/client/resources/groupSpaceEnabled.png" inkscape:export-xdpi="90" @@ -4728,14 +4729,14 @@ sodipodi:cy="16.362183" sodipodi:rx="1" sodipodi:ry="1" - d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + 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,45.524372,-53.39817)" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <path transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,18.680548,-64.20388)" - d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + 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" @@ -4754,14 +4755,14 @@ sodipodi:cy="16.362183" sodipodi:rx="1" sodipodi:ry="1" - d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + 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,43.935022,-24.026857)" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" inkscape:export-xdpi="90" inkscape:export-ydpi="90" /> <path transform="matrix(9.4200602,3.355959,-3.355959,9.4200602,16.336633,-16.494463)" - d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + 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" @@ -4780,7 +4781,7 @@ sodipodi:cy="16.362183" sodipodi:rx="1" sodipodi:ry="1" - d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" + d="m 16,16.362183 a 1,1 0 1 1 -2,0 1,1 0 1 1 2,0 z" transform="matrix(11.211448,3.9941526,-3.9941526,11.211448,-16.590722,-79.68006)" inkscape:export-filename="/home/vjrj/proyectos/dev/kune/trunk/img/icons/from-private-to-public.png" inkscape:export-xdpi="90" @@ -9710,7 +9711,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 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" + 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" sodipodi:ry="6.4900241" sodipodi:rx="5.9459252" sodipodi:cy="1351.6404" @@ -9758,7 +9759,7 @@ sodipodi:cy="1351.6404" sodipodi:rx="5.9459252" sodipodi:ry="6.4900241" - 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" + 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" 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" @@ -9794,7 +9795,7 @@ sodipodi:cy="1351.6404" sodipodi:rx="5.9459252" sodipodi:ry="6.4900241" - 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" + 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" transform="matrix(1.0848531,0,0,0.99393348,2923.6547,371.109)" /> <path sodipodi:nodetypes="cc" @@ -9807,7 +9808,7 @@ inkscape:connector-curvature="0" /> <path transform="matrix(1.0848531,0,0,0.99393348,2923.6547,371.109)" - 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" + 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" sodipodi:ry="6.4900241" sodipodi:rx="5.9459252" sodipodi:cy="1351.6404" @@ -9829,7 +9830,7 @@ inkscape:connector-curvature="0" /> <path transform="matrix(1.0848531,0,0,0.99393348,2923.6547,371.109)" - 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" + 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" sodipodi:ry="6.4900241" sodipodi:rx="5.9459252" sodipodi:cy="1351.6404" @@ -9860,7 +9861,7 @@ sodipodi:cy="1351.6404" sodipodi:rx="5.9459252" sodipodi:ry="6.4900241" - 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" + 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" transform="matrix(1.0848531,0,0,0.99393348,2923.6547,371.109)" /> <path inkscape:connector-curvature="0" @@ -9876,7 +9877,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 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" + 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" sodipodi:ry="6.4900241" sodipodi:rx="5.9459252" sodipodi:cy="1351.6404" @@ -9906,7 +9907,7 @@ sodipodi:cy="1351.6404" sodipodi:rx="5.9459252" sodipodi:ry="6.4900241" - 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" + 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" 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" @@ -9947,7 +9948,7 @@ sodipodi:cy="1351.6404" sodipodi:rx="5.9459252" sodipodi:ry="6.4900241" - 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" + 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" 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" @@ -10014,7 +10015,7 @@ inkscape:connector-curvature="0" /> <path transform="matrix(1.0848538,0,0,0.99390488,2905.3819,371.14766)" - 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" + 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" sodipodi:ry="6.4900241" sodipodi:rx="5.9459252" sodipodi:cy="1351.6404" @@ -12070,10 +12071,1954 @@ </g> <g inkscape:groupmode="layer" + id="layer6" + inkscape:label="en-working" + style="display:none"> + <text + transform="translate(0,435.8268)" + 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="153.85231" + y="-177.52939" + id="text7296" + sodipodi:linespacing="125%"><tspan + y="-177.52939" + x="153.85231" + id="tspan7298" + sodipodi:role="line" + style="font-style:italic">pulsa con tu ratón para continuar</tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7300" + y="-95.960747" + x="105.49536" + 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 + sodipodi:role="line" + id="tspan7302" + x="105.49536" + y="-95.960747">Aquí puedes crear o subir<tspan + style="font-weight:bold" + id="tspan7304"> </tspan></tspan><tspan + sodipodi:role="line" + x="105.49536" + y="-80.960747" + id="tspan7306"><tspan + style="font-weight:bold" + id="tspan7308">tus documentos </tspan></tspan><tspan + sodipodi:role="line" + id="tspan7310" + x="105.49536" + y="-65.960747">personales, grupales o públicos</tspan><tspan + sodipodi:role="line" + id="tspan7312" + x="105.49536" + y="-50.960747" /></text> + <text + transform="translate(0,435.8268)" + 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="54.047176" + y="10.630801" + id="text7314" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="54.047176" + y="10.630801" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan7316">estos documentos <tspan + style="font-weight:bold" + id="tspan7318">no </tspan></tspan><tspan + sodipodi:role="line" + x="54.047176" + y="25.630802" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan7320">se reenvían y diseminan por correo</tspan><tspan + id="tspan7322" + sodipodi:role="line" + x="54.047176" + y="40.630802" + style="font-size:12px;font-weight:normal;fill:#aa4400">(como sucede habitualmente) </tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7324" + y="70.182861" + x="233.72658" + 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="70.182861" + x="233.72658" + id="tspan7326" + sodipodi:role="line">para su edición colaborativa, </tspan><tspan + id="tspan7328" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="85.182861" + x="233.72658" + sodipodi:role="line">generando </tspan><tspan + id="tspan7330" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="100.18286" + x="233.72658" + sodipodi:role="line"><tspan + id="tspan7332" + style="font-weight:bold">multiples copias</tspan> de ellos</tspan></text> + <text + transform="translate(0,435.8268)" + 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="225.12462" + y="168.93408" + id="text7334" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="225.12462" + y="168.93408" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan7336">con los problemas derivados</tspan><tspan + id="tspan7338" + sodipodi:role="line" + x="225.12462" + y="183.93408" + style="font-size:12px;font-weight:normal;fill:#aa4400">como la <tspan + id="tspan7340" + style="font-weight:bold">perdida de cambios </tspan></tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7342" + y="224.47615" + x="220.56689" + style="font-size:22.35296059px;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:22.35296059px;font-weight:normal;fill:#aa4400" + y="224.47615" + x="220.56689" + sodipodi:role="line" + id="tspan7344"><tspan + id="tspan7346" + style="font-weight:bold"><tspan + id="tspan7348" + style="font-weight:normal">y </tspan>duplicación</tspan> </tspan><tspan + id="tspan7350" + style="font-size:22.35296059px;font-weight:normal;fill:#aa4400" + y="252.41736" + x="220.56689" + sodipodi:role="line">del mismo documento</tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7352" + y="358.61398" + x="216.29742" + 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="tspan7354" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="358.61398" + x="216.29742" + sodipodi:role="line">Por el contrario aquí</tspan><tspan + style="font-size:12px;font-weight:bold;fill:#aa4400" + y="373.61398" + x="216.29742" + sodipodi:role="line" + id="tspan7356">un<tspan + style="font-weight:normal" + id="tspan7358"> mismo </tspan>documento</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="388.61398" + x="216.29742" + sodipodi:role="line" + id="tspan7360">puede ser editado por </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="403.61398" + x="216.29742" + sodipodi:role="line" + id="tspan7362">varias personas de</tspan><tspan + id="tspan7364" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="418.61398" + x="216.29742" + sodipodi:role="line">tu grupos</tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7366" + y="455.69901" + x="217.62915" + 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="455.69901" + x="217.62915" + sodipodi:role="line" + id="tspan7368">u otras a las que se </tspan><tspan + style="font-size:12px;font-weight:bold;fill:#aa4400" + y="470.69901" + x="217.62915" + sodipodi:role="line" + id="tspan7370"><tspan + style="font-weight:normal" + id="tspan7372">lo </tspan>compartes</tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7374" + y="559.3252" + x="109.65604" + 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="559.3252" + x="109.65604" + sodipodi:role="line" + id="tspan7376">y ese <tspan + style="font-weight:bold" + id="tspan7378">único </tspan>documento</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="574.3252" + x="109.65604" + sodipodi:role="line" + id="tspan7380">puede ser editado </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="589.3252" + x="109.65604" + sodipodi:role="line" + id="tspan7382">por quien tú quieras</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="604.3252" + x="109.65604" + sodipodi:role="line" + id="tspan7384">incluso </tspan><tspan + id="tspan7386" + style="font-size:12px;font-weight:bold;fill:#aa4400" + y="619.3252" + x="109.65604" + sodipodi:role="line">al mismo tiempo</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="634.3252" + x="109.65604" + sodipodi:role="line" + id="tspan7388" /></text> + <text + transform="translate(0,435.8268)" + 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="323.03564" + y="669.32764" + id="text7390" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="323.03564" + y="669.32764" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan7392">o volver a versiones anteriores.</tspan><tspan + id="tspan7394" + sodipodi:role="line" + x="323.03564" + y="684.32764" + style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan + id="tspan7396" + sodipodi:role="line" + x="323.03564" + y="699.32764" + style="font-size:12px;font-weight:normal;fill:#aa4400">pero además estos documentos,</tspan><tspan + sodipodi:role="line" + x="323.03564" + y="714.32764" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan7398">pueden ser textos básicos </tspan><tspan + sodipodi:role="line" + x="323.03564" + y="729.32764" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan7400">(un artículo, un libro, un </tspan><tspan + sodipodi:role="line" + x="323.03564" + y="744.32764" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan7402">contrato, una redacción, </tspan><tspan + id="tspan7404" + sodipodi:role="line" + x="323.03564" + y="759.32764" + style="font-size:12px;font-weight:normal;fill:#aa4400">una tesis)...</tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7406" + y="-100.6748" + x="596.65607" + 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="-100.6748" + x="596.65607" + sodipodi:role="line" + id="tspan7408">o en un futuro (cercano)</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="-85.674797" + x="596.65607" + sodipodi:role="line" + id="tspan7410">algo como un plano actualizado </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="-70.674797" + x="596.65607" + sodipodi:role="line" + id="tspan7412">por varios arquitectos/as</tspan><tspan + style="font-size:12px;font-weight:bold;fill:#aa4400" + y="-55.674797" + x="596.65607" + sodipodi:role="line" + id="tspan7414">al mismo tiempo</tspan></text> + <g + transform="translate(0,435.8268)" + id="g7416" + style="font-size:14.02383423px;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:#00ff00;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"> + <path + inkscape:connector-curvature="0" + id="path7418" + style="font-weight:bold;fill:#000000;marker:none" + d="m 98.136534,689.32509 c 0.205679,0 0.402012,-0.005 0.589001,-0.014 0.18698,-0.009 0.336567,-0.0234 0.448763,-0.0421 l 0,-1.5847 c -0.08415,-0.0187 -0.210363,-0.0374 -0.378644,-0.0561 -0.16829,-0.0187 -0.322552,-0.0281 -0.462786,-0.0281 -0.196338,0 -0.383322,0.014 -0.560954,0.0421 -0.168289,0.0187 -0.317876,0.0608 -0.448762,0.12621 -0.130892,0.0654 -0.233734,0.15427 -0.308525,0.26646 -0.0748,0.11219 -0.112193,0.25243 -0.112191,0.42071 -2e-6,0.32723 0.107514,0.55628 0.322549,0.68717 0.224378,0.12154 0.528227,0.18231 0.911549,0.18231 m -0.168286,-6.11439 c 0.617044,1e-5 1.131251,0.0701 1.542622,0.21036 0.41136,0.14024 0.73858,0.34125 0.98167,0.60302 0.25242,0.26179 0.43006,0.57966 0.5329,0.95362 0.10284,0.37398 0.15426,0.79002 0.15427,1.24812 l 0,4.34739 c -0.29919,0.0654 -0.71523,0.14024 -1.248125,0.22438 -0.532911,0.0935 -1.178007,0.14024 -1.935289,0.14024 -0.476814,0 -0.911552,-0.0421 -1.304217,-0.12621 -0.38332,-0.0841 -0.715217,-0.21971 -0.995692,-0.40669 -0.280478,-0.19634 -0.49551,-0.44877 -0.645097,-0.75729 -0.149588,-0.30852 -0.224381,-0.68717 -0.224381,-1.13593 0,-0.43006 0.08414,-0.79468 0.252429,-1.09386 0.177634,-0.29917 0.411365,-0.53758 0.701192,-0.71522 0.289824,-0.17763 0.621721,-0.30384 0.995692,-0.37864 0.373966,-0.0841 0.761958,-0.12621 1.163978,-0.12621 0.271124,0 0.509529,0.014 0.715216,0.0421 0.215027,0.0187 0.387988,0.0467 0.518882,0.0841 l 0,-0.19633 c -5e-6,-0.35527 -0.107521,-0.64042 -0.322549,-0.85546 -0.215036,-0.21502 -0.589005,-0.32254 -1.121906,-0.32255 -0.355274,10e-6 -0.705869,0.0281 -1.051788,0.0842 -0.345923,0.0467 -0.645098,0.11687 -0.897525,0.21035 l -0.266453,-1.68286 c 0.121539,-0.0374 0.271126,-0.0748 0.448763,-0.11219 0.186982,-0.0467 0.38799,-0.0841 0.603024,-0.11219 0.21503,-0.0374 0.439411,-0.0654 0.673145,-0.0841 0.243076,-0.028 0.486156,-0.0421 0.729239,-0.0421" /> + <path + inkscape:connector-curvature="0" + id="path7420" + style="font-weight:bold;fill:#000000;marker:none" + d="m 106.0142,690.92381 c -0.6077,-0.009 -1.10321,-0.0748 -1.48652,-0.19634 -0.37397,-0.12154 -0.67315,-0.28982 -0.89753,-0.50485 -0.21503,-0.22438 -0.36462,-0.49084 -0.44876,-0.79936 -0.0748,-0.31787 -0.11219,-0.67314 -0.11219,-1.06581 l 0,-8.1198 2.08955,-0.33658 0,8.03566 c 0,0.18699 0.014,0.35527 0.0421,0.50486 0.0281,0.14959 0.0795,0.2758 0.15426,0.37864 0.0841,0.10285 0.20101,0.18699 0.3506,0.25243 0.14958,0.0654 0.35059,0.10752 0.60302,0.12622 l -0.2945,1.72493" /> + <path + inkscape:connector-curvature="0" + id="path7422" + style="font-weight:bold;fill:#000000;marker:none" + d="m 114.92832,686.87092 c 0,-0.67314 -0.0888,-1.14995 -0.26645,-1.43043 -0.16829,-0.28047 -0.46279,-0.42071 -0.8835,-0.42072 -0.13089,10e-6 -0.26646,0.009 -0.40669,0.0281 -0.14024,0.009 -0.27581,0.0234 -0.40669,0.0421 l 0,5.69368 -2.08956,0 0,-7.12411 c 0.17764,-0.0467 0.38332,-0.0935 0.61705,-0.14024 0.24308,-0.0561 0.49551,-0.10283 0.75729,-0.14024 0.27113,-0.0467 0.54693,-0.0795 0.82741,-0.0982 0.28047,-0.028 0.55627,-0.0421 0.8274,-0.0421 0.5329,0 0.96297,0.0701 1.2902,0.21035 0.33656,0.1309 0.61236,0.28984 0.8274,0.47681 0.29917,-0.21502 0.64042,-0.38331 1.02374,-0.50485 0.39266,-0.12154 0.75261,-0.18231 1.07984,-0.18231 0.58899,0 1.07047,0.0842 1.44445,0.25243 0.38331,0.15894 0.68716,0.388 0.91155,0.68716 0.22437,0.29918 0.37863,0.65445 0.46279,1.06581 0.0841,0.41138 0.1262,0.86949 0.12621,1.37434 l 0,4.16508 -2.08955,0 0,-3.91265 c -1e-5,-0.67314 -0.0888,-1.14995 -0.26645,-1.43043 -0.1683,-0.28047 -0.4628,-0.42071 -0.8835,-0.42072 -0.1122,10e-6 -0.27114,0.0281 -0.47681,0.0842 -0.19634,0.0561 -0.35996,0.12622 -0.49084,0.21035 0.0654,0.21504 0.10751,0.4441 0.12622,0.68717 0.0187,0.23374 0.028,0.48617 0.028,0.75729 l 0,4.02484 -2.08955,0 0,-3.91265" /> + <path + inkscape:connector-curvature="0" + id="path7424" + style="font-weight:bold;fill:#000000;marker:none" + d="m 125.04411,690.78357 -2.08955,0 0,-7.37654 2.08955,0 0,7.37654 m 0.19633,-9.50816 c 0,0.38333 -0.12622,0.68718 -0.37864,0.91155 -0.24308,0.21504 -0.53291,0.32256 -0.86948,0.32255 -0.33657,10e-6 -0.63107,-0.10751 -0.8835,-0.32255 -0.24308,-0.22437 -0.36462,-0.52822 -0.36462,-0.91155 0,-0.38331 0.12154,-0.68248 0.36462,-0.89753 0.25243,-0.22437 0.54693,-0.33656 0.8835,-0.33657 0.33657,1e-5 0.6264,0.1122 0.86948,0.33657 0.25242,0.21505 0.37864,0.51422 0.37864,0.89753" /> + <path + inkscape:connector-curvature="0" + id="path7426" + style="font-weight:bold;fill:#000000;marker:none" + d="m 129.12592,689.28302 c 0.38332,0 0.65444,-0.0374 0.81338,-0.11219 0.15894,-0.0748 0.2384,-0.21971 0.23841,-0.43474 -1e-5,-0.16828 -0.10285,-0.3132 -0.30853,-0.43474 -0.20568,-0.13089 -0.51888,-0.2758 -0.93959,-0.43474 -0.32723,-0.12154 -0.6264,-0.24775 -0.89753,-0.37864 -0.26178,-0.13089 -0.48616,-0.28515 -0.67314,-0.46279 -0.18699,-0.18698 -0.3319,-0.40669 -0.43474,-0.65912 -0.10284,-0.25242 -0.15426,-0.55627 -0.15426,-0.91155 0,-0.69183 0.2571,-1.23876 0.77131,-1.64079 0.5142,-0.40201 1.22007,-0.60301 2.1176,-0.60302 0.44875,10e-6 0.87882,0.0421 1.29019,0.12621 0.41136,0.0748 0.73858,0.15895 0.98167,0.25243 l -0.36462,1.62677 c -0.24309,-0.0841 -0.50954,-0.15893 -0.79936,-0.22438 -0.28048,-0.0654 -0.59836,-0.0982 -0.95362,-0.0982 -0.65445,0 -0.98167,0.18231 -0.98167,0.54693 0,0.0842 0.014,0.15894 0.0421,0.22438 0.0281,0.0655 0.0841,0.13089 0.16829,0.19633 0.0841,0.0561 0.19633,0.12155 0.33657,0.19634 0.14958,0.0654 0.33657,0.14024 0.56095,0.22438 0.45811,0.16829 0.83675,0.33657 1.13593,0.50486 0.29917,0.15894 0.5329,0.33657 0.7012,0.5329 0.17762,0.18699 0.29916,0.39735 0.36462,0.63107 0.0748,0.23374 0.11218,0.50487 0.11219,0.81339 -10e-6,0.72924 -0.27581,1.28084 -0.82741,1.65481 -0.54226,0.37397 -1.31357,0.56095 -2.31393,0.56095 -0.65445,0 -1.20138,-0.0561 -1.64079,-0.16828 -0.43007,-0.11219 -0.72924,-0.20569 -0.89753,-0.28048 l 0.3506,-1.69688 c 0.35527,0.14024 0.71989,0.25243 1.09386,0.33657 0.37396,0.0748 0.74326,0.11219 1.10788,0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7428" + style="font-weight:bold;fill:#000000;marker:none" + d="m 137.854,686.87092 c 0,-0.67314 -0.0888,-1.14995 -0.26645,-1.43043 -0.16829,-0.28047 -0.46279,-0.42071 -0.8835,-0.42072 -0.13089,10e-6 -0.26646,0.009 -0.40669,0.0281 -0.14024,0.009 -0.27581,0.0234 -0.40669,0.0421 l 0,5.69368 -2.08956,0 0,-7.12411 c 0.17764,-0.0467 0.38332,-0.0935 0.61705,-0.14024 0.24308,-0.0561 0.49551,-0.10283 0.75729,-0.14024 0.27113,-0.0467 0.54693,-0.0795 0.82741,-0.0982 0.28047,-0.028 0.55627,-0.0421 0.8274,-0.0421 0.5329,0 0.96297,0.0701 1.2902,0.21035 0.33656,0.1309 0.61236,0.28984 0.8274,0.47681 0.29917,-0.21502 0.64042,-0.38331 1.02374,-0.50485 0.39266,-0.12154 0.75261,-0.18231 1.07984,-0.18231 0.58899,0 1.07047,0.0842 1.44445,0.25243 0.38331,0.15894 0.68716,0.388 0.91155,0.68716 0.22437,0.29918 0.37863,0.65445 0.46279,1.06581 0.0841,0.41138 0.1262,0.86949 0.12621,1.37434 l 0,4.16508 -2.08955,0 0,-3.91265 c -1e-5,-0.67314 -0.0888,-1.14995 -0.26645,-1.43043 -0.1683,-0.28047 -0.4628,-0.42071 -0.8835,-0.42072 -0.1122,10e-6 -0.27114,0.0281 -0.47681,0.0842 -0.19634,0.0561 -0.35996,0.12622 -0.49084,0.21035 0.0654,0.21504 0.10751,0.4441 0.12622,0.68717 0.0187,0.23374 0.028,0.48617 0.028,0.75729 l 0,4.02484 -2.08955,0 0,-3.91265" /> + <path + inkscape:connector-curvature="0" + id="path7430" + style="font-weight:bold;fill:#000000;marker:none" + d="m 152.77997,687.08128 c -1e-5,0.57965 -0.0841,1.11256 -0.25243,1.59871 -0.1683,0.47682 -0.41138,0.88818 -0.72924,1.2341 -0.31788,0.33657 -0.7012,0.59835 -1.14996,0.78534 -0.43942,0.18698 -0.93492,0.28047 -1.48652,0.28047 -0.54226,0 -1.03777,-0.0935 -1.48653,-0.28047 -0.43942,-0.18699 -0.81806,-0.44877 -1.13593,-0.78534 -0.31788,-0.34592 -0.56563,-0.75728 -0.74326,-1.2341 -0.17764,-0.48615 -0.26646,-1.01906 -0.26646,-1.59871 0,-0.57965 0.0888,-1.10788 0.26646,-1.5847 0.18698,-0.4768 0.43941,-0.88349 0.75728,-1.22007 0.32722,-0.33656 0.71054,-0.59834 1.14996,-0.78533 0.44876,-0.18698 0.93492,-0.28047 1.45848,-0.28048 0.5329,10e-6 1.01906,0.0935 1.45848,0.28048 0.44875,0.18699 0.83207,0.44877 1.14995,0.78533 0.31787,0.33658 0.56562,0.74327 0.74326,1.22007 0.17763,0.47682 0.26645,1.00505 0.26646,1.5847 m -2.13163,0 c 0,-0.64509 -0.13089,-1.14995 -0.39266,-1.51458 -0.25244,-0.37396 -0.61706,-0.56094 -1.09386,-0.56095 -0.47682,10e-6 -0.84611,0.18699 -1.10789,0.56095 -0.26178,0.36463 -0.39267,0.86949 -0.39266,1.51458 -1e-5,0.6451 0.13088,1.1593 0.39266,1.54262 0.26178,0.37397 0.63107,0.56095 1.10789,0.56095 0.4768,0 0.84142,-0.18698 1.09386,-0.56095 0.26177,-0.38332 0.39266,-0.89752 0.39266,-1.54262" /> + <path + inkscape:connector-curvature="0" + id="path7432" + style="font-weight:bold;fill:#000000;marker:none" + d="m 157.69751,681.56991 2.08955,-0.33657 0,2.17369 2.51027,0 0,1.73896 -2.51027,0 0,2.59441 c 0,0.43941 0.0748,0.79001 0.22438,1.05178 0.15894,0.26178 0.47214,0.39267 0.9396,0.39267 0.22438,0 0.45343,-0.0187 0.68717,-0.0561 0.24307,-0.0468 0.46278,-0.10752 0.65912,-0.18231 l 0.2945,1.62676 c -0.25244,0.10284 -0.53291,0.19166 -0.84143,0.26645 -0.30853,0.0748 -0.68717,0.1122 -1.13593,0.1122 -0.57031,0 -1.04244,-0.0748 -1.41641,-0.22439 -0.37397,-0.15893 -0.67315,-0.37396 -0.89752,-0.64509 -0.22439,-0.28048 -0.38332,-0.61705 -0.47682,-1.00972 -0.0841,-0.39266 -0.12621,-0.8274 -0.12621,-1.30422 l 0,-6.19853" /> + <path + inkscape:connector-curvature="0" + id="path7434" + style="font-weight:bold;fill:#000000;marker:none" + d="m 166.07478,690.78357 -2.08955,0 0,-7.37654 2.08955,0 0,7.37654 m 0.19634,-9.50816 c -1e-5,0.38333 -0.12622,0.68718 -0.37865,0.91155 -0.24308,0.21504 -0.53291,0.32256 -0.86947,0.32255 -0.33658,10e-6 -0.63108,-0.10751 -0.88351,-0.32255 -0.24308,-0.22437 -0.36462,-0.52822 -0.36462,-0.91155 0,-0.38331 0.12154,-0.68248 0.36462,-0.89753 0.25243,-0.22437 0.54693,-0.33656 0.88351,-0.33657 0.33656,1e-5 0.62639,0.1122 0.86947,0.33657 0.25243,0.21505 0.37864,0.51422 0.37865,0.89753" /> + <path + inkscape:connector-curvature="0" + id="path7436" + style="font-weight:bold;fill:#000000;marker:none" + d="m 167.6884,687.1514 c 0,-0.65445 0.0982,-1.22475 0.2945,-1.71091 0.20568,-0.4955 0.47213,-0.90687 0.79936,-1.2341 0.32722,-0.32721 0.70119,-0.57497 1.12191,-0.74326 0.43006,-0.16828 0.86947,-0.25242 1.31824,-0.25243 1.0471,10e-6 1.87451,0.32255 2.48221,0.96764 0.6077,0.63576 0.91155,1.57535 0.91155,2.81879 0,0.12155 -0.005,0.25711 -0.014,0.4067 -0.009,0.14024 -0.0187,0.26645 -0.0281,0.37864 l -4.74005,0 c 0.0467,0.43007 0.24775,0.77131 0.60302,1.02374 0.35527,0.25243 0.83208,0.37864 1.43043,0.37864 0.38332,0 0.75728,-0.0327 1.12191,-0.0982 0.37396,-0.0748 0.67781,-0.16361 0.91155,-0.26646 l 0.28048,1.69689 c -0.1122,0.0561 -0.26179,0.11219 -0.44877,0.16828 -0.18699,0.0561 -0.39735,0.10284 -0.63107,0.14024 -0.22439,0.0467 -0.46747,0.0841 -0.72924,0.11219 -0.26178,0.0281 -0.52356,0.0421 -0.78533,0.0421 -0.6638,0 -1.24345,-0.0982 -1.73896,-0.2945 -0.48616,-0.19633 -0.89285,-0.46278 -1.22007,-0.79936 -0.31788,-0.34592 -0.55628,-0.75261 -0.71522,-1.22007 -0.14959,-0.46746 -0.22438,-0.97232 -0.22438,-1.51457 m 4.90834,-0.79936 c -0.009,-0.17763 -0.0421,-0.35059 -0.0982,-0.51888 -0.0468,-0.16829 -0.12621,-0.31787 -0.2384,-0.44877 -0.10285,-0.13088 -0.23841,-0.2384 -0.40669,-0.32255 -0.15894,-0.0841 -0.35995,-0.1262 -0.60303,-0.12621 -0.23373,10e-6 -0.43474,0.0421 -0.60302,0.12621 -0.16829,0.0748 -0.30853,0.17765 -0.42072,0.30853 -0.11219,0.13089 -0.20101,0.28516 -0.26645,0.46279 -0.0561,0.16829 -0.0982,0.34125 -0.12621,0.51888 l 2.76269,0" /> + <path + inkscape:connector-curvature="0" + id="path7438" + style="font-weight:bold;fill:#000000;marker:none" + d="m 180.28158,686.87092 c 0,-0.67314 -0.0888,-1.14995 -0.26645,-1.43043 -0.16829,-0.28047 -0.46279,-0.42071 -0.8835,-0.42072 -0.1309,10e-6 -0.26646,0.009 -0.40669,0.0281 -0.14025,0.009 -0.27581,0.0234 -0.4067,0.0421 l 0,5.69368 -2.08955,0 0,-7.12411 c 0.17764,-0.0467 0.38332,-0.0935 0.61705,-0.14024 0.24308,-0.0561 0.49551,-0.10283 0.75729,-0.14024 0.27112,-0.0467 0.54693,-0.0795 0.8274,-0.0982 0.28048,-0.028 0.55628,-0.0421 0.82741,-0.0421 0.5329,0 0.96297,0.0701 1.29019,0.21035 0.33657,0.1309 0.61237,0.28984 0.82741,0.47681 0.29917,-0.21502 0.64042,-0.38331 1.02374,-0.50485 0.39266,-0.12154 0.7526,-0.18231 1.07984,-0.18231 0.58899,0 1.07047,0.0842 1.44445,0.25243 0.38331,0.15894 0.68716,0.388 0.91155,0.68716 0.22437,0.29918 0.37863,0.65445 0.46279,1.06581 0.0841,0.41138 0.1262,0.86949 0.12621,1.37434 l 0,4.16508 -2.08955,0 0,-3.91265 c -1e-5,-0.67314 -0.0888,-1.14995 -0.26645,-1.43043 -0.1683,-0.28047 -0.4628,-0.42071 -0.88351,-0.42072 -0.11219,10e-6 -0.27113,0.0281 -0.47681,0.0842 -0.19634,0.0561 -0.35995,0.12622 -0.49083,0.21035 0.0654,0.21504 0.10751,0.4441 0.12621,0.68717 0.0187,0.23374 0.0281,0.48617 0.0281,0.75729 l 0,4.02484 -2.08955,0 0,-3.91265" /> + <path + inkscape:connector-curvature="0" + id="path7440" + style="font-weight:bold;fill:#000000;marker:none" + d="m 193.03385,687.1514 c -1e-5,-0.6451 -0.14492,-1.1593 -0.43474,-1.54263 -0.28983,-0.39266 -0.71989,-0.58899 -1.29019,-0.589 -0.18699,10e-6 -0.35995,0.009 -0.51888,0.0281 -0.15894,0.009 -0.28983,0.0234 -0.39267,0.0421 l 0,3.77241 c 0.13088,0.0842 0.29917,0.15427 0.50486,0.21036 0.21503,0.0561 0.43006,0.0841 0.64509,0.0841 0.99102,10e-6 1.48652,-0.66846 1.48653,-2.0054 m 2.13162,-0.0561 c -1e-5,0.57031 -0.0701,1.08919 -0.21036,1.55665 -0.14024,0.46746 -0.34592,0.86948 -0.61704,1.20605 -0.27114,0.33657 -0.60771,0.59835 -1.00972,0.78533 -0.40202,0.18699 -0.86481,0.28048 -1.38836,0.28048 -0.28983,0 -0.56096,-0.0281 -0.81338,-0.0842 -0.25243,-0.0561 -0.49551,-0.13556 -0.72924,-0.2384 l 0,2.77672 -2.08955,0 0,-9.71852 c 0.18698,-0.0561 0.40201,-0.10751 0.64509,-0.15426 0.24308,-0.0561 0.49551,-0.10283 0.75729,-0.14024 0.27113,-0.0374 0.54225,-0.0654 0.81338,-0.0841 0.28048,-0.028 0.54693,-0.0421 0.79936,-0.0421 0.6077,0 1.14995,0.0935 1.62677,0.28047 0.4768,0.17765 0.87882,0.43475 1.20605,0.77131 0.32721,0.32723 0.57497,0.72925 0.74326,1.20605 0.17763,0.47682 0.26644,1.00972 0.26645,1.59872" /> + <path + inkscape:connector-curvature="0" + id="path7442" + style="font-weight:bold;fill:#000000;marker:none" + d="m 203.67114,687.08128 c 0,0.57965 -0.0842,1.11256 -0.25243,1.59871 -0.16829,0.47682 -0.41137,0.88818 -0.72923,1.2341 -0.31788,0.33657 -0.7012,0.59835 -1.14996,0.78534 -0.43942,0.18698 -0.93493,0.28047 -1.48653,0.28047 -0.54225,0 -1.03776,-0.0935 -1.48652,-0.28047 -0.43942,-0.18699 -0.81806,-0.44877 -1.13593,-0.78534 -0.31788,-0.34592 -0.56563,-0.75728 -0.74327,-1.2341 -0.17763,-0.48615 -0.26645,-1.01906 -0.26645,-1.59871 0,-0.57965 0.0888,-1.10788 0.26645,-1.5847 0.18699,-0.4768 0.43942,-0.88349 0.75729,-1.22007 0.32722,-0.33656 0.71054,-0.59834 1.14996,-0.78533 0.44876,-0.18698 0.93491,-0.28047 1.45847,-0.28048 0.53291,10e-6 1.01906,0.0935 1.45848,0.28048 0.44876,0.18699 0.83208,0.44877 1.14996,0.78533 0.31786,0.33658 0.56562,0.74327 0.74326,1.22007 0.17763,0.47682 0.26645,1.00505 0.26645,1.5847 m -2.13162,0 c 0,-0.64509 -0.13089,-1.14995 -0.39267,-1.51458 -0.25243,-0.37396 -0.61705,-0.56094 -1.09386,-0.56095 -0.47681,10e-6 -0.8461,0.18699 -1.10788,0.56095 -0.26178,0.36463 -0.39267,0.86949 -0.39267,1.51458 0,0.6451 0.13089,1.1593 0.39267,1.54262 0.26178,0.37397 0.63107,0.56095 1.10788,0.56095 0.47681,0 0.84143,-0.18698 1.09386,-0.56095 0.26178,-0.38332 0.39267,-0.89752 0.39267,-1.54262" /> + <path + inkscape:connector-curvature="0" + id="path7444" + style="fill:#000000;marker:none" + d="m 97.154866,707.37377 c 0.532902,0 0.925569,-0.0701 1.178002,-0.21036 0.261774,-0.14024 0.392663,-0.36462 0.392667,-0.67315 -4e-6,-0.31787 -0.126219,-0.5703 -0.378644,-0.75728 -0.252432,-0.18699 -0.668472,-0.39734 -1.248121,-0.63108 -0.280479,-0.11218 -0.551606,-0.22437 -0.813382,-0.33657 -0.252431,-0.12153 -0.472137,-0.26177 -0.65912,-0.42071 -0.186986,-0.15894 -0.336573,-0.35059 -0.448763,-0.57498 -0.112192,-0.22438 -0.168287,-0.50018 -0.168286,-0.82741 -10e-7,-0.64509 0.238404,-1.15462 0.715215,-1.52859 0.476809,-0.38332 1.126579,-0.57497 1.949313,-0.57498 0.20568,10e-6 0.411362,0.014 0.617049,0.0421 0.205679,0.0187 0.397338,0.0467 0.574977,0.0841 0.177631,0.0281 0.331893,0.0608 0.462787,0.0982 0.140233,0.0374 0.247749,0.0701 0.322548,0.0982 l -0.238405,1.1219 c -0.140243,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.659124,-0.12621 -1.079836,-0.12621 -0.364622,0 -0.682496,0.0748 -0.95362,0.22438 -0.27113,0.14024 -0.406694,0.36462 -0.406692,0.67314 -2e-6,0.15895 0.02805,0.29918 0.08414,0.42072 0.06544,0.12154 0.158935,0.23373 0.280477,0.33657 0.130887,0.0935 0.289823,0.18231 0.476811,0.26645 0.186981,0.0842 0.411362,0.17297 0.673144,0.26646 0.345917,0.13089 0.654441,0.26178 0.925573,0.39266 0.271122,0.12155 0.500178,0.26646 0.687167,0.43474 0.196329,0.16829 0.345916,0.37397 0.448763,0.61705 0.102836,0.23373 0.15426,0.52356 0.15427,0.86948 -1e-5,0.67314 -0.252442,1.18268 -0.757295,1.5286 -0.495513,0.34592 -1.206053,0.51888 -2.131622,0.51888 -0.645099,0 -1.149957,-0.0561 -1.514575,-0.16829 -0.36462,-0.10284 -0.612374,-0.18231 -0.743263,-0.2384 l 0.238405,-1.12191 c 0.149587,0.0561 0.387992,0.14024 0.715216,0.25243 0.327221,0.11219 0.761959,0.16829 1.304217,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path7446" + style="fill:#000000;marker:none" + d="m 103.00719,708.31336 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61063 c -0.23374,10e-6 -0.43474,-0.0748 -0.60303,-0.22438 -0.15894,-0.15893 -0.2384,-0.36929 -0.2384,-0.63108 0,-0.26176 0.0795,-0.46745 0.2384,-0.61704 0.16829,-0.15893 0.36929,-0.2384 0.60303,-0.23841 0.23372,1e-5 0.43006,0.0795 0.589,0.23841 0.16828,0.14959 0.25242,0.35528 0.25243,0.61704 -10e-6,0.26179 -0.0841,0.47215 -0.25243,0.63108 -0.15894,0.14959 -0.35528,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7448" + style="fill:#000000;marker:none" + d="m 109.83548,707.58412 c -0.1122,0.0748 -0.3319,0.17296 -0.65912,0.2945 -0.31788,0.11219 -0.69185,0.16829 -1.12191,0.16829 -0.43942,0 -0.85546,-0.0701 -1.24812,-0.21036 -0.38332,-0.14024 -0.71989,-0.35527 -1.00972,-0.64509 -0.28982,-0.29918 -0.51888,-0.66847 -0.68716,-1.10789 -0.16829,-0.43941 -0.25243,-0.96296 -0.25243,-1.57067 0,-0.5329 0.0795,-1.01906 0.2384,-1.45848 0.15894,-0.44875 0.38799,-0.83207 0.68717,-1.14995 0.30852,-0.32722 0.68249,-0.57964 1.12191,-0.75729 0.43941,-0.18697 0.93492,-0.28047 1.48652,-0.28047 0.6077,0 1.13593,0.0467 1.5847,0.14023 0.4581,0.0842 0.84142,0.16362 1.14995,0.23841 l 0,6.50706 c -1e-5,1.1219 -0.28983,1.93529 -0.86948,2.44015 -0.57965,0.50485 -1.45848,0.75728 -2.63648,0.75728 -0.45811,0 -0.89285,-0.0374 -1.30421,-0.11219 -0.40202,-0.0748 -0.75262,-0.16361 -1.05179,-0.26645 l 0.2384,-1.13593 c 0.26178,0.10284 0.57965,0.19166 0.95362,0.26645 0.38332,0.0841 0.78066,0.12621 1.19203,0.12622 0.77598,-10e-6 1.33226,-0.15427 1.66884,-0.46279 0.34591,-0.30853 0.51887,-0.79936 0.51888,-1.4725 l 0,-0.30853 m -0.014,-5.4132 c -0.13089,-0.0374 -0.30853,-0.0701 -0.5329,-0.0982 -0.21504,-0.0374 -0.50954,-0.0561 -0.8835,-0.0561 -0.7012,10e-6 -1.24345,0.22906 -1.62677,0.68717 -0.37397,0.45812 -0.56095,1.06581 -0.56095,1.8231 0,0.42072 0.0514,0.78066 0.15426,1.07983 0.11219,0.29918 0.2571,0.54693 0.43474,0.74327 0.18698,0.19633 0.39734,0.34124 0.63107,0.43473 0.24308,0.0935 0.49083,0.14024 0.74327,0.14024 0.34591,0 0.66379,-0.0467 0.95362,-0.14024 0.28982,-0.10284 0.51887,-0.2197 0.68716,-0.35059 l 0,-4.26325" /> + <path + inkscape:connector-curvature="0" + id="path7450" + style="fill:#000000;marker:none" + d="m 113.37124,701.23133 c 0.29917,-0.0748 0.69651,-0.15426 1.19202,-0.23841 0.49551,-0.0841 1.06581,-0.12621 1.71091,-0.12621 0.57965,0 1.06113,0.0842 1.44446,0.25243 0.38331,0.15894 0.68716,0.38799 0.91155,0.68716 0.23372,0.28984 0.39733,0.64043 0.49083,1.05179 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c 0,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31786 -0.15426,-0.57497 -0.2945,-0.77131 -0.14024,-0.19632 -0.32722,-0.33656 -0.56095,-0.42071 -0.23373,-0.0935 -0.52356,-0.14023 -0.86948,-0.14024 -0.14024,10e-6 -0.28515,0.005 -0.43474,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36461,0.0421 -0.10285,0.0187 -0.17764,0.0327 -0.22439,0.0421 l 0,6.15646 -1.30421,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7452" + style="fill:#000000;marker:none" + d="m 122.7282,708.31336 -1.30421,0 0,-7.29239 1.30421,0 0,7.29239 m -0.65912,-8.61063 c -0.23373,10e-6 -0.43474,-0.0748 -0.60302,-0.22438 -0.15894,-0.15893 -0.23841,-0.36929 -0.23841,-0.63108 0,-0.26176 0.0795,-0.46745 0.23841,-0.61704 0.16828,-0.15893 0.36929,-0.2384 0.60302,-0.23841 0.23373,1e-5 0.43007,0.0795 0.589,0.23841 0.16829,0.14959 0.25243,0.35528 0.25243,0.61704 0,0.26179 -0.0841,0.47215 -0.25243,0.63108 -0.15893,0.14959 -0.35527,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7454" + style="fill:#000000;marker:none" + d="m 127.83156,697.43087 c 0.32722,10e-6 0.6077,0.0234 0.84143,0.0701 0.23373,0.0374 0.40202,0.0748 0.50486,0.11219 l -0.18231,1.1219 c -0.10284,-0.0374 -0.24308,-0.0748 -0.42071,-0.11219 -0.17764,-0.0467 -0.39267,-0.0701 -0.6451,-0.0701 -0.6077,10e-6 -1.03309,0.1683 -1.27617,0.50486 -0.24308,0.32723 -0.36462,0.77132 -0.36462,1.33227 l 0,0.63107 2.80477,0 0,1.09386 -2.80477,0 0,6.19853 -1.30421,0 0,-7.95151 c 0,-0.93492 0.22905,-1.6548 0.68716,-2.15967 0.45811,-0.5142 1.178,-0.7713 2.15967,-0.77131 m 3.92668,10.88249 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61063 c -0.23374,10e-6 -0.43475,-0.0748 -0.60303,-0.22438 -0.15894,-0.15893 -0.23841,-0.36929 -0.2384,-0.63108 -1e-5,-0.26176 0.0795,-0.46745 0.2384,-0.61704 0.16828,-0.15893 0.36929,-0.2384 0.60303,-0.23841 0.23372,1e-5 0.43005,0.0795 0.589,0.23841 0.16828,0.14959 0.25242,0.35528 0.25243,0.61704 -1e-5,0.26179 -0.0841,0.47215 -0.25243,0.63108 -0.15895,0.14959 -0.35528,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7456" + style="fill:#000000;marker:none" + d="m 137.16552,708.48165 c -0.589,0 -1.10788,-0.0935 -1.55664,-0.28048 -0.43942,-0.18698 -0.81339,-0.44876 -1.12191,-0.78533 -0.29918,-0.33657 -0.52356,-0.73392 -0.67314,-1.19203 -0.14959,-0.46746 -0.22439,-0.98166 -0.22439,-1.54262 0,-0.56095 0.0795,-1.07516 0.23841,-1.54262 0.16829,-0.46746 0.40202,-0.86947 0.70119,-1.20605 0.29918,-0.34592 0.66379,-0.61237 1.09386,-0.79936 0.43941,-0.19633 0.92557,-0.29449 1.45848,-0.2945 0.32722,10e-6 0.65444,0.0281 0.98167,0.0841 0.32722,0.0561 0.64041,0.14492 0.93959,0.26645 l -0.2945,1.10789 c -0.19633,-0.0935 -0.42539,-0.16828 -0.68716,-0.22438 -0.25244,-0.0561 -0.52356,-0.0841 -0.81339,-0.0842 -0.72924,10e-6 -1.29019,0.22906 -1.68286,0.68717 -0.38332,0.45812 -0.57498,1.12659 -0.57497,2.00541 -1e-5,0.39267 0.0421,0.75261 0.12621,1.07983 0.0935,0.32723 0.23373,0.60771 0.42072,0.84143 0.19633,0.23374 0.44408,0.41605 0.74326,0.54693 0.29917,0.12154 0.66379,0.18231 1.09386,0.18231 0.34592,0 0.65911,-0.0327 0.9396,-0.0982 0.28047,-0.0654 0.50017,-0.13557 0.65912,-0.21036 l 0.18231,1.09386 c -0.0748,0.0467 -0.18232,0.0935 -0.32255,0.14024 -0.14025,0.0374 -0.29918,0.0701 -0.47681,0.0982 -0.17764,0.0374 -0.3693,0.0655 -0.57498,0.0842 -0.19634,0.028 -0.388,0.0421 -0.57498,0.0421" /> + <path + inkscape:connector-curvature="0" + id="path7458" + style="fill:#000000;marker:none" + d="m 142.98322,707.37377 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44409,-0.0467 0.60303,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,0 -0.4067,0.014 -0.63108,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0842 -0.32723,0.20569 -0.44877,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.1823,0.60302 -1e-5,0.46747 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70586,0.26646 1.22007,0.26646 m -0.11219,-6.53511 c 0.52355,10e-6 0.96297,0.0701 1.31824,0.21036 0.36462,0.13089 0.65444,0.32255 0.86948,0.57497 0.22437,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55775 c -0.1122,0.0187 -0.27114,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0841 -0.25243,0.0281 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0841 -0.6451,-0.21503 -0.89753,-0.39267 -0.25243,-0.18698 -0.44876,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.23841,-1.03777 0.16828,-0.28982 0.39267,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39266 0.37397,-0.0841 0.76664,-0.12622 1.178,-0.12622 0.13089,0 0.26645,0.009 0.4067,0.0281 0.14023,0.009 0.27112,0.0281 0.39266,0.0561 0.13089,0.0187 0.24308,0.0374 0.33657,0.0561 0.0935,0.0187 0.15894,0.0327 0.19634,0.0421 l 0,-0.36462 c -1e-5,-0.21503 -0.0234,-0.42538 -0.0701,-0.63107 -0.0468,-0.21503 -0.13089,-0.40201 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29916 -0.50486,-0.39266 -0.20568,-0.10284 -0.47681,-0.15426 -0.81338,-0.15426 -0.43007,0 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07983 c 0.16829,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81806,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7460" + style="fill:#000000;marker:none" + d="m 152.01391,704.68119 c 0,0.37397 0.0374,0.72457 0.11219,1.05179 0.0748,0.31787 0.19633,0.59835 0.36462,0.84143 0.16829,0.23373 0.38332,0.42071 0.6451,0.56095 0.27112,0.13089 0.59367,0.19633 0.96764,0.19633 0.35527,0 0.68249,-0.0608 0.98167,-0.18231 0.29917,-0.12153 0.52823,-0.24775 0.68717,-0.37864 l 0,-4.59982 c -0.13089,-0.0374 -0.30853,-0.0701 -0.53291,-0.0982 -0.21503,-0.0281 -0.51888,-0.0421 -0.91154,-0.0421 -0.7012,10e-6 -1.26215,0.22907 -1.68286,0.68717 -0.42072,0.45812 -0.63108,1.11256 -0.63108,1.96334 m -1.36031,0 c 0,-0.589 0.0841,-1.11723 0.25243,-1.58469 0.17763,-0.47681 0.42539,-0.87883 0.74326,-1.20605 0.31787,-0.32722 0.70119,-0.57965 1.14996,-0.75729 0.44876,-0.17763 0.95361,-0.26645 1.51457,-0.26645 0.6077,0 1.1406,0.0467 1.59872,0.14023 0.46745,0.0842 0.85545,0.16362 1.16398,0.23841 l 0,9.66242 -1.30422,0 0,-2.91696 c -0.15894,0.10285 -0.40202,0.21036 -0.72924,0.32255 -0.31788,0.11219 -0.68717,0.16829 -1.10788,0.16829 -0.52356,0 -0.99102,-0.0935 -1.40239,-0.28048 -0.40201,-0.18698 -0.74326,-0.44876 -1.02374,-0.78533 -0.28047,-0.33657 -0.49551,-0.73859 -0.64509,-1.20605 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286" /> + <path + inkscape:connector-curvature="0" + id="path7462" + style="fill:#000000;marker:none" + d="m 165.13803,708.103 c -0.29918,0.0748 -0.69652,0.15427 -1.19203,0.23841 -0.48616,0.0841 -1.05179,0.12621 -1.69688,0.12621 -0.56096,0 -1.03309,-0.0795 -1.41641,-0.2384 -0.38332,-0.16829 -0.69184,-0.40202 -0.92557,-0.70119 -0.23373,-0.29918 -0.40202,-0.64977 -0.50486,-1.05179 -0.10284,-0.41136 -0.15426,-0.8648 -0.15426,-1.36031 l 0,-4.09496 1.30421,0 0,3.81448 c 0,0.88818 0.14024,1.52393 0.42072,1.90724 0.28047,0.38332 0.75261,0.57498 1.41641,0.57498 0.14023,0 0.28514,-0.005 0.43474,-0.014 0.14958,-0.009 0.28982,-0.0187 0.42071,-0.028 0.13089,-0.0187 0.24775,-0.0327 0.3506,-0.0421 0.11218,-0.0187 0.19165,-0.0374 0.2384,-0.0561 l 0,-6.15646 1.30422,0 0,7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7464" + style="fill:#000000;marker:none" + d="m 166.97822,704.68119 c 0,-0.64509 0.0935,-1.20605 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30853,-0.31787 0.6638,-0.55627 1.06581,-0.71522 0.40202,-0.15893 0.81338,-0.23839 1.2341,-0.2384 0.98167,10e-6 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53795 0.78533,2.79074 0,0.0561 0,0.1309 0,0.22439 0,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71522,-0.2384 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46278 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67315,-1.19202 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14024,-1.07048 -0.44876,-1.44445 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26179 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40203 -0.37864,0.6451 -0.0842,0.24308 -0.14024,0.49084 -0.16829,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7466" + style="fill:#000000;marker:none" + d="m 184.14427,701.02097 c -0.36462,1.36499 -0.79469,2.67388 -1.29019,3.92667 -0.48616,1.2528 -0.9583,2.37471 -1.41641,3.36572 l -1.178,0 c -0.45811,-0.99101 -0.93492,-2.11292 -1.43043,-3.36572 -0.48616,-1.25279 -0.91155,-2.56168 -1.27617,-3.92667 l 1.40238,0 c 0.11219,0.45812 0.24308,0.94895 0.39267,1.4725 0.15894,0.51421 0.32255,1.02842 0.49084,1.54262 0.17763,0.50486 0.35526,0.9957 0.5329,1.47251 0.17763,0.47681 0.34592,0.9022 0.50486,1.27616 0.15893,-0.37396 0.32722,-0.79935 0.50486,-1.27616 0.17763,-0.47681 0.35059,-0.96765 0.51888,-1.47251 0.17763,-0.5142 0.34124,-1.02841 0.49083,-1.54262 0.15894,-0.52355 0.2945,-1.01438 0.40669,-1.4725 l 1.34629,0" /> + <path + inkscape:connector-curvature="0" + id="path7468" + style="fill:#000000;marker:none" + d="m 187.9581,707.37377 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44408,-0.0467 0.60303,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.40669,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41604,0.0888 -0.60303,0.18231 -0.17763,0.0842 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60302 0,0.46747 0.14959,0.79469 0.44876,0.98167 0.29918,0.17764 0.70587,0.26646 1.22008,0.26646 m -0.11219,-6.53511 c 0.52355,10e-6 0.96296,0.0701 1.31824,0.21036 0.36461,0.13089 0.65444,0.32255 0.86948,0.57497 0.22437,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14023,1.12191 l 0,4.55775 c -0.11219,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25243,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57965,0.0421 -0.86947,0.0421 -0.41137,0 -0.79002,-0.0421 -1.13593,-0.12621 -0.34593,-0.0841 -0.6451,-0.21503 -0.89753,-0.39267 -0.25243,-0.18698 -0.44876,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.23841,-1.03777 0.16828,-0.28982 0.39266,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39266 0.37396,-0.0841 0.76663,-0.12622 1.178,-0.12622 0.13089,0 0.26645,0.009 0.40669,0.0281 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19634,0.0421 l 0,-0.36462 c -10e-6,-0.21503 -0.0234,-0.42538 -0.0701,-0.63107 -0.0468,-0.21503 -0.1309,-0.40201 -0.25243,-0.56096 -0.12155,-0.16828 -0.28983,-0.29916 -0.50486,-0.39266 -0.20569,-0.10284 -0.47682,-0.15426 -0.81338,-0.15426 -0.43007,0 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7470" + style="fill:#000000;marker:none" + d="m 194.5,707.37377 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26177,-0.14024 0.39266,-0.36462 0.39267,-0.67315 -1e-5,-0.31787 -0.12622,-0.5703 -0.37865,-0.75728 -0.25243,-0.18699 -0.66847,-0.39734 -1.24812,-0.63108 -0.28048,-0.11218 -0.55161,-0.22437 -0.81338,-0.33657 -0.25243,-0.12153 -0.47214,-0.26177 -0.65912,-0.42071 -0.18699,-0.15894 -0.33657,-0.35059 -0.44876,-0.57498 -0.1122,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.2384,-1.15462 0.71522,-1.52859 0.4768,-0.38332 1.12657,-0.57497 1.94931,-0.57498 0.20568,10e-6 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39733,0.0467 0.57497,0.0841 0.17763,0.0281 0.3319,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.1219 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12621 -0.36462,0 -0.6825,0.0748 -0.95362,0.22438 -0.27113,0.14024 -0.4067,0.36462 -0.40669,0.67314 -1e-5,0.15895 0.028,0.29918 0.0841,0.42072 0.0654,0.12154 0.15893,0.23373 0.28048,0.33657 0.13088,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0842 0.41136,0.17297 0.67314,0.26646 0.34592,0.13089 0.65444,0.26178 0.92557,0.39266 0.27113,0.12155 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34592,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52356 0.15427,0.86948 -1e-5,0.67314 -0.25244,1.18268 -0.75729,1.5286 -0.49551,0.34592 -1.20605,0.51888 -2.13162,0.51888 -0.6451,0 -1.14996,-0.0561 -1.51458,-0.16829 -0.36462,-0.10284 -0.61237,-0.18231 -0.74326,-0.2384 l 0.2384,-1.12191 c 0.14959,0.0561 0.388,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16829 1.30422,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path7472" + style="fill:#000000;marker:none" + d="m 204.74835,707.37377 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44409,-0.0467 0.60303,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45811,-0.0561 -0.75729,-0.0561 -0.19633,0 -0.40669,0.014 -0.63107,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0842 -0.32723,0.20569 -0.44877,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60302 0,0.46747 0.14959,0.79469 0.44877,0.98167 0.29917,0.17764 0.70586,0.26646 1.22007,0.26646 m -0.11219,-6.53511 c 0.52355,10e-6 0.96297,0.0701 1.31824,0.21036 0.36461,0.13089 0.65444,0.32255 0.86948,0.57497 0.22437,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55775 c -0.1122,0.0187 -0.27114,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0841 -0.25243,0.0281 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34593,-0.0841 -0.6451,-0.21503 -0.89753,-0.39267 -0.25243,-0.18698 -0.44876,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.23841,-1.03777 0.16828,-0.28982 0.39267,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39266 0.37397,-0.0841 0.76663,-0.12622 1.178,-0.12622 0.13089,0 0.26645,0.009 0.40669,0.0281 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13089,0.0187 0.24308,0.0374 0.33657,0.0561 0.0935,0.0187 0.15894,0.0327 0.19634,0.0421 l 0,-0.36462 c -1e-5,-0.21503 -0.0234,-0.42538 -0.0701,-0.63107 -0.0468,-0.21503 -0.1309,-0.40201 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29916 -0.50486,-0.39266 -0.20569,-0.10284 -0.47681,-0.15426 -0.81338,-0.15426 -0.43007,0 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07983 c 0.16829,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81805,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7474" + style="fill:#000000;marker:none" + d="m 100.52059,722.21098 c -1e-5,-0.85077 -0.21037,-1.50522 -0.631077,-1.96333 -0.42072,-0.45811 -0.981673,-0.68717 -1.68286,-0.68717 -0.392671,0 -0.701195,0.014 -0.925573,0.0421 -0.215035,0.0281 -0.387995,0.0608 -0.518882,0.0982 l 0,4.59981 c 0.158934,0.13089 0.38799,0.25711 0.687168,0.37865 0.299172,0.12154 0.626394,0.18231 0.981668,0.18231 0.373965,0 0.691838,-0.0655 0.953621,-0.19634 0.271122,-0.14023 0.490829,-0.32722 0.659125,-0.56095 0.16828,-0.24308 0.28982,-0.52355 0.36462,-0.84143 0.0748,-0.32722 0.11218,-0.67782 0.11219,-1.05179 m 1.36031,0 c -1e-5,0.55161 -0.0748,1.06114 -0.22438,1.5286 -0.14025,0.46746 -0.35061,0.86948 -0.63108,1.20605 -0.28048,0.33657 -0.6264,0.59835 -1.03776,0.78533 -0.402022,0.18699 -0.864808,0.28048 -1.38836,0.28048 -0.420718,0 -0.794687,-0.0561 -1.121906,-0.16829 -0.317877,-0.11219 -0.556282,-0.2197 -0.715216,-0.32254 l 0,2.91695 -1.304216,0 0,-9.66242 c 0.308522,-0.0748 0.69184,-0.15425 1.149954,-0.2384 0.467458,-0.0935 1.005038,-0.14023 1.612741,-0.14024 0.560949,10e-6 1.065806,0.0888 1.514574,0.26645 0.448759,0.17764 0.832079,0.43007 1.149959,0.75729 0.31786,0.32723 0.56094,0.72924 0.72923,1.20605 0.17763,0.46746 0.26645,0.9957 0.26646,1.58469" /> + <path + inkscape:connector-curvature="0" + id="path7476" + style="fill:#000000;marker:none" + d="m 110.16679,722.19696 c -1e-5,0.57965 -0.0842,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.4067,0.86948 -0.71521,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78533 -0.42072,0.17764 -0.87883,0.26645 -1.37433,0.26645 -0.49552,0 -0.95363,-0.0888 -1.37434,-0.26645 -0.42072,-0.18698 -0.78534,-0.44876 -1.09386,-0.78533 -0.29917,-0.33657 -0.53291,-0.73859 -0.70119,-1.20605 -0.16829,-0.46746 -0.25243,-0.99102 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55665 0.16828,-0.4768 0.40202,-0.88349 0.70119,-1.22007 0.30852,-0.33657 0.67314,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87882,-0.28047 1.37434,-0.28048 0.4955,10e-6 0.95361,0.0935 1.37433,0.28048 0.42071,0.17764 0.78066,0.43474 1.07984,0.77131 0.30851,0.33658 0.54692,0.74327 0.71521,1.22007 0.16828,0.46747 0.25242,0.98635 0.25243,1.55665 m -1.36031,0 c -10e-6,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48616 -0.86481,-0.72924 -1.50055,-0.72924 -0.63575,0 -1.14061,0.24308 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12658 -0.54693,1.94931 0,0.82273 0.18231,1.47718 0.54693,1.96333 0.37397,0.47682 0.87883,0.71522 1.51458,0.71522 0.63574,0 1.13592,-0.2384 1.50055,-0.71522 0.37396,-0.48615 0.56094,-1.1406 0.56095,-1.96333" /> + <path + inkscape:connector-curvature="0" + id="path7478" + style="fill:#000000;marker:none" + d="m 116.71373,720.09338 c -0.15894,-0.13088 -0.388,-0.25709 -0.68717,-0.37864 -0.29918,-0.12153 -0.6264,-0.1823 -0.98167,-0.18231 -0.37397,10e-6 -0.69652,0.0701 -0.96764,0.21036 -0.26178,0.13089 -0.47681,0.31788 -0.6451,0.56095 -0.16828,0.23374 -0.28982,0.51421 -0.36462,0.84143 -0.0748,0.32723 -0.11219,0.67782 -0.11219,1.05179 0,0.85078 0.21036,1.5099 0.63108,1.97736 0.42071,0.45811 0.98166,0.68717 1.68286,0.68717 0.35526,0 0.64976,-0.014 0.8835,-0.0421 0.24307,-0.0374 0.43006,-0.0748 0.56095,-0.1122 l 0,-4.61384 m 0,-4.90834 1.30422,-0.22438 0,10.67214 c -0.29918,0.0841 -0.6825,0.16828 -1.14996,0.25243 -0.46746,0.0841 -1.00504,0.12621 -1.61274,0.12621 -0.56095,0 -1.06581,-0.0888 -1.51457,-0.26645 -0.44877,-0.17764 -0.83208,-0.43007 -1.14996,-0.75729 -0.31787,-0.32722 -0.56563,-0.72456 -0.74326,-1.19202 -0.16829,-0.47681 -0.25243,-1.00972 -0.25243,-1.59872 0,-0.56095 0.0701,-1.07516 0.21036,-1.54262 0.14959,-0.46746 0.36462,-0.86948 0.6451,-1.20605 0.28047,-0.33657 0.62172,-0.59835 1.02374,-0.78534 0.41136,-0.18698 0.87882,-0.28047 1.40238,-0.28047 0.42071,0 0.79,0.0561 1.10788,0.16828 0.32722,0.1122 0.5703,0.21971 0.72924,0.32255 l 0,-3.68827" /> + <path + inkscape:connector-curvature="0" + id="path7480" + style="fill:#000000;marker:none" + d="m 119.8669,722.21098 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30853,-0.31786 0.6638,-0.55627 1.06581,-0.71521 0.40202,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98167,10e-6 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53796 0.78533,2.79075 0,0.0561 0,0.13089 0,0.22438 0,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99248,0 c 0.0561,0.75729 0.27579,1.33227 0.65912,1.72494 0.38331,0.39266 0.98166,0.589 1.79505,0.589 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46278 -1.13594,-0.79935 -0.29917,-0.33658 -0.52355,-0.73392 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,1e-5 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26179 -0.57498,0.44877 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0842,0.24309 -0.14024,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7482" + style="fill:#000000;marker:none" + d="m 130.7998,718.3965 c 0.11218,1e-5 0.2384,0.009 0.37864,0.0281 0.14958,0.009 0.2945,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26646,0.0561 l -0.22439,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12622 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12841 -1.30422,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54263,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7484" + style="fill:#000000;marker:none" + d="m 142.45623,718.55076 c -0.36462,1.36499 -0.79469,2.67388 -1.29019,3.92667 -0.48617,1.2528 -0.9583,2.37471 -1.41641,3.36572 l -1.178,0 c -0.45812,-0.99101 -0.93493,-2.11292 -1.43043,-3.36572 -0.48616,-1.25279 -0.91155,-2.56168 -1.27617,-3.92667 l 1.40238,0 c 0.11219,0.45812 0.24308,0.94895 0.39267,1.4725 0.15893,0.51422 0.32255,1.02842 0.49083,1.54263 0.17764,0.50486 0.35527,0.99569 0.53291,1.4725 0.17763,0.47681 0.34592,0.9022 0.50486,1.27617 0.15893,-0.37397 0.32722,-0.79936 0.50486,-1.27617 0.17763,-0.47681 0.35059,-0.96764 0.51888,-1.4725 0.17763,-0.51421 0.34124,-1.02841 0.49083,-1.54263 0.15893,-0.52355 0.2945,-1.01438 0.40669,-1.4725 l 1.34629,0" /> + <path + inkscape:connector-curvature="0" + id="path7486" + style="fill:#000000;marker:none" + d="m 143.20344,722.21098 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43473,-0.88817 0.74326,-1.20605 0.30852,-0.31786 0.66379,-0.55627 1.06581,-0.71521 0.40201,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,10e-6 1.73427,0.30853 2.25784,0.92557 0.52355,0.60771 0.78532,1.53796 0.78533,2.79075 -1e-5,0.0561 -1e-5,0.13089 0,0.22438 -1e-5,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72494 0.38332,0.39266 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31786,-0.0841 0.55627,-0.16361 0.71521,-0.23841 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45811,-0.19633 -0.83676,-0.46278 -1.13593,-0.79935 -0.29918,-0.33658 -0.52356,-0.73392 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14025,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24813,-0.57498 -0.29917,1e-5 -0.56563,0.0608 -0.79935,0.18231 -0.22439,0.1122 -0.41605,0.26179 -0.57498,0.44877 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0841,0.24309 -0.14025,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7488" + style="fill:#000000;marker:none" + d="m 154.13633,718.3965 c 0.11219,1e-5 0.2384,0.009 0.37865,0.0281 0.14958,0.009 0.29449,0.0281 0.43474,0.0561 0.14023,0.0187 0.26644,0.0421 0.37864,0.0701 0.12153,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51888,-0.12622 -0.23374,-0.0561 -0.53759,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.388,0.0795 -0.46279,0.0982 l 0,6.12841 -1.30421,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7490" + style="fill:#000000;marker:none" + d="m 162.28681,725.98339 c -0.80403,-0.0187 -1.37433,-0.19166 -1.7109,-0.51888 -0.33658,-0.32722 -0.50486,-0.83675 -0.50486,-1.5286 l 0,-8.75087 1.30421,-0.22438 0,8.7649 c 0,0.21503 0.0187,0.39267 0.0561,0.5329 0.0374,0.14024 0.0982,0.25243 0.18231,0.33657 0.0841,0.0842 0.19633,0.14959 0.33657,0.19634 0.14024,0.0374 0.3132,0.0701 0.51888,0.0982 l -0.18231,1.09386" /> + <path + inkscape:connector-curvature="0" + id="path7492" + style="fill:#000000;marker:none" + d="m 170.37068,722.19696 c -1e-5,0.57965 -0.0842,1.10321 -0.25243,1.57067 -0.1683,0.46746 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07983,0.78533 -0.42072,0.17764 -0.87884,0.26645 -1.37434,0.26645 -0.49551,0 -0.95362,-0.0888 -1.37434,-0.26645 -0.42071,-0.18698 -0.78533,-0.44876 -1.09386,-0.78533 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16828,-0.46746 -0.25243,-0.99102 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55665 0.16829,-0.4768 0.40202,-0.88349 0.70119,-1.22007 0.30853,-0.33657 0.67315,-0.59367 1.09386,-0.77131 0.42072,-0.18698 0.87883,-0.28047 1.37434,-0.28048 0.4955,10e-6 0.95362,0.0935 1.37434,0.28048 0.4207,0.17764 0.78065,0.43474 1.07983,0.77131 0.30852,0.33658 0.54692,0.74327 0.71522,1.22007 0.16827,0.46747 0.25242,0.98635 0.25243,1.55665 m -1.36032,0 c 0,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36462,-0.48616 -0.86481,-0.72924 -1.50055,-0.72924 -0.63575,0 -1.14061,0.24308 -1.51457,0.72924 -0.36463,0.47681 -0.54694,1.12658 -0.54693,1.94931 -1e-5,0.82273 0.1823,1.47718 0.54693,1.96333 0.37396,0.47682 0.87882,0.71522 1.51457,0.71522 0.63574,0 1.13593,-0.2384 1.50055,-0.71522 0.37396,-0.48615 0.56095,-1.1406 0.56095,-1.96333" /> + <path + inkscape:connector-curvature="0" + id="path7494" + style="fill:#000000;marker:none" + d="m 176.39128,722.21098 c 0,0.37397 0.0374,0.72457 0.11219,1.05179 0.0748,0.31788 0.19633,0.59835 0.36462,0.84143 0.16828,0.23373 0.38331,0.42072 0.64509,0.56095 0.27113,0.13089 0.59368,0.19634 0.96765,0.19634 0.35526,0 0.68249,-0.0608 0.98167,-0.18231 0.29917,-0.12154 0.52822,-0.24776 0.68717,-0.37865 l 0,-4.59981 c -0.1309,-0.0374 -0.30853,-0.0701 -0.53291,-0.0982 -0.21504,-0.028 -0.51889,-0.0421 -0.91155,-0.0421 -0.7012,0 -1.26215,0.22906 -1.68286,0.68717 -0.42072,0.45811 -0.63107,1.11256 -0.63107,1.96333 m -1.36031,0 c -1e-5,-0.58899 0.0841,-1.11723 0.25242,-1.58469 0.17764,-0.47681 0.42539,-0.87882 0.74327,-1.20605 0.31787,-0.32722 0.70119,-0.57965 1.14995,-0.75729 0.44876,-0.17763 0.95362,-0.26644 1.51458,-0.26645 0.60769,10e-6 1.1406,0.0468 1.59871,0.14024 0.46746,0.0842 0.85545,0.16362 1.16398,0.2384 l 0,9.66242 -1.30421,0 0,-2.91695 c -0.15895,0.10284 -0.40203,0.21035 -0.72924,0.32254 -0.31788,0.1122 -0.68718,0.16829 -1.10789,0.16829 -0.52356,0 -0.99102,-0.0935 -1.40238,-0.28048 -0.40202,-0.18698 -0.74327,-0.44876 -1.02374,-0.78533 -0.28048,-0.33657 -0.49551,-0.73859 -0.6451,-1.20605 -0.14024,-0.46746 -0.21036,-0.97699 -0.21035,-1.5286" /> + <path + inkscape:connector-curvature="0" + id="path7496" + style="fill:#000000;marker:none" + d="m 189.5154,725.6328 c -0.29918,0.0748 -0.69653,0.15426 -1.19203,0.2384 -0.48616,0.0841 -1.05179,0.12622 -1.69688,0.12622 -0.56096,0 -1.03309,-0.0795 -1.41641,-0.23841 -0.38332,-0.16828 -0.69184,-0.40201 -0.92557,-0.70119 -0.23373,-0.29917 -0.40202,-0.64977 -0.50486,-1.05179 -0.10284,-0.41136 -0.15426,-0.8648 -0.15426,-1.36031 l 0,-4.09496 1.30421,0 0,3.81448 c 0,0.88818 0.14024,1.52393 0.42072,1.90725 0.28047,0.38331 0.75261,0.57497 1.41641,0.57497 0.14023,0 0.28514,-0.005 0.43474,-0.014 0.14958,-0.009 0.28982,-0.0187 0.42071,-0.0281 0.13088,-0.0187 0.24775,-0.0327 0.3506,-0.0421 0.11218,-0.0187 0.19165,-0.0374 0.2384,-0.0561 l 0,-6.15646 1.30422,0 0,7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7498" + style="fill:#000000;marker:none" + d="m 191.35559,722.21098 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43473,-0.88817 0.74326,-1.20605 0.30852,-0.31786 0.66379,-0.55627 1.06581,-0.71521 0.40201,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,10e-6 1.73427,0.30853 2.25783,0.92557 0.52355,0.60771 0.78533,1.53796 0.78534,2.79075 -1e-5,0.0561 -1e-5,0.13089 0,0.22438 -1e-5,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72494 0.38332,0.39266 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31786,-0.0841 0.55627,-0.16361 0.71521,-0.23841 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45811,-0.19633 -0.83676,-0.46278 -1.13593,-0.79935 -0.29918,-0.33658 -0.52356,-0.73392 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14025,-1.07048 -0.44877,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,1e-5 -0.56563,0.0608 -0.79935,0.18231 -0.22439,0.1122 -0.41605,0.26179 -0.57498,0.44877 -0.15894,0.18699 -0.28516,0.40202 -0.37865,0.64509 -0.0841,0.24309 -0.14024,0.49084 -0.16828,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7500" + style="fill:#000000;marker:none" + d="m 101.89492,739.72675 c -1e-5,0.57966 -0.0841,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.4067,0.86948 -0.71521,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.079838,0.78533 -0.42072,0.17764 -0.878832,0.26646 -1.374336,0.26646 -0.495513,0 -0.953624,-0.0888 -1.374336,-0.26646 -0.420717,-0.18698 -0.785337,-0.44876 -1.093859,-0.78533 -0.299176,-0.33657 -0.532907,-0.73859 -0.701192,-1.20605 -0.168286,-0.46746 -0.252429,-0.99101 -0.252429,-1.57067 0,-0.5703 0.08414,-1.08918 0.252429,-1.55664 0.168285,-0.47681 0.402016,-0.8835 0.701192,-1.22008 0.308522,-0.33656 0.673142,-0.59367 1.093859,-0.77131 0.420712,-0.18698 0.878823,-0.28047 1.374336,-0.28048 0.495504,10e-6 0.953616,0.0935 1.374336,0.28048 0.420708,0.17764 0.780658,0.43475 1.079838,0.77131 0.30851,0.33658 0.54692,0.74327 0.71521,1.22008 0.16828,0.46746 0.25242,0.98634 0.25243,1.55664 m -1.36031,0 c -1e-5,-0.82273 -0.18699,-1.4725 -0.560954,-1.94931 -0.364625,-0.48616 -0.864808,-0.72924 -1.50055,-0.72924 -0.635751,0 -1.140608,0.24308 -1.514574,0.72924 -0.364622,0.47681 -0.546932,1.12658 -0.54693,1.94931 -2e-6,0.82274 0.182308,1.47718 0.54693,1.96334 0.373966,0.47681 0.878823,0.71521 1.514574,0.71521 0.635742,0 1.135925,-0.2384 1.50055,-0.71521 0.373964,-0.48616 0.560944,-1.1406 0.560954,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7502" + style="fill:#000000;marker:none" + d="m 104.94993,736.08055 2.76269,0 0,1.09386 -2.76269,0 0,3.36572 c -10e-6,0.36463 0.028,0.66847 0.0841,0.91155 0.0561,0.23373 0.14023,0.42072 0.25243,0.56096 0.11219,0.13089 0.25242,0.22438 0.42071,0.28047 0.16829,0.0561 0.36462,0.0842 0.589,0.0842 0.39267,0 0.70587,-0.0421 0.9396,-0.12622 0.24308,-0.0935 0.41136,-0.15893 0.50486,-0.19633 l 0.25243,1.07983 c -0.1309,0.0654 -0.35995,0.14492 -0.68717,0.23841 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90687,-0.0608 -1.23409,-0.18231 -0.31788,-0.13089 -0.57498,-0.32255 -0.77132,-0.57498 -0.19633,-0.25243 -0.33657,-0.56095 -0.42071,-0.92557 -0.0748,-0.37397 -0.11219,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30422,-0.22438 0,2.25783" /> + <path + inkscape:connector-curvature="0" + id="path7504" + style="fill:#000000;marker:none" + d="m 112.06483,735.92629 c 0.11219,10e-6 0.2384,0.009 0.37864,0.0281 0.14959,0.009 0.2945,0.0281 0.43474,0.0561 0.14024,0.0187 0.26645,0.0421 0.37865,0.0701 0.12153,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51888,-0.12621 -0.23374,-0.0561 -0.53759,-0.0841 -0.91155,-0.0842 -0.24309,10e-6 -0.48617,0.0281 -0.72924,0.0842 -0.23374,0.0467 -0.388,0.0795 -0.46279,0.0982 l 0,6.12842 -1.30422,0 0,-6.98387 c 0.30853,-0.11219 0.69184,-0.21503 1.14996,-0.30853 0.45811,-0.10283 0.97231,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7506" + style="fill:#000000;marker:none" + d="m 121.23247,739.72675 c 0,0.57966 -0.0842,1.10321 -0.25242,1.57067 -0.1683,0.46746 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78533 -0.42072,0.17764 -0.87883,0.26646 -1.37433,0.26646 -0.49551,0 -0.95362,-0.0888 -1.37434,-0.26646 -0.42071,-0.18698 -0.78533,-0.44876 -1.09386,-0.78533 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16828,-0.46746 -0.25243,-0.99101 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55664 0.16829,-0.47681 0.40202,-0.8835 0.70119,-1.22008 0.30853,-0.33656 0.67315,-0.59367 1.09386,-0.77131 0.42072,-0.18698 0.87883,-0.28047 1.37434,-0.28048 0.4955,10e-6 0.95361,0.0935 1.37433,0.28048 0.42071,0.17764 0.78066,0.43475 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71522,1.22008 0.16827,0.46746 0.25242,0.98634 0.25242,1.55664 m -1.36031,0 c 0,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48616 -0.86481,-0.72924 -1.50055,-0.72924 -0.63575,0 -1.14061,0.24308 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12658 -0.54692,1.94931 -1e-5,0.82274 0.1823,1.47718 0.54692,1.96334 0.37397,0.47681 0.87883,0.71521 1.51458,0.71521 0.63574,0 1.13592,-0.2384 1.50055,-0.71521 0.37396,-0.48616 0.56095,-1.1406 0.56095,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7508" + style="fill:#000000;marker:none" + d="m 124.76429,742.43335 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26177,-0.14023 0.39266,-0.36461 0.39267,-0.67314 -10e-6,-0.31787 -0.12622,-0.5703 -0.37865,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.5516,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.11219,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.23841,-1.15462 0.71522,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94931,-0.57498 0.20568,10e-6 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0467 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46278,0.0982 0.14024,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.2384,1.12191 c -0.14025,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65913,-0.12621 -1.07984,-0.12622 -0.36462,10e-6 -0.6825,0.0748 -0.95362,0.22438 -0.27113,0.14025 -0.40669,0.36463 -0.40669,0.67315 0,0.15894 0.028,0.29918 0.0841,0.42071 0.0654,0.12155 0.15894,0.23374 0.28048,0.33658 0.13088,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0842 0.41136,0.17296 0.67314,0.26645 0.34592,0.13089 0.65444,0.26178 0.92558,0.39267 0.27112,0.12154 0.50017,0.26646 0.68716,0.43474 0.19633,0.16829 0.34592,0.37397 0.44877,0.61705 0.10283,0.23373 0.15425,0.52355 0.15426,0.86947 -1e-5,0.67315 -0.25244,1.18268 -0.75729,1.5286 -0.49551,0.34592 -1.20605,0.51888 -2.13162,0.51888 -0.6451,0 -1.14996,-0.0561 -1.51458,-0.16828 -0.36462,-0.10284 -0.61237,-0.18231 -0.74326,-0.23841 l 0.23841,-1.1219 c 0.14958,0.0561 0.38799,0.14024 0.71521,0.25242 0.32722,0.1122 0.76196,0.16829 1.30422,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path7510" + style="fill:#000000;marker:none" + d="m 137.60705,739.74077 c 0,-0.85077 -0.21036,-1.50522 -0.63107,-1.96333 -0.42072,-0.45811 -0.98167,-0.68716 -1.68286,-0.68717 -0.39267,10e-6 -0.70119,0.014 -0.92557,0.0421 -0.21504,0.0281 -0.388,0.0608 -0.51888,0.0982 l 0,4.59982 c 0.15893,0.13089 0.38799,0.2571 0.68716,0.37864 0.29918,0.12154 0.6264,0.18231 0.98167,0.18231 0.37397,0 0.69184,-0.0654 0.95362,-0.19633 0.27113,-0.14024 0.49083,-0.32723 0.65912,-0.56096 0.16828,-0.24308 0.28982,-0.52355 0.36462,-0.84143 0.0748,-0.32722 0.11219,-0.67781 0.11219,-1.05179 m 1.36032,0 c -10e-6,0.55161 -0.0748,1.06114 -0.22439,1.5286 -0.14024,0.46747 -0.3506,0.86948 -0.63107,1.20605 -0.28048,0.33657 -0.6264,0.59835 -1.03776,0.78534 -0.40202,0.18698 -0.86481,0.28047 -1.38836,0.28047 -0.42072,0 -0.79469,-0.0561 -1.12191,-0.16828 -0.31787,-0.11219 -0.55628,-0.21971 -0.71521,-0.32255 l 0,2.91696 -1.30422,0 0,-9.66242 c 0.30852,-0.0748 0.69184,-0.15426 1.14995,-0.23841 0.46746,-0.0935 1.00504,-0.14023 1.61274,-0.14024 0.56095,1e-5 1.06581,0.0888 1.51458,0.26645 0.44876,0.17765 0.83207,0.43008 1.14995,0.75729 0.31787,0.32723 0.56095,0.72925 0.72924,1.20605 0.17763,0.46747 0.26645,0.9957 0.26646,1.58469" /> + <path + inkscape:connector-curvature="0" + id="path7512" + style="fill:#000000;marker:none" + d="m 143.28451,742.43335 c 0.30852,0 0.57965,-0.005 0.81339,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,10e-6 -0.4067,0.014 -0.63108,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.1823 -0.17764,0.0842 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14958,0.79468 0.44876,0.98167 0.29917,0.17763 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.53511 c 0.52356,10e-6 0.96297,0.0701 1.31824,0.21036 0.36462,0.1309 0.65444,0.32256 0.86948,0.57498 0.22438,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27113,0.0468 -0.47681,0.0842 -0.19634,0.028 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0841 -0.6451,-0.21504 -0.89752,-0.39267 -0.25243,-0.18699 -0.44877,-0.43007 -0.58901,-0.72924 -0.14023,-0.29918 -0.21035,-0.65912 -0.21035,-1.07984 0,-0.40201 0.0795,-0.74793 0.2384,-1.03776 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.60769,-0.30852 0.98166,-0.39267 0.37397,-0.0841 0.76664,-0.12621 1.17801,-0.12621 0.13088,0 0.26645,0.009 0.40669,0.028 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42539 -0.0701,-0.63108 -0.0468,-0.21502 -0.13089,-0.40201 -0.25243,-0.56095 -0.12154,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20568,-0.10283 -0.47681,-0.15425 -0.81338,-0.15426 -0.43006,10e-6 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15427,-1.07984 c 0.16829,-0.0748 0.44877,-0.1449 0.84143,-0.21036 0.39267,-0.0748 0.81806,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7514" + style="fill:#000000;marker:none" + d="m 150.8221,735.92629 c 0.11219,10e-6 0.23841,0.009 0.37865,0.0281 0.14958,0.009 0.29449,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12621 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0842 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0842 -0.23373,0.0467 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12842 -1.30422,0 0,-6.98387 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7516" + style="fill:#000000;marker:none" + d="m 154.77288,736.08055 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36463 0.0281,0.66847 0.0842,0.91155 0.0561,0.23373 0.14023,0.42072 0.25243,0.56096 0.11218,0.13089 0.25242,0.22438 0.42071,0.28047 0.16828,0.0561 0.36462,0.0842 0.589,0.0842 0.39267,0 0.70586,-0.0421 0.9396,-0.12622 0.24307,-0.0935 0.41136,-0.15893 0.50486,-0.19633 l 0.25243,1.07983 c -0.1309,0.0654 -0.35995,0.14492 -0.68717,0.23841 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13089 -0.57497,-0.32255 -0.77131,-0.57498 -0.19633,-0.25243 -0.33657,-0.56095 -0.42071,-0.92557 -0.0748,-0.37397 -0.11219,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25783" /> + <path + inkscape:connector-curvature="0" + id="path7518" + style="fill:#000000;marker:none" + d="m 160.49943,743.37295 -1.30422,0 0,-7.2924 1.30422,0 0,7.2924 m -0.65912,-8.61064 c -0.23374,1e-5 -0.43474,-0.0748 -0.60303,-0.22438 -0.15894,-0.15893 -0.2384,-0.36928 -0.2384,-0.63107 0,-0.26177 0.0795,-0.46745 0.2384,-0.61705 0.16829,-0.15893 0.36929,-0.23839 0.60303,-0.2384 0.23372,10e-6 0.43006,0.0795 0.589,0.2384 0.16828,0.1496 0.25242,0.35528 0.25243,0.61705 -1e-5,0.26179 -0.0841,0.47214 -0.25243,0.63107 -0.15894,0.1496 -0.35528,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7520" + style="fill:#000000;marker:none" + d="m 165.92533,743.54123 c -0.589,0 -1.10788,-0.0935 -1.55664,-0.28047 -0.43942,-0.18699 -0.81339,-0.44877 -1.12191,-0.78534 -0.29917,-0.33657 -0.52356,-0.73391 -0.67314,-1.19202 -0.14959,-0.46746 -0.22438,-0.98167 -0.22438,-1.54263 0,-0.56094 0.0795,-1.07515 0.2384,-1.54262 0.16829,-0.46745 0.40202,-0.86947 0.70119,-1.20605 0.29918,-0.34591 0.6638,-0.61236 1.09386,-0.79936 0.43941,-0.19632 0.92557,-0.29449 1.45848,-0.2945 0.32722,10e-6 0.65444,0.0281 0.98167,0.0842 0.32722,0.0561 0.64042,0.14492 0.9396,0.26645 l -0.2945,1.10788 c -0.19634,-0.0935 -0.4254,-0.16828 -0.68717,-0.22438 -0.25244,-0.0561 -0.52356,-0.0841 -0.81338,-0.0841 -0.72925,0 -1.2902,0.22906 -1.68286,0.68717 -0.38332,0.45811 -0.57498,1.12658 -0.57498,2.0054 0,0.39268 0.0421,0.75262 0.12621,1.07984 0.0935,0.32722 0.23373,0.6077 0.42072,0.84143 0.19633,0.23373 0.44408,0.41604 0.74326,0.54693 0.29917,0.12154 0.66379,0.18231 1.09386,0.18231 0.34592,0 0.65912,-0.0327 0.9396,-0.0982 0.28047,-0.0654 0.50017,-0.13556 0.65912,-0.21036 l 0.18231,1.09386 c -0.0748,0.0467 -0.18232,0.0935 -0.32255,0.14024 -0.14025,0.0374 -0.29918,0.0701 -0.47681,0.0982 -0.17764,0.0374 -0.3693,0.0654 -0.57498,0.0841 -0.19634,0.0281 -0.388,0.0421 -0.57498,0.0421" /> + <path + inkscape:connector-curvature="0" + id="path7522" + style="fill:#000000;marker:none" + d="m 170.57906,743.37295 -1.30421,0 0,-7.2924 1.30421,0 0,7.2924 m -0.65912,-8.61064 c -0.23373,1e-5 -0.43474,-0.0748 -0.60302,-0.22438 -0.15894,-0.15893 -0.23841,-0.36928 -0.23841,-0.63107 0,-0.26177 0.0795,-0.46745 0.23841,-0.61705 0.16828,-0.15893 0.36929,-0.23839 0.60302,-0.2384 0.23373,10e-6 0.43006,0.0795 0.589,0.2384 0.16829,0.1496 0.25243,0.35528 0.25243,0.61705 0,0.26179 -0.0841,0.47214 -0.25243,0.63107 -0.15894,0.1496 -0.35527,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7524" + style="fill:#000000;marker:none" + d="m 177.89819,739.74077 c -1e-5,-0.85077 -0.21037,-1.50522 -0.63108,-1.96333 -0.42072,-0.45811 -0.98167,-0.68716 -1.68286,-0.68717 -0.39267,10e-6 -0.70119,0.014 -0.92557,0.0421 -0.21503,0.0281 -0.38799,0.0608 -0.51888,0.0982 l 0,4.59982 c 0.15893,0.13089 0.38799,0.2571 0.68717,0.37864 0.29917,0.12154 0.62639,0.18231 0.98167,0.18231 0.37396,0 0.69183,-0.0654 0.95362,-0.19633 0.27112,-0.14024 0.49083,-0.32723 0.65912,-0.56096 0.16828,-0.24308 0.28982,-0.52355 0.36462,-0.84143 0.0748,-0.32722 0.11218,-0.67781 0.11219,-1.05179 m 1.36031,0 c -1e-5,0.55161 -0.0748,1.06114 -0.22438,1.5286 -0.14025,0.46747 -0.3506,0.86948 -0.63107,1.20605 -0.28049,0.33657 -0.62641,0.59835 -1.03777,0.78534 -0.40202,0.18698 -0.86481,0.28047 -1.38836,0.28047 -0.42072,0 -0.79469,-0.0561 -1.1219,-0.16828 -0.31788,-0.11219 -0.55629,-0.21971 -0.71522,-0.32255 l 0,2.91696 -1.30422,0 0,-9.66242 c 0.30853,-0.0748 0.69184,-0.15426 1.14996,-0.23841 0.46746,-0.0935 1.00504,-0.14023 1.61274,-0.14024 0.56095,1e-5 1.0658,0.0888 1.51457,0.26645 0.44876,0.17765 0.83208,0.43008 1.14996,0.75729 0.31786,0.32723 0.56094,0.72925 0.72924,1.20605 0.17762,0.46747 0.26644,0.9957 0.26645,1.58469" /> + <path + inkscape:connector-curvature="0" + id="path7526" + style="fill:#000000;marker:none" + d="m 183.57564,742.43335 c 0.30852,0 0.57965,-0.005 0.81339,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,10e-6 -0.4067,0.014 -0.63108,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.1823 -0.17764,0.0842 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14958,0.79468 0.44876,0.98167 0.29917,0.17763 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.53511 c 0.52356,10e-6 0.96297,0.0701 1.31824,0.21036 0.36462,0.1309 0.65444,0.32256 0.86948,0.57498 0.22438,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27113,0.0468 -0.47681,0.0842 -0.19634,0.028 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0841 -0.6451,-0.21504 -0.89752,-0.39267 -0.25243,-0.18699 -0.44877,-0.43007 -0.58901,-0.72924 -0.14023,-0.29918 -0.21035,-0.65912 -0.21035,-1.07984 0,-0.40201 0.0795,-0.74793 0.2384,-1.03776 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.60769,-0.30852 0.98166,-0.39267 0.37397,-0.0841 0.76664,-0.12621 1.17801,-0.12621 0.13088,0 0.26645,0.009 0.40669,0.028 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42539 -0.0701,-0.63108 -0.0468,-0.21502 -0.13089,-0.40201 -0.25243,-0.56095 -0.12154,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20568,-0.10283 -0.47681,-0.15425 -0.81338,-0.15426 -0.43006,10e-6 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15427,-1.07984 c 0.16829,-0.0748 0.44877,-0.1449 0.84143,-0.21036 0.39267,-0.0748 0.81806,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7528" + style="fill:#000000;marker:none" + d="m 188.42067,736.29091 c 0.29917,-0.0748 0.69651,-0.15425 1.19202,-0.2384 0.49551,-0.0841 1.06581,-0.12621 1.71091,-0.12622 0.57965,10e-6 1.06113,0.0842 1.44445,0.25243 0.38332,0.15894 0.68717,0.388 0.91155,0.68717 0.23373,0.28983 0.39734,0.64043 0.49084,1.05179 0.0935,0.41137 0.14023,0.8648 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81449 c -1e-5,-0.44875 -0.0327,-0.83207 -0.0982,-1.14995 -0.0561,-0.31787 -0.15426,-0.57497 -0.2945,-0.77131 -0.14024,-0.19633 -0.32723,-0.33657 -0.56095,-0.42072 -0.23374,-0.0935 -0.52356,-0.14023 -0.86948,-0.14023 -0.14024,0 -0.28515,0.005 -0.43474,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10284,0.0187 -0.17763,0.0327 -0.22438,0.0421 l 0,6.15647 -1.30421,0 0,-7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7530" + style="fill:#000000;marker:none" + d="m 197.69348,736.08055 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36463 0.0281,0.66847 0.0841,0.91155 0.0561,0.23373 0.14024,0.42072 0.25243,0.56096 0.11219,0.13089 0.25243,0.22438 0.42072,0.28047 0.16828,0.0561 0.36462,0.0842 0.589,0.0842 0.39266,0 0.70586,-0.0421 0.9396,-0.12622 0.24307,-0.0935 0.41136,-0.15893 0.50485,-0.19633 l 0.25243,1.07983 c -0.13089,0.0654 -0.35995,0.14492 -0.68716,0.23841 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13089 -0.57498,-0.32255 -0.77131,-0.57498 -0.19633,-0.25243 -0.33657,-0.56095 -0.42071,-0.92557 -0.0748,-0.37397 -0.1122,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25783" /> + <path + inkscape:connector-curvature="0" + id="path7532" + style="fill:#000000;marker:none" + d="m 201.57217,739.74077 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30852,-0.31786 0.66379,-0.55627 1.06581,-0.71521 0.40202,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,10e-6 1.73428,0.30854 2.25784,0.92558 0.52355,0.6077 0.78533,1.53795 0.78533,2.79074 0,0.0561 0,0.13089 0,0.22438 0,0.0842 -0.005,0.16362 -0.014,0.23841 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33226 0.65912,1.72493 0.38332,0.39267 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71521,-0.23841 l 0.18231,1.09386 c -0.15894,0.0842 -0.43941,0.17296 -0.84143,0.26646 -0.39267,0.0935 -0.84143,0.14023 -1.34628,0.14023 -0.63575,0 -1.18736,-0.0935 -1.65482,-0.28047 -0.45811,-0.19634 -0.83675,-0.46279 -1.13593,-0.79936 -0.29917,-0.33657 -0.52355,-0.73391 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57497 -0.29918,0 -0.56563,0.0608 -0.79936,0.18231 -0.22439,0.11219 -0.41604,0.26178 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.6451 -0.0841,0.24308 -0.14024,0.49083 -0.16829,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7534" + style="fill:#000000;marker:none" + d="m 211.50937,742.43335 c 0.53291,0 0.92557,-0.0701 1.17801,-0.21036 0.26177,-0.14023 0.39266,-0.36461 0.39266,-0.67314 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25244,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33658,-0.35059 -0.44877,-0.57497 -0.11219,-0.22438 -0.16828,-0.50018 -0.16828,-0.82741 0,-0.64509 0.2384,-1.15462 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94931,-0.57498 0.20568,10e-6 0.41137,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0467 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07984,-0.12622 -0.36462,10e-6 -0.68249,0.0748 -0.95362,0.22438 -0.27113,0.14025 -0.40669,0.36463 -0.40669,0.67315 0,0.15894 0.0281,0.29918 0.0842,0.42071 0.0654,0.12155 0.15893,0.23374 0.28047,0.33658 0.13089,0.0935 0.28983,0.18231 0.47681,0.26645 0.18698,0.0842 0.41137,0.17296 0.67315,0.26645 0.34591,0.13089 0.65444,0.26178 0.92557,0.39267 0.27112,0.12154 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34591,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52355 0.15426,0.86947 0,0.67315 -0.25243,1.18268 -0.75728,1.5286 -0.49552,0.34592 -1.20606,0.51888 -2.13163,0.51888 -0.6451,0 -1.14995,-0.0561 -1.51457,-0.16828 -0.36462,-0.10284 -0.61238,-0.18231 -0.74326,-0.23841 l 0.2384,-1.1219 c 0.14959,0.0561 0.38799,0.14024 0.71522,0.25242 0.32722,0.1122 0.76196,0.16829 1.30421,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path7536" + style="fill:#000000;marker:none" + d="m 218.88284,739.74077 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30852,-0.31786 0.66379,-0.55627 1.06581,-0.71521 0.40202,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,10e-6 1.73427,0.30854 2.25784,0.92558 0.52355,0.6077 0.78532,1.53795 0.78533,2.79074 -1e-5,0.0561 -1e-5,0.13089 0,0.22438 -1e-5,0.0842 -0.005,0.16362 -0.014,0.23841 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33226 0.65912,1.72493 0.38332,0.39267 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71521,-0.23841 l 0.18231,1.09386 c -0.15894,0.0842 -0.43942,0.17296 -0.84143,0.26646 -0.39267,0.0935 -0.84143,0.14023 -1.34628,0.14023 -0.63576,0 -1.18736,-0.0935 -1.65482,-0.28047 -0.45811,-0.19634 -0.83675,-0.46279 -1.13593,-0.79936 -0.29917,-0.33657 -0.52356,-0.73391 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57497 -0.29918,0 -0.56564,0.0608 -0.79936,0.18231 -0.22439,0.11219 -0.41605,0.26178 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.6451 -0.0841,0.24308 -0.14024,0.49083 -0.16829,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7538" + style="fill:#000000;marker:none" + d="m 231.83517,737.62318 c -0.15895,-0.13089 -0.388,-0.2571 -0.68717,-0.37865 -0.29918,-0.12153 -0.6264,-0.1823 -0.98167,-0.18231 -0.37397,10e-6 -0.69652,0.0701 -0.96764,0.21036 -0.26179,0.13089 -0.47682,0.31788 -0.6451,0.56095 -0.16829,0.23374 -0.28983,0.51422 -0.36462,0.84143 -0.0748,0.32723 -0.11219,0.67783 -0.11219,1.05179 0,0.85078 0.21035,1.5099 0.63107,1.97736 0.42071,0.45811 0.98167,0.68717 1.68286,0.68717 0.35527,0 0.64977,-0.014 0.8835,-0.0421 0.24308,-0.0374 0.43006,-0.0748 0.56096,-0.11219 l 0,-4.61384 m 0,-4.90835 1.30421,-0.22438 0,10.67214 c -0.29918,0.0841 -0.6825,0.16829 -1.14995,0.25243 -0.46747,0.0841 -1.00505,0.12621 -1.61274,0.12621 -0.56096,0 -1.06582,-0.0888 -1.51458,-0.26645 -0.44876,-0.17763 -0.83208,-0.43006 -1.14995,-0.75729 -0.31788,-0.32722 -0.56563,-0.72456 -0.74326,-1.19202 -0.16829,-0.47681 -0.25243,-1.00972 -0.25243,-1.59872 0,-0.56095 0.0701,-1.07516 0.21035,-1.54262 0.14959,-0.46746 0.36462,-0.86947 0.6451,-1.20605 0.28048,-0.33657 0.62172,-0.59834 1.02374,-0.78534 0.41136,-0.18697 0.87882,-0.28046 1.40238,-0.28047 0.42071,10e-6 0.79001,0.0561 1.10789,0.16828 0.32721,0.1122 0.57029,0.21972 0.72924,0.32255 l 0,-3.68827" /> + <path + inkscape:connector-curvature="0" + id="path7540" + style="fill:#000000;marker:none" + d="m 236.69924,743.37295 -1.30422,0 0,-7.2924 1.30422,0 0,7.2924 m -0.65912,-8.61064 c -0.23373,1e-5 -0.43474,-0.0748 -0.60302,-0.22438 -0.15894,-0.15893 -0.23841,-0.36928 -0.23841,-0.63107 0,-0.26177 0.0795,-0.46745 0.23841,-0.61705 0.16828,-0.15893 0.36929,-0.23839 0.60302,-0.2384 0.23373,10e-6 0.43006,0.0795 0.589,0.2384 0.16828,0.1496 0.25243,0.35528 0.25243,0.61705 0,0.26179 -0.0841,0.47214 -0.25243,0.63107 -0.15894,0.1496 -0.35527,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7542" + style="fill:#000000;marker:none" + d="m 240.17584,736.08055 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36463 0.0281,0.66847 0.0841,0.91155 0.0561,0.23373 0.14023,0.42072 0.25242,0.56096 0.11219,0.13089 0.25243,0.22438 0.42072,0.28047 0.16828,0.0561 0.36462,0.0842 0.589,0.0842 0.39266,0 0.70586,-0.0421 0.9396,-0.12622 0.24307,-0.0935 0.41136,-0.15893 0.50486,-0.19633 l 0.25242,1.07983 c -0.13089,0.0654 -0.35995,0.14492 -0.68716,0.23841 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13089 -0.57498,-0.32255 -0.77131,-0.57498 -0.19633,-0.25243 -0.33657,-0.56095 -0.42071,-0.92557 -0.0748,-0.37397 -0.1122,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25783" /> + <path + inkscape:connector-curvature="0" + id="path7544" + style="fill:#000000;marker:none" + d="m 247.06636,742.43335 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44408,-0.0467 0.60303,-0.0841 l 0,-2.17369 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19633,10e-6 -0.40669,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41604,0.0888 -0.60302,0.1823 -0.17764,0.0842 -0.32723,0.20569 -0.44877,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14959,0.79468 0.44877,0.98167 0.29917,0.17763 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.53511 c 0.52355,10e-6 0.96296,0.0701 1.31824,0.21036 0.36461,0.1309 0.65444,0.32256 0.86948,0.57498 0.22437,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27114,0.0468 -0.47682,0.0842 -0.19633,0.028 -0.42072,0.0561 -0.67314,0.0841 -0.25243,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57965,0.0421 -0.86947,0.0421 -0.41137,0 -0.79002,-0.0421 -1.13593,-0.12621 -0.34593,-0.0841 -0.6451,-0.21504 -0.89753,-0.39267 -0.25243,-0.18699 -0.44876,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.23841,-1.03776 0.16828,-0.28982 0.39266,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37397,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13089,0 0.26645,0.009 0.40669,0.028 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13088,0.0187 0.24308,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19634,0.0421 l 0,-0.36462 c -10e-6,-0.21503 -0.0234,-0.42539 -0.0701,-0.63108 -0.0468,-0.21502 -0.1309,-0.40201 -0.25243,-0.56095 -0.12155,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20569,-0.10283 -0.47681,-0.15425 -0.81338,-0.15426 -0.43007,10e-6 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07984 c 0.16828,-0.0748 0.44876,-0.1449 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7546" + style="fill:#000000;marker:none" + d="m 251.91138,736.29091 c 0.29917,-0.0748 0.69652,-0.15425 1.19203,-0.2384 0.4955,-0.0841 1.06581,-0.12621 1.7109,-0.12622 0.57965,10e-6 1.06114,0.0842 1.44446,0.25243 0.38331,0.15894 0.68716,0.388 0.91155,0.68717 0.23372,0.28983 0.39733,0.64043 0.49083,1.05179 0.0935,0.41137 0.14023,0.8648 0.14024,1.36031 l 0,4.09496 -1.30421,0 0,-3.81449 c -1e-5,-0.44875 -0.0327,-0.83207 -0.0982,-1.14995 -0.0561,-0.31787 -0.15427,-0.57497 -0.2945,-0.77131 -0.14025,-0.19633 -0.32723,-0.33657 -0.56096,-0.42072 -0.23373,-0.0935 -0.52356,-0.14023 -0.86947,-0.14023 -0.14025,0 -0.28516,0.005 -0.43474,0.014 -0.14959,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10284,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15647 -1.30422,0 0,-7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7548" + style="fill:#000000;marker:none" + d="m 96.762198,760.90274 -1.304216,0 0,-7.29239 1.304216,0 0,7.29239 m -0.65912,-8.61063 c -0.233732,0 -0.43474,-0.0748 -0.603025,-0.22439 -0.158938,-0.15892 -0.238406,-0.36928 -0.238405,-0.63107 -10e-7,-0.26177 0.07947,-0.46745 0.238405,-0.61705 0.168285,-0.15892 0.369293,-0.23839 0.603025,-0.2384 0.233729,1e-5 0.430062,0.0795 0.589001,0.2384 0.168283,0.1496 0.252426,0.35528 0.252429,0.61705 -3e-6,0.26179 -0.08415,0.47215 -0.252429,0.63107 -0.158939,0.1496 -0.355272,0.22439 -0.589001,0.22439" /> + <path + inkscape:connector-curvature="0" + id="path7550" + style="fill:#000000;marker:none" + d="m 99.018721,753.8207 c 0.299173,-0.0748 0.696515,-0.15425 1.192029,-0.2384 0.4955,-0.0841 1.0658,-0.12621 1.7109,-0.12622 0.57965,10e-6 1.06114,0.0841 1.44446,0.25243 0.38331,0.15895 0.68716,0.388 0.91155,0.68717 0.23372,0.28983 0.39733,0.64043 0.49083,1.05179 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c 0,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31787 -0.15427,-0.57497 -0.2945,-0.77131 -0.14025,-0.19633 -0.32723,-0.33656 -0.56096,-0.42071 -0.23373,-0.0935 -0.52356,-0.14023 -0.86947,-0.14024 -0.14025,10e-6 -0.28516,0.005 -0.43474,0.014 -0.14959,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10285,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.304219,0 0,-7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7552" + style="fill:#000000;marker:none" + d="m 108.76835,759.96314 c 0.53291,0 0.92557,-0.0701 1.178,-0.21035 0.26178,-0.14024 0.39267,-0.36462 0.39267,-0.67315 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75729 -0.25243,-0.18698 -0.66847,-0.39733 -1.24812,-0.63107 -0.28048,-0.11218 -0.55161,-0.22438 -0.81338,-0.33657 -0.25244,-0.12154 -0.47214,-0.26177 -0.65913,-0.42071 -0.18698,-0.15894 -0.33657,-0.3506 -0.44876,-0.57498 -0.11219,-0.22438 -0.16828,-0.50018 -0.16828,-0.82741 0,-0.64509 0.2384,-1.15462 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94931,-0.57497 0.20568,0 0.41137,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0467 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.1219 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07984,-0.12621 -0.36462,0 -0.68249,0.0748 -0.95362,0.22438 -0.27113,0.14024 -0.40669,0.36462 -0.40669,0.67314 0,0.15894 0.0281,0.29918 0.0842,0.42072 0.0654,0.12154 0.15893,0.23373 0.28047,0.33657 0.13089,0.0935 0.28983,0.18231 0.47681,0.26645 0.18698,0.0842 0.41137,0.17297 0.67315,0.26645 0.34591,0.1309 0.65444,0.26179 0.92557,0.39267 0.27112,0.12154 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34591,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52356 0.15426,0.86948 0,0.67314 -0.25243,1.18267 -0.75728,1.52859 -0.49552,0.34593 -1.20606,0.51889 -2.13163,0.51889 -0.6451,0 -1.14995,-0.0561 -1.51457,-0.16829 -0.36462,-0.10284 -0.61238,-0.18231 -0.74326,-0.2384 l 0.2384,-1.12191 c 0.14959,0.0561 0.38799,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16828 1.30421,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path7554" + style="fill:#000000;marker:none" + d="m 114.53653,753.61035 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36462 0.0281,0.66847 0.0841,0.91155 0.0561,0.23373 0.14024,0.42071 0.25243,0.56095 0.11219,0.13089 0.25243,0.22438 0.42072,0.28048 0.16828,0.0561 0.36462,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.9396,-0.12622 0.24307,-0.0935 0.41136,-0.15893 0.50485,-0.19633 l 0.25243,1.07984 c -0.13089,0.0654 -0.35995,0.14491 -0.68716,0.2384 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13089 -0.57498,-0.32255 -0.77131,-0.57497 -0.19633,-0.25243 -0.33657,-0.56096 -0.42071,-0.92558 -0.0748,-0.37396 -0.1122,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path7556" + style="fill:#000000;marker:none" + d="m 121.42705,759.96314 c 0.30852,0 0.57965,-0.005 0.81339,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,0 -0.4067,0.014 -0.63108,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32722,0.20568 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60302 0,0.46747 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.5351 c 0.52356,0 0.96297,0.0701 1.31824,0.21035 0.36462,0.1309 0.65444,0.32256 0.86948,0.57498 0.22438,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55775 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39267 -0.25243,-0.18698 -0.44877,-0.43006 -0.58901,-0.72924 -0.14023,-0.29917 -0.21035,-0.65912 -0.21035,-1.07983 0,-0.40202 0.0795,-0.74794 0.2384,-1.03777 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.60769,-0.30852 0.98166,-0.39267 0.37397,-0.0841 0.76664,-0.12621 1.17801,-0.12621 0.13088,0 0.26645,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42539 -0.0701,-0.63107 -0.0468,-0.21503 -0.13089,-0.40201 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29917 -0.50486,-0.39266 -0.20568,-0.10284 -0.47681,-0.15426 -0.81338,-0.15427 -0.43006,1e-5 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15427,-1.07983 c 0.16829,-0.0748 0.44877,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81806,-0.11219 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7558" + style="fill:#000000;marker:none" + d="m 126.27207,753.8207 c 0.29917,-0.0748 0.69652,-0.15425 1.19203,-0.2384 0.4955,-0.0841 1.0658,-0.12621 1.7109,-0.12622 0.57965,10e-6 1.06114,0.0841 1.44446,0.25243 0.38331,0.15895 0.68716,0.388 0.91155,0.68717 0.23372,0.28983 0.39733,0.64043 0.49083,1.05179 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c 0,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31787 -0.15427,-0.57497 -0.2945,-0.77131 -0.14025,-0.19633 -0.32723,-0.33656 -0.56096,-0.42071 -0.23373,-0.0935 -0.52356,-0.14023 -0.86947,-0.14024 -0.14025,10e-6 -0.28516,0.005 -0.43474,0.014 -0.14959,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10285,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7560" + style="fill:#000000;marker:none" + d="m 135.54489,753.61035 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36462 0.028,0.66847 0.0841,0.91155 0.0561,0.23373 0.14024,0.42071 0.25243,0.56095 0.11219,0.13089 0.25243,0.22438 0.42072,0.28048 0.16828,0.0561 0.36461,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.9396,-0.12622 0.24307,-0.0935 0.41136,-0.15893 0.50485,-0.19633 l 0.25243,1.07984 c -0.13089,0.0654 -0.35995,0.14491 -0.68716,0.2384 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13089 -0.57498,-0.32255 -0.77131,-0.57497 -0.19633,-0.25243 -0.33657,-0.56096 -0.42071,-0.92558 -0.0748,-0.37396 -0.1122,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path7562" + style="fill:#000000;marker:none" + d="m 142.43542,759.96314 c 0.30852,0 0.57964,-0.005 0.81338,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0841 -0.32722,0.20568 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60302 0,0.46747 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70587,0.26645 1.22008,0.26645 m -0.1122,-6.5351 c 0.52356,0 0.96297,0.0701 1.31825,0.21035 0.36461,0.1309 0.65444,0.32256 0.86947,0.57498 0.22438,0.24309 0.38332,0.53759 0.47681,0.8835 0.0935,0.33658 0.14024,0.71055 0.14024,1.12191 l 0,4.55775 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57965,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39267 -0.25243,-0.18698 -0.44877,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.2384,-1.03777 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13088,0 0.26645,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42539 -0.0701,-0.63107 -0.0468,-0.21503 -0.13089,-0.40201 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29917 -0.50485,-0.39266 -0.20569,-0.10284 -0.47682,-0.15426 -0.81339,-0.15427 -0.43006,1e-5 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11219 1.27616,-0.11219 m 1.90725,-2.58039 -1.97736,1.92127 -0.65912,-0.589 1.79505,-2.15967 0.84143,0.8274" /> + <path + inkscape:connector-curvature="0" + id="path7564" + style="fill:#000000;marker:none" + d="m 147.28043,753.8207 c 0.29917,-0.0748 0.69652,-0.15425 1.19203,-0.2384 0.4955,-0.0841 1.0658,-0.12621 1.7109,-0.12622 0.57965,10e-6 1.06114,0.0841 1.44446,0.25243 0.38331,0.15895 0.68716,0.388 0.91155,0.68717 0.23372,0.28983 0.39733,0.64043 0.49083,1.05179 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c 0,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31787 -0.15427,-0.57497 -0.2945,-0.77131 -0.14025,-0.19633 -0.32723,-0.33656 -0.56096,-0.42071 -0.23373,-0.0935 -0.52356,-0.14023 -0.86947,-0.14024 -0.14025,10e-6 -0.28516,0.005 -0.43474,0.014 -0.14959,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10285,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7566" + style="fill:#000000;marker:none" + d="m 154.92649,757.27057 c 0,-0.64509 0.0935,-1.20605 0.28048,-1.68286 0.18698,-0.48616 0.43473,-0.88817 0.74326,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.2384 1.2341,-0.2384 0.98166,0 1.73427,0.30853 2.25783,0.92557 0.52355,0.60771 0.78533,1.53795 0.78534,2.79074 -1e-5,0.0561 -1e-5,0.1309 0,0.22438 -1e-5,0.0842 -0.005,0.16362 -0.014,0.23841 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38332,0.39267 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31786,-0.0841 0.55627,-0.16361 0.71521,-0.2384 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45811,-0.19633 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67314,-1.19202 -0.14024,-0.46746 -0.21036,-0.977 -0.21036,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14025,-1.07048 -0.44877,-1.44445 -0.29918,-0.38332 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79935,0.18231 -0.22439,0.1122 -0.41605,0.26178 -0.57498,0.44876 -0.15894,0.18699 -0.28516,0.40202 -0.37865,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16828,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7568" + style="fill:#000000;marker:none" + d="m 165.635,759.96314 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44409,-0.0467 0.60303,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45811,-0.0561 -0.75729,-0.0561 -0.19633,0 -0.40669,0.014 -0.63107,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32723,0.20568 -0.44877,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60302 0,0.46747 0.14959,0.79469 0.44877,0.98167 0.29917,0.17764 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.5351 c 0.52355,0 0.96297,0.0701 1.31824,0.21035 0.36461,0.1309 0.65444,0.32256 0.86948,0.57498 0.22437,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55775 c -0.1122,0.0187 -0.27114,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0841 -0.25243,0.0281 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.028 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34593,-0.0841 -0.6451,-0.21503 -0.89753,-0.39267 -0.25243,-0.18698 -0.44876,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.23841,-1.03777 0.16828,-0.28982 0.39267,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37397,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13089,0 0.26645,0.009 0.40669,0.0281 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13089,0.0187 0.24308,0.0374 0.33657,0.0561 0.0935,0.0187 0.15894,0.0327 0.19634,0.0421 l 0,-0.36462 c -1e-5,-0.21503 -0.0234,-0.42539 -0.0701,-0.63107 -0.0468,-0.21503 -0.1309,-0.40201 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29917 -0.50486,-0.39266 -0.20569,-0.10284 -0.47681,-0.15426 -0.81338,-0.15427 -0.43007,1e-5 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07983 c 0.16829,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81805,-0.11219 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7570" + style="fill:#000000;marker:none" + d="m 170.48002,753.8207 c 0.29917,-0.0748 0.69184,-0.15425 1.178,-0.2384 0.4955,-0.0841 1.06581,-0.12621 1.71091,-0.12622 0.46745,10e-6 0.86012,0.0655 1.178,0.19634 0.31787,0.12155 0.58432,0.30385 0.79936,0.54693 0.0654,-0.0467 0.16828,-0.11219 0.30852,-0.19634 0.14023,-0.0841 0.31319,-0.1636 0.51888,-0.2384 0.20568,-0.0841 0.43473,-0.15426 0.68717,-0.21036 0.25242,-0.0654 0.52355,-0.0982 0.81338,-0.0982 0.56095,10e-6 1.01906,0.0841 1.37434,0.25243 0.35526,0.15895 0.63106,0.388 0.8274,0.68717 0.20568,0.29918 0.34124,0.65445 0.4067,1.06581 0.0748,0.41137 0.11218,0.86014 0.11219,1.34629 l 0,4.09496 -1.30422,0 0,-3.81448 c -1e-5,-0.43006 -0.0234,-0.79936 -0.0701,-1.10789 -0.0374,-0.30851 -0.11687,-0.56562 -0.2384,-0.77131 -0.1122,-0.20567 -0.27114,-0.35526 -0.47682,-0.44876 -0.19634,-0.10283 -0.45344,-0.15425 -0.77131,-0.15426 -0.43942,10e-6 -0.80404,0.0608 -1.09386,0.18231 -0.28048,0.1122 -0.47214,0.21504 -0.57497,0.30852 0.0748,0.24309 0.13088,0.50954 0.16828,0.79936 0.0374,0.28983 0.0561,0.59368 0.0561,0.91155 l 0,4.09496 -1.30422,0 0,-3.81448 c 0,-0.43006 -0.0234,-0.79936 -0.0701,-1.10789 -0.0468,-0.30851 -0.13089,-0.56562 -0.25243,-0.77131 -0.11219,-0.20567 -0.27113,-0.35526 -0.47681,-0.44876 -0.19633,-0.10283 -0.44876,-0.15425 -0.75728,-0.15426 -0.1309,10e-6 -0.27113,0.005 -0.42072,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.11219,0.0187 -0.18698,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30421,0 0,-7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7572" + style="fill:#000000;marker:none" + d="m 182.15245,757.27057 c 0,-0.64509 0.0935,-1.20605 0.28048,-1.68286 0.18698,-0.48616 0.43473,-0.88817 0.74326,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.2384 1.2341,-0.2384 0.98166,0 1.73427,0.30853 2.25783,0.92557 0.52355,0.60771 0.78533,1.53795 0.78534,2.79074 -1e-5,0.0561 -1e-5,0.1309 0,0.22438 -1e-5,0.0842 -0.005,0.16362 -0.014,0.23841 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38332,0.39267 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31786,-0.0841 0.55627,-0.16361 0.71521,-0.2384 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45811,-0.19633 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67314,-1.19202 -0.14024,-0.46746 -0.21036,-0.977 -0.21036,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14025,-1.07048 -0.44877,-1.44445 -0.29918,-0.38332 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26178 -0.57497,0.44876 -0.15894,0.18699 -0.28516,0.40202 -0.37865,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16828,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7574" + style="fill:#000000;marker:none" + d="m 190.39277,753.8207 c 0.29917,-0.0748 0.69651,-0.15425 1.19202,-0.2384 0.49551,-0.0841 1.06581,-0.12621 1.71091,-0.12622 0.57965,10e-6 1.06113,0.0841 1.44445,0.25243 0.38332,0.15895 0.68717,0.388 0.91155,0.68717 0.23373,0.28983 0.39734,0.64043 0.49084,1.05179 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c -10e-6,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31787 -0.15427,-0.57497 -0.2945,-0.77131 -0.14024,-0.19633 -0.32723,-0.33656 -0.56095,-0.42071 -0.23374,-0.0935 -0.52356,-0.14023 -0.86948,-0.14024 -0.14024,10e-6 -0.28515,0.005 -0.43474,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10284,0.0187 -0.17763,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30421,0 0,-7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7576" + style="fill:#000000;marker:none" + d="m 199.66559,753.61035 2.76269,0 0,1.09386 -2.76269,0 0,3.36572 c 0,0.36462 0.028,0.66847 0.0841,0.91155 0.0561,0.23373 0.14024,0.42071 0.25243,0.56095 0.11219,0.13089 0.25243,0.22438 0.42072,0.28048 0.16828,0.0561 0.36461,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.93959,-0.12622 0.24308,-0.0935 0.41136,-0.15893 0.50486,-0.19633 l 0.25243,1.07984 c -0.13089,0.0654 -0.35995,0.14491 -0.68717,0.2384 -0.32722,0.10284 -0.70119,0.15426 -1.1219,0.15426 -0.49552,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31788,-0.13089 -0.57498,-0.32255 -0.77131,-0.57497 -0.19634,-0.25243 -0.33658,-0.56096 -0.42072,-0.92558 -0.0748,-0.37396 -0.11219,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30422,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path7578" + style="fill:#000000;marker:none" + d="m 97.000603,795.20504 c -2e-6,0.25243 -0.08414,0.47214 -0.252429,0.65912 -0.168288,0.18698 -0.397344,0.28048 -0.687168,0.28048 -0.289827,0 -0.518883,-0.0935 -0.687167,-0.28048 -0.168287,-0.18698 -0.25243,-0.40669 -0.252429,-0.65912 -10e-7,-0.25243 0.08414,-0.47214 0.252429,-0.65912 0.168284,-0.18698 0.39734,-0.28048 0.687167,-0.28048 0.289824,0 0.51888,0.0935 0.687168,0.28048 0.168284,0.18698 0.252427,0.40669 0.252429,0.65912" /> + <path + inkscape:connector-curvature="0" + id="path7580" + style="fill:#000000;marker:none" + d="m 100.45178,795.20504 c 0,0.25243 -0.0841,0.47214 -0.25243,0.65912 -0.16829,0.18698 -0.397342,0.28048 -0.687165,0.28048 -0.289828,0 -0.518884,-0.0935 -0.687168,-0.28048 -0.168287,-0.18698 -0.25243,-0.40669 -0.252429,-0.65912 -10e-7,-0.25243 0.08414,-0.47214 0.252429,-0.65912 0.168284,-0.18698 0.39734,-0.28048 0.687168,-0.28048 0.289823,0 0.518875,0.0935 0.687165,0.28048 0.16829,0.18698 0.25243,0.40669 0.25243,0.65912" /> + <path + inkscape:connector-curvature="0" + id="path7582" + style="fill:#000000;marker:none" + d="m 103.90296,795.20504 c 0,0.25243 -0.0841,0.47214 -0.25243,0.65912 -0.16829,0.18698 -0.39734,0.28048 -0.68717,0.28048 -0.28982,0 -0.51888,-0.0935 -0.68717,-0.28048 -0.16828,-0.18698 -0.25243,-0.40669 -0.25242,-0.65912 -1e-5,-0.25243 0.0841,-0.47214 0.25242,-0.65912 0.16829,-0.18698 0.39735,-0.28048 0.68717,-0.28048 0.28983,0 0.51888,0.0935 0.68717,0.28048 0.16828,0.18698 0.25243,0.40669 0.25243,0.65912" /> + <path + inkscape:connector-curvature="0" + id="path7584" + style="fill:#000000;marker:none" + d="m 112.24846,792.31613 c -10e-6,0.57965 -0.0841,1.10321 -0.25243,1.57067 -0.1683,0.46746 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33657 -0.65912,0.59835 -1.07983,0.78533 -0.42072,0.17764 -0.87884,0.26646 -1.37434,0.26646 -0.49551,0 -0.95362,-0.0888 -1.37434,-0.26646 -0.42071,-0.18698 -0.78533,-0.44876 -1.09385,-0.78533 -0.29918,-0.33657 -0.53291,-0.73859 -0.7012,-1.20605 -0.16828,-0.46746 -0.25243,-0.99102 -0.25242,-1.57067 -1e-5,-0.5703 0.0841,-1.08918 0.25242,-1.55665 0.16829,-0.4768 0.40202,-0.88349 0.7012,-1.22007 0.30852,-0.33657 0.67314,-0.59367 1.09385,-0.77131 0.42072,-0.18698 0.87883,-0.28047 1.37434,-0.28048 0.4955,10e-6 0.95362,0.0935 1.37434,0.28048 0.42071,0.17764 0.78065,0.43474 1.07983,0.77131 0.30852,0.33658 0.54692,0.74327 0.71522,1.22007 0.16828,0.46747 0.25242,0.98635 0.25243,1.55665 m -1.36032,0 c 0,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36462,-0.48616 -0.86481,-0.72924 -1.50055,-0.72924 -0.63575,0 -1.14061,0.24308 -1.51457,0.72924 -0.36463,0.47681 -0.54694,1.12658 -0.54693,1.94931 -1e-5,0.82273 0.1823,1.47718 0.54693,1.96334 0.37396,0.47681 0.87882,0.71521 1.51457,0.71521 0.63574,0 1.13593,-0.2384 1.50055,-0.71521 0.37396,-0.48616 0.56095,-1.14061 0.56095,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7586" + style="fill:#000000;marker:none" + d="m 122.37805,792.33015 c -1e-5,-0.85077 -0.21037,-1.50522 -0.63108,-1.96333 -0.42072,-0.45811 -0.98167,-0.68717 -1.68286,-0.68717 -0.39267,0 -0.70119,0.014 -0.92557,0.0421 -0.21503,0.0281 -0.388,0.0608 -0.51888,0.0982 l 0,4.59981 c 0.15893,0.13089 0.38799,0.25711 0.68717,0.37865 0.29917,0.12154 0.62639,0.18231 0.98166,0.18231 0.37397,0 0.69184,-0.0654 0.95363,-0.19634 0.27112,-0.14023 0.49082,-0.32722 0.65912,-0.56095 0.16828,-0.24308 0.28982,-0.52355 0.36462,-0.84143 0.0748,-0.32722 0.11218,-0.67781 0.11219,-1.05179 m 1.36031,0 c -1e-5,0.55161 -0.0748,1.06114 -0.22438,1.5286 -0.14025,0.46746 -0.35061,0.86948 -0.63108,1.20605 -0.28048,0.33657 -0.6264,0.59835 -1.03776,0.78534 -0.40202,0.18698 -0.86481,0.28047 -1.38836,0.28047 -0.42072,0 -0.79469,-0.0561 -1.12191,-0.16828 -0.31787,-0.11219 -0.55628,-0.21971 -0.71521,-0.32255 l 0,2.91696 -1.30422,0 0,-9.66243 c 0.30852,-0.0748 0.69184,-0.15425 1.14996,-0.2384 0.46745,-0.0935 1.00503,-0.14023 1.61274,-0.14024 0.56095,1e-5 1.0658,0.0888 1.51457,0.26645 0.44876,0.17765 0.83208,0.43007 1.14996,0.75729 0.31786,0.32723 0.56094,0.72925 0.72923,1.20605 0.17763,0.46747 0.26645,0.9957 0.26646,1.58469" /> + <path + inkscape:connector-curvature="0" + id="path7588" + style="fill:#000000;marker:none" + d="m 132.02425,792.31613 c 0,0.57965 -0.0841,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.40669,0.86948 -0.71521,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78533 -0.42072,0.17764 -0.87883,0.26646 -1.37433,0.26646 -0.49551,0 -0.95363,-0.0888 -1.37434,-0.26646 -0.42072,-0.18698 -0.78533,-0.44876 -1.09386,-0.78533 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16829,-0.46746 -0.25243,-0.99102 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55665 0.16829,-0.4768 0.40202,-0.88349 0.70119,-1.22007 0.30853,-0.33657 0.67314,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87883,-0.28047 1.37434,-0.28048 0.4955,10e-6 0.95361,0.0935 1.37433,0.28048 0.42071,0.17764 0.78066,0.43474 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71521,1.22007 0.16828,0.46747 0.25243,0.98635 0.25243,1.55665 m -1.36031,0 c -1e-5,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48616 -0.86481,-0.72924 -1.50055,-0.72924 -0.63575,0 -1.14061,0.24308 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12658 -0.54693,1.94931 0,0.82273 0.18231,1.47718 0.54693,1.96334 0.37397,0.47681 0.87883,0.71521 1.51458,0.71521 0.63574,0 1.13592,-0.2384 1.50055,-0.71521 0.37396,-0.48616 0.56094,-1.14061 0.56095,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7590" + style="fill:#000000;marker:none" + d="m 138.57119,790.21255 c -0.15894,-0.13088 -0.388,-0.25709 -0.68716,-0.37864 -0.29918,-0.12153 -0.62641,-0.1823 -0.98167,-0.18231 -0.37398,10e-6 -0.69652,0.0701 -0.96765,0.21036 -0.26178,0.13089 -0.47681,0.31788 -0.64509,0.56095 -0.16829,0.23374 -0.28983,0.51421 -0.36462,0.84143 -0.0748,0.32723 -0.1122,0.67782 -0.11219,1.05179 -1e-5,0.85078 0.21035,1.5099 0.63107,1.97736 0.42071,0.45811 0.98166,0.68717 1.68286,0.68717 0.35526,0 0.64976,-0.014 0.8835,-0.0421 0.24307,-0.0374 0.43006,-0.0748 0.56095,-0.11219 l 0,-4.61385 m 0,-4.90834 1.30422,-0.22438 0,10.67214 c -0.29918,0.0841 -0.6825,0.16828 -1.14995,0.25243 -0.46747,0.0841 -1.00505,0.12621 -1.61275,0.12621 -0.56095,0 -1.06581,-0.0888 -1.51457,-0.26645 -0.44876,-0.17764 -0.83208,-0.43006 -1.14995,-0.75729 -0.31788,-0.32722 -0.56563,-0.72456 -0.74327,-1.19202 -0.16828,-0.47681 -0.25243,-1.00972 -0.25243,-1.59872 0,-0.56095 0.0701,-1.07516 0.21036,-1.54262 0.14959,-0.46746 0.36462,-0.86947 0.6451,-1.20605 0.28047,-0.33657 0.62172,-0.59835 1.02374,-0.78534 0.41136,-0.18697 0.87882,-0.28047 1.40238,-0.28047 0.42071,0 0.79001,0.0561 1.10788,0.16828 0.32722,0.1122 0.5703,0.21972 0.72924,0.32255 l 0,-3.68827" /> + <path + inkscape:connector-curvature="0" + id="path7592" + style="fill:#000000;marker:none" + d="m 144.82363,788.51567 c 0.11219,10e-6 0.2384,0.009 0.37864,0.0281 0.14959,0.009 0.2945,0.0281 0.43474,0.0561 0.14024,0.0187 0.26645,0.0421 0.37865,0.0701 0.12153,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51888,-0.12622 -0.23374,-0.0561 -0.53759,-0.0841 -0.91155,-0.0841 -0.24309,10e-6 -0.48617,0.0281 -0.72924,0.0841 -0.23374,0.0468 -0.388,0.0795 -0.46279,0.0982 l 0,6.12842 -1.30422,0 0,-6.98387 c 0.30853,-0.11219 0.69185,-0.21503 1.14996,-0.30853 0.45811,-0.10283 0.97231,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7594" + style="fill:#000000;marker:none" + d="m 150.02253,795.02273 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44408,-0.0467 0.60303,-0.0841 l 0,-2.17369 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,1e-5 -0.40669,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41604,0.0888 -0.60303,0.18231 -0.17763,0.0842 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14959,0.79468 0.44876,0.98167 0.29918,0.17763 0.70587,0.26645 1.22008,0.26645 m -0.11219,-6.53511 c 0.52355,1e-5 0.96296,0.0701 1.31824,0.21036 0.36461,0.1309 0.65444,0.32256 0.86948,0.57498 0.22437,0.24308 0.38331,0.53758 0.47681,0.8835 0.0935,0.33658 0.14023,0.71054 0.14023,1.12191 l 0,4.55774 c -0.11219,0.0187 -0.27113,0.0468 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0842 -0.25243,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57965,0.0421 -0.86947,0.0421 -0.41137,0 -0.79002,-0.0421 -1.13593,-0.12622 -0.34593,-0.0841 -0.6451,-0.21503 -0.89753,-0.39266 -0.25243,-0.18699 -0.44876,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.23841,-1.03776 0.16828,-0.28982 0.39266,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12622 0.13089,1e-5 0.26645,0.009 0.40669,0.0281 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19634,0.0421 l 0,-0.36462 c -1e-5,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0468,-0.21502 -0.1309,-0.40201 -0.25243,-0.56095 -0.12155,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20569,-0.10283 -0.47682,-0.15425 -0.81338,-0.15426 -0.43007,10e-6 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07984 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27617,-0.11219 m 1.90724,-2.58038 -1.97736,1.92126 -0.65912,-0.589 1.79505,-2.15967 0.84143,0.82741" /> + <path + inkscape:connector-curvature="0" + id="path7596" + style="fill:#000000;marker:none" + d="m 156.56443,795.02273 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26177,-0.14024 0.39266,-0.36462 0.39267,-0.67314 -1e-5,-0.31787 -0.12622,-0.5703 -0.37865,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33657,-0.35059 -0.44876,-0.57498 -0.1122,-0.22437 -0.16829,-0.50017 -0.16829,-0.8274 0,-0.64509 0.2384,-1.15462 0.71522,-1.5286 0.4768,-0.38331 1.12657,-0.57497 1.94931,-0.57498 0.20568,10e-6 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39733,0.0468 0.57497,0.0842 0.17763,0.0281 0.3319,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12622 -0.36462,10e-6 -0.6825,0.0748 -0.95362,0.22438 -0.27113,0.14025 -0.4067,0.36463 -0.40669,0.67315 -1e-5,0.15894 0.028,0.29918 0.0841,0.42071 0.0654,0.12155 0.15893,0.23374 0.28048,0.33657 0.13088,0.0935 0.28982,0.18232 0.47681,0.26646 0.18698,0.0841 0.41136,0.17296 0.67314,0.26645 0.34592,0.13089 0.65444,0.26178 0.92557,0.39267 0.27113,0.12154 0.50018,0.26645 0.68717,0.43474 0.19633,0.16829 0.34592,0.37397 0.44876,0.61704 0.10284,0.23374 0.15426,0.52356 0.15427,0.86948 -1e-5,0.67315 -0.25244,1.18268 -0.75729,1.5286 -0.49551,0.34592 -1.20605,0.51888 -2.13162,0.51888 -0.6451,0 -1.14996,-0.0561 -1.51458,-0.16828 -0.36462,-0.10285 -0.61237,-0.18231 -0.74326,-0.23841 l 0.2384,-1.12191 c 0.14959,0.0561 0.388,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16829 1.30422,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path7598" + style="fill:#000000;marker:none" + d="m 170.03826,788.66993 c -0.36462,1.36499 -0.79469,2.67388 -1.29019,3.92668 -0.48616,1.25279 -0.9583,2.3747 -1.41641,3.36572 l -1.178,0 c -0.45811,-0.99102 -0.93492,-2.11293 -1.43043,-3.36572 -0.48616,-1.2528 -0.91155,-2.56169 -1.27617,-3.92668 l 1.40238,0 c 0.11219,0.45812 0.24308,0.94895 0.39267,1.4725 0.15894,0.51422 0.32255,1.02842 0.49084,1.54263 0.17763,0.50486 0.35526,0.99569 0.5329,1.4725 0.17763,0.47681 0.34592,0.9022 0.50486,1.27617 0.15893,-0.37397 0.32722,-0.79936 0.50486,-1.27617 0.17763,-0.47681 0.35059,-0.96764 0.51888,-1.4725 0.17763,-0.51421 0.34124,-1.02841 0.49083,-1.54263 0.15893,-0.52355 0.2945,-1.01438 0.40669,-1.4725 l 1.34629,0" /> + <path + inkscape:connector-curvature="0" + id="path7600" + style="fill:#000000;marker:none" + d="m 170.78547,792.33015 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30853,-0.31786 0.6638,-0.55627 1.06582,-0.71521 0.40201,-0.15893 0.81337,-0.2384 1.23409,-0.23841 0.98167,10e-6 1.73428,0.30853 2.25784,0.92558 0.52355,0.6077 0.78533,1.53795 0.78534,2.79074 -1e-5,0.0561 -1e-5,0.13089 0,0.22438 -1e-5,0.0842 -0.005,0.16361 -0.014,0.23841 l -4.99248,0 c 0.0561,0.75728 0.2758,1.33226 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65481,-0.28047 -0.45812,-0.19634 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73392 -0.67315,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57497 -0.29918,0 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.11219 -0.41604,0.26178 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0841,0.24309 -0.14024,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7602" + style="fill:#000000;marker:none" + d="m 181.71837,788.51567 c 0.11218,10e-6 0.2384,0.009 0.37864,0.0281 0.14958,0.009 0.2945,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21036,0.0374 0.26646,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51889,-0.12622 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0468 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12842 -1.30422,0 0,-6.98387 c 0.30852,-0.11219 0.69184,-0.21503 1.14996,-0.30853 0.45811,-0.10283 0.97231,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7604" + style="fill:#000000;marker:none" + d="m 190.3737,788.51567 c 0.11219,10e-6 0.2384,0.009 0.37865,0.0281 0.14958,0.009 0.29449,0.0281 0.43473,0.0561 0.14024,0.0187 0.26645,0.0421 0.37865,0.0701 0.12153,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51888,-0.12622 -0.23374,-0.0561 -0.53759,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0468 -0.388,0.0795 -0.46279,0.0982 l 0,6.12842 -1.30421,0 0,-6.98387 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7606" + style="fill:#000000;marker:none" + d="m 192.69771,792.33015 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30853,-0.31786 0.6638,-0.55627 1.06582,-0.71521 0.40201,-0.15893 0.81337,-0.2384 1.23409,-0.23841 0.98167,10e-6 1.73428,0.30853 2.25784,0.92558 0.52355,0.6077 0.78533,1.53795 0.78533,2.79074 0,0.0561 0,0.13089 0,0.22438 0,0.0842 -0.005,0.16361 -0.014,0.23841 l -4.99248,0 c 0.0561,0.75728 0.2758,1.33226 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65481,-0.28047 -0.45812,-0.19634 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73392 -0.67315,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57497 -0.29918,0 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.11219 -0.41604,0.26178 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0841,0.24309 -0.14024,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7608" + style="fill:#000000;marker:none" + d="m 202.63491,795.02273 c 0.53291,0 0.92557,-0.0701 1.17801,-0.21036 0.26177,-0.14024 0.39266,-0.36462 0.39266,-0.67314 0,-0.31787 -0.12621,-0.5703 -0.37864,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33658,-0.35059 -0.44877,-0.57498 -0.11219,-0.22437 -0.16828,-0.50017 -0.16828,-0.8274 0,-0.64509 0.2384,-1.15462 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94932,-0.57498 0.20568,10e-6 0.41136,0.014 0.61705,0.0421 0.20567,0.0187 0.39733,0.0468 0.57497,0.0842 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12622 -0.36463,10e-6 -0.6825,0.0748 -0.95362,0.22438 -0.27113,0.14025 -0.4067,0.36463 -0.4067,0.67315 0,0.15894 0.0281,0.29918 0.0842,0.42071 0.0654,0.12155 0.15893,0.23374 0.28047,0.33657 0.13089,0.0935 0.28983,0.18232 0.47681,0.26646 0.18699,0.0841 0.41137,0.17296 0.67315,0.26645 0.34592,0.13089 0.65444,0.26178 0.92557,0.39267 0.27112,0.12154 0.50018,0.26645 0.68717,0.43474 0.19633,0.16829 0.34592,0.37397 0.44876,0.61704 0.10284,0.23374 0.15426,0.52356 0.15426,0.86948 0,0.67315 -0.25243,1.18268 -0.75728,1.5286 -0.49552,0.34592 -1.20606,0.51888 -2.13163,0.51888 -0.64509,0 -1.14995,-0.0561 -1.51457,-0.16828 -0.36462,-0.10285 -0.61237,-0.18231 -0.74326,-0.23841 l 0.2384,-1.12191 c 0.14959,0.0561 0.38799,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16829 1.30421,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path7610" + style="fill:#000000;marker:none" + d="m 209.65121,795.02273 c 0.30852,0 0.57965,-0.005 0.81339,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,1e-5 -0.4067,0.014 -0.63108,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0842 -0.32723,0.20569 -0.44876,0.36462 -0.12155,0.14959 -0.18232,0.3506 -0.18231,0.60303 -1e-5,0.46746 0.14958,0.79468 0.44876,0.98167 0.29917,0.17763 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.53511 c 0.52355,1e-5 0.96297,0.0701 1.31824,0.21036 0.36462,0.1309 0.65444,0.32256 0.86948,0.57498 0.22438,0.24308 0.38331,0.53758 0.47681,0.8835 0.0935,0.33658 0.14023,0.71054 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27113,0.0468 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0842 -0.25243,0.0281 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.028 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34592,-0.0841 -0.6451,-0.21503 -0.89753,-0.39266 -0.25243,-0.18699 -0.44876,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21035,-0.65912 -0.21035,-1.07984 0,-0.40201 0.0795,-0.74793 0.2384,-1.03776 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.60769,-0.30852 0.98166,-0.39267 0.37397,-0.0841 0.76664,-0.12621 1.17801,-0.12622 0.13088,1e-5 0.26644,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39266,0.0561 0.13089,0.0187 0.24308,0.0374 0.33658,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0468,-0.21502 -0.13089,-0.40201 -0.25243,-0.56095 -0.12154,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20568,-0.10283 -0.47681,-0.15425 -0.81338,-0.15426 -0.43007,10e-6 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15427,-1.07984 c 0.16829,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81806,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7612" + style="fill:#000000;marker:none" + d="m 216.68395,796.10256 c -0.80404,-0.0187 -1.37434,-0.19165 -1.71091,-0.51888 -0.33658,-0.32722 -0.50486,-0.83675 -0.50486,-1.5286 l 0,-8.75087 1.30422,-0.22438 0,8.7649 c -1e-5,0.21503 0.0187,0.39267 0.0561,0.5329 0.0374,0.14024 0.0982,0.25243 0.18231,0.33657 0.0841,0.0842 0.19633,0.14959 0.33657,0.19634 0.14024,0.0374 0.3132,0.0701 0.51889,0.0982 l -0.18231,1.09385" /> + <path + inkscape:connector-curvature="0" + id="path7614" + style="fill:#000000;marker:none" + d="m 219.55095,788.66993 2.76269,0 0,1.09386 -2.76269,0 0,3.36572 c 0,0.36462 0.028,0.66847 0.0841,0.91155 0.0561,0.23373 0.14024,0.42072 0.25243,0.56095 0.11219,0.13089 0.25243,0.22439 0.42072,0.28048 0.16828,0.0561 0.36461,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.93959,-0.12621 0.24308,-0.0935 0.41137,-0.15894 0.50486,-0.19633 l 0.25243,1.07983 c -0.13089,0.0654 -0.35995,0.14491 -0.68717,0.23841 -0.32722,0.10284 -0.70119,0.15426 -1.1219,0.15426 -0.49552,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31788,-0.13089 -0.57498,-0.32255 -0.77131,-0.57498 -0.19634,-0.25243 -0.33657,-0.56095 -0.42072,-0.92557 -0.0748,-0.37397 -0.11219,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30422,-0.22439 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path7616" + style="fill:#000000;marker:none" + d="m 226.44147,795.02273 c 0.30852,0 0.57964,-0.005 0.81338,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,1e-5 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0842 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14958,0.79468 0.44876,0.98167 0.29917,0.17763 0.70587,0.26645 1.22008,0.26645 m -0.11219,-6.53511 c 0.52355,1e-5 0.96296,0.0701 1.31824,0.21036 0.36461,0.1309 0.65444,0.32256 0.86947,0.57498 0.22438,0.24308 0.38332,0.53758 0.47681,0.8835 0.0935,0.33658 0.14024,0.71054 0.14024,1.12191 l 0,4.55774 c -0.11219,0.0187 -0.27113,0.0468 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0842 -0.25244,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57965,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39266 -0.25243,-0.18699 -0.44877,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.2384,-1.03776 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12622 0.13088,1e-5 0.26645,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21502 -0.13089,-0.40201 -0.25243,-0.56095 -0.12154,-0.16828 -0.28983,-0.29917 -0.50485,-0.39267 -0.20569,-0.10283 -0.47682,-0.15425 -0.81339,-0.15426 -0.43006,10e-6 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15426,-1.07984 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7618" + style="fill:#000000;marker:none" + d="m 235.9985,790.21255 c -0.15895,-0.13088 -0.388,-0.25709 -0.68717,-0.37864 -0.29918,-0.12153 -0.6264,-0.1823 -0.98167,-0.18231 -0.37397,10e-6 -0.69652,0.0701 -0.96764,0.21036 -0.26179,0.13089 -0.47682,0.31788 -0.6451,0.56095 -0.16829,0.23374 -0.28983,0.51421 -0.36462,0.84143 -0.0748,0.32723 -0.11219,0.67782 -0.11219,1.05179 0,0.85078 0.21035,1.5099 0.63107,1.97736 0.42071,0.45811 0.98167,0.68717 1.68286,0.68717 0.35527,0 0.64977,-0.014 0.8835,-0.0421 0.24308,-0.0374 0.43006,-0.0748 0.56096,-0.11219 l 0,-4.61385 m 0,-4.90834 1.30421,-0.22438 0,10.67214 c -0.29918,0.0841 -0.6825,0.16828 -1.14995,0.25243 -0.46747,0.0841 -1.00505,0.12621 -1.61274,0.12621 -0.56096,0 -1.06582,-0.0888 -1.51458,-0.26645 -0.44876,-0.17764 -0.83208,-0.43006 -1.14995,-0.75729 -0.31788,-0.32722 -0.56563,-0.72456 -0.74326,-1.19202 -0.16829,-0.47681 -0.25243,-1.00972 -0.25243,-1.59872 0,-0.56095 0.0701,-1.07516 0.21035,-1.54262 0.14959,-0.46746 0.36462,-0.86947 0.6451,-1.20605 0.28048,-0.33657 0.62172,-0.59835 1.02374,-0.78534 0.41136,-0.18697 0.87882,-0.28047 1.40238,-0.28047 0.42071,0 0.79001,0.0561 1.10789,0.16828 0.32721,0.1122 0.57029,0.21972 0.72924,0.32255 l 0,-3.68827" /> + <path + inkscape:connector-curvature="0" + id="path7620" + style="fill:#000000;marker:none" + d="m 245.99529,792.31613 c 0,0.57965 -0.0842,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.40669,0.86948 -0.71521,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78533 -0.42072,0.17764 -0.87883,0.26646 -1.37433,0.26646 -0.49551,0 -0.95363,-0.0888 -1.37434,-0.26646 -0.42071,-0.18698 -0.78533,-0.44876 -1.09386,-0.78533 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16829,-0.46746 -0.25243,-0.99102 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55665 0.16829,-0.4768 0.40202,-0.88349 0.70119,-1.22007 0.30853,-0.33657 0.67315,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87883,-0.28047 1.37434,-0.28048 0.4955,10e-6 0.95361,0.0935 1.37433,0.28048 0.42071,0.17764 0.78066,0.43474 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71521,1.22007 0.16828,0.46747 0.25243,0.98635 0.25243,1.55665 m -1.36031,0 c 0,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48616 -0.86481,-0.72924 -1.50055,-0.72924 -0.63575,0 -1.14061,0.24308 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12658 -0.54693,1.94931 0,0.82273 0.18231,1.47718 0.54693,1.96334 0.37397,0.47681 0.87883,0.71521 1.51458,0.71521 0.63574,0 1.13592,-0.2384 1.50055,-0.71521 0.37396,-0.48616 0.56095,-1.14061 0.56095,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7622" + style="fill:#000000;marker:none" + d="m 249.5271,795.02273 c 0.53291,0 0.92557,-0.0701 1.17801,-0.21036 0.26177,-0.14024 0.39266,-0.36462 0.39266,-0.67314 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33658,-0.35059 -0.44877,-0.57498 -0.11219,-0.22437 -0.16828,-0.50017 -0.16828,-0.8274 0,-0.64509 0.2384,-1.15462 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94932,-0.57498 0.20567,10e-6 0.41136,0.014 0.61704,0.0421 0.20568,0.0187 0.39734,0.0468 0.57498,0.0842 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12622 -0.36463,10e-6 -0.6825,0.0748 -0.95363,0.22438 -0.27112,0.14025 -0.40669,0.36463 -0.40669,0.67315 0,0.15894 0.0281,0.29918 0.0842,0.42071 0.0654,0.12155 0.15893,0.23374 0.28047,0.33657 0.13089,0.0935 0.28983,0.18232 0.47681,0.26646 0.18699,0.0841 0.41137,0.17296 0.67315,0.26645 0.34592,0.13089 0.65444,0.26178 0.92557,0.39267 0.27112,0.12154 0.50018,0.26645 0.68717,0.43474 0.19633,0.16829 0.34591,0.37397 0.44876,0.61704 0.10284,0.23374 0.15426,0.52356 0.15426,0.86948 0,0.67315 -0.25243,1.18268 -0.75728,1.5286 -0.49552,0.34592 -1.20606,0.51888 -2.13163,0.51888 -0.64509,0 -1.14995,-0.0561 -1.51457,-0.16828 -0.36462,-0.10285 -0.61238,-0.18231 -0.74326,-0.23841 l 0.2384,-1.12191 c 0.14959,0.0561 0.38799,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16829 1.30421,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path7624" + style="fill:#000000;marker:none" + d="m 97.6457,813.63236 c -0.804036,-0.0187 -1.374338,-0.19166 -1.710908,-0.51888 -0.336573,-0.32723 -0.504859,-0.83676 -0.504858,-1.5286 l 0,-8.75088 1.304216,-0.22438 0,8.7649 c -2e-6,0.21503 0.0187,0.39267 0.0561,0.53291 0.03739,0.14024 0.09816,0.25243 0.18231,0.33657 0.08414,0.0841 0.196331,0.14959 0.336572,0.19633 0.140235,0.0374 0.313195,0.0701 0.518882,0.0982 l -0.18231,1.09386" /> + <path + inkscape:connector-curvature="0" + id="path7626" + style="fill:#000000;marker:none" + d="m 105.72956,809.84592 c 0,0.57966 -0.0842,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.40669,0.86948 -0.71521,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78534 -0.42072,0.17763 -0.87883,0.26645 -1.37433,0.26645 -0.49551,0 -0.95363,-0.0888 -1.37434,-0.26645 -0.42072,-0.18699 -0.78533,-0.44877 -1.093857,-0.78534 -0.299176,-0.33657 -0.532907,-0.73859 -0.701191,-1.20605 -0.168287,-0.46746 -0.25243,-0.99101 -0.252429,-1.57067 -10e-7,-0.5703 0.08414,-1.08918 0.252429,-1.55664 0.168284,-0.47681 0.402015,-0.8835 0.701191,-1.22008 0.308527,-0.33656 0.673137,-0.59367 1.093857,-0.77131 0.42071,-0.18698 0.87883,-0.28047 1.37434,-0.28047 0.4955,0 0.95361,0.0935 1.37433,0.28047 0.42071,0.17764 0.78066,0.43475 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71521,1.22008 0.16828,0.46746 0.25243,0.98634 0.25243,1.55664 m -1.36031,0 c 0,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48615 -0.86481,-0.72923 -1.50055,-0.72924 -0.63575,10e-6 -1.14061,0.24309 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12658 -0.54693,1.94931 0,0.82274 0.18231,1.47718 0.54693,1.96334 0.37397,0.47681 0.87883,0.71522 1.51458,0.71521 0.63574,1e-5 1.13592,-0.2384 1.50055,-0.71521 0.37396,-0.48616 0.56095,-1.1406 0.56095,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7628" + style="fill:#000000;marker:none" + d="m 109.26138,812.55252 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26177,-0.14023 0.39266,-0.36461 0.39267,-0.67314 -10e-6,-0.31787 -0.12622,-0.5703 -0.37865,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.5516,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18698,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.11219,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.23841,-1.15462 0.71522,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94931,-0.57497 0.20568,0 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0467 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46278,0.0982 0.14024,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.2384,1.12191 c -0.14025,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65913,-0.12621 -1.07984,-0.12622 -0.36462,1e-5 -0.6825,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.40669,0.36462 -0.40669,0.67314 0,0.15894 0.028,0.29918 0.0841,0.42071 0.0654,0.12155 0.15894,0.23374 0.28048,0.33658 0.13088,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0841 0.41136,0.17296 0.67314,0.26645 0.34592,0.1309 0.65444,0.26178 0.92558,0.39267 0.27112,0.12154 0.50017,0.26646 0.68716,0.43474 0.19633,0.16829 0.34592,0.37397 0.44877,0.61705 0.10283,0.23373 0.15425,0.52356 0.15426,0.86948 -1e-5,0.67314 -0.25244,1.18267 -0.75729,1.52859 -0.49551,0.34592 -1.20605,0.51888 -2.13162,0.51888 -0.6451,0 -1.14996,-0.0561 -1.51458,-0.16828 -0.36462,-0.10284 -0.61237,-0.18231 -0.74326,-0.23841 l 0.23841,-1.1219 c 0.14958,0.0561 0.38799,0.14024 0.71521,0.25243 0.32722,0.11219 0.76196,0.16828 1.30422,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path7630" + style="fill:#000000;marker:none" + d="m 120.21093,813.6604 c -0.58901,0 -1.10789,-0.0935 -1.55665,-0.28047 -0.43942,-0.18699 -0.81338,-0.44876 -1.12191,-0.78534 -0.29917,-0.33657 -0.52355,-0.73391 -0.67314,-1.19202 -0.14959,-0.46746 -0.22438,-0.98167 -0.22438,-1.54262 0,-0.56095 0.0795,-1.07516 0.2384,-1.54263 0.16829,-0.46745 0.40202,-0.86947 0.70119,-1.20605 0.29918,-0.34591 0.6638,-0.61236 1.09386,-0.79935 0.43941,-0.19633 0.92557,-0.2945 1.45848,-0.2945 0.32722,0 0.65444,0.0281 0.98167,0.0841 0.32722,0.0561 0.64042,0.14492 0.9396,0.26645 l -0.2945,1.10788 c -0.19634,-0.0935 -0.4254,-0.16828 -0.68717,-0.22438 -0.25243,-0.0561 -0.52356,-0.0841 -0.81338,-0.0841 -0.72925,10e-6 -1.2902,0.22906 -1.68286,0.68717 -0.38332,0.45811 -0.57498,1.12658 -0.57498,2.00541 0,0.39267 0.0421,0.75261 0.12621,1.07983 0.0935,0.32723 0.23373,0.6077 0.42072,0.84143 0.19633,0.23373 0.44408,0.41604 0.74326,0.54693 0.29917,0.12154 0.66379,0.18231 1.09386,0.18231 0.34592,0 0.65912,-0.0327 0.9396,-0.0982 0.28047,-0.0654 0.50018,-0.13556 0.65912,-0.21035 l 0.18231,1.09386 c -0.0748,0.0467 -0.18232,0.0935 -0.32255,0.14023 -0.14024,0.0374 -0.29918,0.0701 -0.47681,0.0982 -0.17764,0.0374 -0.3693,0.0654 -0.57498,0.0841 -0.19634,0.0281 -0.38799,0.0421 -0.57497,0.0421" /> + <path + inkscape:connector-curvature="0" + id="path7632" + style="fill:#000000;marker:none" + d="m 126.02863,812.55252 c 0.30852,0 0.57964,-0.005 0.81338,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,10e-6 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0841 -0.32722,0.20568 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.35059 -0.18231,0.60302 0,0.46746 0.14959,0.79469 0.44876,0.98167 0.29917,0.17764 0.70587,0.26645 1.22008,0.26645 m -0.11219,-6.5351 c 0.52355,0 0.96296,0.0701 1.31824,0.21035 0.36461,0.1309 0.65444,0.32256 0.86947,0.57498 0.22438,0.24309 0.38332,0.53759 0.47681,0.8835 0.0935,0.33658 0.14024,0.71055 0.14024,1.12191 l 0,4.55774 c -0.11219,0.0187 -0.27113,0.0467 -0.47681,0.0842 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57965,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0842 -0.64509,-0.21504 -0.89752,-0.39267 -0.25243,-0.18698 -0.44877,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.2384,-1.03776 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13088,0 0.26645,0.009 0.40669,0.028 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42539 -0.0701,-0.63108 -0.0468,-0.21502 -0.13089,-0.40201 -0.25243,-0.56095 -0.12154,-0.16828 -0.28983,-0.29917 -0.50485,-0.39267 -0.20569,-0.10283 -0.47682,-0.15425 -0.81339,-0.15426 -0.43006,10e-6 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15426,-1.07984 c 0.16828,-0.0748 0.44876,-0.1449 0.84143,-0.21035 0.39266,-0.0748 0.81805,-0.11219 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7634" + style="fill:#000000;marker:none" + d="m 130.87364,806.41008 c 0.29918,-0.0748 0.69184,-0.15425 1.178,-0.2384 0.49551,-0.0841 1.06581,-0.12621 1.71091,-0.12622 0.46746,10e-6 0.86013,0.0654 1.178,0.19634 0.31787,0.12154 0.58433,0.30385 0.79936,0.54693 0.0654,-0.0467 0.16828,-0.11219 0.30853,-0.19634 0.14023,-0.0841 0.31319,-0.1636 0.51888,-0.2384 0.20568,-0.0841 0.43473,-0.15426 0.68717,-0.21036 0.25242,-0.0654 0.52355,-0.0982 0.81338,-0.0982 0.56094,10e-6 1.01906,0.0841 1.37434,0.25243 0.35526,0.15895 0.63106,0.388 0.8274,0.68717 0.20567,0.29918 0.34124,0.65445 0.40669,1.06581 0.0748,0.41137 0.11218,0.86013 0.11219,1.34629 l 0,4.09496 -1.30421,0 0,-3.81448 c -1e-5,-0.43006 -0.0234,-0.79936 -0.0701,-1.10789 -0.0374,-0.30852 -0.11688,-0.56562 -0.23841,-0.77131 -0.1122,-0.20567 -0.27113,-0.35526 -0.47681,-0.44876 -0.19634,-0.10284 -0.45344,-0.15426 -0.77131,-0.15426 -0.43942,0 -0.80404,0.0608 -1.09386,0.18231 -0.28048,0.11219 -0.47214,0.21504 -0.57498,0.30852 0.0748,0.24309 0.13089,0.50954 0.16829,0.79936 0.0374,0.28983 0.0561,0.59368 0.0561,0.91155 l 0,4.09496 -1.30422,0 0,-3.81448 c -1e-5,-0.43006 -0.0234,-0.79936 -0.0701,-1.10789 -0.0467,-0.30852 -0.13089,-0.56562 -0.25243,-0.77131 -0.11219,-0.20567 -0.27113,-0.35526 -0.47681,-0.44876 -0.19634,-0.10284 -0.44877,-0.15426 -0.75729,-0.15426 -0.13089,0 -0.27113,0.005 -0.42071,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.11219,0.0187 -0.18699,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7636" + style="fill:#000000;marker:none" + d="m 144.25698,806.52227 c 0.15893,-0.10283 0.39734,-0.21035 0.71522,-0.32254 0.32721,-0.11219 0.70118,-0.16828 1.1219,-0.16829 0.52355,10e-6 0.98634,0.0935 1.38836,0.28048 0.41136,0.18699 0.75728,0.44877 1.03777,0.78533 0.28046,0.33658 0.49082,0.73859 0.63107,1.20605 0.14958,0.46747 0.22437,0.98167 0.22438,1.54262 -10e-6,0.58901 -0.0888,1.12191 -0.26645,1.59872 -0.1683,0.46746 -0.41138,0.8648 -0.72924,1.19202 -0.31788,0.32723 -0.7012,0.57966 -1.14996,0.75729 -0.44877,0.17764 -0.95362,0.26645 -1.51457,0.26645 -0.6077,0 -1.14528,-0.0421 -1.61274,-0.12621 -0.46747,-0.0841 -0.85078,-0.16829 -1.14996,-0.25243 l 0,-10.44776 1.30422,-0.22438 0,3.91265 m 0,5.83392 c 0.13089,0.0374 0.3132,0.0748 0.54693,0.11219 0.24308,0.0281 0.54225,0.0421 0.89752,0.0421 0.70119,0 1.26214,-0.22905 1.68286,-0.68717 0.42071,-0.46746 0.63107,-1.12658 0.63108,-1.97736 -1e-5,-0.37396 -0.0374,-0.72456 -0.11219,-1.05179 -0.0748,-0.32721 -0.19634,-0.60769 -0.36462,-0.84143 -0.16829,-0.24307 -0.388,-0.43005 -0.65912,-0.56095 -0.26179,-0.14023 -0.57966,-0.21035 -0.95362,-0.21036 -0.35528,10e-6 -0.6825,0.0608 -0.98167,0.18231 -0.29918,0.12155 -0.52824,0.24776 -0.68717,0.37865 l 0,4.61384" /> + <path + inkscape:connector-curvature="0" + id="path7638" + style="fill:#000000;marker:none" + d="m 152.52885,813.49212 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61064 c -0.23373,10e-6 -0.43474,-0.0748 -0.60303,-0.22438 -0.15893,-0.15892 -0.2384,-0.36928 -0.2384,-0.63107 0,-0.26177 0.0795,-0.46745 0.2384,-0.61705 0.16829,-0.15892 0.3693,-0.23839 0.60303,-0.2384 0.23373,10e-6 0.43006,0.0795 0.589,0.2384 0.16828,0.1496 0.25243,0.35528 0.25243,0.61705 0,0.26179 -0.0841,0.47215 -0.25243,0.63107 -0.15894,0.1496 -0.35527,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7640" + style="fill:#000000;marker:none" + d="m 161.22231,809.84592 c 0,0.57966 -0.0841,1.10321 -0.25242,1.57067 -0.1683,0.46746 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78534 -0.42072,0.17763 -0.87883,0.26645 -1.37433,0.26645 -0.49551,0 -0.95363,-0.0888 -1.37434,-0.26645 -0.42071,-0.18699 -0.78533,-0.44877 -1.09386,-0.78534 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16828,-0.46746 -0.25243,-0.99101 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55664 0.16829,-0.47681 0.40202,-0.8835 0.70119,-1.22008 0.30853,-0.33656 0.67315,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87883,-0.28047 1.37434,-0.28047 0.4955,0 0.95361,0.0935 1.37433,0.28047 0.42071,0.17764 0.78066,0.43475 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71522,1.22008 0.16827,0.46746 0.25242,0.98634 0.25242,1.55664 m -1.36031,0 c 0,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48615 -0.86481,-0.72923 -1.50055,-0.72924 -0.63575,10e-6 -1.14061,0.24309 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12658 -0.54693,1.94931 0,0.82274 0.18231,1.47718 0.54693,1.96334 0.37397,0.47681 0.87883,0.71522 1.51458,0.71521 0.63574,1e-5 1.13592,-0.2384 1.50055,-0.71521 0.37396,-0.48616 0.56095,-1.1406 0.56095,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7642" + style="fill:#000000;marker:none" + d="m 164.75412,812.55252 c 0.53291,0 0.92557,-0.0701 1.17801,-0.21036 0.26177,-0.14023 0.39266,-0.36461 0.39266,-0.67314 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33658,-0.35059 -0.44877,-0.57497 -0.11219,-0.22438 -0.16828,-0.50018 -0.16828,-0.82741 0,-0.64509 0.2384,-1.15462 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94932,-0.57497 0.20568,0 0.41136,0.014 0.61704,0.0421 0.20568,0.0187 0.39734,0.0467 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12622 -0.36463,1e-5 -0.6825,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.4067,0.36462 -0.4067,0.67314 0,0.15894 0.0281,0.29918 0.0841,0.42071 0.0654,0.12155 0.15893,0.23374 0.28047,0.33658 0.13089,0.0935 0.28983,0.18231 0.47681,0.26645 0.18699,0.0841 0.41137,0.17296 0.67315,0.26645 0.34592,0.1309 0.65444,0.26178 0.92557,0.39267 0.27112,0.12154 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34591,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52356 0.15426,0.86948 0,0.67314 -0.25243,1.18267 -0.75728,1.52859 -0.49552,0.34592 -1.20606,0.51888 -2.13163,0.51888 -0.64509,0 -1.14995,-0.0561 -1.51457,-0.16828 -0.36462,-0.10284 -0.61237,-0.18231 -0.74326,-0.23841 l 0.2384,-1.1219 c 0.14959,0.0561 0.38799,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16828 1.30421,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path7644" + style="fill:#000000;marker:none" + d="m 177.2463,807.74235 c -0.15894,-0.13089 -0.388,-0.2571 -0.68717,-0.37865 -0.29918,-0.12153 -0.6264,-0.1823 -0.98167,-0.18231 -0.37397,1e-5 -0.69652,0.0701 -0.96764,0.21036 -0.26178,0.1309 -0.47681,0.31788 -0.6451,0.56095 -0.16829,0.23374 -0.28983,0.51422 -0.36462,0.84143 -0.0748,0.32723 -0.11219,0.67783 -0.11219,1.05179 0,0.85078 0.21036,1.5099 0.63107,1.97736 0.42072,0.45812 0.98167,0.68717 1.68286,0.68717 0.35527,0 0.64977,-0.014 0.88351,-0.0421 0.24307,-0.0374 0.43005,-0.0748 0.56095,-0.11219 l 0,-4.61384 m 0,-4.90835 1.30422,-0.22438 0,10.67214 c -0.29919,0.0841 -0.6825,0.16829 -1.14996,0.25243 -0.46747,0.0841 -1.00505,0.12621 -1.61274,0.12621 -0.56096,0 -1.06581,-0.0888 -1.51457,-0.26645 -0.44877,-0.17763 -0.83209,-0.43006 -1.14996,-0.75729 -0.31787,-0.32722 -0.56563,-0.72456 -0.74326,-1.19202 -0.16829,-0.47681 -0.25243,-1.00971 -0.25243,-1.59872 0,-0.56095 0.0701,-1.07515 0.21036,-1.54262 0.14958,-0.46746 0.36462,-0.86947 0.64509,-1.20605 0.28048,-0.33656 0.62172,-0.59834 1.02374,-0.78533 0.41137,-0.18698 0.87883,-0.28047 1.40239,-0.28048 0.42071,10e-6 0.79,0.0561 1.10788,0.16829 0.32722,0.11219 0.5703,0.21971 0.72924,0.32254 l 0,-3.68827" /> + <path + inkscape:connector-curvature="0" + id="path7646" + style="fill:#000000;marker:none" + d="m 180.39947,809.85995 c -1e-5,-0.6451 0.0935,-1.20605 0.28047,-1.68286 0.18699,-0.48616 0.43474,-0.88817 0.74327,-1.20605 0.30852,-0.31787 0.66379,-0.55628 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.2384 1.23409,-0.2384 0.98167,0 1.73428,0.30853 2.25784,0.92557 0.52355,0.6077 0.78533,1.53795 0.78534,2.79074 -1e-5,0.0561 -1e-5,0.13089 0,0.22438 -1e-5,0.0842 -0.005,0.16362 -0.014,0.23841 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33226 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.45811,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55628,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15895,0.0842 -0.43942,0.17296 -0.84143,0.26646 -0.39267,0.0935 -0.84144,0.14023 -1.34629,0.14023 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28047 -0.45812,-0.19634 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67315,-1.19203 -0.14024,-0.46745 -0.21036,-0.97699 -0.21035,-1.52859 m 5.0065,-0.71522 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44445 -0.29918,-0.38332 -0.71522,-0.57498 -1.24812,-0.57498 -0.29918,0 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.11219 -0.41604,0.26178 -0.57498,0.44876 -0.15893,0.18699 -0.28515,0.40202 -0.37864,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16828,0.74326 l 3.61814,0" /> + <path + inkscape:connector-curvature="0" + id="path7648" + style="fill:#000000;marker:none" + d="m 197.56551,806.19973 c -0.36462,1.36499 -0.79469,2.67388 -1.29019,3.92667 -0.48616,1.2528 -0.9583,2.3747 -1.41641,3.36572 l -1.178,0 c -0.45811,-0.99102 -0.93492,-2.11292 -1.43043,-3.36572 -0.48616,-1.25279 -0.91155,-2.56168 -1.27617,-3.92667 l 1.40239,0 c 0.11219,0.45811 0.24307,0.94895 0.39266,1.4725 0.15894,0.51421 0.32255,1.02842 0.49084,1.54262 0.17763,0.50486 0.35527,0.99569 0.5329,1.4725 0.17764,0.47681 0.34592,0.9022 0.50486,1.27617 0.15893,-0.37397 0.32722,-0.79936 0.50486,-1.27617 0.17763,-0.47681 0.35059,-0.96764 0.51888,-1.4725 0.17763,-0.5142 0.34124,-1.02841 0.49084,-1.54262 0.15893,-0.52355 0.29449,-1.01439 0.40669,-1.4725 l 1.34628,0" /> + <path + inkscape:connector-curvature="0" + id="path7650" + style="fill:#000000;marker:none" + d="m 198.31273,809.85995 c 0,-0.6451 0.0935,-1.20605 0.28047,-1.68286 0.18699,-0.48616 0.43474,-0.88817 0.74327,-1.20605 0.30852,-0.31787 0.66379,-0.55628 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.2384 1.2341,-0.2384 0.98166,0 1.73427,0.30853 2.25783,0.92557 0.52355,0.6077 0.78533,1.53795 0.78534,2.79074 -1e-5,0.0561 -1e-5,0.13089 0,0.22438 -1e-5,0.0842 -0.005,0.16362 -0.014,0.23841 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33226 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.45811,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55628,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15894,0.0842 -0.43942,0.17296 -0.84143,0.26646 -0.39267,0.0935 -0.84144,0.14023 -1.34629,0.14023 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28047 -0.45812,-0.19634 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67315,-1.19203 -0.14023,-0.46745 -0.21035,-0.97699 -0.21035,-1.52859 m 5.00651,-0.71522 c 0.009,-0.589 -0.14025,-1.07048 -0.44877,-1.44445 -0.29918,-0.38332 -0.71522,-0.57498 -1.24812,-0.57498 -0.29918,0 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.11219 -0.41604,0.26178 -0.57497,0.44876 -0.15894,0.18699 -0.28516,0.40202 -0.37865,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16828,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7652" + style="fill:#000000;marker:none" + d="m 209.24562,806.04546 c 0.11219,10e-6 0.2384,0.009 0.37864,0.0281 0.14959,0.009 0.2945,0.0281 0.43474,0.0561 0.14024,0.0187 0.26645,0.0421 0.37865,0.0701 0.12153,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51888,-0.12621 -0.23374,-0.0561 -0.53759,-0.0841 -0.91155,-0.0842 -0.24309,10e-6 -0.48617,0.0281 -0.72924,0.0842 -0.23374,0.0467 -0.388,0.0795 -0.46279,0.0982 l 0,6.12842 -1.30422,0 0,-6.98387 c 0.30853,-0.11218 0.69184,-0.21503 1.14996,-0.30852 0.45811,-0.10284 0.97231,-0.15426 1.54262,-0.15427" /> + <path + inkscape:connector-curvature="0" + id="path7654" + style="fill:#000000;marker:none" + d="m 213.67321,812.55252 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26177,-0.14023 0.39266,-0.36461 0.39267,-0.67314 -1e-5,-0.31787 -0.12622,-0.5703 -0.37865,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.1122,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.2384,-1.15462 0.71522,-1.5286 0.4768,-0.38331 1.12657,-0.57497 1.94931,-0.57497 0.20568,0 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39733,0.0467 0.57497,0.0841 0.17763,0.0281 0.3319,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12622 -0.36462,1e-5 -0.6825,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.4067,0.36462 -0.40669,0.67314 -1e-5,0.15894 0.028,0.29918 0.0841,0.42071 0.0654,0.12155 0.15893,0.23374 0.28048,0.33658 0.13088,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0841 0.41136,0.17296 0.67314,0.26645 0.34592,0.1309 0.65444,0.26178 0.92557,0.39267 0.27113,0.12154 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34592,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52356 0.15427,0.86948 -1e-5,0.67314 -0.25244,1.18267 -0.75729,1.52859 -0.49551,0.34592 -1.20605,0.51888 -2.13162,0.51888 -0.6451,0 -1.14996,-0.0561 -1.51458,-0.16828 -0.36462,-0.10284 -0.61237,-0.18231 -0.74326,-0.23841 l 0.2384,-1.1219 c 0.14959,0.0561 0.388,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16828 1.30422,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path7656" + style="fill:#000000;marker:none" + d="m 219.52553,813.49212 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61064 c -0.23374,10e-6 -0.43474,-0.0748 -0.60303,-0.22438 -0.15894,-0.15892 -0.2384,-0.36928 -0.2384,-0.63107 0,-0.26177 0.0795,-0.46745 0.2384,-0.61705 0.16829,-0.15892 0.36929,-0.23839 0.60303,-0.2384 0.23373,10e-6 0.43006,0.0795 0.589,0.2384 0.16828,0.1496 0.25242,0.35528 0.25243,0.61705 -1e-5,0.26179 -0.0841,0.47215 -0.25243,0.63107 -0.15894,0.1496 -0.35527,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7658" + style="fill:#000000;marker:none" + d="m 228.21899,809.84592 c -1e-5,0.57966 -0.0841,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33657 -0.65912,0.59835 -1.07983,0.78534 -0.42072,0.17763 -0.87883,0.26645 -1.37434,0.26645 -0.49551,0 -0.95362,-0.0888 -1.37433,-0.26645 -0.42072,-0.18699 -0.78534,-0.44877 -1.09386,-0.78534 -0.29918,-0.33657 -0.53291,-0.73859 -0.70119,-1.20605 -0.16829,-0.46746 -0.25243,-0.99101 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55664 0.16828,-0.47681 0.40201,-0.8835 0.70119,-1.22008 0.30852,-0.33656 0.67314,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87882,-0.28047 1.37433,-0.28047 0.49551,0 0.95362,0.0935 1.37434,0.28047 0.42071,0.17764 0.78065,0.43475 1.07983,0.77131 0.30852,0.33658 0.54693,0.74327 0.71522,1.22008 0.16828,0.46746 0.25242,0.98634 0.25243,1.55664 m -1.36031,0 c -1e-5,-0.82273 -0.18699,-1.4725 -0.56096,-1.94931 -0.36462,-0.48615 -0.86481,-0.72923 -1.50055,-0.72924 -0.63575,10e-6 -1.14061,0.24309 -1.51457,0.72924 -0.36462,0.47681 -0.54693,1.12658 -0.54693,1.94931 0,0.82274 0.18231,1.47718 0.54693,1.96334 0.37396,0.47681 0.87882,0.71522 1.51457,0.71521 0.63574,1e-5 1.13593,-0.2384 1.50055,-0.71521 0.37397,-0.48616 0.56095,-1.1406 0.56096,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7660" + style="fill:#000000;marker:none" + d="m 230.05391,806.41008 c 0.29918,-0.0748 0.69652,-0.15425 1.19203,-0.2384 0.49551,-0.0841 1.06581,-0.12621 1.71091,-0.12622 0.57964,10e-6 1.06113,0.0841 1.44445,0.25243 0.38331,0.15895 0.68716,0.388 0.91155,0.68717 0.23373,0.28983 0.39734,0.64043 0.49084,1.05179 0.0935,0.41137 0.14023,0.86481 0.14023,1.36031 l 0,4.09496 -1.30421,0 0,-3.81448 c -1e-5,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31787 -0.15427,-0.57497 -0.2945,-0.77131 -0.14024,-0.19633 -0.32723,-0.33657 -0.56095,-0.42071 -0.23374,-0.0935 -0.52356,-0.14024 -0.86948,-0.14024 -0.14024,0 -0.28516,0.005 -0.43474,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10284,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7662" + style="fill:#000000;marker:none" + d="m 237.69997,809.85995 c 0,-0.6451 0.0935,-1.20605 0.28048,-1.68286 0.18698,-0.48616 0.43474,-0.88817 0.74326,-1.20605 0.30852,-0.31787 0.66379,-0.55628 1.06581,-0.71522 0.40202,-0.15893 0.81338,-0.2384 1.2341,-0.2384 0.98166,0 1.73428,0.30853 2.25784,0.92557 0.52355,0.6077 0.78533,1.53795 0.78533,2.79074 0,0.0561 0,0.13089 0,0.22438 0,0.0842 -0.005,0.16362 -0.014,0.23841 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33226 0.65912,1.72493 0.38332,0.39267 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71521,-0.23841 l 0.18231,1.09386 c -0.15894,0.0842 -0.43941,0.17296 -0.84143,0.26646 -0.39267,0.0935 -0.84143,0.14023 -1.34628,0.14023 -0.63575,0 -1.18736,-0.0935 -1.65482,-0.28047 -0.45811,-0.19634 -0.83675,-0.46279 -1.13593,-0.79936 -0.29917,-0.33657 -0.52355,-0.73391 -0.67314,-1.19203 -0.14024,-0.46745 -0.21036,-0.97699 -0.21036,-1.52859 m 5.00651,-0.71522 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44445 -0.29918,-0.38332 -0.71522,-0.57498 -1.24812,-0.57498 -0.29918,0 -0.56563,0.0608 -0.79936,0.18231 -0.22439,0.11219 -0.41604,0.26178 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16829,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7664" + style="fill:#000000;marker:none" + d="m 247.63718,812.55252 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26178,-0.14023 0.39267,-0.36461 0.39267,-0.67314 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75729 -0.25244,-0.18698 -0.66848,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81339,-0.33657 -0.25243,-0.12154 -0.47213,-0.26178 -0.65912,-0.42072 -0.18698,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.11219,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.23841,-1.15462 0.71522,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94931,-0.57497 0.20568,0 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0467 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46278,0.0982 0.14024,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.2384,1.12191 c -0.14025,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65913,-0.12621 -1.07984,-0.12622 -0.36462,1e-5 -0.68249,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.40669,0.36462 -0.40669,0.67314 0,0.15894 0.0281,0.29918 0.0841,0.42071 0.0654,0.12155 0.15894,0.23374 0.28048,0.33658 0.13089,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0841 0.41136,0.17296 0.67314,0.26645 0.34592,0.1309 0.65445,0.26178 0.92558,0.39267 0.27112,0.12154 0.50018,0.26646 0.68717,0.43474 0.19632,0.16829 0.34591,0.37397 0.44876,0.61705 0.10283,0.23373 0.15425,0.52356 0.15426,0.86948 -1e-5,0.67314 -0.25243,1.18267 -0.75729,1.52859 -0.49551,0.34592 -1.20605,0.51888 -2.13162,0.51888 -0.6451,0 -1.14996,-0.0561 -1.51457,-0.16828 -0.36462,-0.10284 -0.61238,-0.18231 -0.74327,-0.23841 l 0.23841,-1.1219 c 0.14959,0.0561 0.38799,0.14024 0.71521,0.25243 0.32722,0.11219 0.76196,0.16828 1.30422,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path7666" + style="fill:#000000;marker:none" + d="m 100.16999,825.27214 c -0.15894,-0.13088 -0.387998,-0.2571 -0.687168,-0.37864 -0.29918,-0.12154 -0.626402,-0.18231 -0.981668,-0.18231 -0.373973,0 -0.696521,0.0701 -0.967645,0.21035 -0.261781,0.1309 -0.476813,0.31788 -0.645096,0.56096 -0.168289,0.23373 -0.289829,0.51421 -0.36462,0.84143 -0.0748,0.32722 -0.112193,0.67782 -0.112191,1.05178 -2e-6,0.85079 0.210356,1.50991 0.631073,1.97737 0.420712,0.45811 0.981665,0.68716 1.68286,0.68716 0.355266,0 0.649766,-0.014 0.883501,-0.0421 0.243075,-0.0374 0.430064,-0.0748 0.560954,-0.11219 l 0,-4.61384 m 0,-4.90834 1.30422,-0.22438 0,10.67213 c -0.29919,0.0842 -0.6825,0.16829 -1.14996,0.25243 -0.467465,0.0842 -1.005044,0.12622 -1.612739,0.12622 -0.560957,0 -1.065815,-0.0888 -1.514574,-0.26646 -0.448765,-0.17763 -0.832083,-0.43006 -1.149954,-0.75728 -0.317875,-0.32722 -0.56563,-0.72457 -0.743264,-1.19203 -0.168286,-0.47681 -0.252429,-1.00971 -0.252429,-1.59872 0,-0.56094 0.07012,-1.07515 0.210358,-1.54262 0.149586,-0.46745 0.364618,-0.86947 0.645096,-1.20605 0.280475,-0.33656 0.621721,-0.59834 1.02374,-0.78533 0.411363,-0.18698 0.878824,-0.28047 1.402384,-0.28048 0.42071,10e-6 0.790004,0.0561 1.107882,0.16829 0.327218,0.1122 0.5703,0.21971 0.72924,0.32255 l 0,-3.68827" /> + <path + inkscape:connector-curvature="0" + id="path7668" + style="fill:#000000;marker:none" + d="m 103.32316,827.38974 c 0,-0.64509 0.0935,-1.20605 0.28048,-1.68286 0.18698,-0.48616 0.43474,-0.88817 0.74326,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71522 0.40202,-0.15893 0.81338,-0.23839 1.2341,-0.2384 0.98166,1e-5 1.73427,0.30853 2.25784,0.92557 0.52355,0.60771 0.78532,1.53795 0.78533,2.79074 -1e-5,0.0561 -1e-5,0.1309 0,0.22439 -1e-5,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38332,0.39267 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71521,-0.2384 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34628,0.14024 -0.63576,0 -1.18736,-0.0935 -1.65482,-0.28048 -0.45811,-0.19633 -0.83675,-0.46279 -1.13593,-0.79936 -0.29917,-0.33657 -0.52356,-0.73391 -0.67314,-1.19202 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14024,-1.07048 -0.44876,-1.44445 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56564,0.0608 -0.79936,0.18231 -0.22439,0.1122 -0.41605,0.26178 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40203 -0.37864,0.6451 -0.0842,0.24308 -0.14024,0.49084 -0.16829,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7670" + style="fill:#000000;marker:none" + d="m 113.26036,830.08231 c 0.53291,10e-6 0.92557,-0.0701 1.178,-0.21035 0.26178,-0.14024 0.39267,-0.36462 0.39267,-0.67315 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75728 -0.25243,-0.18699 -0.66847,-0.39734 -1.24812,-0.63108 -0.28048,-0.11218 -0.55161,-0.22437 -0.81338,-0.33657 -0.25244,-0.12153 -0.47214,-0.26177 -0.65913,-0.42071 -0.18698,-0.15894 -0.33657,-0.3506 -0.44876,-0.57498 -0.11219,-0.22438 -0.16828,-0.50018 -0.16828,-0.82741 0,-0.64509 0.2384,-1.15462 0.71521,-1.52859 0.47681,-0.38332 1.12658,-0.57497 1.94931,-0.57498 0.20568,1e-5 0.41137,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0467 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.1219 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07984,-0.12621 -0.36462,0 -0.68249,0.0748 -0.95362,0.22438 -0.27113,0.14024 -0.40669,0.36462 -0.40669,0.67314 0,0.15894 0.028,0.29918 0.0841,0.42072 0.0654,0.12154 0.15893,0.23373 0.28047,0.33657 0.13089,0.0935 0.28983,0.18231 0.47681,0.26645 0.18698,0.0842 0.41137,0.17297 0.67315,0.26646 0.34591,0.13089 0.65444,0.26178 0.92557,0.39266 0.27112,0.12155 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34591,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52356 0.15426,0.86948 0,0.67314 -0.25243,1.18268 -0.75728,1.5286 -0.49552,0.34592 -1.20606,0.51888 -2.13163,0.51888 -0.6451,0 -1.14995,-0.0561 -1.51457,-0.16829 -0.36462,-0.10284 -0.61238,-0.18231 -0.74326,-0.2384 l 0.2384,-1.12191 c 0.14959,0.0561 0.38799,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16829 1.30421,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path7672" + style="fill:#000000;marker:none" + d="m 122.52047,825.27214 c -0.15894,-0.13088 -0.38799,-0.2571 -0.68716,-0.37864 -0.29918,-0.12154 -0.62641,-0.18231 -0.98167,-0.18231 -0.37397,0 -0.69652,0.0701 -0.96765,0.21035 -0.26178,0.1309 -0.47681,0.31788 -0.64509,0.56096 -0.16829,0.23373 -0.28983,0.51421 -0.36462,0.84143 -0.0748,0.32722 -0.11219,0.67782 -0.11219,1.05178 0,0.85079 0.21035,1.50991 0.63107,1.97737 0.42071,0.45811 0.98166,0.68716 1.68286,0.68716 0.35527,0 0.64977,-0.014 0.8835,-0.0421 0.24308,-0.0374 0.43006,-0.0748 0.56095,-0.11219 l 0,-4.61384 m 0,-4.90834 1.30422,-0.22438 0,10.67213 c -0.29918,0.0842 -0.6825,0.16829 -1.14995,0.25243 -0.46747,0.0842 -1.00505,0.12622 -1.61274,0.12622 -0.56096,0 -1.06582,-0.0888 -1.51458,-0.26646 -0.44876,-0.17763 -0.83208,-0.43006 -1.14995,-0.75728 -0.31788,-0.32722 -0.56563,-0.72457 -0.74327,-1.19203 -0.16828,-0.47681 -0.25243,-1.00971 -0.25242,-1.59872 -1e-5,-0.56094 0.0701,-1.07515 0.21035,-1.54262 0.14959,-0.46745 0.36462,-0.86947 0.6451,-1.20605 0.28047,-0.33656 0.62172,-0.59834 1.02374,-0.78533 0.41136,-0.18698 0.87882,-0.28047 1.40238,-0.28048 0.42071,10e-6 0.79001,0.0561 1.10789,0.16829 0.32721,0.1122 0.57029,0.21971 0.72923,0.32255 l 0,-3.68827" /> + <path + inkscape:connector-curvature="0" + id="path7674" + style="fill:#000000;marker:none" + d="m 125.67365,827.38974 c 0,-0.64509 0.0935,-1.20605 0.28047,-1.68286 0.18699,-0.48616 0.43474,-0.88817 0.74327,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.23839 1.2341,-0.2384 0.98166,1e-5 1.73427,0.30853 2.25783,0.92557 0.52355,0.60771 0.78533,1.53795 0.78534,2.79074 -1e-5,0.0561 -1e-5,0.1309 0,0.22439 -1e-5,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.45811,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55628,-0.16361 0.71522,-0.2384 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67315,-1.19202 -0.14023,-0.46746 -0.21035,-0.97699 -0.21035,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14025,-1.07048 -0.44877,-1.44445 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26178 -0.57497,0.44876 -0.15894,0.18699 -0.28516,0.40203 -0.37865,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16828,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7676" + style="fill:#000000;marker:none" + d="m 139.33374,831.16215 c -0.80404,-0.0187 -1.37434,-0.19166 -1.71091,-0.51888 -0.33657,-0.32722 -0.50486,-0.83676 -0.50486,-1.5286 l 0,-8.75087 1.30422,-0.22438 0,8.76489 c 0,0.21504 0.0187,0.39267 0.0561,0.53291 0.0374,0.14024 0.0982,0.25243 0.18231,0.33657 0.0841,0.0841 0.19633,0.14959 0.33658,0.19633 0.14023,0.0374 0.31319,0.0701 0.51888,0.0982 l -0.18231,1.09386" /> + <path + inkscape:connector-curvature="0" + id="path7678" + style="fill:#000000;marker:none" + d="m 143.44885,830.08231 c 0.30853,10e-6 0.57965,-0.005 0.81339,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0841 -0.32722,0.20568 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60302 0,0.46747 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70586,0.26646 1.22007,0.26645 m -0.11219,-6.5351 c 0.52356,10e-6 0.96297,0.0701 1.31824,0.21036 0.36462,0.13089 0.65444,0.32255 0.86948,0.57497 0.22438,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55775 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39267 -0.25243,-0.18698 -0.44877,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.2384,-1.03777 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.60769,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13088,0 0.26645,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42538 -0.0701,-0.63107 -0.0468,-0.21503 -0.13089,-0.40201 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29916 -0.50485,-0.39266 -0.20569,-0.10284 -0.47682,-0.15426 -0.81339,-0.15427 -0.43006,10e-6 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27616,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7680" + style="fill:#000000;marker:none" + d="m 157.3318,830.81155 c -0.29919,0.0748 -0.69653,0.15427 -1.19203,0.23841 -0.48616,0.0841 -1.05179,0.12621 -1.69688,0.12621 -0.56096,0 -1.0331,-0.0795 -1.41641,-0.2384 -0.38332,-0.16829 -0.69185,-0.40202 -0.92557,-0.70119 -0.23374,-0.29918 -0.40202,-0.64977 -0.50486,-1.05179 -0.10284,-0.41136 -0.15427,-0.8648 -0.15426,-1.36031 l 0,-4.09496 1.30421,0 0,3.81448 c 0,0.88818 0.14024,1.52393 0.42072,1.90724 0.28047,0.38332 0.75261,0.57498 1.4164,0.57498 0.14024,0 0.28515,-0.005 0.43474,-0.014 0.14959,-0.009 0.28982,-0.0187 0.42072,-0.0281 0.13088,-0.0187 0.24775,-0.0327 0.35059,-0.0421 0.11219,-0.0187 0.19166,-0.0374 0.23841,-0.0561 l 0,-6.15646 1.30422,0 0,7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7682" + style="fill:#000000;marker:none" + d="m 165.38455,830.81155 c -0.29919,0.0748 -0.69653,0.15427 -1.19203,0.23841 -0.48616,0.0841 -1.05179,0.12621 -1.69688,0.12621 -0.56096,0 -1.0331,-0.0795 -1.41641,-0.2384 -0.38332,-0.16829 -0.69185,-0.40202 -0.92557,-0.70119 -0.23374,-0.29918 -0.40202,-0.64977 -0.50486,-1.05179 -0.10284,-0.41136 -0.15427,-0.8648 -0.15426,-1.36031 l 0,-4.09496 1.30421,0 0,3.81448 c 0,0.88818 0.14024,1.52393 0.42072,1.90724 0.28047,0.38332 0.75261,0.57498 1.4164,0.57498 0.14024,0 0.28515,-0.005 0.43474,-0.014 0.14959,-0.009 0.28982,-0.0187 0.42072,-0.0281 0.13088,-0.0187 0.24775,-0.0327 0.35059,-0.0421 0.11219,-0.0187 0.19166,-0.0374 0.23841,-0.0561 l 0,-6.15646 1.30422,0 0,7.08203 m -1.24813,-9.84473 -1.97736,1.92127 -0.65912,-0.589 1.79505,-2.15967 0.84143,0.8274" /> + <path + inkscape:connector-curvature="0" + id="path7684" + style="fill:#000000;marker:none" + d="m 169.81915,831.16215 c -0.80404,-0.0187 -1.37434,-0.19166 -1.71091,-0.51888 -0.33657,-0.32722 -0.50486,-0.83676 -0.50486,-1.5286 l 0,-8.75087 1.30422,-0.22438 0,8.76489 c -1e-5,0.21504 0.0187,0.39267 0.0561,0.53291 0.0374,0.14024 0.0982,0.25243 0.18231,0.33657 0.0841,0.0841 0.19633,0.14959 0.33657,0.19633 0.14024,0.0374 0.3132,0.0701 0.51889,0.0982 l -0.18231,1.09386" /> + <path + inkscape:connector-curvature="0" + id="path7686" + style="fill:#000000;marker:none" + d="m 172.68614,823.72952 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36462 0.0281,0.66847 0.0841,0.91155 0.0561,0.23373 0.14023,0.42071 0.25242,0.56095 0.11219,0.13089 0.25243,0.22438 0.42072,0.28048 0.16828,0.0561 0.36462,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.9396,-0.12622 0.24307,-0.0935 0.41136,-0.15893 0.50486,-0.19633 l 0.25242,1.07984 c -0.13089,0.0654 -0.35995,0.14491 -0.68716,0.2384 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13089 -0.57498,-0.32254 -0.77131,-0.57497 -0.19633,-0.25243 -0.33657,-0.56096 -0.42071,-0.92558 -0.0748,-0.37396 -0.1122,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path7688" + style="fill:#000000;marker:none" + d="m 178.41269,831.02191 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61063 c -0.23373,10e-6 -0.43474,-0.0748 -0.60303,-0.22438 -0.15893,-0.15893 -0.2384,-0.36929 -0.2384,-0.63108 0,-0.26176 0.0795,-0.46745 0.2384,-0.61705 0.16829,-0.15892 0.3693,-0.23839 0.60303,-0.2384 0.23373,10e-6 0.43006,0.0795 0.589,0.2384 0.16828,0.1496 0.25243,0.35529 0.25243,0.61705 0,0.26179 -0.0841,0.47215 -0.25243,0.63108 -0.15894,0.14959 -0.35527,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7690" + style="fill:#000000;marker:none" + d="m 180.66921,823.93988 c 0.29917,-0.0748 0.69184,-0.15426 1.178,-0.23841 0.49551,-0.0841 1.06581,-0.12621 1.71091,-0.12621 0.46746,0 0.86012,0.0655 1.178,0.19633 0.31787,0.12155 0.58432,0.30386 0.79936,0.54693 0.0654,-0.0467 0.16828,-0.11218 0.30852,-0.19633 0.14024,-0.0841 0.3132,-0.16361 0.51889,-0.23841 0.20567,-0.0841 0.43473,-0.15425 0.68716,-0.21036 0.25242,-0.0654 0.52355,-0.0982 0.81339,-0.0982 0.56094,0 1.01905,0.0842 1.37433,0.25242 0.35526,0.15895 0.63106,0.388 0.82741,0.68717 0.20567,0.29918 0.34123,0.65445 0.40669,1.06581 0.0748,0.41137 0.11218,0.86014 0.11219,1.34629 l 0,4.09496 -1.30422,0 0,-3.81448 c -1e-5,-0.43006 -0.0234,-0.79936 -0.0701,-1.10788 -0.0374,-0.30852 -0.11687,-0.56563 -0.2384,-0.77132 -0.1122,-0.20567 -0.27114,-0.35526 -0.47681,-0.44876 -0.19634,-0.10283 -0.45345,-0.15425 -0.77131,-0.15426 -0.43942,10e-6 -0.80404,0.0608 -1.09386,0.18231 -0.28048,0.1122 -0.47214,0.21504 -0.57498,0.30852 0.0748,0.24309 0.13088,0.50954 0.16829,0.79936 0.0374,0.28983 0.0561,0.59368 0.0561,0.91155 l 0,4.09496 -1.30421,0 0,-3.81448 c -1e-5,-0.43006 -0.0234,-0.79936 -0.0701,-1.10788 -0.0468,-0.30852 -0.1309,-0.56563 -0.25243,-0.77132 -0.1122,-0.20567 -0.27113,-0.35526 -0.47681,-0.44876 -0.19634,-0.10283 -0.44877,-0.15425 -0.75729,-0.15426 -0.13089,10e-6 -0.27113,0.005 -0.42071,0.014 -0.1496,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.1309,0.009 -0.25244,0.0234 -0.36462,0.0421 -0.1122,0.0187 -0.18699,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7692" + style="fill:#000000;marker:none" + d="m 195.21653,830.08231 c 0.30852,10e-6 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44408,-0.0467 0.60303,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.40669,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41604,0.0888 -0.60303,0.18231 -0.17763,0.0841 -0.32722,0.20568 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60302 0,0.46747 0.14959,0.79469 0.44876,0.98167 0.29918,0.17764 0.70587,0.26646 1.22008,0.26645 m -0.11219,-6.5351 c 0.52355,10e-6 0.96296,0.0701 1.31824,0.21036 0.36461,0.13089 0.65444,0.32255 0.86948,0.57497 0.22437,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14023,1.12191 l 0,4.55775 c -0.11219,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25243,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57965,0.0421 -0.86947,0.0421 -0.41137,0 -0.79002,-0.0421 -1.13593,-0.12621 -0.34593,-0.0841 -0.6451,-0.21503 -0.89753,-0.39267 -0.25243,-0.18698 -0.44876,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.23841,-1.03777 0.16828,-0.28982 0.39266,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37397,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13089,0 0.26645,0.009 0.40669,0.0281 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19634,0.0421 l 0,-0.36462 c -1e-5,-0.21503 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.1309,-0.40201 -0.25243,-0.56096 -0.12155,-0.16828 -0.28983,-0.29916 -0.50486,-0.39266 -0.20569,-0.10284 -0.47681,-0.15426 -0.81338,-0.15427 -0.43007,10e-6 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7694" + style="fill:#000000;marker:none" + d="m 208.98728,823.72952 c -0.36463,1.36499 -0.79469,2.67388 -1.2902,3.92667 -0.48616,1.2528 -0.9583,2.3747 -1.4164,3.36572 l -1.17801,0 c -0.45811,-0.99102 -0.93492,-2.11292 -1.43043,-3.36572 -0.48616,-1.25279 -0.91155,-2.56168 -1.27617,-3.92667 l 1.40239,0 c 0.11219,0.45812 0.24307,0.94895 0.39266,1.4725 0.15894,0.51421 0.32255,1.02842 0.49084,1.54262 0.17763,0.50486 0.35527,0.9957 0.5329,1.4725 0.17764,0.47682 0.34592,0.90221 0.50486,1.27617 0.15894,-0.37396 0.32722,-0.79935 0.50486,-1.27617 0.17763,-0.4768 0.35059,-0.96764 0.51888,-1.4725 0.17763,-0.5142 0.34124,-1.02841 0.49084,-1.54262 0.15893,-0.52355 0.29449,-1.01438 0.40669,-1.4725 l 1.34629,0" /> + <path + inkscape:connector-curvature="0" + id="path7696" + style="fill:#000000;marker:none" + d="m 209.73448,827.38974 c 0,-0.64509 0.0935,-1.20605 0.28048,-1.68286 0.18698,-0.48616 0.43473,-0.88817 0.74326,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.23839 1.2341,-0.2384 0.98166,1e-5 1.73427,0.30853 2.25784,0.92557 0.52355,0.60771 0.78532,1.53795 0.78533,2.79074 -1e-5,0.0561 -1e-5,0.1309 0,0.22439 -1e-5,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38332,0.39267 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31786,-0.0841 0.55627,-0.16361 0.71521,-0.2384 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45811,-0.19633 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67314,-1.19202 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14025,-1.07048 -0.44876,-1.44445 -0.29918,-0.38331 -0.71522,-0.57497 -1.24813,-0.57498 -0.29917,10e-6 -0.56563,0.0608 -0.79935,0.18231 -0.22439,0.1122 -0.41605,0.26178 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40203 -0.37864,0.6451 -0.0842,0.24308 -0.14025,0.49084 -0.16829,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7698" + style="fill:#000000;marker:none" + d="m 222.81302,824.71119 c -0.19634,0.21503 -0.45812,0.51888 -0.78534,0.91155 -0.31787,0.39267 -0.66379,0.82741 -1.03776,1.30421 -0.36462,0.47682 -0.73392,0.977 -1.10788,1.50055 -0.36462,0.52356 -0.68717,1.02374 -0.96765,1.50055 l 4.01082,0 0,1.09386 -5.56746,0 0,-0.86948 c 0.22438,-0.41136 0.50018,-0.8648 0.8274,-1.36031 0.32723,-0.4955 0.66847,-0.98634 1.02374,-1.4725 0.36462,-0.49551 0.71522,-0.95829 1.05179,-1.38836 0.34592,-0.43941 0.64509,-0.8087 0.89753,-1.10788 l -3.60413,0 0,-1.09386 5.25894,0 0,0.98167" /> + <path + inkscape:connector-curvature="0" + id="path7700" + style="fill:#000000;marker:none" + d="m 228.76153,827.38974 c 0,0.37397 0.0374,0.72457 0.11219,1.05179 0.0748,0.31787 0.19633,0.59835 0.36462,0.84143 0.16829,0.23373 0.38332,0.42071 0.6451,0.56095 0.27112,0.13089 0.59367,0.19633 0.96764,0.19633 0.35527,0 0.68249,-0.0608 0.98167,-0.18231 0.29917,-0.12154 0.52823,-0.24775 0.68717,-0.37864 l 0,-4.59982 c -0.1309,-0.0374 -0.30853,-0.0701 -0.53291,-0.0982 -0.21503,-0.0281 -0.51888,-0.0421 -0.91155,-0.0421 -0.70119,1e-5 -1.26214,0.22907 -1.68286,0.68717 -0.42071,0.45812 -0.63107,1.11256 -0.63107,1.96334 m -1.36031,0 c 0,-0.589 0.0841,-1.11723 0.25243,-1.58469 0.17763,-0.47681 0.42539,-0.87883 0.74326,-1.20605 0.31787,-0.32722 0.70119,-0.57965 1.14996,-0.75729 0.44876,-0.17763 0.95361,-0.26645 1.51457,-0.26645 0.6077,0 1.1406,0.0468 1.59872,0.14023 0.46745,0.0841 0.85545,0.16362 1.16398,0.23841 l 0,9.66242 -1.30422,0 0,-2.91696 c -0.15894,0.10285 -0.40202,0.21036 -0.72924,0.32255 -0.31788,0.11219 -0.68717,0.16829 -1.10788,0.16829 -0.52356,0 -0.99102,-0.0935 -1.40239,-0.28048 -0.40201,-0.18698 -0.74326,-0.44876 -1.02374,-0.78533 -0.28047,-0.33657 -0.49551,-0.73859 -0.64509,-1.20605 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286" /> + <path + inkscape:connector-curvature="0" + id="path7702" + style="fill:#000000;marker:none" + d="m 241.88566,830.81155 c -0.29918,0.0748 -0.69652,0.15427 -1.19203,0.23841 -0.48616,0.0841 -1.05179,0.12621 -1.69688,0.12621 -0.56096,0 -1.03309,-0.0795 -1.41641,-0.2384 -0.38332,-0.16829 -0.69184,-0.40202 -0.92557,-0.70119 -0.23373,-0.29918 -0.40202,-0.64977 -0.50486,-1.05179 -0.10284,-0.41136 -0.15426,-0.8648 -0.15426,-1.36031 l 0,-4.09496 1.30422,0 0,3.81448 c -1e-5,0.88818 0.14023,1.52393 0.42071,1.90724 0.28047,0.38332 0.75261,0.57498 1.41641,0.57498 0.14023,0 0.28515,-0.005 0.43474,-0.014 0.14958,-0.009 0.28982,-0.0187 0.42071,-0.0281 0.13089,-0.0187 0.24775,-0.0327 0.3506,-0.0421 0.11218,-0.0187 0.19165,-0.0374 0.2384,-0.0561 l 0,-6.15646 1.30422,0 0,7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7704" + style="fill:#000000;marker:none" + d="m 243.72585,827.38974 c 0,-0.64509 0.0935,-1.20605 0.28048,-1.68286 0.18698,-0.48616 0.43474,-0.88817 0.74326,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71522 0.40202,-0.15893 0.81338,-0.23839 1.2341,-0.2384 0.98166,1e-5 1.73427,0.30853 2.25784,0.92557 0.52355,0.60771 0.78532,1.53795 0.78533,2.79074 -1e-5,0.0561 -1e-5,0.1309 0,0.22439 -1e-5,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38332,0.39267 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71521,-0.2384 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34628,0.14024 -0.63576,0 -1.18736,-0.0935 -1.65482,-0.28048 -0.45811,-0.19633 -0.83675,-0.46279 -1.13593,-0.79936 -0.29917,-0.33657 -0.52356,-0.73391 -0.67314,-1.19202 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14024,-1.07048 -0.44876,-1.44445 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56564,0.0608 -0.79936,0.18231 -0.22439,0.1122 -0.41605,0.26178 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40203 -0.37864,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16829,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7706" + style="fill:#000000;marker:none" + d="m 257.38593,831.16215 c -0.80403,-0.0187 -1.37433,-0.19166 -1.7109,-0.51888 -0.33658,-0.32722 -0.50486,-0.83676 -0.50486,-1.5286 l 0,-8.75087 1.30421,-0.22438 0,8.76489 c 0,0.21504 0.0187,0.39267 0.0561,0.53291 0.0374,0.14024 0.0982,0.25243 0.18231,0.33657 0.0841,0.0841 0.19633,0.14959 0.33657,0.19633 0.14024,0.0374 0.3132,0.0701 0.51888,0.0982 l -0.18231,1.09386" /> + <path + inkscape:connector-curvature="0" + id="path7708" + style="fill:#000000;marker:none" + d="m 265.4698,827.37571 c -1e-5,0.57966 -0.0842,1.10322 -0.25243,1.57067 -0.1683,0.46747 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33658 -0.65912,0.59835 -1.07983,0.78534 -0.42072,0.17763 -0.87884,0.26645 -1.37434,0.26645 -0.49551,0 -0.95362,-0.0888 -1.37433,-0.26645 -0.42072,-0.18699 -0.78534,-0.44876 -1.09386,-0.78534 -0.29918,-0.33657 -0.53291,-0.73858 -0.7012,-1.20605 -0.16828,-0.46745 -0.25243,-0.99101 -0.25242,-1.57067 -10e-6,-0.57029 0.0841,-1.08918 0.25242,-1.55664 0.16829,-0.47681 0.40202,-0.8835 0.7012,-1.22007 0.30852,-0.33657 0.67314,-0.59367 1.09386,-0.77132 0.42071,-0.18697 0.87882,-0.28046 1.37433,-0.28047 0.4955,1e-5 0.95362,0.0935 1.37434,0.28047 0.42071,0.17765 0.78065,0.43475 1.07983,0.77132 0.30852,0.33657 0.54692,0.74326 0.71522,1.22007 0.16828,0.46746 0.25242,0.98635 0.25243,1.55664 m -1.36032,0 c 0,-0.82272 -0.18699,-1.47249 -0.56095,-1.94931 -0.36462,-0.48615 -0.86481,-0.72923 -1.50055,-0.72924 -0.63575,10e-6 -1.14061,0.24309 -1.51457,0.72924 -0.36463,0.47682 -0.54693,1.12659 -0.54693,1.94931 0,0.82274 0.1823,1.47718 0.54693,1.96334 0.37396,0.47681 0.87882,0.71522 1.51457,0.71522 0.63574,0 1.13593,-0.23841 1.50055,-0.71522 0.37396,-0.48616 0.56095,-1.1406 0.56095,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7710" + style="fill:#000000;marker:none" + d="m 97.6457,848.69194 c -0.804036,-0.0187 -1.374338,-0.19166 -1.710908,-0.51888 -0.336573,-0.32722 -0.504859,-0.83675 -0.504858,-1.5286 l 0,-8.75087 1.304216,-0.22438 0,8.7649 c -2e-6,0.21503 0.0187,0.39266 0.0561,0.5329 0.03739,0.14024 0.09816,0.25243 0.18231,0.33657 0.08414,0.0842 0.196331,0.14959 0.336572,0.19634 0.140235,0.0374 0.313195,0.0701 0.518882,0.0982 l -0.18231,1.09386" /> + <path + inkscape:connector-curvature="0" + id="path7712" + style="fill:#000000;marker:none" + d="m 98.885933,844.91953 c -10e-7,-0.64509 0.09349,-1.20604 0.280476,-1.68286 0.186984,-0.48615 0.434738,-0.88817 0.743263,-1.20605 0.308518,-0.31787 0.663788,-0.55627 1.065808,-0.71521 0.40202,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,10e-6 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53796 0.78533,2.79075 0,0.0561 0,0.13089 0,0.22438 0,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38332,0.39267 0.98167,0.58901 1.79506,0.58901 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0842 0.55627,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65482,-0.28048 -0.45811,-0.19633 -0.83675,-0.46278 -1.135926,-0.79935 -0.299176,-0.33658 -0.523557,-0.73392 -0.673144,-1.19203 -0.140239,-0.46746 -0.210358,-0.97699 -0.210357,-1.5286 m 5.006507,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22439,0.1122 -0.41604,0.26179 -0.57498,0.44877 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0842,0.24309 -0.14024,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7714" + style="fill:#000000;marker:none" + d="m 108.43047,848.5517 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61063 c -0.23374,1e-5 -0.43474,-0.0748 -0.60303,-0.22438 -0.15894,-0.15893 -0.2384,-0.36929 -0.2384,-0.63107 0,-0.26177 0.0795,-0.46745 0.2384,-0.61705 0.16829,-0.15893 0.36929,-0.2384 0.60303,-0.23841 0.23372,1e-5 0.43006,0.0795 0.589,0.23841 0.16828,0.1496 0.25242,0.35528 0.25243,0.61705 -1e-5,0.26178 -0.0841,0.47214 -0.25243,0.63107 -0.15894,0.1496 -0.35528,0.22439 -0.589,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7716" + style="fill:#000000;marker:none" + d="m 112.38387,847.61211 c 0.53291,0 0.92557,-0.0701 1.17801,-0.21036 0.26177,-0.14024 0.39266,-0.36462 0.39266,-0.67314 0,-0.31788 -0.12622,-0.5703 -0.37864,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33658 -0.25244,-0.12153 -0.47214,-0.26177 -0.65912,-0.42071 -0.18699,-0.15893 -0.33658,-0.35059 -0.44877,-0.57498 -0.11219,-0.22437 -0.16828,-0.50018 -0.16828,-0.8274 0,-0.64509 0.2384,-1.15463 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94932,-0.57498 0.20567,10e-6 0.41136,0.014 0.61704,0.0421 0.20568,0.0187 0.39734,0.0468 0.57498,0.0842 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14959 -0.65912,-0.22439 -0.29918,-0.0841 -0.65912,-0.1262 -1.07983,-0.12621 -0.36463,10e-6 -0.6825,0.0748 -0.95363,0.22438 -0.27113,0.14025 -0.40669,0.36463 -0.40669,0.67315 0,0.15894 0.0281,0.29918 0.0841,0.42071 0.0654,0.12155 0.15893,0.23374 0.28047,0.33657 0.13089,0.0935 0.28983,0.18232 0.47681,0.26646 0.18698,0.0841 0.41137,0.17296 0.67315,0.26645 0.34591,0.13089 0.65444,0.26178 0.92557,0.39267 0.27112,0.12154 0.50018,0.26645 0.68717,0.43473 0.19633,0.16829 0.34591,0.37398 0.44876,0.61705 0.10284,0.23374 0.15426,0.52356 0.15426,0.86948 0,0.67315 -0.25243,1.18268 -0.75728,1.5286 -0.49552,0.34592 -1.20606,0.51888 -2.13163,0.51888 -0.6451,0 -1.14995,-0.0561 -1.51457,-0.16829 -0.36462,-0.10284 -0.61238,-0.18231 -0.74326,-0.2384 l 0.2384,-1.12191 c 0.14959,0.0561 0.38799,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16829 1.30421,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path7718" + style="fill:#000000;marker:none" + d="m 118.15205,841.25931 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36462 0.028,0.66847 0.0841,0.91155 0.0561,0.23373 0.14024,0.42072 0.25243,0.56095 0.11219,0.13089 0.25243,0.22438 0.42072,0.28048 0.16828,0.0561 0.36461,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.9396,-0.12621 0.24307,-0.0935 0.41136,-0.15894 0.50485,-0.19634 l 0.25243,1.07984 c -0.13089,0.0654 -0.35995,0.14491 -0.68717,0.2384 -0.32722,0.10285 -0.70119,0.15427 -1.1219,0.15427 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31788,-0.13089 -0.57498,-0.32255 -0.77131,-0.57498 -0.19634,-0.25243 -0.33657,-0.56095 -0.42072,-0.92557 -0.0748,-0.37397 -0.11219,-0.80403 -0.11219,-1.2902 l 0,-6.50706 1.30422,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path7720" + style="fill:#000000;marker:none" + d="m 122.03074,844.91953 c 0,-0.64509 0.0935,-1.20604 0.28047,-1.68286 0.18699,-0.48615 0.43474,-0.88817 0.74327,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71521 0.40201,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,10e-6 1.73427,0.30853 2.25783,0.92557 0.52355,0.60771 0.78533,1.53796 0.78534,2.79075 -1e-5,0.0561 -1e-5,0.13089 0,0.22438 -1e-5,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38331,0.39267 0.98166,0.58901 1.79505,0.58901 0.45811,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0842 0.55628,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46278 -1.13593,-0.79935 -0.29918,-0.33658 -0.52356,-0.73392 -0.67315,-1.19203 -0.14023,-0.46746 -0.21035,-0.97699 -0.21035,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14025,-1.07048 -0.44877,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26179 -0.57497,0.44877 -0.15894,0.18699 -0.28516,0.40202 -0.37865,0.64509 -0.0841,0.24309 -0.14024,0.49084 -0.16828,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7722" + style="fill:#000000;marker:none" + d="m 133.09642,844.91953 c 0,-0.64509 0.0935,-1.20604 0.28047,-1.68286 0.18699,-0.48615 0.43474,-0.88817 0.74327,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71521 0.40201,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,10e-6 1.73427,0.30853 2.25783,0.92557 0.52355,0.60771 0.78533,1.53796 0.78534,2.79075 -1e-5,0.0561 -1e-5,0.13089 0,0.22438 -1e-5,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38332,0.39267 0.98167,0.58901 1.79505,0.58901 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31786,-0.0842 0.55627,-0.16361 0.71521,-0.23841 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45811,-0.19633 -0.83676,-0.46278 -1.13593,-0.79935 -0.29918,-0.33658 -0.52356,-0.73392 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14025,-1.07048 -0.44877,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26179 -0.57497,0.44877 -0.15894,0.18699 -0.28516,0.40202 -0.37865,0.64509 -0.0841,0.24309 -0.14024,0.49084 -0.16828,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7724" + style="fill:#000000;marker:none" + d="m 143.52445,848.69194 c -0.80403,-0.0187 -1.37433,-0.19166 -1.7109,-0.51888 -0.33658,-0.32722 -0.50486,-0.83675 -0.50486,-1.5286 l 0,-8.75087 1.30421,-0.22438 0,8.7649 c 0,0.21503 0.0187,0.39266 0.0561,0.5329 0.0374,0.14024 0.0982,0.25243 0.18231,0.33657 0.0841,0.0842 0.19633,0.14959 0.33657,0.19634 0.14024,0.0374 0.3132,0.0701 0.51888,0.0982 l -0.18231,1.09386" /> + <path + inkscape:connector-curvature="0" + id="path7726" + style="fill:#000000;marker:none" + d="m 153.11544,842.80193 c -0.15894,-0.13088 -0.38799,-0.2571 -0.68716,-0.37864 -0.29918,-0.12153 -0.62641,-0.1823 -0.98167,-0.18231 -0.37398,10e-6 -0.69652,0.0701 -0.96765,0.21036 -0.26178,0.13089 -0.47681,0.31788 -0.64509,0.56095 -0.16829,0.23374 -0.28983,0.51421 -0.36462,0.84143 -0.0748,0.32723 -0.1122,0.67782 -0.11219,1.05179 -1e-5,0.85078 0.21035,1.5099 0.63107,1.97736 0.42071,0.45811 0.98166,0.68717 1.68286,0.68717 0.35526,0 0.64976,-0.014 0.8835,-0.0421 0.24307,-0.0374 0.43006,-0.0748 0.56095,-0.11219 l 0,-4.61384 m 0,-4.90834 1.30422,-0.22438 0,10.67214 c -0.29918,0.0841 -0.6825,0.16828 -1.14995,0.25243 -0.46747,0.0841 -1.00505,0.12621 -1.61275,0.12621 -0.56095,0 -1.06581,-0.0888 -1.51457,-0.26645 -0.44876,-0.17764 -0.83208,-0.43007 -1.14995,-0.75729 -0.31788,-0.32722 -0.56563,-0.72456 -0.74327,-1.19203 -0.16828,-0.4768 -0.25243,-1.00971 -0.25243,-1.59871 0,-0.56095 0.0701,-1.07516 0.21036,-1.54262 0.14959,-0.46746 0.36462,-0.86948 0.6451,-1.20605 0.28047,-0.33657 0.62172,-0.59835 1.02374,-0.78534 0.41136,-0.18698 0.87882,-0.28047 1.40238,-0.28048 0.42071,10e-6 0.79001,0.0561 1.10788,0.16829 0.32722,0.1122 0.5703,0.21971 0.72924,0.32255 l 0,-3.68827" /> + <path + inkscape:connector-curvature="0" + id="path7728" + style="fill:#000000;marker:none" + d="m 163.11224,844.90551 c 0,0.57965 -0.0842,1.10321 -0.25242,1.57067 -0.1683,0.46746 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78533 -0.42072,0.17764 -0.87883,0.26645 -1.37433,0.26645 -0.49551,0 -0.95362,-0.0888 -1.37434,-0.26645 -0.42071,-0.18698 -0.78533,-0.44876 -1.09386,-0.78533 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16828,-0.46746 -0.25243,-0.99102 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55665 0.16829,-0.4768 0.40202,-0.88349 0.70119,-1.22007 0.30853,-0.33657 0.67315,-0.59367 1.09386,-0.77131 0.42072,-0.18698 0.87883,-0.28047 1.37434,-0.28048 0.4955,10e-6 0.95361,0.0935 1.37433,0.28048 0.42071,0.17764 0.78066,0.43474 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71522,1.22007 0.16827,0.46747 0.25242,0.98635 0.25242,1.55665 m -1.36031,0 c 0,-0.82273 -0.18699,-1.4725 -0.56095,-1.94932 -0.36463,-0.48615 -0.86481,-0.72923 -1.50055,-0.72923 -0.63575,0 -1.14061,0.24308 -1.51457,0.72923 -0.36463,0.47682 -0.54694,1.12659 -0.54693,1.94932 -1e-5,0.82273 0.1823,1.47718 0.54693,1.96333 0.37396,0.47682 0.87882,0.71522 1.51457,0.71522 0.63574,0 1.13592,-0.2384 1.50055,-0.71522 0.37396,-0.48615 0.56095,-1.1406 0.56095,-1.96333" /> + <path + inkscape:connector-curvature="0" + id="path7730" + style="fill:#000000;marker:none" + d="m 168.11656,848.71999 c -0.589,0 -1.10788,-0.0935 -1.55664,-0.28048 -0.43942,-0.18698 -0.81339,-0.44876 -1.12191,-0.78533 -0.29917,-0.33657 -0.52356,-0.73391 -0.67314,-1.19203 -0.14959,-0.46746 -0.22438,-0.98166 -0.22438,-1.54262 0,-0.56095 0.0795,-1.07515 0.2384,-1.54262 0.16829,-0.46746 0.40202,-0.86947 0.70119,-1.20605 0.29918,-0.34591 0.6638,-0.61237 1.09386,-0.79936 0.43941,-0.19633 0.92557,-0.29449 1.45848,-0.2945 0.32722,10e-6 0.65444,0.0281 0.98167,0.0841 0.32722,0.0561 0.64042,0.14492 0.9396,0.26646 l -0.2945,1.10788 c -0.19634,-0.0935 -0.4254,-0.16828 -0.68717,-0.22438 -0.25244,-0.0561 -0.52356,-0.0841 -0.81338,-0.0841 -0.72925,0 -1.2902,0.22906 -1.68286,0.68716 -0.38332,0.45812 -0.57498,1.12659 -0.57498,2.00541 0,0.39267 0.0421,0.75262 0.12621,1.07984 0.0935,0.32722 0.23373,0.6077 0.42072,0.84143 0.19633,0.23373 0.44408,0.41604 0.74326,0.54693 0.29917,0.12154 0.66379,0.18231 1.09386,0.18231 0.34592,0 0.65912,-0.0327 0.9396,-0.0982 0.28047,-0.0654 0.50018,-0.13556 0.65912,-0.21036 l 0.18231,1.09386 c -0.0748,0.0467 -0.18232,0.0935 -0.32255,0.14024 -0.14024,0.0374 -0.29918,0.0701 -0.47681,0.0982 -0.17764,0.0374 -0.3693,0.0654 -0.57498,0.0841 -0.19634,0.0281 -0.388,0.0421 -0.57498,0.0421" /> + <path + inkscape:connector-curvature="0" + id="path7732" + style="fill:#000000;marker:none" + d="m 177.27194,848.34135 c -0.29919,0.0748 -0.69653,0.15426 -1.19203,0.2384 -0.48616,0.0841 -1.05179,0.12622 -1.69688,0.12622 -0.56096,0 -1.0331,-0.0795 -1.41641,-0.23841 -0.38332,-0.16828 -0.69185,-0.40201 -0.92557,-0.70119 -0.23374,-0.29917 -0.40202,-0.64977 -0.50486,-1.05179 -0.10284,-0.41136 -0.15427,-0.8648 -0.15426,-1.36031 l 0,-4.09496 1.30421,0 0,3.81448 c 0,0.88818 0.14024,1.52393 0.42072,1.90724 0.28047,0.38332 0.75261,0.57498 1.4164,0.57498 0.14024,0 0.28515,-0.005 0.43474,-0.014 0.14959,-0.009 0.28982,-0.0187 0.42072,-0.0281 0.13088,-0.0187 0.24775,-0.0327 0.35059,-0.0421 0.11219,-0.0187 0.19166,-0.0374 0.23841,-0.0561 l 0,-6.15646 1.30422,0 0,7.08204" /> + <path + inkscape:connector-curvature="0" + id="path7734" + style="fill:#000000;marker:none" + d="m 179.51882,841.46967 c 0.29917,-0.0748 0.69184,-0.15426 1.178,-0.23841 0.49551,-0.0841 1.06581,-0.1262 1.71091,-0.12621 0.46745,10e-6 0.86012,0.0654 1.178,0.19633 0.31787,0.12155 0.58432,0.30386 0.79936,0.54693 0.0654,-0.0467 0.16828,-0.11218 0.30852,-0.19633 0.14024,-0.0841 0.3132,-0.16361 0.51889,-0.23841 0.20567,-0.0841 0.43473,-0.15425 0.68716,-0.21035 0.25242,-0.0654 0.52355,-0.0982 0.81339,-0.0982 0.56094,1e-5 1.01905,0.0842 1.37433,0.25243 0.35526,0.15894 0.63106,0.388 0.82741,0.68717 0.20567,0.29918 0.34123,0.65445 0.40669,1.06581 0.0748,0.41137 0.11218,0.86013 0.11219,1.34628 l 0,4.09496 -1.30422,0 0,-3.81448 c -1e-5,-0.43006 -0.0234,-0.79935 -0.0701,-1.10788 -0.0374,-0.30852 -0.11687,-0.56562 -0.2384,-0.77131 -0.1122,-0.20568 -0.27114,-0.35527 -0.47681,-0.44876 -0.19634,-0.10284 -0.45345,-0.15426 -0.77131,-0.15427 -0.43942,1e-5 -0.80404,0.0608 -1.09386,0.18231 -0.28049,0.1122 -0.47214,0.21504 -0.57498,0.30853 0.0748,0.24308 0.13088,0.50953 0.16829,0.79936 0.0374,0.28983 0.0561,0.59368 0.0561,0.91154 l 0,4.09496 -1.30421,0 0,-3.81448 c -1e-5,-0.43006 -0.0234,-0.79935 -0.0701,-1.10788 -0.0468,-0.30852 -0.1309,-0.56562 -0.25243,-0.77131 -0.1122,-0.20568 -0.27114,-0.35527 -0.47681,-0.44876 -0.19634,-0.10284 -0.44877,-0.15426 -0.75729,-0.15427 -0.13089,1e-5 -0.27113,0.005 -0.42072,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43473,0.0421 -0.1309,0.009 -0.25244,0.0234 -0.36462,0.0421 -0.1122,0.0187 -0.18699,0.0327 -0.22439,0.0421 l 0,6.15646 -1.30421,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7736" + style="fill:#000000;marker:none" + d="m 191.19124,844.91953 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30853,-0.31787 0.6638,-0.55627 1.06582,-0.71521 0.40201,-0.15893 0.81337,-0.2384 1.23409,-0.23841 0.98167,10e-6 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53796 0.78533,2.79075 0,0.0561 0,0.13089 0,0.22438 0,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38331,0.39267 0.98166,0.58901 1.79505,0.58901 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0842 0.55627,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46278 -1.13593,-0.79935 -0.29918,-0.33658 -0.52356,-0.73392 -0.67315,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26179 -0.57498,0.44877 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0842,0.24309 -0.14024,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7738" + style="fill:#000000;marker:none" + d="m 199.43157,841.46967 c 0.29917,-0.0748 0.69651,-0.15426 1.19202,-0.23841 0.49551,-0.0841 1.06581,-0.1262 1.71091,-0.12621 0.57965,10e-6 1.06113,0.0842 1.44446,0.25243 0.38331,0.15894 0.68716,0.388 0.91155,0.68717 0.23372,0.28983 0.39733,0.64042 0.49083,1.05178 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c 0,-0.44876 -0.0327,-0.83207 -0.0982,-1.14995 -0.0561,-0.31787 -0.15427,-0.57497 -0.2945,-0.77131 -0.14025,-0.19633 -0.32723,-0.33657 -0.56096,-0.42072 -0.23373,-0.0935 -0.52356,-0.14023 -0.86948,-0.14024 -0.14024,10e-6 -0.28515,0.005 -0.43473,0.014 -0.1496,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.1309,0.009 -0.25244,0.0234 -0.36462,0.0421 -0.10285,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7740" + style="fill:#000000;marker:none" + d="m 208.70438,841.25931 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36462 0.0281,0.66847 0.0842,0.91155 0.0561,0.23373 0.14023,0.42072 0.25243,0.56095 0.11218,0.13089 0.25242,0.22438 0.42071,0.28048 0.16828,0.0561 0.36462,0.0841 0.589,0.0841 0.39267,0 0.70586,-0.0421 0.9396,-0.12621 0.24307,-0.0935 0.41136,-0.15894 0.50486,-0.19634 l 0.25243,1.07984 c -0.1309,0.0654 -0.35995,0.14491 -0.68717,0.2384 -0.32723,0.10285 -0.7012,0.15427 -1.12191,0.15427 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13089 -0.57497,-0.32255 -0.77131,-0.57498 -0.19633,-0.25243 -0.33657,-0.56095 -0.42071,-0.92557 -0.0748,-0.37397 -0.11219,-0.80403 -0.11219,-1.2902 l 0,-6.50706 1.30421,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path7742" + style="fill:#000000;marker:none" + d="m 219.37193,844.90551 c -1e-5,0.57965 -0.0841,1.10321 -0.25243,1.57067 -0.1683,0.46746 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33657 -0.65912,0.59835 -1.07983,0.78533 -0.42072,0.17764 -0.87883,0.26645 -1.37434,0.26645 -0.49551,0 -0.95362,-0.0888 -1.37433,-0.26645 -0.42072,-0.18698 -0.78534,-0.44876 -1.09386,-0.78533 -0.29918,-0.33657 -0.53291,-0.73859 -0.7012,-1.20605 -0.16828,-0.46746 -0.25243,-0.99102 -0.25242,-1.57067 -1e-5,-0.5703 0.0841,-1.08918 0.25242,-1.55665 0.16829,-0.4768 0.40202,-0.88349 0.7012,-1.22007 0.30852,-0.33657 0.67314,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87882,-0.28047 1.37433,-0.28048 0.49551,10e-6 0.95362,0.0935 1.37434,0.28048 0.42071,0.17764 0.78065,0.43474 1.07983,0.77131 0.30852,0.33658 0.54692,0.74327 0.71522,1.22007 0.16828,0.46747 0.25242,0.98635 0.25243,1.55665 m -1.36032,0 c 0,-0.82273 -0.18699,-1.4725 -0.56095,-1.94932 -0.36462,-0.48615 -0.86481,-0.72923 -1.50055,-0.72923 -0.63575,0 -1.14061,0.24308 -1.51457,0.72923 -0.36463,0.47682 -0.54693,1.12659 -0.54693,1.94932 0,0.82273 0.1823,1.47718 0.54693,1.96333 0.37396,0.47682 0.87882,0.71522 1.51457,0.71522 0.63574,0 1.13593,-0.2384 1.50055,-0.71522 0.37396,-0.48615 0.56095,-1.1406 0.56095,-1.96333" /> + </g> + <g + transform="translate(0,435.8268)" + id="g7744" + style="font-size:14.02383423px;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:#00ff00;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"> + <path + inkscape:connector-curvature="0" + id="path7746" + style="fill:#000000;marker:none" + d="m 150.73951,826.59859 7.01192,0 0,1.10788 -7.01192,0 0,-1.10788" /> + </g> + <g + transform="translate(0,435.8268)" + id="g7748" + style="font-size:14.02383423px;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:#00ff00;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"> + <path + inkscape:connector-curvature="0" + id="path7750" + style="fill:#000000;marker:none" + d="m 252.41229,826.59859 7.01192,0 0,1.10788 -7.01192,0 0,-1.10788" /> + </g> + <g + transform="translate(0,435.8268)" + id="g7752" + style="font-size:14.02383423px;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:#00ff00;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"> + <path + inkscape:connector-curvature="0" + id="path7754" + style="fill:#000000;marker:none" + d="m 259.83551,826.59859 7.01191,0 0,1.10788 -7.01191,0 0,-1.10788" /> + </g> + <g + style="display:inline" + transform="translate(110,50.83675)" + id="g7756"> + <text + transform="scale(0.99912117,1.0008796)" + sodipodi:linespacing="125%" + id="text7758" + 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="tspan7760" + style="font-size:32px;font-weight:bold;fill:#aa4400" + y="122.68937" + x="101.1684" + sodipodi:role="line">documentos</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="text7762" + 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="tspan7764">explicando los</tspan></text> + </g> + <text + transform="translate(0,435.8268)" + 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="596.65607" + y="-360.6748" + id="text7766" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="596.65607" + y="-360.6748" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan7768">...pero pueden ser de muchos </tspan><tspan + sodipodi:role="line" + x="596.65607" + y="-345.6748" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan7770">más tipos y formas:</tspan><tspan + id="tspan7772" + sodipodi:role="line" + x="596.65607" + y="-330.6748" + style="font-size:12px;font-weight:normal;fill:#aa4400">una votación, un dibujo, </tspan><tspan + id="tspan7774" + sodipodi:role="line" + x="596.65607" + y="-315.6748" + style="font-size:12px;font-weight:bold;fill:#aa4400" /></text> + <g + transform="translate(0,435.8268)" + id="g7776" + style="font-size:14.02383423px;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:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"> + <path + inkscape:connector-curvature="0" + id="path7778" + style="fill:#000000;marker:none" + d="m 838.81492,-348.89388 c -10e-6,0.35527 0.12621,0.64509 0.37864,0.86948 0.26178,0.23372 0.62172,0.35059 1.07983,0.35059 0.61705,0 1.22007,-0.15894 1.80908,-0.47681 l 0.36462,1.00972 c -0.31788,0.16828 -0.67782,0.30384 -1.07984,0.40669 -0.39267,0.10284 -0.81338,0.15426 -1.26214,0.15426 -0.50486,0 -0.92558,-0.0654 -1.26215,-0.19633 -0.33657,-0.13089 -0.61237,-0.29918 -0.8274,-0.50486 -0.20569,-0.20569 -0.35527,-0.43942 -0.44877,-0.70119 -0.0841,-0.25243 -0.12621,-0.50486 -0.12621,-0.75729 0,-0.30852 0.0561,-0.58433 0.16829,-0.82741 0.12154,-0.24308 0.27112,-0.47213 0.44876,-0.68716 0.17763,-0.22438 0.36462,-0.43474 0.56095,-0.63108 0.20568,-0.19633 0.39734,-0.40201 0.57498,-0.61705 0.17763,-0.22437 0.32254,-0.4581 0.43474,-0.70119 0.12154,-0.24307 0.18231,-0.51888 0.18231,-0.8274 0,-0.0467 0,-0.0888 0,-0.12622 0,-0.0467 -0.005,-0.0935 -0.014,-0.14024 l 1.09386,0 c 0.0374,0.18699 0.0561,0.3693 0.0561,0.54693 -10e-6,0.29918 -0.0561,0.57031 -0.16829,0.81339 -0.10284,0.24308 -0.23373,0.47213 -0.39266,0.68716 -0.1496,0.20569 -0.31788,0.40202 -0.50486,0.589 -0.18699,0.18699 -0.35995,0.37397 -0.51888,0.56096 -0.14959,0.18698 -0.28048,0.37864 -0.39267,0.57497 -0.10285,0.19634 -0.15427,0.4067 -0.15426,0.63108 m 0.51888,-6.67535 c 0,-0.25242 0.0841,-0.47213 0.25243,-0.65912 0.16828,-0.18698 0.39734,-0.28047 0.68716,-0.28047 0.28983,0 0.51888,0.0935 0.68717,0.28047 0.16828,0.18699 0.25243,0.4067 0.25243,0.65912 0,0.25244 -0.0842,0.47214 -0.25243,0.65912 -0.16829,0.18699 -0.39734,0.28048 -0.68717,0.28048 -0.28982,0 -0.51888,-0.0935 -0.68716,-0.28048 -0.16829,-0.18698 -0.25243,-0.40668 -0.25243,-0.65912" /> + <path + inkscape:connector-curvature="0" + id="path7780" + style="fill:#000000;marker:none" + d="m 851.11973,-358.93495 c -0.35527,1.02843 -0.69652,1.98205 -1.02374,2.86086 -0.31788,0.86949 -0.63108,1.69689 -0.93959,2.48222 -0.30853,0.78534 -0.61706,1.53795 -0.92558,2.25784 -0.29918,0.71054 -0.6077,1.41641 -0.92557,2.1176 l -1.27617,0 c -0.31787,-0.70119 -0.63107,-1.40706 -0.93959,-2.1176 -0.29918,-0.71989 -0.60771,-1.4725 -0.92558,-2.25784 -0.30852,-0.78533 -0.6264,-1.61273 -0.95362,-2.48222 -0.32722,-0.87881 -0.66379,-1.83243 -1.00971,-2.86086 l 1.50055,0 c 0.50485,1.47719 1.00036,2.89827 1.48652,4.26325 0.48616,1.36499 0.98634,2.64583 1.50055,3.84253 0.5142,-1.18735 1.01439,-2.46352 1.50055,-3.82851 0.48616,-1.37433 0.97699,-2.80008 1.47251,-4.27727 l 1.45847,0" /> + <path + inkscape:connector-curvature="0" + id="path7782" + style="fill:#000000;marker:none" + d="m 854.49751,-350.15603 c 0.30852,0 0.57964,-0.005 0.81338,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0841 -0.32722,0.20568 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.35059 -0.18231,0.60302 0,0.46746 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70587,0.26645 1.22008,0.26645 m -0.1122,-6.5351 c 0.52356,0 0.96297,0.0701 1.31825,0.21035 0.36461,0.1309 0.65444,0.32256 0.86947,0.57498 0.22438,0.24309 0.38332,0.53759 0.47681,0.8835 0.0935,0.33658 0.14024,0.71055 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.028 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57965,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0842 -0.6451,-0.21503 -0.89752,-0.39267 -0.25243,-0.18698 -0.44877,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.2384,-1.03777 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13088,0 0.26645,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42539 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40202 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29917 -0.50485,-0.39267 -0.20569,-0.10283 -0.47682,-0.15425 -0.81339,-0.15426 -0.43006,1e-5 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15426,-1.07984 c 0.16828,-0.0748 0.44876,-0.1449 0.84143,-0.21035 0.39266,-0.0748 0.81805,-0.11219 1.27616,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7784" + style="fill:#000000;marker:none" + d="m 861.03941,-350.15603 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26177,-0.14023 0.39266,-0.36461 0.39267,-0.67314 -1e-5,-0.31787 -0.12622,-0.5703 -0.37865,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.1122,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.2384,-1.15462 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94932,-0.57497 0.20568,0 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39733,0.0468 0.57497,0.0841 0.17763,0.0281 0.3319,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12622 -0.36462,10e-6 -0.6825,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.4067,0.36462 -0.40669,0.67314 -10e-6,0.15894 0.028,0.29918 0.0841,0.42072 0.0654,0.12154 0.15893,0.23373 0.28048,0.33657 0.13088,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0842 0.41136,0.17296 0.67314,0.26645 0.34592,0.1309 0.65444,0.26179 0.92557,0.39267 0.27113,0.12154 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34592,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52356 0.15427,0.86948 -10e-6,0.67314 -0.25244,1.18267 -0.75729,1.52859 -0.49551,0.34592 -1.20605,0.51889 -2.13162,0.51889 -0.6451,0 -1.14996,-0.0561 -1.51458,-0.16829 -0.36462,-0.10284 -0.61237,-0.18231 -0.74326,-0.23841 l 0.2384,-1.1219 c 0.14959,0.0561 0.388,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16828 1.30422,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path7786" + style="fill:#000000;marker:none" + d="m 871.28776,-350.15603 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44409,-0.0467 0.60303,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19633,0 -0.40669,0.014 -0.63107,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32723,0.20568 -0.44877,0.36462 -0.12154,0.14959 -0.18231,0.35059 -0.18231,0.60302 0,0.46746 0.14959,0.79469 0.44877,0.98167 0.29917,0.17764 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.5351 c 0.52355,0 0.96296,0.0701 1.31824,0.21035 0.36461,0.1309 0.65444,0.32256 0.86948,0.57498 0.22437,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27114,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0841 -0.25243,0.028 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34593,-0.0842 -0.6451,-0.21503 -0.89753,-0.39267 -0.25243,-0.18698 -0.44876,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.23841,-1.03777 0.16828,-0.28982 0.39266,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37397,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13089,0 0.26645,0.009 0.40669,0.0281 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13089,0.0187 0.24308,0.0374 0.33657,0.0561 0.0935,0.0187 0.15894,0.0327 0.19634,0.0421 l 0,-0.36462 c -10e-6,-0.21503 -0.0234,-0.42539 -0.0701,-0.63107 -0.0467,-0.21503 -0.1309,-0.40202 -0.25243,-0.56096 -0.12155,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20569,-0.10283 -0.47681,-0.15425 -0.81338,-0.15426 -0.43007,1e-5 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07984 c 0.16828,-0.0748 0.44876,-0.1449 0.84143,-0.21035 0.39267,-0.0748 0.81805,-0.11219 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7788" + style="fill:#000000;marker:none" + d="m 884.42743,-352.8486 c 0,-0.85078 -0.21036,-1.50522 -0.63107,-1.96334 -0.42072,-0.45811 -0.98167,-0.68716 -1.68286,-0.68717 -0.39267,10e-6 -0.70119,0.014 -0.92557,0.0421 -0.21504,0.0281 -0.388,0.0608 -0.51888,0.0982 l 0,4.59982 c 0.15893,0.13089 0.38799,0.2571 0.68716,0.37864 0.29918,0.12154 0.6264,0.18231 0.98167,0.18231 0.37397,0 0.69184,-0.0654 0.95362,-0.19633 0.27113,-0.14024 0.49083,-0.32722 0.65912,-0.56096 0.16828,-0.24307 0.28982,-0.52355 0.36462,-0.84143 0.0748,-0.32722 0.11219,-0.67781 0.11219,-1.05178 m 1.36032,0 c -10e-6,0.5516 -0.0748,1.06114 -0.22438,1.52859 -0.14025,0.46747 -0.35061,0.86948 -0.63108,1.20605 -0.28048,0.33658 -0.6264,0.59835 -1.03776,0.78534 -0.40202,0.18698 -0.86481,0.28048 -1.38836,0.28048 -0.42072,0 -0.79469,-0.0561 -1.12191,-0.16829 -0.31787,-0.11219 -0.55628,-0.21971 -0.71521,-0.32255 l 0,2.91696 -1.30422,0 0,-9.66242 c 0.30852,-0.0748 0.69184,-0.15426 1.14995,-0.23841 0.46746,-0.0935 1.00504,-0.14023 1.61275,-0.14024 0.56094,10e-6 1.0658,0.0888 1.51457,0.26646 0.44876,0.17764 0.83207,0.43007 1.14995,0.75728 0.31787,0.32723 0.56095,0.72925 0.72924,1.20605 0.17763,0.46747 0.26645,0.9957 0.26646,1.5847" /> + <path + inkscape:connector-curvature="0" + id="path7790" + style="fill:#000000;marker:none" + d="m 894.07364,-352.86263 c 0,0.57966 -0.0841,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.40669,0.86948 -0.71521,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78534 -0.42072,0.17763 -0.87883,0.26645 -1.37433,0.26645 -0.49551,0 -0.95363,-0.0888 -1.37434,-0.26645 -0.42071,-0.18699 -0.78533,-0.44877 -1.09386,-0.78534 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16829,-0.46746 -0.25243,-0.99101 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55664 0.16829,-0.47681 0.40202,-0.8835 0.70119,-1.22008 0.30853,-0.33656 0.67315,-0.59367 1.09386,-0.77131 0.42071,-0.18697 0.87883,-0.28047 1.37434,-0.28047 0.4955,0 0.95361,0.0935 1.37433,0.28047 0.42071,0.17764 0.78066,0.43475 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71521,1.22008 0.16828,0.46746 0.25243,0.98634 0.25243,1.55664 m -1.36031,0 c 0,-0.82272 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48615 -0.86481,-0.72923 -1.50055,-0.72924 -0.63575,10e-6 -1.14061,0.24309 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12659 -0.54693,1.94931 0,0.82274 0.18231,1.47718 0.54693,1.96334 0.37397,0.47681 0.87883,0.71522 1.51458,0.71521 0.63574,10e-6 1.13592,-0.2384 1.50055,-0.71521 0.37396,-0.48616 0.56095,-1.1406 0.56095,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path7792" + style="fill:#000000;marker:none" + d="m 900.62058,-354.9662 c -0.15894,-0.13089 -0.388,-0.2571 -0.68717,-0.37865 -0.29918,-0.12153 -0.6264,-0.1823 -0.98166,-0.18231 -0.37398,10e-6 -0.69652,0.0701 -0.96765,0.21036 -0.26178,0.1309 -0.47681,0.31788 -0.6451,0.56095 -0.16828,0.23374 -0.28982,0.51422 -0.36461,0.84143 -0.0748,0.32723 -0.1122,0.67783 -0.1122,1.05179 0,0.85078 0.21036,1.5099 0.63108,1.97736 0.42071,0.45812 0.98166,0.68717 1.68286,0.68717 0.35526,0 0.64976,-0.014 0.8835,-0.0421 0.24307,-0.0374 0.43006,-0.0748 0.56095,-0.11219 l 0,-4.61384 m 0,-4.90834 1.30422,-0.22439 0,10.67214 c -0.29918,0.0841 -0.6825,0.16829 -1.14996,0.25243 -0.46746,0.0841 -1.00504,0.12622 -1.61274,0.12622 -0.56095,0 -1.06581,-0.0888 -1.51457,-0.26646 -0.44877,-0.17763 -0.83208,-0.43006 -1.14996,-0.75728 -0.31787,-0.32723 -0.56562,-0.72457 -0.74326,-1.19203 -0.16829,-0.47681 -0.25243,-1.00971 -0.25243,-1.59872 0,-0.56095 0.0701,-1.07515 0.21036,-1.54262 0.14959,-0.46745 0.36462,-0.86947 0.6451,-1.20605 0.28047,-0.33656 0.62172,-0.59834 1.02374,-0.78533 0.41136,-0.18698 0.87882,-0.28047 1.40238,-0.28048 0.42071,1e-5 0.79,0.0561 1.10788,0.16829 0.32722,0.11219 0.5703,0.21971 0.72924,0.32254 l 0,-3.68826" /> + <path + inkscape:connector-curvature="0" + id="path7794" + style="fill:#000000;marker:none" + d="m 903.77376,-352.8486 c 0,-0.6451 0.0935,-1.20605 0.28047,-1.68286 0.18699,-0.48616 0.43474,-0.88817 0.74327,-1.20605 0.30852,-0.31787 0.66379,-0.55628 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.2384 1.23409,-0.2384 0.98167,0 1.73428,0.30853 2.25784,0.92557 0.52355,0.6077 0.78533,1.53795 0.78534,2.79074 -10e-6,0.0561 -10e-6,0.13089 0,0.22438 -10e-6,0.0842 -0.005,0.16362 -0.014,0.23841 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33226 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.45811,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55628,-0.16361 0.71522,-0.2384 l 0.18231,1.09385 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26646 -0.39267,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67315,-1.19203 -0.14024,-0.46745 -0.21035,-0.97699 -0.21035,-1.52859 m 5.0065,-0.71522 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44445 -0.29918,-0.38332 -0.71522,-0.57498 -1.24812,-0.57498 -0.29918,0 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26178 -0.57497,0.44876 -0.15894,0.18699 -0.28516,0.40202 -0.37865,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16828,0.74326 l 3.61814,0" /> + <path + inkscape:connector-curvature="0" + id="path7796" + style="fill:#000000;marker:none" + d="m 914.70665,-356.66309 c 0.11219,1e-5 0.2384,0.009 0.37864,0.0281 0.14959,0.009 0.2945,0.0281 0.43474,0.0561 0.14024,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21036,0.0374 0.26646,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51889,-0.12621 -0.23373,-0.0561 -0.53758,-0.0841 -0.91154,-0.0841 -0.24309,10e-6 -0.48617,0.0281 -0.72924,0.0841 -0.23374,0.0468 -0.388,0.0795 -0.46279,0.0982 l 0,6.12842 -1.30422,0 0,-6.98387 c 0.30853,-0.11218 0.69184,-0.21503 1.14996,-0.30852 0.45811,-0.10284 0.97231,-0.15426 1.54262,-0.15427" /> + <path + inkscape:connector-curvature="0" + id="path7798" + style="fill:#000000;marker:none" + d="m 923.1376,-350.15603 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44409,-0.0467 0.60303,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,0 -0.4067,0.014 -0.63108,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32723,0.20568 -0.44876,0.36462 -0.12155,0.14959 -0.18232,0.35059 -0.18231,0.60302 -10e-6,0.46746 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.5351 c 0.52355,0 0.96297,0.0701 1.31824,0.21035 0.36462,0.1309 0.65444,0.32256 0.86948,0.57498 0.22438,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27114,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0841 -0.25243,0.028 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0842 -0.6451,-0.21503 -0.89753,-0.39267 -0.25243,-0.18698 -0.44876,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21035,-1.07983 -10e-6,-0.40202 0.0795,-0.74794 0.2384,-1.03777 0.16829,-0.28982 0.39267,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37397,-0.0841 0.76664,-0.12621 1.17801,-0.12621 0.13088,0 0.26644,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39266,0.0561 0.13089,0.0187 0.24308,0.0374 0.33658,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c -10e-6,-0.21503 -0.0234,-0.42539 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40202 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20568,-0.10283 -0.47681,-0.15425 -0.81338,-0.15426 -0.43007,1e-5 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07984 c 0.16829,-0.0748 0.44876,-0.1449 0.84143,-0.21035 0.39267,-0.0748 0.81806,-0.11219 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7800" + style="fill:#000000;marker:none" + d="m 929.6795,-350.15603 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26178,-0.14023 0.39267,-0.36461 0.39267,-0.67314 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75729 -0.25244,-0.18698 -0.66848,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81339,-0.33657 -0.25243,-0.12154 -0.47213,-0.26178 -0.65912,-0.42072 -0.18698,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.11219,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.23841,-1.15462 0.71522,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94931,-0.57497 0.20568,0 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0468 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24774,0.0701 0.32254,0.0982 l -0.2384,1.12191 c -0.14025,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65913,-0.12621 -1.07984,-0.12622 -0.36462,10e-6 -0.68249,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.40669,0.36462 -0.40669,0.67314 0,0.15894 0.0281,0.29918 0.0841,0.42072 0.0655,0.12154 0.15894,0.23373 0.28048,0.33657 0.13089,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0842 0.41136,0.17296 0.67314,0.26645 0.34592,0.1309 0.65445,0.26179 0.92558,0.39267 0.27112,0.12154 0.50018,0.26646 0.68717,0.43474 0.19632,0.16829 0.34591,0.37397 0.44876,0.61705 0.10283,0.23373 0.15425,0.52356 0.15426,0.86948 -10e-6,0.67314 -0.25243,1.18267 -0.75729,1.52859 -0.49551,0.34592 -1.20605,0.51889 -2.13162,0.51889 -0.6451,0 -1.14996,-0.0561 -1.51457,-0.16829 -0.36462,-0.10284 -0.61238,-0.18231 -0.74327,-0.23841 l 0.23841,-1.1219 c 0.14959,0.0561 0.38799,0.14024 0.71521,0.25243 0.32723,0.11219 0.76196,0.16828 1.30422,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path7802" + style="fill:#000000;marker:none" + d="m 935.53182,-349.21643 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61063 c -0.23373,0 -0.43474,-0.0748 -0.60302,-0.22439 -0.15894,-0.15892 -0.23841,-0.36928 -0.23841,-0.63107 0,-0.26177 0.0795,-0.46745 0.23841,-0.61705 0.16828,-0.15892 0.36929,-0.23839 0.60302,-0.2384 0.23373,10e-6 0.43006,0.0795 0.589,0.2384 0.16829,0.1496 0.25243,0.35528 0.25243,0.61705 0,0.26179 -0.0841,0.47215 -0.25243,0.63107 -0.15894,0.1496 -0.35527,0.22439 -0.589,0.22439" /> + <path + inkscape:connector-curvature="0" + id="path7804" + style="fill:#000000;marker:none" + d="m 939.48523,-350.15603 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26177,-0.14023 0.39266,-0.36461 0.39267,-0.67314 -10e-6,-0.31787 -0.12622,-0.5703 -0.37865,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.1122,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.2384,-1.15462 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94932,-0.57497 0.20568,0 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39733,0.0468 0.57497,0.0841 0.17763,0.0281 0.3319,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12622 -0.36462,10e-6 -0.6825,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.4067,0.36462 -0.40669,0.67314 -1e-5,0.15894 0.028,0.29918 0.0841,0.42072 0.0654,0.12154 0.15893,0.23373 0.28048,0.33657 0.13088,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0842 0.41136,0.17296 0.67314,0.26645 0.34592,0.1309 0.65444,0.26179 0.92557,0.39267 0.27113,0.12154 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34592,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52356 0.15427,0.86948 -10e-6,0.67314 -0.25244,1.18267 -0.75729,1.52859 -0.49551,0.34592 -1.20605,0.51889 -2.13162,0.51889 -0.6451,0 -1.14996,-0.0561 -1.51458,-0.16829 -0.36462,-0.10284 -0.61237,-0.18231 -0.74326,-0.23841 l 0.2384,-1.1219 c 0.14959,0.0561 0.388,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16828 1.30422,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path7806" + style="fill:#000000;marker:none" + d="m 945.2534,-356.50882 2.7627,0 0,1.09385 -2.7627,0 0,3.36572 c 0,0.36463 0.028,0.66848 0.0841,0.91155 0.0561,0.23374 0.14023,0.42072 0.25243,0.56096 0.11218,0.13089 0.25242,0.22438 0.42071,0.28047 0.16828,0.0561 0.36462,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.9396,-0.12622 0.24307,-0.0935 0.41136,-0.15893 0.50486,-0.19633 l 0.25243,1.07983 c -0.1309,0.0654 -0.35996,0.14492 -0.68717,0.23841 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13089 -0.57498,-0.32255 -0.77131,-0.57498 -0.19633,-0.25242 -0.33657,-0.56095 -0.42071,-0.92557 -0.0748,-0.37397 -0.11219,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path7808" + style="fill:#000000;marker:none" + d="m 950.97995,-349.21643 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61063 c -0.23373,0 -0.43474,-0.0748 -0.60303,-0.22439 -0.15893,-0.15892 -0.2384,-0.36928 -0.2384,-0.63107 0,-0.26177 0.0795,-0.46745 0.2384,-0.61705 0.16829,-0.15892 0.3693,-0.23839 0.60303,-0.2384 0.23373,10e-6 0.43006,0.0795 0.589,0.2384 0.16828,0.1496 0.25243,0.35528 0.25243,0.61705 0,0.26179 -0.0841,0.47215 -0.25243,0.63107 -0.15894,0.1496 -0.35527,0.22439 -0.589,0.22439" /> + <path + inkscape:connector-curvature="0" + id="path7810" + style="fill:#000000;marker:none" + d="m 955.92905,-356.66309 c 0.11218,1e-5 0.2384,0.009 0.37864,0.0281 0.14958,0.009 0.2945,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12621 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0468 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12842 -1.30422,0 0,-6.98387 c 0.30852,-0.11218 0.69184,-0.21503 1.14995,-0.30852 0.45811,-0.10284 0.97232,-0.15426 1.54263,-0.15427" /> + <path + inkscape:connector-curvature="0" + id="path7812" + style="fill:#000000;marker:none" + d="m 840.63801,-332.62623 c 0.30852,0 0.57965,-0.005 0.81339,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,0 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0841 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60302 0,0.46747 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70586,0.26646 1.22007,0.26646 m -0.11219,-6.53511 c 0.52356,10e-6 0.96297,0.0701 1.31824,0.21036 0.36462,0.13089 0.65444,0.32255 0.86948,0.57497 0.22438,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55775 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.028 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39267 -0.25243,-0.18698 -0.44877,-0.43006 -0.58901,-0.72924 -0.14023,-0.29917 -0.21035,-0.65912 -0.21035,-1.07983 0,-0.40202 0.0795,-0.74794 0.2384,-1.03777 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.60769,-0.30852 0.98167,-0.39266 0.37396,-0.0841 0.76663,-0.12622 1.178,-0.12622 0.13088,0 0.26645,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40201 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29916 -0.50485,-0.39266 -0.20569,-0.10284 -0.47682,-0.15426 -0.81339,-0.15426 -0.43006,0 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15427,-1.07983 c 0.16829,-0.0748 0.44877,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81806,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7814" + style="fill:#000000;marker:none" + d="m 847.67075,-331.5464 c -0.80404,-0.0187 -1.37434,-0.19166 -1.71091,-0.51888 -0.33657,-0.32722 -0.50486,-0.83676 -0.50486,-1.5286 l 0,-8.75087 1.30422,-0.22438 0,8.76489 c 0,0.21504 0.0187,0.39267 0.0561,0.53291 0.0374,0.14024 0.0982,0.25243 0.18231,0.33657 0.0841,0.0841 0.19633,0.14959 0.33658,0.19633 0.14023,0.0374 0.31319,0.0701 0.51888,0.0982 l -0.18231,1.09386" /> + <path + inkscape:connector-curvature="0" + id="path7816" + style="fill:#000000;marker:none" + d="m 852.14304,-335.31881 c 0,-0.64509 0.0935,-1.20605 0.28047,-1.68286 0.18699,-0.48615 0.43474,-0.88817 0.74327,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.23839 1.2341,-0.2384 0.98166,10e-6 1.73427,0.30853 2.25783,0.92557 0.52355,0.60771 0.78533,1.53795 0.78534,2.79074 -10e-6,0.0561 -10e-6,0.1309 0,0.22439 -10e-6,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.45811,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55628,-0.16361 0.71522,-0.2384 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46278 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67315,-1.19202 -0.14023,-0.46746 -0.21035,-0.97699 -0.21035,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14025,-1.07048 -0.44877,-1.44445 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26179 -0.57497,0.44876 -0.15894,0.18699 -0.28516,0.40203 -0.37865,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16828,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7818" + style="fill:#000000;marker:none" + d="m 860.38335,-338.76867 c 0.29918,-0.0748 0.69652,-0.15426 1.19203,-0.23841 0.49551,-0.0841 1.06581,-0.12621 1.71091,-0.12621 0.57965,0 1.06113,0.0841 1.44445,0.25243 0.38332,0.15894 0.68716,0.38799 0.91155,0.68716 0.23373,0.28984 0.39734,0.64043 0.49084,1.05179 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c -10e-6,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31786 -0.15427,-0.57497 -0.2945,-0.77131 -0.14024,-0.19632 -0.32723,-0.33656 -0.56095,-0.42071 -0.23374,-0.0935 -0.52356,-0.14023 -0.86948,-0.14024 -0.14024,10e-6 -0.28515,0.005 -0.43474,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10284,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7820" + style="fill:#000000;marker:none" + d="m 871.60549,-331.51835 c -0.58901,0 -1.10789,-0.0935 -1.55665,-0.28048 -0.43941,-0.18698 -0.81338,-0.44876 -1.1219,-0.78533 -0.29918,-0.33657 -0.52356,-0.73392 -0.67315,-1.19203 -0.14959,-0.46746 -0.22438,-0.98166 -0.22438,-1.54262 0,-0.56095 0.0795,-1.07516 0.23841,-1.54262 0.16828,-0.46746 0.40201,-0.86947 0.70119,-1.20605 0.29917,-0.34592 0.66379,-0.61237 1.09386,-0.79936 0.43941,-0.19633 0.92557,-0.29449 1.45848,-0.2945 0.32721,10e-6 0.65444,0.0281 0.98166,0.0841 0.32722,0.0561 0.64042,0.14492 0.9396,0.26645 l -0.2945,1.10789 c -0.19634,-0.0935 -0.42539,-0.16828 -0.68717,-0.22438 -0.25243,-0.0561 -0.52356,-0.0841 -0.81338,-0.0842 -0.72924,1e-5 -1.2902,0.22906 -1.68286,0.68717 -0.38332,0.45812 -0.57498,1.12659 -0.57498,2.00541 0,0.39267 0.0421,0.75261 0.12622,1.07983 0.0935,0.32723 0.23373,0.60771 0.42071,0.84143 0.19633,0.23374 0.44409,0.41605 0.74327,0.54693 0.29917,0.12154 0.66379,0.18231 1.09385,0.18231 0.34592,0 0.65912,-0.0327 0.9396,-0.0982 0.28047,-0.0654 0.50018,-0.13557 0.65912,-0.21036 l 0.18231,1.09386 c -0.0748,0.0467 -0.18231,0.0935 -0.32255,0.14024 -0.14024,0.0374 -0.29918,0.0701 -0.47681,0.0982 -0.17764,0.0374 -0.3693,0.0654 -0.57497,0.0841 -0.19634,0.028 -0.388,0.0421 -0.57498,0.0421" /> + <path + inkscape:connector-curvature="0" + id="path7822" + style="fill:#000000;marker:none" + d="m 880.76086,-331.897 c -0.29918,0.0748 -0.69652,0.15427 -1.19202,0.23841 -0.48617,0.0841 -1.0518,0.12621 -1.69689,0.12621 -0.56095,0 -1.03309,-0.0795 -1.41641,-0.2384 -0.38332,-0.16829 -0.69184,-0.40202 -0.92557,-0.70119 -0.23373,-0.29918 -0.40202,-0.64977 -0.50486,-1.05179 -0.10284,-0.41136 -0.15426,-0.8648 -0.15426,-1.36031 l 0,-4.09496 1.30422,0 0,3.81448 c 0,0.88818 0.14023,1.52393 0.42071,1.90724 0.28048,0.38332 0.75261,0.57498 1.41641,0.57498 0.14023,0 0.28515,-0.005 0.43474,-0.014 0.14958,-0.009 0.28982,-0.0187 0.42071,-0.0281 0.13089,-0.0187 0.24775,-0.0327 0.3506,-0.0421 0.11219,-0.0187 0.19165,-0.0374 0.23841,-0.0561 l 0,-6.15646 1.30421,0 0,7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7824" + style="fill:#000000;marker:none" + d="m 882.60105,-335.31881 c 0,-0.64509 0.0935,-1.20605 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30853,-0.31787 0.6638,-0.55627 1.06581,-0.71522 0.40202,-0.15893 0.81338,-0.23839 1.2341,-0.2384 0.98167,10e-6 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53795 0.78533,2.79074 0,0.0561 0,0.1309 0,0.22439 0,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99248,0 c 0.0561,0.75729 0.27579,1.33227 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71522,-0.2384 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46278 -1.13594,-0.79936 -0.29917,-0.33657 -0.52355,-0.73391 -0.67314,-1.19202 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14024,-1.07048 -0.44876,-1.44445 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26179 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40203 -0.37864,0.6451 -0.0842,0.24308 -0.14024,0.49084 -0.16829,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7826" + style="fill:#000000;marker:none" + d="m 890.84137,-338.76867 c 0.29917,-0.0748 0.69652,-0.15426 1.19203,-0.23841 0.4955,-0.0841 1.0658,-0.12621 1.7109,-0.12621 0.57965,0 1.06114,0.0841 1.44446,0.25243 0.38331,0.15894 0.68716,0.38799 0.91155,0.68716 0.23372,0.28984 0.39733,0.64043 0.49083,1.05179 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c 0,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31786 -0.15427,-0.57497 -0.2945,-0.77131 -0.14025,-0.19632 -0.32723,-0.33656 -0.56096,-0.42071 -0.23373,-0.0935 -0.52356,-0.14023 -0.86947,-0.14024 -0.14025,10e-6 -0.28516,0.005 -0.43474,0.014 -0.14959,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10285,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7828" + style="fill:#000000;marker:none" + d="m 900.11419,-338.97903 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36462 0.0281,0.66847 0.0842,0.91155 0.0561,0.23373 0.14023,0.42071 0.25243,0.56095 0.11218,0.13089 0.25242,0.22438 0.42071,0.28048 0.16828,0.0561 0.36462,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.9396,-0.12621 0.24307,-0.0935 0.41136,-0.15894 0.50486,-0.19634 l 0.25243,1.07984 c -0.1309,0.0654 -0.35995,0.14491 -0.68717,0.2384 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13088 -0.57498,-0.32254 -0.77131,-0.57497 -0.19633,-0.25243 -0.33657,-0.56095 -0.42071,-0.92558 -0.0748,-0.37396 -0.11219,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path7830" + style="fill:#000000;marker:none" + d="m 907.22909,-339.13329 c 0.11219,0 0.23841,0.009 0.37865,0.028 0.14958,0.009 0.29449,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12621 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,0 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0468 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12841 -1.30422,0 0,-6.98387 c 0.30852,-0.11218 0.69184,-0.21502 1.14995,-0.30852 0.45811,-0.10284 0.97232,-0.15426 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7832" + style="fill:#000000;marker:none" + d="m 916.39674,-335.33283 c -10e-6,0.57965 -0.0842,1.10321 -0.25243,1.57066 -0.16829,0.46747 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33658 -0.65912,0.59835 -1.07983,0.78534 -0.42072,0.17763 -0.87883,0.26645 -1.37434,0.26645 -0.49551,0 -0.95362,-0.0888 -1.37433,-0.26645 -0.42072,-0.18699 -0.78534,-0.44876 -1.09386,-0.78534 -0.29918,-0.33657 -0.53291,-0.73858 -0.70119,-1.20605 -0.16829,-0.46745 -0.25243,-0.99101 -0.25243,-1.57066 0,-0.5703 0.0841,-1.08918 0.25243,-1.55665 0.16828,-0.47681 0.40201,-0.8835 0.70119,-1.22007 0.30852,-0.33657 0.67314,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87882,-0.28047 1.37433,-0.28048 0.49551,10e-6 0.95362,0.0935 1.37434,0.28048 0.42071,0.17764 0.78065,0.43474 1.07983,0.77131 0.30852,0.33657 0.54693,0.74326 0.71522,1.22007 0.16828,0.46747 0.25242,0.98635 0.25243,1.55665 m -1.36031,0 c -10e-6,-0.82273 -0.187,-1.4725 -0.56096,-1.94932 -0.36462,-0.48615 -0.86481,-0.72923 -1.50055,-0.72924 -0.63575,1e-5 -1.14061,0.24309 -1.51457,0.72924 -0.36462,0.47682 -0.54693,1.12659 -0.54693,1.94932 0,0.82273 0.18231,1.47717 0.54693,1.96333 0.37396,0.47681 0.87882,0.71522 1.51457,0.71522 0.63574,0 1.13593,-0.23841 1.50055,-0.71522 0.37396,-0.48616 0.56095,-1.1406 0.56096,-1.96333" /> + <path + inkscape:connector-curvature="0" + id="path7834" + style="fill:#000000;marker:none" + d="m 919.13905,-340.53568 c -0.61705,1e-5 -1.22007,0.15895 -1.80907,0.47681 l -0.36462,-1.00971 c 0.31787,-0.16828 0.67314,-0.30384 1.06581,-0.40669 0.40202,-0.10284 0.8274,-0.15426 1.27617,-0.15427 0.5329,1e-5 0.96764,0.0748 1.30422,0.22439 0.34591,0.14024 0.62171,0.32255 0.8274,0.54692 0.20568,0.22439 0.34592,0.47682 0.42072,0.75729 0.0841,0.27114 0.12621,0.53292 0.12621,0.78534 0,0.31788 -0.0608,0.60303 -0.18231,0.85545 -0.12154,0.24309 -0.27113,0.47214 -0.44876,0.68717 -0.17764,0.21504 -0.37397,0.42072 -0.589,0.61705 -0.21504,0.19634 -0.41137,0.40202 -0.589,0.61705 -0.17764,0.20568 -0.32723,0.43474 -0.44877,0.68716 -0.12154,0.24309 -0.18231,0.51889 -0.18231,0.82741 0,0.0468 0,0.0982 0,0.15426 0,0.0561 0.005,0.10752 0.014,0.15426 l -1.09386,0 c -0.0374,-0.18698 -0.0561,-0.38331 -0.0561,-0.589 0,-0.29917 0.0514,-0.5703 0.15427,-0.81338 0.11218,-0.24307 0.25242,-0.46746 0.42071,-0.67314 0.16828,-0.21503 0.34592,-0.41136 0.53291,-0.589 0.18698,-0.18698 0.36461,-0.37397 0.5329,-0.56096 0.16828,-0.18698 0.30385,-0.38331 0.40669,-0.589 0.11219,-0.20567 0.16829,-0.43006 0.16829,-0.67314 0,-0.39266 -0.12622,-0.71054 -0.37864,-0.95362 -0.25244,-0.25242 -0.62173,-0.37864 -1.10789,-0.37865 m 0.8835,8.09176 c 0,0.25242 -0.0841,0.47213 -0.25242,0.65912 -0.16829,0.18698 -0.39735,0.28047 -0.68717,0.28047 -0.28983,0 -0.51889,-0.0935 -0.68717,-0.28047 -0.16829,-0.18699 -0.25243,-0.4067 -0.25243,-0.65912 0,-0.25243 0.0841,-0.47214 0.25243,-0.65913 0.16828,-0.18698 0.39734,-0.28047 0.68717,-0.28047 0.28982,0 0.51888,0.0935 0.68717,0.28047 0.16828,0.18699 0.25242,0.4067 0.25242,0.65913" /> + <path + inkscape:connector-curvature="0" + id="path7836" + style="marker:none" + d="m 842.43306,-313.94649 c -0.68249,0 -1.30422,-0.11219 -1.86517,-0.33657 -0.56095,-0.22438 -1.04244,-0.5516 -1.44445,-0.98167 -0.40202,-0.43006 -0.71522,-0.95829 -0.9396,-1.58469 -0.21503,-0.63575 -0.32255,-1.36031 -0.32255,-2.1737 0,-0.81337 0.12154,-1.53326 0.36462,-2.15967 0.25243,-0.63574 0.589,-1.16864 1.00972,-1.59871 0.42071,-0.43006 0.91155,-0.75728 1.4725,-0.98167 0.56095,-0.22437 1.1593,-0.33656 1.79505,-0.33657 0.40201,10e-6 0.76196,0.0281 1.07984,0.0841 0.32722,0.0561 0.60769,0.12155 0.84143,0.19633 0.24307,0.0748 0.43941,0.1496 0.589,0.22438 0.14958,0.0748 0.25242,0.1309 0.30852,0.16829 l -0.39266,1.12191 c -0.0842,-0.0561 -0.20569,-0.11686 -0.36462,-0.18231 -0.15895,-0.0654 -0.34126,-0.13088 -0.54693,-0.19634 -0.19634,-0.0654 -0.41605,-0.11685 -0.65912,-0.15426 -0.23374,-0.0467 -0.47214,-0.0701 -0.71522,-0.0701 -0.51421,10e-6 -0.977,0.0888 -1.38836,0.26646 -0.41137,0.17764 -0.76196,0.43474 -1.05178,0.77131 -0.28983,0.33658 -0.51421,0.74794 -0.67315,1.23409 -0.14959,0.47682 -0.22438,1.0144 -0.22438,1.61274 0,0.57966 0.0654,1.10789 0.19633,1.5847 0.14024,0.47681 0.34592,0.88818 0.61705,1.2341 0.27113,0.33657 0.6077,0.59835 1.00972,0.78533 0.41136,0.18699 0.88817,0.28048 1.43043,0.28048 0.62639,0 1.14527,-0.0654 1.55665,-0.19634 0.41135,-0.13088 0.71988,-0.24775 0.92557,-0.35059 l 0.35059,1.1219 c -0.0655,0.0467 -0.18231,0.10752 -0.35059,0.18231 -0.1683,0.0654 -0.37865,0.13089 -0.63107,0.19634 -0.25244,0.0654 -0.54694,0.12154 -0.88351,0.16828 -0.33657,0.0468 -0.70119,0.0701 -1.09386,0.0701" /> + <path + inkscape:connector-curvature="0" + id="path7838" + style="marker:none" + d="m 853.07036,-317.80304 c -1e-5,0.57965 -0.0842,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.40669,0.86948 -0.71521,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78533 -0.42072,0.17764 -0.87883,0.26645 -1.37433,0.26645 -0.49552,0 -0.95363,-0.0888 -1.37434,-0.26645 -0.42072,-0.18698 -0.78534,-0.44876 -1.09386,-0.78533 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16829,-0.46746 -0.25243,-0.99102 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55665 0.16829,-0.4768 0.40202,-0.88349 0.70119,-1.22007 0.30852,-0.33657 0.67314,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87882,-0.28047 1.37434,-0.28048 0.4955,1e-5 0.95361,0.0935 1.37433,0.28048 0.42071,0.17764 0.78066,0.43474 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71521,1.22007 0.16828,0.46747 0.25242,0.98635 0.25243,1.55665 m -1.36031,0 c -10e-6,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48616 -0.86481,-0.72924 -1.50055,-0.72924 -0.63575,0 -1.14061,0.24308 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12658 -0.54693,1.94931 0,0.82273 0.18231,1.47718 0.54693,1.96333 0.37397,0.47682 0.87883,0.71522 1.51458,0.71522 0.63574,0 1.13592,-0.2384 1.50055,-0.71522 0.37396,-0.48615 0.56094,-1.1406 0.56095,-1.96333" /> + <path + inkscape:connector-curvature="0" + id="path7840" + style="marker:none" + d="m 854.90529,-321.23888 c 0.29918,-0.0748 0.69652,-0.15426 1.19203,-0.23841 0.4955,-0.0841 1.06581,-0.1262 1.71091,-0.12621 0.57964,10e-6 1.06113,0.0842 1.44445,0.25243 0.38331,0.15894 0.68716,0.388 0.91155,0.68717 0.23372,0.28983 0.39734,0.64042 0.49084,1.05178 0.0935,0.41137 0.14023,0.86481 0.14023,1.36032 l 0,4.09495 -1.30421,0 0,-3.81448 c -10e-6,-0.44876 -0.0327,-0.83207 -0.0982,-1.14995 -0.0561,-0.31787 -0.15427,-0.57497 -0.2945,-0.77131 -0.14024,-0.19633 -0.32723,-0.33657 -0.56095,-0.42072 -0.23374,-0.0935 -0.52356,-0.14023 -0.86948,-0.14024 -0.14024,1e-5 -0.28516,0.005 -0.43474,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10284,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7842" + style="marker:none" + d="m 865.80488,-325.03934 c 0.32722,10e-6 0.6077,0.0234 0.84143,0.0701 0.23373,0.0374 0.40201,0.0748 0.50486,0.11219 l -0.18231,1.12191 c -0.10285,-0.0374 -0.24309,-0.0748 -0.42072,-0.11219 -0.17764,-0.0467 -0.39267,-0.0701 -0.64509,-0.0701 -0.60771,1e-5 -1.03309,0.16829 -1.27617,0.50485 -0.24308,0.32724 -0.36462,0.77132 -0.36462,1.33227 l 0,0.63107 2.80477,0 0,1.09386 -2.80477,0 0,6.19853 -1.30422,0 0,-7.95151 c 0,-0.93491 0.22906,-1.6548 0.68717,-2.15967 0.45811,-0.5142 1.178,-0.7713 2.15967,-0.77131 m 3.92667,10.88249 -1.30421,0 0,-7.29239 1.30421,0 0,7.29239 m -0.65912,-8.61063 c -0.23373,10e-6 -0.43474,-0.0748 -0.60302,-0.22438 -0.15894,-0.15893 -0.23841,-0.36929 -0.23841,-0.63107 0,-0.26177 0.0795,-0.46745 0.23841,-0.61705 0.16828,-0.15893 0.36929,-0.2384 0.60302,-0.23841 0.23373,10e-6 0.43006,0.0795 0.58901,0.23841 0.16827,0.1496 0.25242,0.35528 0.25242,0.61705 0,0.26178 -0.0842,0.47214 -0.25242,0.63107 -0.15895,0.1496 -0.35528,0.22439 -0.58901,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path7844" + style="marker:none" + d="m 874.66202,-321.6035 c 0.11219,10e-6 0.23841,0.009 0.37865,0.0281 0.14958,0.009 0.29449,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12622 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12841 -1.30422,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7846" + style="marker:none" + d="m 877.39273,-321.23888 c 0.29917,-0.0748 0.69184,-0.15426 1.178,-0.23841 0.49551,-0.0841 1.06581,-0.1262 1.71091,-0.12621 0.46746,10e-6 0.86012,0.0654 1.178,0.19633 0.31787,0.12155 0.58432,0.30386 0.79936,0.54693 0.0654,-0.0467 0.16828,-0.11218 0.30853,-0.19633 0.14023,-0.0841 0.31319,-0.16361 0.51888,-0.23841 0.20567,-0.0841 0.43473,-0.15425 0.68717,-0.21035 0.25242,-0.0654 0.52354,-0.0982 0.81338,-0.0982 0.56094,10e-6 1.01905,0.0842 1.37433,0.25243 0.35526,0.15894 0.63107,0.388 0.82741,0.68717 0.20567,0.29918 0.34124,0.65445 0.40669,1.06581 0.0748,0.41137 0.11218,0.86013 0.11219,1.34629 l 0,4.09495 -1.30421,0 0,-3.81448 c -10e-6,-0.43006 -0.0234,-0.79935 -0.0701,-1.10788 -0.0374,-0.30852 -0.11688,-0.56562 -0.23841,-0.77131 -0.1122,-0.20568 -0.27114,-0.35527 -0.47681,-0.44876 -0.19634,-0.10284 -0.45345,-0.15426 -0.77131,-0.15427 -0.43942,10e-6 -0.80404,0.0608 -1.09386,0.18231 -0.28048,0.1122 -0.47214,0.21504 -0.57498,0.30853 0.0748,0.24308 0.13089,0.50954 0.16829,0.79936 0.0374,0.28983 0.0561,0.59368 0.0561,0.91155 l 0,4.09495 -1.30421,0 0,-3.81448 c -10e-6,-0.43006 -0.0234,-0.79935 -0.0701,-1.10788 -0.0467,-0.30852 -0.1309,-0.56562 -0.25243,-0.77131 -0.1122,-0.20568 -0.27113,-0.35527 -0.47681,-0.44876 -0.19634,-0.10284 -0.44877,-0.15426 -0.75729,-0.15427 -0.13089,10e-6 -0.27113,0.005 -0.42071,0.014 -0.14959,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.11219,0.0187 -0.18699,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path7848" + style="marker:none" + d="m 891.94005,-315.09644 c 0.30852,0 0.57964,-0.005 0.81338,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0468 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.40669,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17763,0.0841 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14959,0.79468 0.44876,0.98167 0.29918,0.17763 0.70587,0.26645 1.22008,0.26645 m -0.11219,-6.53511 c 0.52355,10e-6 0.96296,0.0701 1.31824,0.21036 0.36461,0.1309 0.65444,0.32255 0.86947,0.57498 0.22438,0.24308 0.38332,0.53758 0.47681,0.8835 0.0935,0.33658 0.14024,0.71054 0.14024,1.1219 l 0,4.55775 c -0.11219,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.028 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57965,0.0421 -0.86948,0.0421 -0.41136,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34592,-0.0841 -0.64509,-0.21503 -0.89752,-0.39266 -0.25243,-0.18699 -0.44877,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.23841,-1.03776 0.16828,-0.28983 0.39266,-0.52356 0.67314,-0.70119 0.28047,-0.17764 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12622 0.13088,1e-5 0.26645,0.009 0.40669,0.028 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40201 -0.25242,-0.56095 -0.12155,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20569,-0.10283 -0.47682,-0.15426 -0.81338,-0.15426 -0.43007,0 -0.80872,0.0327 -1.13594,0.0982 -0.31787,0.0561 -0.55628,0.11688 -0.71521,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7850" + style="marker:none" + d="m 905.07972,-317.78902 c -10e-6,-0.85077 -0.21036,-1.50522 -0.63107,-1.96333 -0.42072,-0.45811 -0.98167,-0.68717 -1.68286,-0.68717 -0.39267,0 -0.7012,0.014 -0.92557,0.0421 -0.21504,0.0281 -0.388,0.0608 -0.51889,0.0982 l 0,4.59981 c 0.15894,0.13089 0.38799,0.25711 0.68717,0.37865 0.29917,0.12154 0.6264,0.18231 0.98167,0.18231 0.37396,0 0.69184,-0.0654 0.95362,-0.19634 0.27112,-0.14023 0.49083,-0.32722 0.65912,-0.56095 0.16828,-0.24308 0.28982,-0.52355 0.36462,-0.84143 0.0748,-0.32722 0.11218,-0.67782 0.11219,-1.05179 m 1.36031,0 c 0,0.55161 -0.0748,1.06114 -0.22438,1.5286 -0.14024,0.46746 -0.3506,0.86948 -0.63107,1.20605 -0.28048,0.33657 -0.6264,0.59835 -1.03776,0.78533 -0.40203,0.18699 -0.86481,0.28048 -1.38836,0.28048 -0.42072,0 -0.79469,-0.0561 -1.12191,-0.16829 -0.31788,-0.11219 -0.55628,-0.2197 -0.71522,-0.32254 l 0,2.91695 -1.30421,0 0,-9.66242 c 0.30852,-0.0748 0.69184,-0.15425 1.14995,-0.2384 0.46746,-0.0935 1.00504,-0.14023 1.61274,-0.14024 0.56095,10e-6 1.06581,0.0888 1.51458,0.26645 0.44875,0.17764 0.83207,0.43007 1.14995,0.75729 0.31787,0.32723 0.56095,0.72924 0.72924,1.20605 0.17763,0.46746 0.26645,0.9957 0.26645,1.58469" /> + <path + inkscape:connector-curvature="0" + id="path7852" + style="marker:none" + d="m 910.75719,-315.09644 c 0.30852,0 0.57964,-0.005 0.81338,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0468 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0841 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14958,0.79468 0.44876,0.98167 0.29917,0.17763 0.70586,0.26645 1.22008,0.26645 m -0.1122,-6.53511 c 0.52356,10e-6 0.96297,0.0701 1.31825,0.21036 0.36461,0.1309 0.65444,0.32255 0.86947,0.57498 0.22438,0.24308 0.38331,0.53758 0.47681,0.8835 0.0935,0.33658 0.14024,0.71054 0.14024,1.1219 l 0,4.55775 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.028 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57965,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39266 -0.25243,-0.18699 -0.44877,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.2384,-1.03776 0.16829,-0.28983 0.39267,-0.52356 0.67315,-0.70119 0.28047,-0.17764 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12622 0.13088,1e-5 0.26645,0.009 0.40669,0.028 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40201 -0.25243,-0.56095 -0.12154,-0.16828 -0.28983,-0.29917 -0.50485,-0.39267 -0.20569,-0.10283 -0.47682,-0.15426 -0.81339,-0.15426 -0.43006,0 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11688 -0.71521,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27616,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7854" + style="marker:none" + d="m 918.29478,-321.6035 c 0.11218,10e-6 0.2384,0.009 0.37864,0.0281 0.14958,0.009 0.2945,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12622 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12841 -1.30422,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54263,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7856" + style="marker:none" + d="m 923.49367,-315.09644 c 0.30852,0 0.57965,-0.005 0.81339,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0468 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,0 -0.4067,0.014 -0.63108,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32723,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14958,0.79468 0.44876,0.98167 0.29917,0.17763 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.53511 c 0.52356,10e-6 0.96297,0.0701 1.31824,0.21036 0.36462,0.1309 0.65444,0.32255 0.86948,0.57498 0.22438,0.24308 0.38331,0.53758 0.47681,0.8835 0.0935,0.33658 0.14023,0.71054 0.14024,1.1219 l 0,4.55775 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.028 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39266 -0.25243,-0.18699 -0.44877,-0.43007 -0.58901,-0.72924 -0.14023,-0.29918 -0.21035,-0.65912 -0.21035,-1.07984 0,-0.40201 0.0795,-0.74793 0.2384,-1.03776 0.16829,-0.28983 0.39267,-0.52356 0.67315,-0.70119 0.28047,-0.17764 0.60769,-0.30852 0.98166,-0.39267 0.37397,-0.0841 0.76664,-0.12621 1.17801,-0.12622 0.13088,1e-5 0.26645,0.009 0.40669,0.028 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40201 -0.25243,-0.56095 -0.12154,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20568,-0.10283 -0.47681,-0.15426 -0.81338,-0.15426 -0.43006,0 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11688 -0.71521,0.18231 l -0.15427,-1.07983 c 0.16829,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81806,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7858" + style="marker:none" + d="m 934.26332,-321.6035 c 0.11219,10e-6 0.2384,0.009 0.37864,0.0281 0.14959,0.009 0.2945,0.0281 0.43474,0.0561 0.14024,0.0187 0.26645,0.0421 0.37865,0.0701 0.12153,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51888,-0.12622 -0.23374,-0.0561 -0.53759,-0.0841 -0.91155,-0.0841 -0.24309,10e-6 -0.48617,0.0281 -0.72924,0.0841 -0.23374,0.0467 -0.388,0.0795 -0.46279,0.0982 l 0,6.12841 -1.30422,0 0,-6.98386 c 0.30853,-0.11219 0.69184,-0.21503 1.14996,-0.30853 0.45811,-0.10283 0.97231,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7860" + style="marker:none" + d="m 936.58733,-317.78902 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30852,-0.31786 0.66379,-0.55627 1.06581,-0.71521 0.40202,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,1e-5 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53796 0.78533,2.79075 0,0.0561 0,0.13089 0,0.22438 0,0.0842 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72494 0.38332,0.39266 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31787,-0.0842 0.55627,-0.16361 0.71521,-0.23841 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34628,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65482,-0.28048 -0.45811,-0.19633 -0.83675,-0.46278 -1.13593,-0.79935 -0.29917,-0.33658 -0.52355,-0.73392 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22439,0.1122 -0.41605,0.26179 -0.57498,0.44877 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0842,0.24309 -0.14024,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7862" + style="marker:none" + d="m 946.52453,-315.09644 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26178,-0.14024 0.39267,-0.36462 0.39267,-0.67314 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81339,-0.33658 -0.25243,-0.12153 -0.47213,-0.26177 -0.65912,-0.42071 -0.18698,-0.15893 -0.33657,-0.35059 -0.44876,-0.57498 -0.11219,-0.22437 -0.16828,-0.50018 -0.16828,-0.8274 0,-0.64509 0.2384,-1.15463 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94931,-0.57498 0.20568,1e-5 0.41137,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0468 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14959 -0.65912,-0.22439 -0.29918,-0.0841 -0.65912,-0.1262 -1.07984,-0.12621 -0.36462,1e-5 -0.68249,0.0748 -0.95362,0.22438 -0.27113,0.14025 -0.40669,0.36463 -0.40669,0.67315 0,0.15894 0.0281,0.29918 0.0842,0.42071 0.0654,0.12155 0.15893,0.23374 0.28047,0.33657 0.13089,0.0935 0.28983,0.18232 0.47681,0.26646 0.18698,0.0841 0.41137,0.17296 0.67315,0.26645 0.34591,0.13089 0.65444,0.26178 0.92557,0.39267 0.27112,0.12154 0.50018,0.26645 0.68717,0.43473 0.19633,0.16829 0.34591,0.37398 0.44876,0.61705 0.10284,0.23374 0.15426,0.52356 0.15426,0.86948 0,0.67315 -0.25243,1.18268 -0.75728,1.5286 -0.49552,0.34592 -1.20606,0.51888 -2.13163,0.51888 -0.6451,0 -1.14995,-0.0561 -1.51457,-0.16829 -0.36462,-0.10284 -0.61238,-0.1823 -0.74326,-0.2384 l 0.2384,-1.12191 c 0.14959,0.0561 0.38799,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16829 1.30421,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path7864" + style="marker:none" + d="m 950.66595,-317.78902 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30852,-0.31786 0.66379,-0.55627 1.06581,-0.71521 0.40202,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,1e-5 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53796 0.78533,2.79075 0,0.0561 0,0.13089 0,0.22438 0,0.0842 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72494 0.38332,0.39266 0.98167,0.589 1.79506,0.589 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0842 0.55627,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65482,-0.28048 -0.45811,-0.19633 -0.83675,-0.46278 -1.13593,-0.79935 -0.29917,-0.33658 -0.52355,-0.73392 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22439,0.1122 -0.41604,0.26179 -0.57498,0.44877 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0842,0.24309 -0.14024,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path7866" + style="marker:none" + d="m 961.59885,-321.6035 c 0.11218,10e-6 0.2384,0.009 0.37864,0.0281 0.14958,0.009 0.2945,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12622 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12841 -1.30422,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54263,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7868" + style="marker:none" + d="m 970.32452,-321.44924 c -0.36463,1.36499 -0.79469,2.67388 -1.2902,3.92667 -0.48616,1.2528 -0.9583,2.37471 -1.4164,3.36572 l -1.178,0 c -0.45812,-0.99101 -0.93493,-2.11292 -1.43044,-3.36572 -0.48616,-1.25279 -0.91155,-2.56168 -1.27616,-3.92667 l 1.40238,0 c 0.11219,0.45812 0.24308,0.94895 0.39267,1.4725 0.15893,0.51422 0.32254,1.02842 0.49083,1.54263 0.17763,0.50486 0.35527,0.99569 0.53291,1.4725 0.17763,0.47681 0.34591,0.9022 0.50485,1.27617 0.15894,-0.37397 0.32722,-0.79936 0.50486,-1.27617 0.17763,-0.47681 0.35059,-0.96764 0.51888,-1.4725 0.17763,-0.51421 0.34125,-1.02841 0.49084,-1.54263 0.15893,-0.52355 0.29449,-1.01438 0.40669,-1.4725 l 1.34629,0" /> + <path + inkscape:connector-curvature="0" + id="path7870" + style="marker:none" + d="m 974.13835,-315.09644 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44409,-0.0467 0.60303,-0.0841 l 0,-2.17369 c -0.0935,-0.0468 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19633,0 -0.40669,0.014 -0.63107,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32723,0.20569 -0.44877,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14959,0.79468 0.44877,0.98167 0.29917,0.17763 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.53511 c 0.52355,10e-6 0.96296,0.0701 1.31824,0.21036 0.36461,0.1309 0.65444,0.32255 0.86948,0.57498 0.22437,0.24308 0.38331,0.53758 0.47681,0.8835 0.0935,0.33658 0.14023,0.71054 0.14024,1.1219 l 0,4.55775 c -0.1122,0.0187 -0.27114,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0841 -0.25243,0.028 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.028 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34593,-0.0841 -0.6451,-0.21503 -0.89753,-0.39266 -0.25243,-0.18699 -0.44876,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.23841,-1.03776 0.16828,-0.28983 0.39266,-0.52356 0.67314,-0.70119 0.28048,-0.17764 0.6077,-0.30852 0.98167,-0.39267 0.37397,-0.0841 0.76663,-0.12621 1.178,-0.12622 0.13089,1e-5 0.26645,0.009 0.40669,0.028 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13089,0.0187 0.24308,0.0374 0.33657,0.0561 0.0935,0.0187 0.15894,0.0327 0.19634,0.0421 l 0,-0.36462 c -10e-6,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.1309,-0.40201 -0.25243,-0.56095 -0.12155,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20569,-0.10283 -0.47681,-0.15426 -0.81338,-0.15426 -0.43007,0 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11688 -0.71522,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81805,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path7872" + style="marker:none" + d="m 981.67593,-321.6035 c 0.11219,10e-6 0.2384,0.009 0.37865,0.0281 0.14958,0.009 0.29449,0.0281 0.43474,0.0561 0.14023,0.0187 0.26644,0.0421 0.37864,0.0701 0.12153,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51888,-0.12622 -0.23374,-0.0561 -0.53759,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.388,0.0795 -0.46279,0.0982 l 0,6.12841 -1.30421,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path7874" + style="marker:none" + d="m 985.94926,-314.91413 c -10e-6,0.25243 -0.0842,0.47213 -0.25243,0.65912 -0.16829,0.18698 -0.39735,0.28047 -0.68717,0.28047 -0.28983,0 -0.51888,-0.0935 -0.68717,-0.28047 -0.16828,-0.18699 -0.25243,-0.40669 -0.25243,-0.65912 0,-0.25243 0.0842,-0.47214 0.25243,-0.65912 0.16829,-0.18699 0.39734,-0.28048 0.68717,-0.28048 0.28982,0 0.51888,0.0935 0.68717,0.28048 0.16828,0.18698 0.25242,0.40669 0.25243,0.65912 m 0,-5.59551 c -10e-6,0.25243 -0.0842,0.47214 -0.25243,0.65912 -0.16829,0.18699 -0.39735,0.28048 -0.68717,0.28047 -0.28983,10e-6 -0.51888,-0.0935 -0.68717,-0.28047 -0.16828,-0.18698 -0.25243,-0.40669 -0.25243,-0.65912 0,-0.25242 0.0842,-0.47213 0.25243,-0.65912 0.16829,-0.18698 0.39734,-0.28047 0.68717,-0.28048 0.28982,10e-6 0.51888,0.0935 0.68717,0.28048 0.16828,0.18699 0.25242,0.4067 0.25243,0.65912" /> + </g> + <g + transform="translate(0,435.8268)" + id="g7876" + style="font-size:13.35415173px;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:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"> + <path + inkscape:connector-curvature="0" + id="path7878" + style="font-weight:bold;marker:none" + d="m 855.49443,-280.67636 c 0.29378,0 0.53416,-0.0223 0.72112,-0.0668 0.19586,-0.0534 0.35166,-0.12019 0.4674,-0.20032 0.11573,-0.089 0.19585,-0.1914 0.24037,-0.30714 0.0445,-0.11574 0.0668,-0.24483 0.0668,-0.38727 0,-0.30269 -0.14245,-0.55197 -0.42733,-0.74783 -0.28489,-0.20476 -0.77455,-0.42288 -1.46896,-0.65436 -0.30269,-0.10683 -0.60539,-0.22701 -0.90808,-0.36056 -0.3027,-0.14244 -0.57423,-0.31604 -0.8146,-0.52081 -0.24038,-0.21366 -0.43624,-0.46739 -0.58759,-0.76119 -0.15134,-0.30269 -0.22702,-0.6677 -0.22702,-1.09504 0,-0.42732 0.0801,-0.81014 0.24038,-1.14846 0.16025,-0.3472 0.38727,-0.64099 0.68106,-0.88137 0.29379,-0.24037 0.6499,-0.42287 1.06833,-0.54752 0.41843,-0.13353 0.89028,-0.2003 1.41554,-0.20031 0.62319,10e-6 1.16181,0.0668 1.61586,0.20031 0.45403,0.13355 0.82795,0.28045 1.12174,0.44069 l -0.60093,1.64256 c -0.25819,-0.13354 -0.54753,-0.24927 -0.86802,-0.34721 -0.3116,-0.10683 -0.68997,-0.16024 -1.13511,-0.16025 -0.49855,1e-5 -0.85912,0.0712 -1.08168,0.21367 -0.21367,0.13354 -0.3205,0.34276 -0.3205,0.62764 0,0.16916 0.0401,0.3116 0.12019,0.42733 0.0801,0.11575 0.1914,0.22258 0.33385,0.3205 0.15134,0.089 0.3205,0.17361 0.50746,0.25373 0.19585,0.0712 0.40952,0.1469 0.641,0.22702 0.48074,0.17806 0.89917,0.35612 1.25529,0.53417 0.3561,0.16916 0.64989,0.36947 0.88137,0.60094 0.24037,0.23147 0.41842,0.50301 0.53417,0.8146 0.11573,0.3116 0.17359,0.68997 0.1736,1.1351 -10e-6,0.86357 -0.3027,1.53573 -0.90808,2.01648 -0.6054,0.47185 -1.51793,0.70777 -2.7376,0.70777 -0.40953,0 -0.779,-0.0267 -1.1084,-0.0801 -0.3294,-0.0445 -0.62319,-0.10238 -0.88137,-0.1736 -0.24928,-0.0712 -0.4674,-0.1469 -0.65435,-0.22702 -0.17806,-0.0801 -0.32941,-0.1558 -0.45405,-0.22702 l 0.58759,-1.65592 c 0.27598,0.15135 0.61429,0.28935 1.01491,0.41398 0.40953,0.11574 0.90808,0.17361 1.49567,0.17361" /> + <path + inkscape:connector-curvature="0" + id="path7880" + style="font-weight:bold;marker:none" + d="m 862.59925,-279.08722 -1.98977,0 0,-7.02428 1.98977,0 0,7.02428 m 0.73448,-9.54822 -2.20343,1.85623 -0.90809,-0.8146 1.89629,-2.16338 1.21523,1.12175" /> + </g> + <g + transform="translate(0,435.8268)" + id="g7882" + style="font-size:13.35415173px;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:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu"> + <path + inkscape:connector-curvature="0" + id="path7884" + style="font-weight:bold;marker:none" + d="m 915.27539,-279.08722 c -0.59649,-1.05943 -1.24194,-2.1055 -1.93635,-3.13822 -0.69442,-1.03272 -1.43335,-2.00757 -2.21679,-2.92456 l 0,6.06278 -2.05654,0 0,-9.25443 1.69597,0 c 0.29379,0.2938 0.61874,0.65437 0.97486,1.08169 0.3561,0.42734 0.71667,0.88583 1.08168,1.37548 0.37392,0.48075 0.74338,0.98376 1.1084,1.50902 0.36501,0.51636 0.70776,1.01492 1.02827,1.49566 l 0,-5.46185 2.06989,0 0,9.25443 -1.74939,0" /> + <path + inkscape:connector-curvature="0" + id="path7886" + style="font-weight:bold;marker:none" + d="m 925.59627,-282.61272 c -10e-6,0.55198 -0.0801,1.05944 -0.24038,1.52238 -0.16025,0.45404 -0.39172,0.84576 -0.69441,1.17516 -0.3027,0.3205 -0.66771,0.56978 -1.09504,0.74784 -0.41844,0.17805 -0.89028,0.26708 -1.41554,0.26708 -0.51637,0 -0.98821,-0.089 -1.41554,-0.26708 -0.41843,-0.17806 -0.779,-0.42734 -1.08169,-0.74784 -0.30269,-0.3294 -0.53862,-0.72112 -0.70777,-1.17516 -0.16915,-0.46294 -0.25373,-0.9704 -0.25373,-1.52238 0,-0.55196 0.0846,-1.05497 0.25373,-1.50901 0.17806,-0.45404 0.41843,-0.84131 0.72113,-1.16182 0.31159,-0.32049 0.6766,-0.56977 1.09504,-0.74783 0.42733,-0.17805 0.89027,-0.26707 1.38883,-0.26708 0.50745,10e-6 0.97039,0.089 1.38883,0.26708 0.42733,0.17806 0.79234,0.42734 1.09504,0.74783 0.30269,0.32051 0.53861,0.70778 0.70777,1.16182 0.16915,0.45404 0.25372,0.95705 0.25373,1.50901 m -2.02983,0 c -10e-6,-0.61428 -0.12465,-1.09503 -0.37392,-1.44224 -0.24038,-0.35611 -0.58759,-0.53416 -1.04162,-0.53417 -0.45405,1e-5 -0.80571,0.17806 -1.05498,0.53417 -0.24928,0.34721 -0.37392,0.82796 -0.37392,1.44224 0,0.6143 0.12464,1.10395 0.37392,1.46896 0.24927,0.35611 0.60093,0.53417 1.05498,0.53417 0.45403,0 0.80124,-0.17806 1.04162,-0.53417 0.24927,-0.36501 0.37391,-0.85466 0.37392,-1.46896" /> + </g> + <g + transform="translate(0,435.8268)" + id="g7888" + style="font-size:13.35415173px;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:#806600;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"> + <path + inkscape:connector-curvature="0" + id="path7890" + style="font-weight:bold;fill:#806600;marker:none" + d="m 953.68131,-283.72111 c 0,0.45405 0.0534,0.86357 0.16025,1.22858 0.11574,0.36502 0.27598,0.68107 0.48075,0.94815 0.21366,0.25818 0.47184,0.45849 0.77454,0.60093 0.30269,0.14245 0.6499,0.21367 1.04163,0.21367 0.38281,0 0.72557,-0.0712 1.02827,-0.21367 0.31159,-0.14244 0.56977,-0.34275 0.77454,-0.60093 0.21366,-0.26708 0.37391,-0.58313 0.48075,-0.94815 0.11572,-0.36501 0.17359,-0.77453 0.1736,-1.22858 -10e-6,-0.45404 -0.0579,-0.86356 -0.1736,-1.22858 -0.10684,-0.37391 -0.26709,-0.68996 -0.48075,-0.94815 -0.20477,-0.26707 -0.46295,-0.47184 -0.77454,-0.61429 -0.3027,-0.14243 -0.64546,-0.21366 -1.02827,-0.21366 -0.39173,0 -0.73894,0.0757 -1.04163,0.22702 -0.3027,0.14245 -0.56088,0.34721 -0.77454,0.61429 -0.20477,0.25818 -0.36501,0.57423 -0.48075,0.94814 -0.10683,0.36502 -0.16025,0.7701 -0.16025,1.21523 m 7.06435,0 c -1e-5,0.64991 -0.0801,1.23749 -0.24038,1.76275 -0.16026,0.51636 -0.38728,0.9704 -0.68106,1.36212 -0.2849,0.39172 -0.62765,0.71668 -1.02827,0.97485 -0.40063,0.25819 -0.84132,0.44514 -1.32206,0.56088 0.0445,0.17805 0.14244,0.3205 0.29379,0.42733 0.15134,0.11574 0.34275,0.20922 0.57423,0.28044 0.23147,0.0712 0.49855,0.12464 0.80125,0.16025 0.31159,0.0356 0.64544,0.0668 1.00156,0.0935 l -0.42733,1.52237 c -0.69443,-0.0267 -1.29091,-0.0979 -1.78946,-0.21367 -0.48966,-0.10683 -0.90809,-0.25818 -1.25529,-0.45404 -0.33831,-0.19586 -0.60984,-0.43623 -0.8146,-0.72112 -0.19587,-0.28489 -0.34721,-0.61429 -0.45404,-0.98821 -0.55198,-0.0712 -1.06389,-0.22257 -1.53573,-0.45404 -0.47185,-0.24037 -0.88138,-0.56087 -1.22858,-0.9615 -0.34721,-0.40062 -0.61874,-0.88137 -0.8146,-1.44225 -0.19587,-0.56087 -0.2938,-1.19741 -0.2938,-1.90964 0,-0.79234 0.12464,-1.48676 0.37392,-2.08325 0.24928,-0.60538 0.58313,-1.11284 1.00156,-1.52237 0.42733,-0.40952 0.91698,-0.71666 1.46896,-0.92144 0.56087,-0.20475 1.14845,-0.30713 1.76275,-0.30714 0.63209,1e-5 1.22857,0.10239 1.78945,0.30714 0.56087,0.20478 1.05052,0.51192 1.46896,0.92144 0.41842,0.40953 0.74782,0.91699 0.98821,1.52237 0.24036,0.59649 0.36055,1.29091 0.36056,2.08325" /> + <path + inkscape:connector-curvature="0" + id="path7892" + style="font-weight:bold;fill:#806600;marker:none" + d="m 968.33165,-279.32759 c -0.33831,0.0979 -0.77455,0.18695 -1.30871,0.26708 -0.53417,0.089 -1.09504,0.13354 -1.68262,0.13354 -0.59649,0 -1.09504,-0.0801 -1.49566,-0.24037 -0.39173,-0.16025 -0.70332,-0.38282 -0.93479,-0.66771 -0.23148,-0.29379 -0.39618,-0.641 -0.49411,-1.04163 -0.0979,-0.40062 -0.14689,-0.8413 -0.14689,-1.32206 l 0,-3.91276 1.98976,0 0,3.67239 c 0,0.641 0.0846,1.10394 0.25373,1.38883 0.16915,0.28489 0.4852,0.42733 0.94815,0.42733 0.14244,0 0.29379,-0.004 0.45404,-0.0134 0.16024,-0.0178 0.30269,-0.0356 0.42733,-0.0534 l 0,-5.42178 1.98977,0 0,6.78391" /> + <path + inkscape:connector-curvature="0" + id="path7894" + style="font-weight:bold;fill:#806600;marker:none" + d="m 972.20227,-279.08722 -1.98977,0 0,-7.02428 1.98977,0 0,7.02428 m 0.18696,-9.05411 c -10e-6,0.36502 -0.12019,0.65436 -0.36056,0.86802 -0.23148,0.20477 -0.50746,0.30715 -0.82796,0.30714 -0.3205,10e-6 -0.60094,-0.10237 -0.84131,-0.30714 -0.23148,-0.21366 -0.34721,-0.503 -0.34721,-0.86802 0,-0.36501 0.11573,-0.6499 0.34721,-0.85467 0.24037,-0.21366 0.52081,-0.32049 0.84131,-0.3205 0.3205,1e-5 0.59648,0.10684 0.82796,0.3205 0.24037,0.20477 0.36055,0.48966 0.36056,0.85467" /> + <path + inkscape:connector-curvature="0" + id="path7896" + style="font-weight:bold;fill:#806600;marker:none" + d="m 979.34757,-284.77609 c -0.16025,0.17806 -0.37837,0.41844 -0.65435,0.72113 -0.26709,0.3027 -0.55643,0.63655 -0.86802,1.00156 -0.3116,0.36501 -0.62765,0.74783 -0.94814,1.14845 -0.3116,0.40063 -0.59649,0.7879 -0.85467,1.16182 l 3.39195,0 0,1.65591 -5.80905,0 0,-1.17516 c 0.18696,-0.3205 0.40953,-0.66326 0.66771,-1.02827 0.26708,-0.37392 0.54306,-0.74783 0.82795,-1.12175 0.29379,-0.37392 0.58313,-0.73448 0.86802,-1.08169 0.28489,-0.35611 0.54752,-0.6766 0.7879,-0.9615 l -2.99133,0 0,-1.65591 5.58203,0 0,1.33541" /> + <path + inkscape:connector-curvature="0" + id="path7898" + style="font-weight:bold;fill:#806600;marker:none" + d="m 983.22529,-280.47605 c 0.19585,0 0.38281,-0.004 0.56087,-0.0134 0.17805,-0.009 0.3205,-0.0222 0.42733,-0.0401 l 0,-1.50902 c -0.0801,-0.0178 -0.20031,-0.0356 -0.36056,-0.0534 -0.16025,-0.0178 -0.30715,-0.0267 -0.44068,-0.0267 -0.18697,0 -0.36502,0.0134 -0.53417,0.0401 -0.16025,0.0178 -0.3027,0.0579 -0.42733,0.12019 -0.12465,0.0623 -0.22258,0.1469 -0.2938,0.25373 -0.0712,0.10683 -0.10683,0.24037 -0.10683,0.40062 0,0.3116 0.10238,0.52972 0.30715,0.65436 0.21366,0.11573 0.503,0.1736 0.86802,0.1736 m -0.16025,-5.82241 c 0.58758,10e-6 1.07723,0.0668 1.46895,0.20031 0.39172,0.13355 0.70332,0.32496 0.93479,0.57423 0.24037,0.24928 0.40953,0.55198 0.50746,0.90808 0.0979,0.35612 0.14689,0.75229 0.1469,1.18852 l 0,4.13979 c -0.2849,0.0623 -0.68107,0.13354 -1.18852,0.21366 -0.50746,0.089 -1.12175,0.13355 -1.84287,0.13355 -0.45405,0 -0.86803,-0.0401 -1.24194,-0.12019 -0.36502,-0.0801 -0.68106,-0.20922 -0.94815,-0.38727 -0.26708,-0.18696 -0.47184,-0.42733 -0.61429,-0.72113 -0.14244,-0.29379 -0.21366,-0.65435 -0.21366,-1.08168 0,-0.40953 0.0801,-0.75673 0.24037,-1.04163 0.16915,-0.28488 0.39172,-0.5119 0.66771,-0.68106 0.27598,-0.16915 0.59203,-0.28933 0.94814,-0.36056 0.35611,-0.0801 0.72558,-0.12018 1.1084,-0.12019 0.25818,10e-6 0.4852,0.0134 0.68106,0.0401 0.20476,0.0178 0.36946,0.0445 0.4941,0.0801 l 0,-0.18696 c 0,-0.3383 -0.10238,-0.60983 -0.30714,-0.8146 -0.20477,-0.20476 -0.56088,-0.30714 -1.06833,-0.30715 -0.33831,10e-6 -0.67217,0.0267 -1.00156,0.0801 -0.32941,0.0445 -0.6143,0.11129 -0.85467,0.20031 l -0.25373,-1.6025 c 0.11574,-0.0356 0.25818,-0.0712 0.42733,-0.10683 0.17806,-0.0445 0.36947,-0.0801 0.57423,-0.10683 0.20476,-0.0356 0.41843,-0.0623 0.641,-0.0801 0.23147,-0.0267 0.46294,-0.0401 0.69442,-0.0401" /> + <path + inkscape:connector-curvature="0" + id="path7900" + style="font-weight:bold;fill:#806600;marker:none" + d="m 989.93888,-280.51611 c 0.36501,0 0.62319,-0.0356 0.77454,-0.10684 0.15134,-0.0712 0.22701,-0.20921 0.22702,-0.41398 -10e-6,-0.16024 -0.0979,-0.29824 -0.29379,-0.41397 -0.19587,-0.12464 -0.49411,-0.26263 -0.89473,-0.41398 -0.3116,-0.11574 -0.59649,-0.23592 -0.85467,-0.36056 -0.24928,-0.12464 -0.46294,-0.27154 -0.641,-0.44069 -0.17805,-0.17805 -0.31604,-0.38727 -0.41397,-0.62765 -0.0979,-0.24037 -0.1469,-0.52971 -0.1469,-0.86802 0,-0.6588 0.24483,-1.17961 0.73448,-1.56243 0.48965,-0.38281 1.16181,-0.57422 2.01648,-0.57423 0.42732,10e-6 0.83685,0.0401 1.22858,0.12019 0.39171,0.0712 0.70331,0.15135 0.93479,0.24037 l -0.34721,1.54908 c -0.23148,-0.0801 -0.48521,-0.15134 -0.76119,-0.21366 -0.26708,-0.0623 -0.56978,-0.0935 -0.90808,-0.0935 -0.6232,0 -0.93479,0.17361 -0.93479,0.52081 0,0.0801 0.0133,0.15135 0.0401,0.21367 0.0267,0.0623 0.0801,0.12464 0.16025,0.18695 0.0801,0.0534 0.18696,0.11574 0.3205,0.18696 0.14244,0.0623 0.3205,0.13355 0.53417,0.21367 0.43623,0.16025 0.79679,0.3205 1.08168,0.48075 0.28489,0.15135 0.50746,0.3205 0.66771,0.50746 0.16915,0.17805 0.28488,0.37837 0.34721,0.60093 0.0712,0.22257 0.10683,0.48075 0.10683,0.77454 0,0.69442 -0.26263,1.21968 -0.78789,1.57579 -0.51637,0.35611 -1.25084,0.53417 -2.20344,0.53417 -0.62319,0 -1.144,-0.0534 -1.56243,-0.16025 -0.40953,-0.10683 -0.69442,-0.19586 -0.85467,-0.26708 l 0.33386,-1.61586 c 0.3383,0.13355 0.68551,0.24038 1.04162,0.3205 0.35611,0.0712 0.70777,0.10684 1.05498,0.10684" /> + </g> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7902" + y="160.58392" + x="648.06165" + 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="160.58392" + x="648.06165" + sodipodi:role="line" + id="tspan7904">las <tspan + style="font-weight:bold" + id="tspan7906">carpetas</tspan> ayudan </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="175.58392" + x="648.06165" + sodipodi:role="line" + id="tspan7908">a organizar, a </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="190.58392" + x="648.06165" + sodipodi:role="line" + id="tspan7910"><tspan + style="font-weight:bold" + id="tspan7912">ordenar </tspan>los documentos</tspan></text> + <text + transform="translate(0,435.8268)" + 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="648.06165" + y="270.58392" + id="text7914" + sodipodi:linespacing="125%"><tspan + id="tspan7916" + sodipodi:role="line" + x="648.06165" + y="270.58392" + style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan + id="tspan7918" + sodipodi:role="line" + x="648.06165" + y="285.58392" + style="font-size:12px;font-weight:normal;fill:#aa4400">y a darles <tspan + id="tspan7920" + style="font-weight:bold">estructura</tspan></tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7922" + y="470.58392" + x="708.06165" + 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="470.58392" + x="708.06165" + sodipodi:role="line" + id="tspan7924" /><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="485.58392" + x="708.06165" + sodipodi:role="line" + id="tspan7926">esa misma </tspan><tspan + id="tspan7928" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="500.58392" + x="708.06165" + sodipodi:role="line"><tspan + id="tspan7930" + style="font-weight:bold">estructura</tspan> es la </tspan><tspan + id="tspan7932" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="515.58392" + x="708.06165" + sodipodi:role="line">que se mostrará </tspan><tspan + id="tspan7934" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="530.58392" + x="708.06165" + sodipodi:role="line">si haces <tspan + id="tspan7936" + style="font-weight:bold">públicos </tspan></tspan><tspan + id="tspan7938" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="545.58392" + x="708.06165" + sodipodi:role="line">los documentos,</tspan><tspan + id="tspan7940" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="560.58392" + x="708.06165" + sodipodi:role="line">y así formarán tu</tspan><tspan + id="tspan7942" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="575.58392" + x="708.06165" + sodipodi:role="line"><tspan + id="tspan7944" + style="font-weight:bold">web personal </tspan>o la</tspan><tspan + id="tspan7946" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="590.58392" + x="708.06165" + sodipodi:role="line">de tus <tspan + id="tspan7948" + style="font-weight:bold">grupos</tspan> (*)</tspan><tspan + id="tspan7950" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="605.58392" + x="708.06165" + sodipodi:role="line" /><tspan + style="font-size:8px;font-style:italic;font-weight:normal;fill:#aa4400" + y="616.5282" + x="708.06165" + sodipodi:role="line" + id="tspan7952">(*) en desarrollo</tspan></text> + <text + transform="translate(0,435.8268)" + 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="648.65973" + y="683.70709" + id="text7954" + sodipodi:linespacing="125%"><tspan + id="tspan7956" + sodipodi:role="line" + x="648.65973" + y="683.70709" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">Aquí puedes crear </tspan><tspan + id="tspan7958" + sodipodi:role="line" + x="648.65973" + y="698.70709" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">nuevos <tspan + id="tspan7960" + style="font-weight:bold">documentos</tspan>, </tspan><tspan + id="tspan7962" + sodipodi:role="line" + x="648.65973" + y="713.70709" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"><tspan + id="tspan7964" + style="font-weight:bold">carpetas</tspan> y </tspan><tspan + id="tspan7966" + sodipodi:role="line" + x="648.65973" + y="728.70709" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">muchas <tspan + id="tspan7968" + style="font-weight:bold">más</tspan> cosas</tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7970" + y="787.7229" + x="648.23376" + 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="787.7229" + x="648.23376" + sodipodi:role="line" + id="tspan7972" /><tspan + id="tspan7974" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="802.7229" + x="648.23376" + sodipodi:role="line">Esto es todo, </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="817.7229" + x="648.23376" + sodipodi:role="line" + id="tspan7976">danos tu <tspan + id="tspan7978" + style="font-weight:bold">feedback </tspan></tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="832.7229" + x="648.23376" + sodipodi:role="line" + id="tspan7980">y participa para </tspan><tspan + id="tspan7982" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="847.7229" + x="648.23376" + sodipodi:role="line">mejorar esta </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="862.7229" + x="648.23376" + sodipodi:role="line" + id="tspan7984">herramienta...</tspan></text> + <text + transform="translate(0,435.8268)" + sodipodi:linespacing="125%" + id="text7986" + y="386.78421" + x="733.44012" + 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="386.78421" + x="733.44012" + sodipodi:role="line" + id="tspan7988" /><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="401.78421" + x="733.44012" + sodipodi:role="line" + id="tspan7990">puedes</tspan><tspan + id="tspan7992" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="416.78421" + x="733.44012" + sodipodi:role="line"><tspan + id="tspan7994" + style="font-weight:bold">arrastrar</tspan> y <tspan + id="tspan7996" + style="font-weight:bold">soltar</tspan></tspan><tspan + id="tspan7998" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="431.78421" + x="733.44012" + sodipodi:role="line">para moverlos</tspan></text> + <g + transform="matrix(1.9571643,0,0,1.9571643,-583.82123,-317.64711)" + id="g8000" + 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="path8002" + 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="path8004" + 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="path8006" + 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="path8008" + 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="path8010" + 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,-638.39303,-235.8964)" + id="g8012" + 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="path8014" + 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="path8016" + 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="path8018" + 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="path8020" + 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,-607.57601,-276.77175)" + id="g8022" + 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="path8024" + 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="path8026" + 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="path8028" + 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="path8030" + 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="path8032" + 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="path8034" + 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="path8036" + 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> + <g + transform="translate(0,435.8268)" + id="g8038" + 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:#ffffff;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="path8040" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 607.60554,560.37489 0.43682,0 0,1.94048 -0.43682,0 0,-1.94048" /> + <path + inkscape:connector-curvature="0" + id="path8042" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 608.46351,560.89291 c 0.0709,-0.0205 0.16241,-0.0392 0.27442,-0.056 0.112,-0.0187 0.22961,-0.028 0.35281,-0.028 0.12507,10e-6 0.22868,0.0168 0.31081,0.0504 0.084,0.0317 0.15028,0.0775 0.19881,0.1372 0.0485,0.0597 0.0831,0.13068 0.10361,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.0355,-0.056 -0.10174,-0.084 -0.19881,-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="path8044" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 610.53236,562.31537 -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 0,-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="path8046" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 610.85455,561.57894 c 0,-0.10641 0.0168,-0.20628 0.0504,-0.29962 0.0355,-0.0952 0.0859,-0.17734 0.1512,-0.24641 0.0653,-0.0709 0.14467,-0.12693 0.23801,-0.168 0.0933,-0.0411 0.19974,-0.0616 0.31922,-0.0616 0.0784,10e-6 0.15027,0.007 0.2156,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.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.15773,0.10921 0.29961,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.182,0.0532 -0.0728,0.0149 -0.15308,0.0224 -0.24081,0.0224 -0.13441,0 -0.25015,-0.0196 -0.34722,-0.0588 -0.0971,-0.0411 -0.17734,-0.0961 -0.24081,-0.16521 -0.0616,-0.0691 -0.10734,-0.15027 -0.1372,-0.24361 -0.028,-0.0952 -0.042,-0.19787 -0.042,-0.30801" /> + <path + inkscape:connector-curvature="0" + id="path8048" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 613.63118,561.57614 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.14001,0.11947 -0.22961,0.15681 -0.0877,0.0373 -0.18668,0.056 -0.29681,0.056 -0.10827,0 -0.20721,-0.0187 -0.29682,-0.056 -0.0877,-0.0373 -0.16334,-0.0896 -0.22681,-0.15681 -0.0635,-0.0691 -0.11293,-0.1512 -0.1484,-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.1512,-0.24361 0.0653,-0.0672 0.14188,-0.11947 0.22961,-0.1568 0.0896,-0.0373 0.18668,-0.056 0.29122,-0.056 0.1064,10e-6 0.20347,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.12321,-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.126,0.11201 0.22121,0.11201 0.0952,0 0.168,-0.0373 0.21841,-0.11201 0.0523,-0.0765 0.0784,-0.17921 0.0784,-0.30801" /> + </g> + <g + transform="translate(0,435.8268)" + id="g8050" + 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:#ffffff;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="path8052" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 641.34838,562.41625 c -0.10641,0 -0.21281,-0.004 -0.31922,-0.0112 -0.10454,-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.10453,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.27721 -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.22401,0.45922 -0.14747,0.10267 -0.36775,0.154 -0.66082,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.1204,-0.20721 0,-0.0896 -0.0336,-0.15308 -0.1008,-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="path8054" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 643.1429,562.41905 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 -10e-6,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.1204,0.0252 l -0.0588,0.34441" /> + <path + inkscape:connector-curvature="0" + id="path8056" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 644.81851,561.65182 c 0,0.11574 -0.0168,0.22214 -0.0504,0.31921 -0.0336,0.0952 -0.0821,0.17735 -0.14561,0.24641 -0.0635,0.0672 -0.14,0.11948 -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.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.20347,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="path8058" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 645.49732,561.60702 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.24642,0.10921 -0.0541,0.0728 -0.0812,0.16521 -0.0812,0.27721 m 0.91564,0.59922 c 0,0.24081 -0.0616,0.41909 -0.18481,0.53483 -0.12134,0.1176 -0.30988,0.1764 -0.56562,0.1764 -0.0896,0 -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.11948 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.20348,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.10173,0.0168 0.1484,0.028 0.0485,0.009 0.0915,0.0196 0.12881,0.0308 l 0,1.23765" /> + </g> + <g + transform="translate(0,435.8268)" + id="g8060" + 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:#ffffff;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="path8062" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 626.3589,562.31537 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.14188,-0.40228 0.20721,-0.57963 0.0653,-0.17734 0.12881,-0.34441 0.19041,-0.50122 0.0635,-0.1568 0.12507,-0.30521 0.18481,-0.44522 0.0616,-0.14187 0.12507,-0.28001 0.19041,-0.41441 l 0.41721,0 c 0.0635,0.1344 0.12601,0.27254 0.18761,0.41441 0.0616,0.14001 0.12321,0.28842 0.18481,0.44522 0.0635,0.15681 0.12787,0.32388 0.19321,0.50122 0.0653,0.17735 0.1344,0.37055 0.20721,0.57963 l -0.46762,0 m -0.52363,-1.50087 c -0.009,0.028 -0.0233,0.0663 -0.042,0.11481 -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.55163,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.11481" /> + <path + inkscape:connector-curvature="0" + id="path8064" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 627.93733,561.21212 c -0.0373,-0.009 -0.0812,-0.0187 -0.1316,-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.41721,0 0,-1.39446 c 0.0747,-0.0261 0.1624,-0.0504 0.26321,-0.0728 0.10267,-0.0243 0.21654,-0.0364 0.34161,-0.0364 0.0224,10e-6 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="path8066" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 628.13365,561.57894 c 0,-0.10641 0.0168,-0.20628 0.0504,-0.29962 0.0355,-0.0952 0.0859,-0.17734 0.15121,-0.24641 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.17735,-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="path8068" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 629.60371,562.31537 0,-2.10569 0.41722,-0.0672 0,0.70563 c 0.028,-0.009 0.0635,-0.0177 0.1064,-0.0252 0.0448,-0.009 0.0877,-0.014 0.12881,-0.014 0.11947,10e-6 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.1008,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 0,-0.13441 -0.0177,-0.22961 -0.0532,-0.28562 -0.0336,-0.056 -0.0971,-0.084 -0.1904,-0.084 -0.0373,0 -0.0728,0.004 -0.10641,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="path8070" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 631.67256,562.31537 -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="path8072" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 632.42142,562.31537 c -0.0952,-0.18668 -0.19228,-0.40508 -0.29121,-0.65523 -0.0971,-0.25014 -0.18948,-0.52269 -0.27722,-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.28002,0.81763 -0.0971,0.25015 -0.1932,0.46855 -0.28841,0.65523 l -0.34721,0" /> + <path + inkscape:connector-curvature="0" + id="path8074" + style="font-weight:bold;fill:#ffffff;marker:none" + d="m 634.90263,561.57614 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.14001,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.1064,10e-6 0.20347,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.12321,-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.126,0.11201 0.22121,0.11201 0.0952,0 0.168,-0.0373 0.21841,-0.11201 0.0523,-0.0765 0.0784,-0.17921 0.0784,-0.30801" /> + </g> + </g> + <g + inkscape:groupmode="layer" id="layer3" inkscape:label="en" style="display:none" - transform="translate(0,435.8268)"> + 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" @@ -12327,7 +14272,7 @@ </g> <text xml:space="preserve" - style="display:inline;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;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + 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" @@ -12360,7 +14305,7 @@ <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="display:inline;fill:#231f20" + style="fill:#231f20;display:inline" inkscape:connector-curvature="0" /> </g> <g @@ -12368,7 +14313,8 @@ id="layer4" inkscape:label="fr" style="display:none" - transform="translate(0,435.8268)"> + transform="translate(0,435.8268)" + sodipodi:insensitive="true"> <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-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/webapp/tutorials/events.svg 2012-03-24 23:15:23 UTC (rev 1777) @@ -25,7 +25,7 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="1.6809434" + inkscape:zoom="1.6245201" inkscape:cx="243.10117" inkscape:cy="1308.5714" inkscape:document-units="px" @@ -2070,13 +2070,14 @@ style="display:inline" inkscape:label="graphics" id="layer6" - inkscape:groupmode="layer"> + inkscape:groupmode="layer" + sodipodi:insensitive="true"> <g id="g3" transform="matrix(1.5625,0,0,1.5636219,145.02002,137.31615)"> <polygon style="fill:#231f20" - points="4,28 28,28 28,4 32,4 32,32 32,32 0,32 0,4 4,4 " + points="28,4 32,4 32,32 32,32 0,32 0,4 4,4 4,28 28,28 " id="polygon5" /> <rect x="6" @@ -2115,7 +2116,7 @@ id="rect15" /> <polygon style="fill:#231f20" - points="22,20 26,20 22,24 " + points="22,24 22,20 26,20 " id="polygon17" /> <path inkscape:connector-curvature="0" @@ -2155,7 +2156,7 @@ transform="matrix(0.6386928,0,0,0.63915139,47.303524,385.57271)"> <polygon style="fill:#231f20" - points="28,4 32,4 32,32 32,32 0,32 0,4 4,4 4,28 28,28 " + points="32,32 32,32 0,32 0,4 4,4 4,28 28,28 28,4 32,4 " id="polygon5-3" /> <rect x="6" @@ -2194,7 +2195,7 @@ id="rect15-1" /> <polygon style="fill:#231f20" - points="22,24 22,20 26,20 " + points="26,20 22,24 22,20 " id="polygon17-0" /> <path inkscape:connector-curvature="0" @@ -2213,7 +2214,7 @@ transform="matrix(0.6386928,0,0,0.63915139,42.373015,451.86067)"> <polygon style="fill:#231f20" - points="4,4 4,28 28,28 28,4 32,4 32,32 32,32 0,32 0,4 " + points="28,28 28,4 32,4 32,32 32,32 0,32 0,4 4,4 4,28 " id="polygon5-3-5" /> <rect x="6" @@ -2252,7 +2253,7 @@ id="rect15-1-7" /> <polygon style="fill:#231f20" - points="22,24 22,20 26,20 " + points="26,20 22,24 22,20 " id="polygon17-0-3" /> <path inkscape:connector-curvature="0" @@ -2271,7 +2272,7 @@ transform="matrix(0.6386928,0,0,0.63915139,64.834225,510.47894)"> <polygon style="fill:#231f20" - points="4,4 4,28 28,28 28,4 32,4 32,32 32,32 0,32 0,4 " + points="28,28 28,4 32,4 32,32 32,32 0,32 0,4 4,4 4,28 " id="polygon5-3-6" /> <rect x="6" @@ -2310,7 +2311,7 @@ id="rect15-1-0" /> <polygon style="fill:#231f20" - points="22,24 22,20 26,20 " + points="26,20 22,24 22,20 " id="polygon17-0-4" /> <path inkscape:connector-curvature="0" @@ -2329,7 +2330,7 @@ transform="matrix(0.6386928,0,0,0.63915139,203.98416,520.33996)"> <polygon style="fill:#231f20" - points="4,4 4,28 28,28 28,4 32,4 32,32 32,32 0,32 0,4 " + points="28,28 28,4 32,4 32,32 32,32 0,32 0,4 4,4 4,28 " id="polygon5-3-6-0" /> <rect x="6" @@ -2368,7 +2369,7 @@ id="rect15-1-0-2" /> <polygon style="fill:#231f20" - points="22,24 22,20 26,20 " + points="26,20 22,24 22,20 " id="polygon17-0-4-9" /> <path inkscape:connector-curvature="0" @@ -2387,7 +2388,7 @@ transform="matrix(0.6386928,0,0,0.63915139,229.18454,388.31188)"> <polygon style="fill:#231f20" - points="28,4 32,4 32,32 32,32 0,32 0,4 4,4 4,28 28,28 " + points="32,32 32,32 0,32 0,4 4,4 4,28 28,28 28,4 32,4 " id="polygon5-3-6-0-2" /> <rect x="6" @@ -2426,7 +2427,7 @@ id="rect15-1-0-2-9" /> <polygon style="fill:#231f20" - points="22,24 22,20 26,20 " + points="26,20 22,24 22,20 " id="polygon17-0-4-9-6" /> <path inkscape:connector-curvature="0" @@ -2445,7 +2446,7 @@ style="display:inline"> <polygon id="polygon15266" - points="32,32 0,32 0,4 4,4 4,28 28,28 28,4 32,4 32,32 " + points="0,4 4,4 4,28 28,28 28,4 32,4 32,32 32,32 0,32 " style="fill:#231f20" /> <rect id="rect15268" @@ -2484,7 +2485,7 @@ x="14" /> <polygon id="polygon15278" - points="22,24 22,20 26,20 " + points="26,20 22,24 22,20 " style="fill:#231f20" /> <path id="path15280" @@ -2503,7 +2504,7 @@ style="display:inline"> <polygon id="polygon15266-4" - points="4,28 28,28 28,4 32,4 32,32 32,32 0,32 0,4 4,4 " + points="28,4 32,4 32,32 32,32 0,32 0,4 4,4 4,28 28,28 " style="fill:#231f20" /> <rect id="rect15268-2" @@ -2542,7 +2543,7 @@ x="14" /> <polygon id="polygon15278-6" - points="22,20 26,20 22,24 " + points="22,24 22,20 26,20 " style="fill:#231f20" /> <path id="path15280-5" @@ -2561,7 +2562,7 @@ style="display:inline"> <polygon id="polygon15266-4-4" - points="32,32 0,32 0,4 4,4 4,28 28,28 28,4 32,4 32,32 " + points="0,4 4,4 4,28 28,28 28,4 32,4 32,32 32,32 0,32 " style="fill:#231f20" /> <rect id="rect15268-2-1" @@ -2600,7 +2601,7 @@ x="14" /> <polygon id="polygon15278-6-9" - points="22,24 22,20 26,20 " + points="26,20 22,24 22,20 " style="fill:#231f20" /> <path id="path15280-5-8" @@ -5145,7 +5146,7 @@ id="g17044"> <polygon id="polygon15266-4-5" - points="28,28 28,4 32,4 32,32 32,32 0,32 0,4 4,4 4,28 " + points="32,4 32,32 32,32 0,32 0,4 4,4 4,28 28,28 28,4 " style="fill:#231f20" transform="matrix(1.1709546,0,0,1.1717953,256.42291,1260.4496)" /> <rect @@ -5185,7 +5186,7 @@ x="272.81628" /> <polygon id="polygon15278-6-5" - points="26,20 22,24 22,20 " + points="22,20 26,20 22,24 " style="fill:#e6e6e6" transform="matrix(1.1709546,0,0,1.1717953,256.42291,1260.4496)" /> <path @@ -5918,6 +5919,723 @@ style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">no aparecerá en tu agenda</tspan></text> </g> <g + inkscape:groupmode="layer" + id="g18039" + inkscape:label="en-working" + style="display:none"> + <g + style="display:inline" + id="g18041" + transform="translate(106.00677,59.44173)"> + <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.1684" + y="122.68937" + id="text18043" + sodipodi:linespacing="125%" + transform="scale(0.99912117,1.0008796)"><tspan + sodipodi:role="line" + x="101.1684" + y="122.68937" + style="font-size:32px;font-weight:bold;fill:#aa4400" + id="tspan18045">eventos</tspan></text> + <text + transform="scale(0.99912117,1.0008796)" + sodipodi:linespacing="125%" + id="text18047" + y="95.114334" + x="101.42439" + 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="tspan18049" + style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" + y="95.114334" + x="101.42439" + sodipodi:role="line">explicando los</tspan></text> + </g> + <text + transform="translate(0,435.82679)" + sodipodi:linespacing="125%" + id="text18051" + 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="tspan18053" + x="149.85907" + y="-168.92439">pulsa con tu ratón para continuar</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="638.5896" + y="669.90698" + id="text18055" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="638.5896" + y="669.90698" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan18057">Lo siento, estamos</tspan><tspan + sodipodi:role="line" + x="638.5896" + y="684.90698" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan18059">diseñando este</tspan><tspan + sodipodi:role="line" + x="638.5896" + y="699.90698" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan18061">tutorial.</tspan><tspan + sodipodi:role="line" + x="638.5896" + y="714.90698" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan18063">Mientras tanto...</tspan><tspan + sodipodi:role="line" + x="638.5896" + y="729.90698" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan18065" /></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="110.06956" + y="1359.1978" + id="text18067" + sodipodi:linespacing="125%"><tspan + id="tspan18069" + sodipodi:role="line" + x="110.06956" + y="1359.1978" + style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan + id="tspan18071" + sodipodi:role="line" + x="110.06956" + y="1374.1978" + style="font-size:12px;font-weight:normal;fill:#aa4400">...darnos tu <tspan + style="font-weight:bold" + id="tspan18073">feedback </tspan></tspan><tspan + id="tspan18075" + sodipodi:role="line" + x="110.06956" + y="1389.1978" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">y participar para </tspan><tspan + sodipodi:role="line" + x="110.06956" + y="1404.1978" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan18077">mejorar esta </tspan><tspan + id="tspan18079" + sodipodi:role="line" + x="110.06956" + y="1419.1978" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">herramienta...</tspan></text> + <text + sodipodi:linespacing="125%" + id="text18081" + y="1276.1549" + x="82.407417" + 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="1276.1549" + x="82.407417" + sodipodi:role="line" + id="tspan18083">...aquí puedes crear </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:bold;fill:#aa4400" + y="1291.1549" + x="82.407417" + sodipodi:role="line" + id="tspan18085"><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan18087">nuevos </tspan>eventos<tspan + style="font-weight:normal" + id="tspan18089">...</tspan></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="208.17262" + y="646.41119" + id="text18091" + sodipodi:linespacing="125%"><tspan + id="tspan18093" + sodipodi:role="line" + x="208.17262" + y="646.41119" + style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan + id="tspan18095" + sodipodi:role="line" + x="208.17262" + y="661.41119" + style="font-size:12px;font-weight:normal;fill:#aa4400">...nuestro calendario de eventos </tspan><tspan + id="tspan18097" + sodipodi:role="line" + x="208.17262" + y="676.41119" + style="font-size:12px;font-weight:normal;fill:#aa4400">os permite crear <tspan + id="tspan18099" + style="font-weight:bold">entre todos/as</tspan></tspan><tspan + id="tspan18101" + sodipodi:role="line" + x="208.17262" + y="691.41119" + style="font-size:12px;font-weight:normal;fill:#aa4400">la agenda de actividades </tspan><tspan + id="tspan18103" + sodipodi:role="line" + x="208.17262" + y="706.41119" + style="font-size:12px;font-weight:normal;fill:#aa4400">de tu grupo, darle visibilidad, </tspan><tspan + id="tspan18105" + sodipodi:role="line" + x="208.17262" + y="721.41119" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">hacer convocatorias externas, </tspan><tspan + id="tspan18107" + sodipodi:role="line" + x="208.17262" + y="736.41119" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"><tspan + id="tspan18109" + style="font-style:italic">smartmobs</tspan>, ruedas de emergencia, </tspan><tspan + id="tspan18111" + sodipodi:role="line" + x="208.17262" + y="751.41119" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">etc.</tspan></text> + <text + sodipodi:linespacing="125%" + id="text18113" + y="415.59091" + x="254.51424" + 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="415.59091" + x="254.51424" + sodipodi:role="line" + id="tspan18115" /><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="430.59091" + x="254.51424" + sodipodi:role="line" + id="tspan18117">Hoy muchos eventos de iniciativas </tspan><tspan + id="tspan18119" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="445.59091" + x="254.51424" + sodipodi:role="line">y colectivos <tspan + id="tspan18121" + style="font-weight:bold">se convocan mediante </tspan></tspan><tspan + id="tspan18123" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="460.59091" + x="254.51424" + sodipodi:role="line"><tspan + id="tspan18125" + style="font-weight:bold">correos</tspan>. Cada miembro intenta </tspan><tspan + id="tspan18127" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="475.59091" + x="254.51424" + sodipodi:role="line">actualizar su agenda personal con </tspan><tspan + id="tspan18129" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="490.59091" + x="254.51424" + sodipodi:role="line">estos eventos</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="256.83853" + y="815.23053" + id="text18131" + sodipodi:linespacing="125%"><tspan + id="tspan18133" + sodipodi:role="line" + x="256.83853" + y="815.23053" + style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan + id="tspan18135" + sodipodi:role="line" + x="256.83853" + y="830.23053" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">estos eventos puede ser </tspan><tspan + sodipodi:role="line" + x="256.83853" + y="845.23053" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan18137">actualizados también por todos </tspan><tspan + sodipodi:role="line" + x="256.83853" + y="860.23053" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan18139">los miembros de tu grupo </tspan><tspan + sodipodi:role="line" + x="256.83853" + y="875.23053" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan18141">en <tspan + id="tspan18143" + style="font-weight:bold">tiempo real</tspan>, es decir, </tspan><tspan + id="tspan18145" + sodipodi:role="line" + x="256.83853" + y="890.23053" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">al mismo tiempo, </tspan><tspan + id="tspan18147" + sodipodi:role="line" + x="256.83853" + y="905.23053" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">confirmando asistencia,</tspan><tspan + sodipodi:role="line" + x="256.83853" + y="920.23053" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan18149">o aportando información sobre </tspan><tspan + sodipodi:role="line" + x="256.83853" + y="935.23053" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan18151">el evento, etc</tspan></text> + <flowRoot + style="font-size:46px;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.05;color:#000000;fill:#00ff00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu Bold" + id="flowRoot18153" + xml:space="preserve"><flowRegion + id="flowRegion18155"><rect + y="1007.841" + x="37.962986" + height="304.47864" + width="291.3078" + id="rect18157" /></flowRegion><flowPara + id="flowPara18159" /></flowRoot> <g + id="g18161" + style="font-size:14.02383423px;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:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + transform="translate(-799.34627,1184.927)"> + <path + inkscape:connector-curvature="0" + id="path18163" + style="fill:#000000;marker:none" + d="m 838.81492,-348.89388 c -10e-6,0.35527 0.12621,0.64509 0.37864,0.86948 0.26178,0.23372 0.62172,0.35059 1.07983,0.35059 0.61705,0 1.22007,-0.15894 1.80908,-0.47681 l 0.36462,1.00972 c -0.31788,0.16828 -0.67782,0.30384 -1.07984,0.40669 -0.39267,0.10284 -0.81338,0.15426 -1.26214,0.15426 -0.50486,0 -0.92558,-0.0654 -1.26215,-0.19633 -0.33657,-0.13089 -0.61237,-0.29918 -0.8274,-0.50486 -0.20569,-0.20569 -0.35527,-0.43942 -0.44877,-0.70119 -0.0841,-0.25243 -0.12621,-0.50486 -0.12621,-0.75729 0,-0.30852 0.0561,-0.58433 0.16829,-0.82741 0.12154,-0.24308 0.27112,-0.47213 0.44876,-0.68716 0.17763,-0.22438 0.36462,-0.43474 0.56095,-0.63108 0.20568,-0.19633 0.39734,-0.40201 0.57498,-0.61705 0.17763,-0.22437 0.32254,-0.4581 0.43474,-0.70119 0.12154,-0.24307 0.18231,-0.51888 0.18231,-0.8274 0,-0.0467 0,-0.0888 0,-0.12622 0,-0.0467 -0.005,-0.0935 -0.014,-0.14024 l 1.09386,0 c 0.0374,0.18699 0.0561,0.3693 0.0561,0.54693 -10e-6,0.29918 -0.0561,0.57031 -0.16829,0.81339 -0.10284,0.24308 -0.23373,0.47213 -0.39266,0.68716 -0.1496,0.20569 -0.31788,0.40202 -0.50486,0.589 -0.18699,0.18699 -0.35995,0.37397 -0.51888,0.56096 -0.14959,0.18698 -0.28048,0.37864 -0.39267,0.57497 -0.10285,0.19634 -0.15427,0.4067 -0.15426,0.63108 m 0.51888,-6.67535 c 0,-0.25242 0.0841,-0.47213 0.25243,-0.65912 0.16828,-0.18698 0.39734,-0.28047 0.68716,-0.28047 0.28983,0 0.51888,0.0935 0.68717,0.28047 0.16828,0.18699 0.25243,0.4067 0.25243,0.65912 0,0.25244 -0.0842,0.47214 -0.25243,0.65912 -0.16829,0.18699 -0.39734,0.28048 -0.68717,0.28048 -0.28982,0 -0.51888,-0.0935 -0.68716,-0.28048 -0.16829,-0.18698 -0.25243,-0.40668 -0.25243,-0.65912" /> + <path + inkscape:connector-curvature="0" + id="path18165" + style="fill:#000000;marker:none" + d="m 851.11973,-358.93495 c -0.35527,1.02843 -0.69652,1.98205 -1.02374,2.86086 -0.31788,0.86949 -0.63108,1.69689 -0.93959,2.48222 -0.30853,0.78534 -0.61706,1.53795 -0.92558,2.25784 -0.29918,0.71054 -0.6077,1.41641 -0.92557,2.1176 l -1.27617,0 c -0.31787,-0.70119 -0.63107,-1.40706 -0.93959,-2.1176 -0.29918,-0.71989 -0.60771,-1.4725 -0.92558,-2.25784 -0.30852,-0.78533 -0.6264,-1.61273 -0.95362,-2.48222 -0.32722,-0.87881 -0.66379,-1.83243 -1.00971,-2.86086 l 1.50055,0 c 0.50485,1.47719 1.00036,2.89827 1.48652,4.26325 0.48616,1.36499 0.98634,2.64583 1.50055,3.84253 0.5142,-1.18735 1.01439,-2.46352 1.50055,-3.82851 0.48616,-1.37433 0.97699,-2.80008 1.47251,-4.27727 l 1.45847,0" /> + <path + inkscape:connector-curvature="0" + id="path18167" + style="fill:#000000;marker:none" + d="m 854.49751,-350.15603 c 0.30852,0 0.57964,-0.005 0.81338,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0841 -0.32722,0.20568 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.35059 -0.18231,0.60302 0,0.46746 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70587,0.26645 1.22008,0.26645 m -0.1122,-6.5351 c 0.52356,0 0.96297,0.0701 1.31825,0.21035 0.36461,0.1309 0.65444,0.32256 0.86947,0.57498 0.22438,0.24309 0.38332,0.53759 0.47681,0.8835 0.0935,0.33658 0.14024,0.71055 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.028 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57965,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0842 -0.6451,-0.21503 -0.89752,-0.39267 -0.25243,-0.18698 -0.44877,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.2384,-1.03777 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13088,0 0.26645,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42539 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40202 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29917 -0.50485,-0.39267 -0.20569,-0.10283 -0.47682,-0.15425 -0.81339,-0.15426 -0.43006,1e-5 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15426,-1.07984 c 0.16828,-0.0748 0.44876,-0.1449 0.84143,-0.21035 0.39266,-0.0748 0.81805,-0.11219 1.27616,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path18169" + style="fill:#000000;marker:none" + d="m 861.03941,-350.15603 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26177,-0.14023 0.39266,-0.36461 0.39267,-0.67314 -1e-5,-0.31787 -0.12622,-0.5703 -0.37865,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.1122,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.2384,-1.15462 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94932,-0.57497 0.20568,0 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39733,0.0468 0.57497,0.0841 0.17763,0.0281 0.3319,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12622 -0.36462,10e-6 -0.6825,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.4067,0.36462 -0.40669,0.67314 -10e-6,0.15894 0.028,0.29918 0.0841,0.42072 0.0654,0.12154 0.15893,0.23373 0.28048,0.33657 0.13088,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0842 0.41136,0.17296 0.67314,0.26645 0.34592,0.1309 0.65444,0.26179 0.92557,0.39267 0.27113,0.12154 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34592,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52356 0.15427,0.86948 -10e-6,0.67314 -0.25244,1.18267 -0.75729,1.52859 -0.49551,0.34592 -1.20605,0.51889 -2.13162,0.51889 -0.6451,0 -1.14996,-0.0561 -1.51458,-0.16829 -0.36462,-0.10284 -0.61237,-0.18231 -0.74326,-0.23841 l 0.2384,-1.1219 c 0.14959,0.0561 0.388,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16828 1.30422,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path18171" + style="fill:#000000;marker:none" + d="m 871.28776,-350.15603 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44409,-0.0467 0.60303,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19633,0 -0.40669,0.014 -0.63107,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32723,0.20568 -0.44877,0.36462 -0.12154,0.14959 -0.18231,0.35059 -0.18231,0.60302 0,0.46746 0.14959,0.79469 0.44877,0.98167 0.29917,0.17764 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.5351 c 0.52355,0 0.96296,0.0701 1.31824,0.21035 0.36461,0.1309 0.65444,0.32256 0.86948,0.57498 0.22437,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27114,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0841 -0.25243,0.028 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34593,-0.0842 -0.6451,-0.21503 -0.89753,-0.39267 -0.25243,-0.18698 -0.44876,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21036,-1.07983 0,-0.40202 0.0795,-0.74794 0.23841,-1.03777 0.16828,-0.28982 0.39266,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37397,-0.0841 0.76663,-0.12621 1.178,-0.12621 0.13089,0 0.26645,0.009 0.40669,0.0281 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13089,0.0187 0.24308,0.0374 0.33657,0.0561 0.0935,0.0187 0.15894,0.0327 0.19634,0.0421 l 0,-0.36462 c -10e-6,-0.21503 -0.0234,-0.42539 -0.0701,-0.63107 -0.0467,-0.21503 -0.1309,-0.40202 -0.25243,-0.56096 -0.12155,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20569,-0.10283 -0.47681,-0.15425 -0.81338,-0.15426 -0.43007,1e-5 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07984 c 0.16828,-0.0748 0.44876,-0.1449 0.84143,-0.21035 0.39267,-0.0748 0.81805,-0.11219 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path18173" + style="fill:#000000;marker:none" + d="m 884.42743,-352.8486 c 0,-0.85078 -0.21036,-1.50522 -0.63107,-1.96334 -0.42072,-0.45811 -0.98167,-0.68716 -1.68286,-0.68717 -0.39267,10e-6 -0.70119,0.014 -0.92557,0.0421 -0.21504,0.0281 -0.388,0.0608 -0.51888,0.0982 l 0,4.59982 c 0.15893,0.13089 0.38799,0.2571 0.68716,0.37864 0.29918,0.12154 0.6264,0.18231 0.98167,0.18231 0.37397,0 0.69184,-0.0654 0.95362,-0.19633 0.27113,-0.14024 0.49083,-0.32722 0.65912,-0.56096 0.16828,-0.24307 0.28982,-0.52355 0.36462,-0.84143 0.0748,-0.32722 0.11219,-0.67781 0.11219,-1.05178 m 1.36032,0 c -10e-6,0.5516 -0.0748,1.06114 -0.22438,1.52859 -0.14025,0.46747 -0.35061,0.86948 -0.63108,1.20605 -0.28048,0.33658 -0.6264,0.59835 -1.03776,0.78534 -0.40202,0.18698 -0.86481,0.28048 -1.38836,0.28048 -0.42072,0 -0.79469,-0.0561 -1.12191,-0.16829 -0.31787,-0.11219 -0.55628,-0.21971 -0.71521,-0.32255 l 0,2.91696 -1.30422,0 0,-9.66242 c 0.30852,-0.0748 0.69184,-0.15426 1.14995,-0.23841 0.46746,-0.0935 1.00504,-0.14023 1.61275,-0.14024 0.56094,10e-6 1.0658,0.0888 1.51457,0.26646 0.44876,0.17764 0.83207,0.43007 1.14995,0.75728 0.31787,0.32723 0.56095,0.72925 0.72924,1.20605 0.17763,0.46747 0.26645,0.9957 0.26646,1.5847" /> + <path + inkscape:connector-curvature="0" + id="path18175" + style="fill:#000000;marker:none" + d="m 894.07364,-352.86263 c 0,0.57966 -0.0841,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.40669,0.86948 -0.71521,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78534 -0.42072,0.17763 -0.87883,0.26645 -1.37433,0.26645 -0.49551,0 -0.95363,-0.0888 -1.37434,-0.26645 -0.42071,-0.18699 -0.78533,-0.44877 -1.09386,-0.78534 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16829,-0.46746 -0.25243,-0.99101 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55664 0.16829,-0.47681 0.40202,-0.8835 0.70119,-1.22008 0.30853,-0.33656 0.67315,-0.59367 1.09386,-0.77131 0.42071,-0.18697 0.87883,-0.28047 1.37434,-0.28047 0.4955,0 0.95361,0.0935 1.37433,0.28047 0.42071,0.17764 0.78066,0.43475 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71521,1.22008 0.16828,0.46746 0.25243,0.98634 0.25243,1.55664 m -1.36031,0 c 0,-0.82272 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48615 -0.86481,-0.72923 -1.50055,-0.72924 -0.63575,10e-6 -1.14061,0.24309 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12659 -0.54693,1.94931 0,0.82274 0.18231,1.47718 0.54693,1.96334 0.37397,0.47681 0.87883,0.71522 1.51458,0.71521 0.63574,10e-6 1.13592,-0.2384 1.50055,-0.71521 0.37396,-0.48616 0.56095,-1.1406 0.56095,-1.96334" /> + <path + inkscape:connector-curvature="0" + id="path18177" + style="fill:#000000;marker:none" + d="m 900.62058,-354.9662 c -0.15894,-0.13089 -0.388,-0.2571 -0.68717,-0.37865 -0.29918,-0.12153 -0.6264,-0.1823 -0.98166,-0.18231 -0.37398,10e-6 -0.69652,0.0701 -0.96765,0.21036 -0.26178,0.1309 -0.47681,0.31788 -0.6451,0.56095 -0.16828,0.23374 -0.28982,0.51422 -0.36461,0.84143 -0.0748,0.32723 -0.1122,0.67783 -0.1122,1.05179 0,0.85078 0.21036,1.5099 0.63108,1.97736 0.42071,0.45812 0.98166,0.68717 1.68286,0.68717 0.35526,0 0.64976,-0.014 0.8835,-0.0421 0.24307,-0.0374 0.43006,-0.0748 0.56095,-0.11219 l 0,-4.61384 m 0,-4.90834 1.30422,-0.22439 0,10.67214 c -0.29918,0.0841 -0.6825,0.16829 -1.14996,0.25243 -0.46746,0.0841 -1.00504,0.12622 -1.61274,0.12622 -0.56095,0 -1.06581,-0.0888 -1.51457,-0.26646 -0.44877,-0.17763 -0.83208,-0.43006 -1.14996,-0.75728 -0.31787,-0.32723 -0.56562,-0.72457 -0.74326,-1.19203 -0.16829,-0.47681 -0.25243,-1.00971 -0.25243,-1.59872 0,-0.56095 0.0701,-1.07515 0.21036,-1.54262 0.14959,-0.46745 0.36462,-0.86947 0.6451,-1.20605 0.28047,-0.33656 0.62172,-0.59834 1.02374,-0.78533 0.41136,-0.18698 0.87882,-0.28047 1.40238,-0.28048 0.42071,1e-5 0.79,0.0561 1.10788,0.16829 0.32722,0.11219 0.5703,0.21971 0.72924,0.32254 l 0,-3.68826" /> + <path + inkscape:connector-curvature="0" + id="path18179" + style="fill:#000000;marker:none" + d="m 903.77376,-352.8486 c 0,-0.6451 0.0935,-1.20605 0.28047,-1.68286 0.18699,-0.48616 0.43474,-0.88817 0.74327,-1.20605 0.30852,-0.31787 0.66379,-0.55628 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.2384 1.23409,-0.2384 0.98167,0 1.73428,0.30853 2.25784,0.92557 0.52355,0.6077 0.78533,1.53795 0.78534,2.79074 -10e-6,0.0561 -10e-6,0.13089 0,0.22438 -10e-6,0.0842 -0.005,0.16362 -0.014,0.23841 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33226 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.45811,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55628,-0.16361 0.71522,-0.2384 l 0.18231,1.09385 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26646 -0.39267,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46279 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67315,-1.19203 -0.14024,-0.46745 -0.21035,-0.97699 -0.21035,-1.52859 m 5.0065,-0.71522 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44445 -0.29918,-0.38332 -0.71522,-0.57498 -1.24812,-0.57498 -0.29918,0 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26178 -0.57497,0.44876 -0.15894,0.18699 -0.28516,0.40202 -0.37865,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16828,0.74326 l 3.61814,0" /> + <path + inkscape:connector-curvature="0" + id="path18181" + style="fill:#000000;marker:none" + d="m 914.70665,-356.66309 c 0.11219,1e-5 0.2384,0.009 0.37864,0.0281 0.14959,0.009 0.2945,0.0281 0.43474,0.0561 0.14024,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21036,0.0374 0.26646,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51889,-0.12621 -0.23373,-0.0561 -0.53758,-0.0841 -0.91154,-0.0841 -0.24309,10e-6 -0.48617,0.0281 -0.72924,0.0841 -0.23374,0.0468 -0.388,0.0795 -0.46279,0.0982 l 0,6.12842 -1.30422,0 0,-6.98387 c 0.30853,-0.11218 0.69184,-0.21503 1.14996,-0.30852 0.45811,-0.10284 0.97231,-0.15426 1.54262,-0.15427" /> + <path + inkscape:connector-curvature="0" + id="path18183" + style="fill:#000000;marker:none" + d="m 923.1376,-350.15603 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44409,-0.0467 0.60303,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,0 -0.4067,0.014 -0.63108,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32723,0.20568 -0.44876,0.36462 -0.12155,0.14959 -0.18232,0.35059 -0.18231,0.60302 -10e-6,0.46746 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.5351 c 0.52355,0 0.96297,0.0701 1.31824,0.21035 0.36462,0.1309 0.65444,0.32256 0.86948,0.57498 0.22438,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55774 c -0.1122,0.0187 -0.27114,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0841 -0.25243,0.028 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0842 -0.6451,-0.21503 -0.89753,-0.39267 -0.25243,-0.18698 -0.44876,-0.43006 -0.589,-0.72924 -0.14024,-0.29917 -0.21036,-0.65912 -0.21035,-1.07983 -10e-6,-0.40202 0.0795,-0.74794 0.2384,-1.03777 0.16829,-0.28982 0.39267,-0.52355 0.67314,-0.70119 0.28048,-0.17763 0.6077,-0.30852 0.98167,-0.39267 0.37397,-0.0841 0.76664,-0.12621 1.17801,-0.12621 0.13088,0 0.26644,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39266,0.0561 0.13089,0.0187 0.24308,0.0374 0.33658,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c -10e-6,-0.21503 -0.0234,-0.42539 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40202 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20568,-0.10283 -0.47681,-0.15425 -0.81338,-0.15426 -0.43007,1e-5 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11687 -0.71522,0.18231 l -0.15426,-1.07984 c 0.16829,-0.0748 0.44876,-0.1449 0.84143,-0.21035 0.39267,-0.0748 0.81806,-0.11219 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path18185" + style="fill:#000000;marker:none" + d="m 929.6795,-350.15603 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26178,-0.14023 0.39267,-0.36461 0.39267,-0.67314 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75729 -0.25244,-0.18698 -0.66848,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81339,-0.33657 -0.25243,-0.12154 -0.47213,-0.26178 -0.65912,-0.42072 -0.18698,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.11219,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.23841,-1.15462 0.71522,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94931,-0.57497 0.20568,0 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0468 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24774,0.0701 0.32254,0.0982 l -0.2384,1.12191 c -0.14025,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65913,-0.12621 -1.07984,-0.12622 -0.36462,10e-6 -0.68249,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.40669,0.36462 -0.40669,0.67314 0,0.15894 0.0281,0.29918 0.0841,0.42072 0.0655,0.12154 0.15894,0.23373 0.28048,0.33657 0.13089,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0842 0.41136,0.17296 0.67314,0.26645 0.34592,0.1309 0.65445,0.26179 0.92558,0.39267 0.27112,0.12154 0.50018,0.26646 0.68717,0.43474 0.19632,0.16829 0.34591,0.37397 0.44876,0.61705 0.10283,0.23373 0.15425,0.52356 0.15426,0.86948 -10e-6,0.67314 -0.25243,1.18267 -0.75729,1.52859 -0.49551,0.34592 -1.20605,0.51889 -2.13162,0.51889 -0.6451,0 -1.14996,-0.0561 -1.51457,-0.16829 -0.36462,-0.10284 -0.61238,-0.18231 -0.74327,-0.23841 l 0.23841,-1.1219 c 0.14959,0.0561 0.38799,0.14024 0.71521,0.25243 0.32723,0.11219 0.76196,0.16828 1.30422,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path18187" + style="fill:#000000;marker:none" + d="m 935.53182,-349.21643 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61063 c -0.23373,0 -0.43474,-0.0748 -0.60302,-0.22439 -0.15894,-0.15892 -0.23841,-0.36928 -0.23841,-0.63107 0,-0.26177 0.0795,-0.46745 0.23841,-0.61705 0.16828,-0.15892 0.36929,-0.23839 0.60302,-0.2384 0.23373,10e-6 0.43006,0.0795 0.589,0.2384 0.16829,0.1496 0.25243,0.35528 0.25243,0.61705 0,0.26179 -0.0841,0.47215 -0.25243,0.63107 -0.15894,0.1496 -0.35527,0.22439 -0.589,0.22439" /> + <path + inkscape:connector-curvature="0" + id="path18189" + style="fill:#000000;marker:none" + d="m 939.48523,-350.15603 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26177,-0.14023 0.39266,-0.36461 0.39267,-0.67314 -10e-6,-0.31787 -0.12622,-0.5703 -0.37865,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81338,-0.33657 -0.25243,-0.12154 -0.47214,-0.26178 -0.65912,-0.42072 -0.18699,-0.15893 -0.33657,-0.35059 -0.44876,-0.57497 -0.1122,-0.22438 -0.16829,-0.50018 -0.16829,-0.82741 0,-0.64509 0.2384,-1.15462 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94932,-0.57497 0.20568,0 0.41136,0.014 0.61705,0.0421 0.20568,0.0187 0.39733,0.0468 0.57497,0.0841 0.17763,0.0281 0.3319,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14958 -0.65912,-0.22438 -0.29918,-0.0841 -0.65912,-0.12621 -1.07983,-0.12622 -0.36462,10e-6 -0.6825,0.0748 -0.95362,0.22439 -0.27113,0.14024 -0.4067,0.36462 -0.40669,0.67314 -1e-5,0.15894 0.028,0.29918 0.0841,0.42072 0.0654,0.12154 0.15893,0.23373 0.28048,0.33657 0.13088,0.0935 0.28982,0.18231 0.47681,0.26645 0.18698,0.0842 0.41136,0.17296 0.67314,0.26645 0.34592,0.1309 0.65444,0.26179 0.92557,0.39267 0.27113,0.12154 0.50018,0.26646 0.68717,0.43474 0.19633,0.16829 0.34592,0.37397 0.44876,0.61705 0.10284,0.23373 0.15426,0.52356 0.15427,0.86948 -10e-6,0.67314 -0.25244,1.18267 -0.75729,1.52859 -0.49551,0.34592 -1.20605,0.51889 -2.13162,0.51889 -0.6451,0 -1.14996,-0.0561 -1.51458,-0.16829 -0.36462,-0.10284 -0.61237,-0.18231 -0.74326,-0.23841 l 0.2384,-1.1219 c 0.14959,0.0561 0.388,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16828 1.30422,0.16828" /> + <path + inkscape:connector-curvature="0" + id="path18191" + style="fill:#000000;marker:none" + d="m 945.2534,-356.50882 2.7627,0 0,1.09385 -2.7627,0 0,3.36572 c 0,0.36463 0.028,0.66848 0.0841,0.91155 0.0561,0.23374 0.14023,0.42072 0.25243,0.56096 0.11218,0.13089 0.25242,0.22438 0.42071,0.28047 0.16828,0.0561 0.36462,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.9396,-0.12622 0.24307,-0.0935 0.41136,-0.15893 0.50486,-0.19633 l 0.25243,1.07983 c -0.1309,0.0654 -0.35996,0.14492 -0.68717,0.23841 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13089 -0.57498,-0.32255 -0.77131,-0.57498 -0.19633,-0.25242 -0.33657,-0.56095 -0.42071,-0.92557 -0.0748,-0.37397 -0.11219,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path18193" + style="fill:#000000;marker:none" + d="m 950.97995,-349.21643 -1.30422,0 0,-7.29239 1.30422,0 0,7.29239 m -0.65912,-8.61063 c -0.23373,0 -0.43474,-0.0748 -0.60303,-0.22439 -0.15893,-0.15892 -0.2384,-0.36928 -0.2384,-0.63107 0,-0.26177 0.0795,-0.46745 0.2384,-0.61705 0.16829,-0.15892 0.3693,-0.23839 0.60303,-0.2384 0.23373,10e-6 0.43006,0.0795 0.589,0.2384 0.16828,0.1496 0.25243,0.35528 0.25243,0.61705 0,0.26179 -0.0841,0.47215 -0.25243,0.63107 -0.15894,0.1496 -0.35527,0.22439 -0.589,0.22439" /> + <path + inkscape:connector-curvature="0" + id="path18195" + style="fill:#000000;marker:none" + d="m 955.92905,-356.66309 c 0.11218,1e-5 0.2384,0.009 0.37864,0.0281 0.14958,0.009 0.2945,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12621 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0468 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12842 -1.30422,0 0,-6.98387 c 0.30852,-0.11218 0.69184,-0.21503 1.14995,-0.30852 0.45811,-0.10284 0.97232,-0.15426 1.54263,-0.15427" /> + <path + inkscape:connector-curvature="0" + id="path18197" + style="fill:#000000;marker:none" + d="m 840.63801,-332.62623 c 0.30852,0 0.57965,-0.005 0.81339,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.1737 c -0.0935,-0.0467 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,0 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0841 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60302 0,0.46747 0.14958,0.79469 0.44876,0.98167 0.29917,0.17764 0.70586,0.26646 1.22007,0.26646 m -0.11219,-6.53511 c 0.52356,10e-6 0.96297,0.0701 1.31824,0.21036 0.36462,0.13089 0.65444,0.32255 0.86948,0.57497 0.22438,0.24309 0.38331,0.53759 0.47681,0.8835 0.0935,0.33658 0.14023,0.71055 0.14024,1.12191 l 0,4.55775 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.028 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.0281 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.0281 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12621 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39267 -0.25243,-0.18698 -0.44877,-0.43006 -0.58901,-0.72924 -0.14023,-0.29917 -0.21035,-0.65912 -0.21035,-1.07983 0,-0.40202 0.0795,-0.74794 0.2384,-1.03777 0.16829,-0.28982 0.39267,-0.52355 0.67315,-0.70119 0.28047,-0.17763 0.60769,-0.30852 0.98167,-0.39266 0.37396,-0.0841 0.76663,-0.12622 1.178,-0.12622 0.13088,0 0.26645,0.009 0.40669,0.0281 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21503 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40201 -0.25243,-0.56096 -0.12154,-0.16828 -0.28983,-0.29916 -0.50485,-0.39266 -0.20569,-0.10284 -0.47682,-0.15426 -0.81339,-0.15426 -0.43006,0 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11687 -0.71521,0.18231 l -0.15427,-1.07983 c 0.16829,-0.0748 0.44877,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81806,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path18199" + style="fill:#000000;marker:none" + d="m 847.67075,-331.5464 c -0.80404,-0.0187 -1.37434,-0.19166 -1.71091,-0.51888 -0.33657,-0.32722 -0.50486,-0.83676 -0.50486,-1.5286 l 0,-8.75087 1.30422,-0.22438 0,8.76489 c 0,0.21504 0.0187,0.39267 0.0561,0.53291 0.0374,0.14024 0.0982,0.25243 0.18231,0.33657 0.0841,0.0841 0.19633,0.14959 0.33658,0.19633 0.14023,0.0374 0.31319,0.0701 0.51888,0.0982 l -0.18231,1.09386" /> + <path + inkscape:connector-curvature="0" + id="path18201" + style="fill:#000000;marker:none" + d="m 852.14304,-335.31881 c 0,-0.64509 0.0935,-1.20605 0.28047,-1.68286 0.18699,-0.48615 0.43474,-0.88817 0.74327,-1.20605 0.30852,-0.31787 0.66379,-0.55627 1.06581,-0.71522 0.40201,-0.15893 0.81338,-0.23839 1.2341,-0.2384 0.98166,10e-6 1.73427,0.30853 2.25783,0.92557 0.52355,0.60771 0.78533,1.53795 0.78534,2.79074 -10e-6,0.0561 -10e-6,0.1309 0,0.22439 -10e-6,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99248,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.45811,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55628,-0.16361 0.71522,-0.2384 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18735,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46278 -1.13593,-0.79936 -0.29918,-0.33657 -0.52356,-0.73391 -0.67315,-1.19202 -0.14023,-0.46746 -0.21035,-0.97699 -0.21035,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14025,-1.07048 -0.44877,-1.44445 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26179 -0.57497,0.44876 -0.15894,0.18699 -0.28516,0.40203 -0.37865,0.6451 -0.0841,0.24308 -0.14024,0.49084 -0.16828,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path18203" + style="fill:#000000;marker:none" + d="m 860.38335,-338.76867 c 0.29918,-0.0748 0.69652,-0.15426 1.19203,-0.23841 0.49551,-0.0841 1.06581,-0.12621 1.71091,-0.12621 0.57965,0 1.06113,0.0841 1.44445,0.25243 0.38332,0.15894 0.68716,0.38799 0.91155,0.68716 0.23373,0.28984 0.39734,0.64043 0.49084,1.05179 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c -10e-6,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31786 -0.15427,-0.57497 -0.2945,-0.77131 -0.14024,-0.19632 -0.32723,-0.33656 -0.56095,-0.42071 -0.23374,-0.0935 -0.52356,-0.14023 -0.86948,-0.14024 -0.14024,10e-6 -0.28515,0.005 -0.43474,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10284,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path18205" + style="fill:#000000;marker:none" + d="m 871.60549,-331.51835 c -0.58901,0 -1.10789,-0.0935 -1.55665,-0.28048 -0.43941,-0.18698 -0.81338,-0.44876 -1.1219,-0.78533 -0.29918,-0.33657 -0.52356,-0.73392 -0.67315,-1.19203 -0.14959,-0.46746 -0.22438,-0.98166 -0.22438,-1.54262 0,-0.56095 0.0795,-1.07516 0.23841,-1.54262 0.16828,-0.46746 0.40201,-0.86947 0.70119,-1.20605 0.29917,-0.34592 0.66379,-0.61237 1.09386,-0.79936 0.43941,-0.19633 0.92557,-0.29449 1.45848,-0.2945 0.32721,10e-6 0.65444,0.0281 0.98166,0.0841 0.32722,0.0561 0.64042,0.14492 0.9396,0.26645 l -0.2945,1.10789 c -0.19634,-0.0935 -0.42539,-0.16828 -0.68717,-0.22438 -0.25243,-0.0561 -0.52356,-0.0841 -0.81338,-0.0842 -0.72924,1e-5 -1.2902,0.22906 -1.68286,0.68717 -0.38332,0.45812 -0.57498,1.12659 -0.57498,2.00541 0,0.39267 0.0421,0.75261 0.12622,1.07983 0.0935,0.32723 0.23373,0.60771 0.42071,0.84143 0.19633,0.23374 0.44409,0.41605 0.74327,0.54693 0.29917,0.12154 0.66379,0.18231 1.09385,0.18231 0.34592,0 0.65912,-0.0327 0.9396,-0.0982 0.28047,-0.0654 0.50018,-0.13557 0.65912,-0.21036 l 0.18231,1.09386 c -0.0748,0.0467 -0.18231,0.0935 -0.32255,0.14024 -0.14024,0.0374 -0.29918,0.0701 -0.47681,0.0982 -0.17764,0.0374 -0.3693,0.0654 -0.57497,0.0841 -0.19634,0.028 -0.388,0.0421 -0.57498,0.0421" /> + <path + inkscape:connector-curvature="0" + id="path18207" + style="fill:#000000;marker:none" + d="m 880.76086,-331.897 c -0.29918,0.0748 -0.69652,0.15427 -1.19202,0.23841 -0.48617,0.0841 -1.0518,0.12621 -1.69689,0.12621 -0.56095,0 -1.03309,-0.0795 -1.41641,-0.2384 -0.38332,-0.16829 -0.69184,-0.40202 -0.92557,-0.70119 -0.23373,-0.29918 -0.40202,-0.64977 -0.50486,-1.05179 -0.10284,-0.41136 -0.15426,-0.8648 -0.15426,-1.36031 l 0,-4.09496 1.30422,0 0,3.81448 c 0,0.88818 0.14023,1.52393 0.42071,1.90724 0.28048,0.38332 0.75261,0.57498 1.41641,0.57498 0.14023,0 0.28515,-0.005 0.43474,-0.014 0.14958,-0.009 0.28982,-0.0187 0.42071,-0.0281 0.13089,-0.0187 0.24775,-0.0327 0.3506,-0.0421 0.11219,-0.0187 0.19165,-0.0374 0.23841,-0.0561 l 0,-6.15646 1.30421,0 0,7.08203" /> + <path + inkscape:connector-curvature="0" + id="path18209" + style="fill:#000000;marker:none" + d="m 882.60105,-335.31881 c 0,-0.64509 0.0935,-1.20605 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30853,-0.31787 0.6638,-0.55627 1.06581,-0.71522 0.40202,-0.15893 0.81338,-0.23839 1.2341,-0.2384 0.98167,10e-6 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53795 0.78533,2.79074 0,0.0561 0,0.1309 0,0.22439 0,0.0841 -0.005,0.16361 -0.014,0.2384 l -4.99248,0 c 0.0561,0.75729 0.27579,1.33227 0.65912,1.72493 0.38331,0.39267 0.98166,0.589 1.79505,0.589 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0841 0.55627,-0.16361 0.71522,-0.2384 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65481,-0.28048 -0.45812,-0.19633 -0.83676,-0.46278 -1.13594,-0.79936 -0.29917,-0.33657 -0.52355,-0.73391 -0.67314,-1.19202 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71522 c 0.009,-0.58899 -0.14024,-1.07048 -0.44876,-1.44445 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22438,0.1122 -0.41604,0.26179 -0.57498,0.44876 -0.15894,0.18699 -0.28515,0.40203 -0.37864,0.6451 -0.0842,0.24308 -0.14024,0.49084 -0.16829,0.74326 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path18211" + style="fill:#000000;marker:none" + d="m 890.84137,-338.76867 c 0.29917,-0.0748 0.69652,-0.15426 1.19203,-0.23841 0.4955,-0.0841 1.0658,-0.12621 1.7109,-0.12621 0.57965,0 1.06114,0.0841 1.44446,0.25243 0.38331,0.15894 0.68716,0.38799 0.91155,0.68716 0.23372,0.28984 0.39733,0.64043 0.49083,1.05179 0.0935,0.41137 0.14023,0.86481 0.14024,1.36031 l 0,4.09496 -1.30422,0 0,-3.81448 c 0,-0.44876 -0.0327,-0.83208 -0.0982,-1.14996 -0.0561,-0.31786 -0.15427,-0.57497 -0.2945,-0.77131 -0.14025,-0.19632 -0.32723,-0.33656 -0.56096,-0.42071 -0.23373,-0.0935 -0.52356,-0.14023 -0.86947,-0.14024 -0.14025,10e-6 -0.28516,0.005 -0.43474,0.014 -0.14959,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10285,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path18213" + style="fill:#000000;marker:none" + d="m 900.11419,-338.97903 2.7627,0 0,1.09386 -2.7627,0 0,3.36572 c 0,0.36462 0.0281,0.66847 0.0842,0.91155 0.0561,0.23373 0.14023,0.42071 0.25243,0.56095 0.11218,0.13089 0.25242,0.22438 0.42071,0.28048 0.16828,0.0561 0.36462,0.0841 0.589,0.0841 0.39266,0 0.70586,-0.0421 0.9396,-0.12621 0.24307,-0.0935 0.41136,-0.15894 0.50486,-0.19634 l 0.25243,1.07984 c -0.1309,0.0654 -0.35995,0.14491 -0.68717,0.2384 -0.32723,0.10284 -0.7012,0.15426 -1.12191,0.15426 -0.49551,0 -0.90688,-0.0608 -1.2341,-0.18231 -0.31787,-0.13088 -0.57498,-0.32254 -0.77131,-0.57497 -0.19633,-0.25243 -0.33657,-0.56095 -0.42071,-0.92558 -0.0748,-0.37396 -0.11219,-0.80403 -0.11219,-1.29019 l 0,-6.50706 1.30421,-0.22438 0,2.25784" /> + <path + inkscape:connector-curvature="0" + id="path18215" + style="fill:#000000;marker:none" + d="m 907.22909,-339.13329 c 0.11219,0 0.23841,0.009 0.37865,0.028 0.14958,0.009 0.29449,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12621 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,0 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0468 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12841 -1.30422,0 0,-6.98387 c 0.30852,-0.11218 0.69184,-0.21502 1.14995,-0.30852 0.45811,-0.10284 0.97232,-0.15426 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path18217" + style="fill:#000000;marker:none" + d="m 916.39674,-335.33283 c -10e-6,0.57965 -0.0842,1.10321 -0.25243,1.57066 -0.16829,0.46747 -0.4067,0.86948 -0.71522,1.20605 -0.29918,0.33658 -0.65912,0.59835 -1.07983,0.78534 -0.42072,0.17763 -0.87883,0.26645 -1.37434,0.26645 -0.49551,0 -0.95362,-0.0888 -1.37433,-0.26645 -0.42072,-0.18699 -0.78534,-0.44876 -1.09386,-0.78534 -0.29918,-0.33657 -0.53291,-0.73858 -0.70119,-1.20605 -0.16829,-0.46745 -0.25243,-0.99101 -0.25243,-1.57066 0,-0.5703 0.0841,-1.08918 0.25243,-1.55665 0.16828,-0.47681 0.40201,-0.8835 0.70119,-1.22007 0.30852,-0.33657 0.67314,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87882,-0.28047 1.37433,-0.28048 0.49551,10e-6 0.95362,0.0935 1.37434,0.28048 0.42071,0.17764 0.78065,0.43474 1.07983,0.77131 0.30852,0.33657 0.54693,0.74326 0.71522,1.22007 0.16828,0.46747 0.25242,0.98635 0.25243,1.55665 m -1.36031,0 c -10e-6,-0.82273 -0.187,-1.4725 -0.56096,-1.94932 -0.36462,-0.48615 -0.86481,-0.72923 -1.50055,-0.72924 -0.63575,1e-5 -1.14061,0.24309 -1.51457,0.72924 -0.36462,0.47682 -0.54693,1.12659 -0.54693,1.94932 0,0.82273 0.18231,1.47717 0.54693,1.96333 0.37396,0.47681 0.87882,0.71522 1.51457,0.71522 0.63574,0 1.13593,-0.23841 1.50055,-0.71522 0.37396,-0.48616 0.56095,-1.1406 0.56096,-1.96333" /> + <path + inkscape:connector-curvature="0" + id="path18219" + style="fill:#000000;marker:none" + d="m 919.13905,-340.53568 c -0.61705,1e-5 -1.22007,0.15895 -1.80907,0.47681 l -0.36462,-1.00971 c 0.31787,-0.16828 0.67314,-0.30384 1.06581,-0.40669 0.40202,-0.10284 0.8274,-0.15426 1.27617,-0.15427 0.5329,1e-5 0.96764,0.0748 1.30422,0.22439 0.34591,0.14024 0.62171,0.32255 0.8274,0.54692 0.20568,0.22439 0.34592,0.47682 0.42072,0.75729 0.0841,0.27114 0.12621,0.53292 0.12621,0.78534 0,0.31788 -0.0608,0.60303 -0.18231,0.85545 -0.12154,0.24309 -0.27113,0.47214 -0.44876,0.68717 -0.17764,0.21504 -0.37397,0.42072 -0.589,0.61705 -0.21504,0.19634 -0.41137,0.40202 -0.589,0.61705 -0.17764,0.20568 -0.32723,0.43474 -0.44877,0.68716 -0.12154,0.24309 -0.18231,0.51889 -0.18231,0.82741 0,0.0468 0,0.0982 0,0.15426 0,0.0561 0.005,0.10752 0.014,0.15426 l -1.09386,0 c -0.0374,-0.18698 -0.0561,-0.38331 -0.0561,-0.589 0,-0.29917 0.0514,-0.5703 0.15427,-0.81338 0.11218,-0.24307 0.25242,-0.46746 0.42071,-0.67314 0.16828,-0.21503 0.34592,-0.41136 0.53291,-0.589 0.18698,-0.18698 0.36461,-0.37397 0.5329,-0.56096 0.16828,-0.18698 0.30385,-0.38331 0.40669,-0.589 0.11219,-0.20567 0.16829,-0.43006 0.16829,-0.67314 0,-0.39266 -0.12622,-0.71054 -0.37864,-0.95362 -0.25244,-0.25242 -0.62173,-0.37864 -1.10789,-0.37865 m 0.8835,8.09176 c 0,0.25242 -0.0841,0.47213 -0.25242,0.65912 -0.16829,0.18698 -0.39735,0.28047 -0.68717,0.28047 -0.28983,0 -0.51889,-0.0935 -0.68717,-0.28047 -0.16829,-0.18699 -0.25243,-0.4067 -0.25243,-0.65912 0,-0.25243 0.0841,-0.47214 0.25243,-0.65913 0.16828,-0.18698 0.39734,-0.28047 0.68717,-0.28047 0.28982,0 0.51888,0.0935 0.68717,0.28047 0.16828,0.18699 0.25242,0.4067 0.25242,0.65913" /> + <path + inkscape:connector-curvature="0" + id="path18221" + style="marker:none" + d="m 842.43306,-313.94649 c -0.68249,0 -1.30422,-0.11219 -1.86517,-0.33657 -0.56095,-0.22438 -1.04244,-0.5516 -1.44445,-0.98167 -0.40202,-0.43006 -0.71522,-0.95829 -0.9396,-1.58469 -0.21503,-0.63575 -0.32255,-1.36031 -0.32255,-2.1737 0,-0.81337 0.12154,-1.53326 0.36462,-2.15967 0.25243,-0.63574 0.589,-1.16864 1.00972,-1.59871 0.42071,-0.43006 0.91155,-0.75728 1.4725,-0.98167 0.56095,-0.22437 1.1593,-0.33656 1.79505,-0.33657 0.40201,10e-6 0.76196,0.0281 1.07984,0.0841 0.32722,0.0561 0.60769,0.12155 0.84143,0.19633 0.24307,0.0748 0.43941,0.1496 0.589,0.22438 0.14958,0.0748 0.25242,0.1309 0.30852,0.16829 l -0.39266,1.12191 c -0.0842,-0.0561 -0.20569,-0.11686 -0.36462,-0.18231 -0.15895,-0.0654 -0.34126,-0.13088 -0.54693,-0.19634 -0.19634,-0.0654 -0.41605,-0.11685 -0.65912,-0.15426 -0.23374,-0.0467 -0.47214,-0.0701 -0.71522,-0.0701 -0.51421,10e-6 -0.977,0.0888 -1.38836,0.26646 -0.41137,0.17764 -0.76196,0.43474 -1.05178,0.77131 -0.28983,0.33658 -0.51421,0.74794 -0.67315,1.23409 -0.14959,0.47682 -0.22438,1.0144 -0.22438,1.61274 0,0.57966 0.0654,1.10789 0.19633,1.5847 0.14024,0.47681 0.34592,0.88818 0.61705,1.2341 0.27113,0.33657 0.6077,0.59835 1.00972,0.78533 0.41136,0.18699 0.88817,0.28048 1.43043,0.28048 0.62639,0 1.14527,-0.0654 1.55665,-0.19634 0.41135,-0.13088 0.71988,-0.24775 0.92557,-0.35059 l 0.35059,1.1219 c -0.0655,0.0467 -0.18231,0.10752 -0.35059,0.18231 -0.1683,0.0654 -0.37865,0.13089 -0.63107,0.19634 -0.25244,0.0654 -0.54694,0.12154 -0.88351,0.16828 -0.33657,0.0468 -0.70119,0.0701 -1.09386,0.0701" /> + <path + inkscape:connector-curvature="0" + id="path18223" + style="marker:none" + d="m 853.07036,-317.80304 c -1e-5,0.57965 -0.0842,1.10321 -0.25243,1.57067 -0.16829,0.46746 -0.40669,0.86948 -0.71521,1.20605 -0.29918,0.33657 -0.65913,0.59835 -1.07984,0.78533 -0.42072,0.17764 -0.87883,0.26645 -1.37433,0.26645 -0.49552,0 -0.95363,-0.0888 -1.37434,-0.26645 -0.42072,-0.18698 -0.78534,-0.44876 -1.09386,-0.78533 -0.29917,-0.33657 -0.5329,-0.73859 -0.70119,-1.20605 -0.16829,-0.46746 -0.25243,-0.99102 -0.25243,-1.57067 0,-0.5703 0.0841,-1.08918 0.25243,-1.55665 0.16829,-0.4768 0.40202,-0.88349 0.70119,-1.22007 0.30852,-0.33657 0.67314,-0.59367 1.09386,-0.77131 0.42071,-0.18698 0.87882,-0.28047 1.37434,-0.28048 0.4955,1e-5 0.95361,0.0935 1.37433,0.28048 0.42071,0.17764 0.78066,0.43474 1.07984,0.77131 0.30852,0.33658 0.54692,0.74327 0.71521,1.22007 0.16828,0.46747 0.25242,0.98635 0.25243,1.55665 m -1.36031,0 c -10e-6,-0.82273 -0.18699,-1.4725 -0.56095,-1.94931 -0.36463,-0.48616 -0.86481,-0.72924 -1.50055,-0.72924 -0.63575,0 -1.14061,0.24308 -1.51458,0.72924 -0.36462,0.47681 -0.54693,1.12658 -0.54693,1.94931 0,0.82273 0.18231,1.47718 0.54693,1.96333 0.37397,0.47682 0.87883,0.71522 1.51458,0.71522 0.63574,0 1.13592,-0.2384 1.50055,-0.71522 0.37396,-0.48615 0.56094,-1.1406 0.56095,-1.96333" /> + <path + inkscape:connector-curvature="0" + id="path18225" + style="marker:none" + d="m 854.90529,-321.23888 c 0.29918,-0.0748 0.69652,-0.15426 1.19203,-0.23841 0.4955,-0.0841 1.06581,-0.1262 1.71091,-0.12621 0.57964,10e-6 1.06113,0.0842 1.44445,0.25243 0.38331,0.15894 0.68716,0.388 0.91155,0.68717 0.23372,0.28983 0.39734,0.64042 0.49084,1.05178 0.0935,0.41137 0.14023,0.86481 0.14023,1.36032 l 0,4.09495 -1.30421,0 0,-3.81448 c -10e-6,-0.44876 -0.0327,-0.83207 -0.0982,-1.14995 -0.0561,-0.31787 -0.15427,-0.57497 -0.2945,-0.77131 -0.14024,-0.19633 -0.32723,-0.33657 -0.56095,-0.42072 -0.23374,-0.0935 -0.52356,-0.14023 -0.86948,-0.14024 -0.14024,1e-5 -0.28516,0.005 -0.43474,0.014 -0.14959,0.009 -0.2945,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.10284,0.0187 -0.17764,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path18227" + style="marker:none" + d="m 865.80488,-325.03934 c 0.32722,10e-6 0.6077,0.0234 0.84143,0.0701 0.23373,0.0374 0.40201,0.0748 0.50486,0.11219 l -0.18231,1.12191 c -0.10285,-0.0374 -0.24309,-0.0748 -0.42072,-0.11219 -0.17764,-0.0467 -0.39267,-0.0701 -0.64509,-0.0701 -0.60771,1e-5 -1.03309,0.16829 -1.27617,0.50485 -0.24308,0.32724 -0.36462,0.77132 -0.36462,1.33227 l 0,0.63107 2.80477,0 0,1.09386 -2.80477,0 0,6.19853 -1.30422,0 0,-7.95151 c 0,-0.93491 0.22906,-1.6548 0.68717,-2.15967 0.45811,-0.5142 1.178,-0.7713 2.15967,-0.77131 m 3.92667,10.88249 -1.30421,0 0,-7.29239 1.30421,0 0,7.29239 m -0.65912,-8.61063 c -0.23373,10e-6 -0.43474,-0.0748 -0.60302,-0.22438 -0.15894,-0.15893 -0.23841,-0.36929 -0.23841,-0.63107 0,-0.26177 0.0795,-0.46745 0.23841,-0.61705 0.16828,-0.15893 0.36929,-0.2384 0.60302,-0.23841 0.23373,10e-6 0.43006,0.0795 0.58901,0.23841 0.16827,0.1496 0.25242,0.35528 0.25242,0.61705 0,0.26178 -0.0842,0.47214 -0.25242,0.63107 -0.15895,0.1496 -0.35528,0.22439 -0.58901,0.22438" /> + <path + inkscape:connector-curvature="0" + id="path18229" + style="marker:none" + d="m 874.66202,-321.6035 c 0.11219,10e-6 0.23841,0.009 0.37865,0.0281 0.14958,0.009 0.29449,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12622 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12841 -1.30422,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path18231" + style="marker:none" + d="m 877.39273,-321.23888 c 0.29917,-0.0748 0.69184,-0.15426 1.178,-0.23841 0.49551,-0.0841 1.06581,-0.1262 1.71091,-0.12621 0.46746,10e-6 0.86012,0.0654 1.178,0.19633 0.31787,0.12155 0.58432,0.30386 0.79936,0.54693 0.0654,-0.0467 0.16828,-0.11218 0.30853,-0.19633 0.14023,-0.0841 0.31319,-0.16361 0.51888,-0.23841 0.20567,-0.0841 0.43473,-0.15425 0.68717,-0.21035 0.25242,-0.0654 0.52354,-0.0982 0.81338,-0.0982 0.56094,10e-6 1.01905,0.0842 1.37433,0.25243 0.35526,0.15894 0.63107,0.388 0.82741,0.68717 0.20567,0.29918 0.34124,0.65445 0.40669,1.06581 0.0748,0.41137 0.11218,0.86013 0.11219,1.34629 l 0,4.09495 -1.30421,0 0,-3.81448 c -10e-6,-0.43006 -0.0234,-0.79935 -0.0701,-1.10788 -0.0374,-0.30852 -0.11688,-0.56562 -0.23841,-0.77131 -0.1122,-0.20568 -0.27114,-0.35527 -0.47681,-0.44876 -0.19634,-0.10284 -0.45345,-0.15426 -0.77131,-0.15427 -0.43942,10e-6 -0.80404,0.0608 -1.09386,0.18231 -0.28048,0.1122 -0.47214,0.21504 -0.57498,0.30853 0.0748,0.24308 0.13089,0.50954 0.16829,0.79936 0.0374,0.28983 0.0561,0.59368 0.0561,0.91155 l 0,4.09495 -1.30421,0 0,-3.81448 c -10e-6,-0.43006 -0.0234,-0.79935 -0.0701,-1.10788 -0.0467,-0.30852 -0.1309,-0.56562 -0.25243,-0.77131 -0.1122,-0.20568 -0.27113,-0.35527 -0.47681,-0.44876 -0.19634,-0.10284 -0.44877,-0.15426 -0.75729,-0.15427 -0.13089,10e-6 -0.27113,0.005 -0.42071,0.014 -0.14959,0.009 -0.29451,0.0234 -0.43474,0.0421 -0.13089,0.009 -0.25243,0.0234 -0.36462,0.0421 -0.11219,0.0187 -0.18699,0.0327 -0.22438,0.0421 l 0,6.15646 -1.30422,0 0,-7.08203" /> + <path + inkscape:connector-curvature="0" + id="path18233" + style="marker:none" + d="m 891.94005,-315.09644 c 0.30852,0 0.57964,-0.005 0.81338,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0468 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.40669,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17763,0.0841 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14959,0.79468 0.44876,0.98167 0.29918,0.17763 0.70587,0.26645 1.22008,0.26645 m -0.11219,-6.53511 c 0.52355,10e-6 0.96296,0.0701 1.31824,0.21036 0.36461,0.1309 0.65444,0.32255 0.86947,0.57498 0.22438,0.24308 0.38332,0.53758 0.47681,0.8835 0.0935,0.33658 0.14024,0.71054 0.14024,1.1219 l 0,4.55775 c -0.11219,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.028 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57965,0.0421 -0.86948,0.0421 -0.41136,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34592,-0.0841 -0.64509,-0.21503 -0.89752,-0.39266 -0.25243,-0.18699 -0.44877,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.23841,-1.03776 0.16828,-0.28983 0.39266,-0.52356 0.67314,-0.70119 0.28047,-0.17764 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12622 0.13088,1e-5 0.26645,0.009 0.40669,0.028 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40201 -0.25242,-0.56095 -0.12155,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20569,-0.10283 -0.47682,-0.15426 -0.81338,-0.15426 -0.43007,0 -0.80872,0.0327 -1.13594,0.0982 -0.31787,0.0561 -0.55628,0.11688 -0.71521,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path18235" + style="marker:none" + d="m 905.07972,-317.78902 c -10e-6,-0.85077 -0.21036,-1.50522 -0.63107,-1.96333 -0.42072,-0.45811 -0.98167,-0.68717 -1.68286,-0.68717 -0.39267,0 -0.7012,0.014 -0.92557,0.0421 -0.21504,0.0281 -0.388,0.0608 -0.51889,0.0982 l 0,4.59981 c 0.15894,0.13089 0.38799,0.25711 0.68717,0.37865 0.29917,0.12154 0.6264,0.18231 0.98167,0.18231 0.37396,0 0.69184,-0.0654 0.95362,-0.19634 0.27112,-0.14023 0.49083,-0.32722 0.65912,-0.56095 0.16828,-0.24308 0.28982,-0.52355 0.36462,-0.84143 0.0748,-0.32722 0.11218,-0.67782 0.11219,-1.05179 m 1.36031,0 c 0,0.55161 -0.0748,1.06114 -0.22438,1.5286 -0.14024,0.46746 -0.3506,0.86948 -0.63107,1.20605 -0.28048,0.33657 -0.6264,0.59835 -1.03776,0.78533 -0.40203,0.18699 -0.86481,0.28048 -1.38836,0.28048 -0.42072,0 -0.79469,-0.0561 -1.12191,-0.16829 -0.31788,-0.11219 -0.55628,-0.2197 -0.71522,-0.32254 l 0,2.91695 -1.30421,0 0,-9.66242 c 0.30852,-0.0748 0.69184,-0.15425 1.14995,-0.2384 0.46746,-0.0935 1.00504,-0.14023 1.61274,-0.14024 0.56095,10e-6 1.06581,0.0888 1.51458,0.26645 0.44875,0.17764 0.83207,0.43007 1.14995,0.75729 0.31787,0.32723 0.56095,0.72924 0.72924,1.20605 0.17763,0.46746 0.26645,0.9957 0.26645,1.58469" /> + <path + inkscape:connector-curvature="0" + id="path18237" + style="marker:none" + d="m 910.75719,-315.09644 c 0.30852,0 0.57964,-0.005 0.81338,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0468 -0.24776,-0.0841 -0.46278,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19634,0 -0.4067,0.014 -0.63107,0.0421 -0.21504,0.0281 -0.41605,0.0888 -0.60303,0.18231 -0.17764,0.0841 -0.32722,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14958,0.79468 0.44876,0.98167 0.29917,0.17763 0.70586,0.26645 1.22008,0.26645 m -0.1122,-6.53511 c 0.52356,10e-6 0.96297,0.0701 1.31825,0.21036 0.36461,0.1309 0.65444,0.32255 0.86947,0.57498 0.22438,0.24308 0.38331,0.53758 0.47681,0.8835 0.0935,0.33658 0.14024,0.71054 0.14024,1.1219 l 0,4.55775 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.028 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57965,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39266 -0.25243,-0.18699 -0.44877,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.2384,-1.03776 0.16829,-0.28983 0.39267,-0.52356 0.67315,-0.70119 0.28047,-0.17764 0.6077,-0.30852 0.98167,-0.39267 0.37396,-0.0841 0.76663,-0.12621 1.178,-0.12622 0.13088,1e-5 0.26645,0.009 0.40669,0.028 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40201 -0.25243,-0.56095 -0.12154,-0.16828 -0.28983,-0.29917 -0.50485,-0.39267 -0.20569,-0.10283 -0.47682,-0.15426 -0.81339,-0.15426 -0.43006,0 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11688 -0.71521,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39266,-0.0748 0.81805,-0.11218 1.27616,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path18239" + style="marker:none" + d="m 918.29478,-321.6035 c 0.11218,10e-6 0.2384,0.009 0.37864,0.0281 0.14958,0.009 0.2945,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12622 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12841 -1.30422,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54263,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path18241" + style="marker:none" + d="m 923.49367,-315.09644 c 0.30852,0 0.57965,-0.005 0.81339,-0.014 0.24307,-0.0187 0.44408,-0.0467 0.60302,-0.0841 l 0,-2.17369 c -0.0935,-0.0468 -0.24776,-0.0841 -0.46279,-0.11219 -0.20568,-0.0374 -0.45811,-0.0561 -0.75728,-0.0561 -0.19634,0 -0.4067,0.014 -0.63108,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32723,0.20569 -0.44876,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14958,0.79468 0.44876,0.98167 0.29917,0.17763 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.53511 c 0.52356,10e-6 0.96297,0.0701 1.31824,0.21036 0.36462,0.1309 0.65444,0.32255 0.86948,0.57498 0.22438,0.24308 0.38331,0.53758 0.47681,0.8835 0.0935,0.33658 0.14023,0.71054 0.14024,1.1219 l 0,4.55775 c -0.1122,0.0187 -0.27113,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67314,0.0841 -0.25244,0.028 -0.52824,0.0514 -0.82741,0.0701 -0.28983,0.028 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34592,-0.0841 -0.6451,-0.21503 -0.89752,-0.39266 -0.25243,-0.18699 -0.44877,-0.43007 -0.58901,-0.72924 -0.14023,-0.29918 -0.21035,-0.65912 -0.21035,-1.07984 0,-0.40201 0.0795,-0.74793 0.2384,-1.03776 0.16829,-0.28983 0.39267,-0.52356 0.67315,-0.70119 0.28047,-0.17764 0.60769,-0.30852 0.98166,-0.39267 0.37397,-0.0841 0.76664,-0.12621 1.17801,-0.12622 0.13088,1e-5 0.26645,0.009 0.40669,0.028 0.14023,0.009 0.27112,0.0281 0.39267,0.0561 0.13088,0.0187 0.24307,0.0374 0.33657,0.0561 0.0935,0.0187 0.15893,0.0327 0.19633,0.0421 l 0,-0.36462 c 0,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.13089,-0.40201 -0.25243,-0.56095 -0.12154,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20568,-0.10283 -0.47681,-0.15426 -0.81338,-0.15426 -0.43006,0 -0.80871,0.0327 -1.13593,0.0982 -0.31787,0.0561 -0.55628,0.11688 -0.71521,0.18231 l -0.15427,-1.07983 c 0.16829,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81806,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path18243" + style="marker:none" + d="m 934.26332,-321.6035 c 0.11219,10e-6 0.2384,0.009 0.37864,0.0281 0.14959,0.009 0.2945,0.0281 0.43474,0.0561 0.14024,0.0187 0.26645,0.0421 0.37865,0.0701 0.12153,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51888,-0.12622 -0.23374,-0.0561 -0.53759,-0.0841 -0.91155,-0.0841 -0.24309,10e-6 -0.48617,0.0281 -0.72924,0.0841 -0.23374,0.0467 -0.388,0.0795 -0.46279,0.0982 l 0,6.12841 -1.30422,0 0,-6.98386 c 0.30853,-0.11219 0.69184,-0.21503 1.14996,-0.30853 0.45811,-0.10283 0.97231,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path18245" + style="marker:none" + d="m 936.58733,-317.78902 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30852,-0.31786 0.66379,-0.55627 1.06581,-0.71521 0.40202,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,1e-5 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53796 0.78533,2.79075 0,0.0561 0,0.13089 0,0.22438 0,0.0842 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72494 0.38332,0.39266 0.98167,0.589 1.79505,0.589 0.45811,0 0.84143,-0.0374 1.14996,-0.11219 0.31787,-0.0842 0.55627,-0.16361 0.71521,-0.23841 l 0.18231,1.09386 c -0.15894,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39267,0.0935 -0.84143,0.14024 -1.34628,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65482,-0.28048 -0.45811,-0.19633 -0.83675,-0.46278 -1.13593,-0.79935 -0.29917,-0.33658 -0.52355,-0.73392 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22439,0.1122 -0.41605,0.26179 -0.57498,0.44877 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0842,0.24309 -0.14024,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path18247" + style="marker:none" + d="m 946.52453,-315.09644 c 0.5329,0 0.92557,-0.0701 1.178,-0.21036 0.26178,-0.14024 0.39267,-0.36462 0.39267,-0.67314 0,-0.31787 -0.12622,-0.5703 -0.37864,-0.75729 -0.25243,-0.18698 -0.66847,-0.39734 -1.24812,-0.63107 -0.28048,-0.11219 -0.55161,-0.22438 -0.81339,-0.33658 -0.25243,-0.12153 -0.47213,-0.26177 -0.65912,-0.42071 -0.18698,-0.15893 -0.33657,-0.35059 -0.44876,-0.57498 -0.11219,-0.22437 -0.16828,-0.50018 -0.16828,-0.8274 0,-0.64509 0.2384,-1.15463 0.71521,-1.5286 0.47681,-0.38331 1.12658,-0.57497 1.94931,-0.57498 0.20568,1e-5 0.41137,0.014 0.61705,0.0421 0.20568,0.0187 0.39734,0.0468 0.57498,0.0841 0.17763,0.0281 0.33189,0.0608 0.46279,0.0982 0.14023,0.0374 0.24775,0.0701 0.32255,0.0982 l -0.23841,1.12191 c -0.14024,-0.0748 -0.35995,-0.14959 -0.65912,-0.22439 -0.29918,-0.0841 -0.65912,-0.1262 -1.07984,-0.12621 -0.36462,1e-5 -0.68249,0.0748 -0.95362,0.22438 -0.27113,0.14025 -0.40669,0.36463 -0.40669,0.67315 0,0.15894 0.0281,0.29918 0.0842,0.42071 0.0654,0.12155 0.15893,0.23374 0.28047,0.33657 0.13089,0.0935 0.28983,0.18232 0.47681,0.26646 0.18698,0.0841 0.41137,0.17296 0.67315,0.26645 0.34591,0.13089 0.65444,0.26178 0.92557,0.39267 0.27112,0.12154 0.50018,0.26645 0.68717,0.43473 0.19633,0.16829 0.34591,0.37398 0.44876,0.61705 0.10284,0.23374 0.15426,0.52356 0.15426,0.86948 0,0.67315 -0.25243,1.18268 -0.75728,1.5286 -0.49552,0.34592 -1.20606,0.51888 -2.13163,0.51888 -0.6451,0 -1.14995,-0.0561 -1.51457,-0.16829 -0.36462,-0.10284 -0.61238,-0.1823 -0.74326,-0.2384 l 0.2384,-1.12191 c 0.14959,0.0561 0.38799,0.14024 0.71522,0.25243 0.32722,0.11219 0.76196,0.16829 1.30421,0.16829" /> + <path + inkscape:connector-curvature="0" + id="path18249" + style="marker:none" + d="m 950.66595,-317.78902 c 0,-0.64509 0.0935,-1.20604 0.28048,-1.68286 0.18698,-0.48615 0.43474,-0.88817 0.74326,-1.20605 0.30852,-0.31786 0.66379,-0.55627 1.06581,-0.71521 0.40202,-0.15893 0.81338,-0.2384 1.2341,-0.23841 0.98166,1e-5 1.73428,0.30853 2.25784,0.92557 0.52355,0.60771 0.78533,1.53796 0.78533,2.79075 0,0.0561 0,0.13089 0,0.22438 0,0.0842 -0.005,0.16361 -0.014,0.2384 l -4.99249,0 c 0.0561,0.75729 0.2758,1.33227 0.65912,1.72494 0.38332,0.39266 0.98167,0.589 1.79506,0.589 0.4581,0 0.84142,-0.0374 1.14995,-0.11219 0.31787,-0.0842 0.55627,-0.16361 0.71522,-0.23841 l 0.18231,1.09386 c -0.15895,0.0841 -0.43942,0.17296 -0.84143,0.26645 -0.39268,0.0935 -0.84144,0.14024 -1.34629,0.14024 -0.63575,0 -1.18736,-0.0935 -1.65482,-0.28048 -0.45811,-0.19633 -0.83675,-0.46278 -1.13593,-0.79935 -0.29917,-0.33658 -0.52355,-0.73392 -0.67314,-1.19203 -0.14024,-0.46746 -0.21036,-0.97699 -0.21036,-1.5286 m 5.00651,-0.71521 c 0.009,-0.589 -0.14024,-1.07048 -0.44876,-1.44446 -0.29918,-0.38331 -0.71522,-0.57497 -1.24812,-0.57498 -0.29918,10e-6 -0.56563,0.0608 -0.79936,0.18231 -0.22439,0.1122 -0.41604,0.26179 -0.57498,0.44877 -0.15894,0.18699 -0.28515,0.40202 -0.37864,0.64509 -0.0842,0.24309 -0.14024,0.49084 -0.16829,0.74327 l 3.61815,0" /> + <path + inkscape:connector-curvature="0" + id="path18251" + style="marker:none" + d="m 961.59885,-321.6035 c 0.11218,10e-6 0.2384,0.009 0.37864,0.0281 0.14958,0.009 0.2945,0.0281 0.43474,0.0561 0.14023,0.0187 0.26645,0.0421 0.37864,0.0701 0.12154,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10284,-0.0374 -0.2758,-0.0795 -0.51888,-0.12622 -0.23373,-0.0561 -0.53758,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.38799,0.0795 -0.46278,0.0982 l 0,6.12841 -1.30422,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54263,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path18253" + style="marker:none" + d="m 970.32452,-321.44924 c -0.36463,1.36499 -0.79469,2.67388 -1.2902,3.92667 -0.48616,1.2528 -0.9583,2.37471 -1.4164,3.36572 l -1.178,0 c -0.45812,-0.99101 -0.93493,-2.11292 -1.43044,-3.36572 -0.48616,-1.25279 -0.91155,-2.56168 -1.27616,-3.92667 l 1.40238,0 c 0.11219,0.45812 0.24308,0.94895 0.39267,1.4725 0.15893,0.51422 0.32254,1.02842 0.49083,1.54263 0.17763,0.50486 0.35527,0.99569 0.53291,1.4725 0.17763,0.47681 0.34591,0.9022 0.50485,1.27617 0.15894,-0.37397 0.32722,-0.79936 0.50486,-1.27617 0.17763,-0.47681 0.35059,-0.96764 0.51888,-1.4725 0.17763,-0.51421 0.34125,-1.02841 0.49084,-1.54263 0.15893,-0.52355 0.29449,-1.01438 0.40669,-1.4725 l 1.34629,0" /> + <path + inkscape:connector-curvature="0" + id="path18255" + style="marker:none" + d="m 974.13835,-315.09644 c 0.30852,0 0.57965,-0.005 0.81338,-0.014 0.24308,-0.0187 0.44409,-0.0467 0.60303,-0.0841 l 0,-2.17369 c -0.0935,-0.0468 -0.24776,-0.0841 -0.46279,-0.11219 -0.20569,-0.0374 -0.45812,-0.0561 -0.75729,-0.0561 -0.19633,0 -0.40669,0.014 -0.63107,0.0421 -0.21503,0.0281 -0.41604,0.0888 -0.60302,0.18231 -0.17764,0.0841 -0.32723,0.20569 -0.44877,0.36462 -0.12154,0.14959 -0.18231,0.3506 -0.18231,0.60303 0,0.46746 0.14959,0.79468 0.44877,0.98167 0.29917,0.17763 0.70586,0.26645 1.22007,0.26645 m -0.11219,-6.53511 c 0.52355,10e-6 0.96296,0.0701 1.31824,0.21036 0.36461,0.1309 0.65444,0.32255 0.86948,0.57498 0.22437,0.24308 0.38331,0.53758 0.47681,0.8835 0.0935,0.33658 0.14023,0.71054 0.14024,1.1219 l 0,4.55775 c -0.1122,0.0187 -0.27114,0.0467 -0.47681,0.0841 -0.19634,0.0281 -0.42072,0.0561 -0.67315,0.0841 -0.25243,0.028 -0.52823,0.0514 -0.8274,0.0701 -0.28983,0.028 -0.57966,0.0421 -0.86948,0.0421 -0.41137,0 -0.79001,-0.0421 -1.13593,-0.12622 -0.34593,-0.0841 -0.6451,-0.21503 -0.89753,-0.39266 -0.25243,-0.18699 -0.44876,-0.43007 -0.589,-0.72924 -0.14024,-0.29918 -0.21036,-0.65912 -0.21036,-1.07984 0,-0.40201 0.0795,-0.74793 0.23841,-1.03776 0.16828,-0.28983 0.39266,-0.52356 0.67314,-0.70119 0.28048,-0.17764 0.6077,-0.30852 0.98167,-0.39267 0.37397,-0.0841 0.76663,-0.12621 1.178,-0.12622 0.13089,1e-5 0.26645,0.009 0.40669,0.028 0.14024,0.009 0.27113,0.0281 0.39267,0.0561 0.13089,0.0187 0.24308,0.0374 0.33657,0.0561 0.0935,0.0187 0.15894,0.0327 0.19634,0.0421 l 0,-0.36462 c -10e-6,-0.21502 -0.0234,-0.42538 -0.0701,-0.63107 -0.0467,-0.21503 -0.1309,-0.40201 -0.25243,-0.56095 -0.12155,-0.16828 -0.28983,-0.29917 -0.50486,-0.39267 -0.20569,-0.10283 -0.47681,-0.15426 -0.81338,-0.15426 -0.43007,0 -0.80871,0.0327 -1.13593,0.0982 -0.31788,0.0561 -0.55628,0.11688 -0.71522,0.18231 l -0.15426,-1.07983 c 0.16828,-0.0748 0.44876,-0.14491 0.84143,-0.21036 0.39267,-0.0748 0.81805,-0.11218 1.27617,-0.11219" /> + <path + inkscape:connector-curvature="0" + id="path18257" + style="marker:none" + d="m 981.67593,-321.6035 c 0.11219,10e-6 0.2384,0.009 0.37865,0.0281 0.14958,0.009 0.29449,0.0281 0.43474,0.0561 0.14023,0.0187 0.26644,0.0421 0.37864,0.0701 0.12153,0.0187 0.21035,0.0374 0.26645,0.0561 l -0.22438,1.13593 c -0.10285,-0.0374 -0.27581,-0.0795 -0.51888,-0.12622 -0.23374,-0.0561 -0.53759,-0.0841 -0.91155,-0.0841 -0.24308,10e-6 -0.48616,0.0281 -0.72924,0.0841 -0.23373,0.0467 -0.388,0.0795 -0.46279,0.0982 l 0,6.12841 -1.30421,0 0,-6.98386 c 0.30852,-0.11219 0.69184,-0.21503 1.14995,-0.30853 0.45811,-0.10283 0.97232,-0.15425 1.54262,-0.15426" /> + <path + inkscape:connector-curvature="0" + id="path18259" + style="marker:none" + d="m 985.94926,-314.91413 c -10e-6,0.25243 -0.0842,0.47213 -0.25243,0.65912 -0.16829,0.18698 -0.39735,0.28047 -0.68717,0.28047 -0.28983,0 -0.51888,-0.0935 -0.68717,-0.28047 -0.16828,-0.18699 -0.25243,-0.40669 -0.25243,-0.65912 0,-0.25243 0.0842,-0.47214 0.25243,-0.65912 0.16829,-0.18699 0.39734,-0.28048 0.68717,-0.28048 0.28982,0 0.51888,0.0935 0.68717,0.28048 0.16828,0.18698 0.25242,0.40669 0.25243,0.65912 m 0,-5.59551 c -10e-6,0.25243 -0.0842,0.47214 -0.25243,0.65912 -0.16829,0.18699 -0.39735,0.28048 -0.68717,0.28047 -0.28983,10e-6 -0.51888,-0.0935 -0.68717,-0.28047 -0.16828,-0.18698 -0.25243,-0.40669 -0.25243,-0.65912 0,-0.25242 0.0842,-0.47213 0.25243,-0.65912 0.16829,-0.18698 0.39734,-0.28047 0.68717,-0.28048 0.28982,10e-6 0.51888,0.0935 0.68717,0.28048 0.16828,0.18699 0.25242,0.4067 0.25243,0.65912" /> + </g> + <g + id="g18261" + style="font-size:13.35415173px;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:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + transform="translate(-799.34627,1184.927)"> + <path + inkscape:connector-curvature="0" + id="path18263" + style="font-weight:bold;marker:none" + d="m 855.49443,-280.67636 c 0.29378,0 0.53416,-0.0223 0.72112,-0.0668 0.19586,-0.0534 0.35166,-0.12019 0.4674,-0.20032 0.11573,-0.089 0.19585,-0.1914 0.24037,-0.30714 0.0445,-0.11574 0.0668,-0.24483 0.0668,-0.38727 0,-0.30269 -0.14245,-0.55197 -0.42733,-0.74783 -0.28489,-0.20476 -0.77455,-0.42288 -1.46896,-0.65436 -0.30269,-0.10683 -0.60539,-0.22701 -0.90808,-0.36056 -0.3027,-0.14244 -0.57423,-0.31604 -0.8146,-0.52081 -0.24038,-0.21366 -0.43624,-0.46739 -0.58759,-0.76119 -0.15134,-0.30269 -0.22702,-0.6677 -0.22702,-1.09504 0,-0.42732 0.0801,-0.81014 0.24038,-1.14846 0.16025,-0.3472 0.38727,-0.64099 0.68106,-0.88137 0.29379,-0.24037 0.6499,-0.42287 1.06833,-0.54752 0.41843,-0.13353 0.89028,-0.2003 1.41554,-0.20031 0.62319,10e-6 1.16181,0.0668 1.61586,0.20031 0.45403,0.13355 0.82795,0.28045 1.12174,0.44069 l -0.60093,1.64256 c -0.25819,-0.13354 -0.54753,-0.24927 -0.86802,-0.34721 -0.3116,-0.10683 -0.68997,-0.16024 -1.13511,-0.16025 -0.49855,1e-5 -0.85912,0.0712 -1.08168,0.21367 -0.21367,0.13354 -0.3205,0.34276 -0.3205,0.62764 0,0.16916 0.0401,0.3116 0.12019,0.42733 0.0801,0.11575 0.1914,0.22258 0.33385,0.3205 0.15134,0.089 0.3205,0.17361 0.50746,0.25373 0.19585,0.0712 0.40952,0.1469 0.641,0.22702 0.48074,0.17806 0.89917,0.35612 1.25529,0.53417 0.3561,0.16916 0.64989,0.36947 0.88137,0.60094 0.24037,0.23147 0.41842,0.50301 0.53417,0.8146 0.11573,0.3116 0.17359,0.68997 0.1736,1.1351 -10e-6,0.86357 -0.3027,1.53573 -0.90808,2.01648 -0.6054,0.47185 -1.51793,0.70777 -2.7376,0.70777 -0.40953,0 -0.779,-0.0267 -1.1084,-0.0801 -0.3294,-0.0445 -0.62319,-0.10238 -0.88137,-0.1736 -0.24928,-0.0712 -0.4674,-0.1469 -0.65435,-0.22702 -0.17806,-0.0801 -0.32941,-0.1558 -0.45405,-0.22702 l 0.58759,-1.65592 c 0.27598,0.15135 0.61429,0.28935 1.01491,0.41398 0.40953,0.11574 0.90808,0.17361 1.49567,0.17361" /> + <path + inkscape:connector-curvature="0" + id="path18265" + style="font-weight:bold;marker:none" + d="m 862.59925,-279.08722 -1.98977,0 0,-7.02428 1.98977,0 0,7.02428 m 0.73448,-9.54822 -2.20343,1.85623 -0.90809,-0.8146 1.89629,-2.16338 1.21523,1.12175" /> + </g> + <g + id="g18267" + style="font-size:13.35415173px;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:evenodd;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Ubuntu;-inkscape-font-specification:Ubuntu" + transform="translate(-799.34627,1184.927)"> + <path + inkscape:connector-curvature="0" + id="path18269" + style="font-weight:bold;marker:none" + d="m 915.27539,-279.08722 c -0.59649,-1.05943 -1.24194,-2.1055 -1.93635,-3.13822 -0.69442,-1.03272 -1.43335,-2.00757 -2.21679,-2.92456 l 0,6.06278 -2.05654,0 0,-9.25443 1.69597,0 c 0.29379,0.2938 0.61874,0.65437 0.97486,1.08169 0.3561,0.42734 0.71667,0.88583 1.08168,1.37548 0.37392,0.48075 0.74338,0.98376 1.1084,1.50902 0.36501,0.51636 0.70776,1.01492 1.02827,1.49566 l 0,-5.46185 2.06989,0 0,9.25443 -1.74939,0" /> + <path + inkscape:connector-curvature="0" + id="path18271" + style="font-weight:bold;marker:none" + d="m 925.59627,-282.61272 c -10e-6,0.55198 -0.0801,1.05944 -0.24038,1.52238 -0.16025,0.45404 -0.39172,0.84576 -0.69441,1.17516 -0.3027,0.3205 -0.66771,0.56978 -1.09504,0.74784 -0.41844,0.17805 -0.89028,0.26708 -1.41554,0.26708 -0.51637,0 -0.98821,-0.089 -1.41554,-0.26708 -0.41843,-0.17806 -0.779,-0.42734 -1.08169,-0.74784 -0.30269,-0.3294 -0.53862,-0.72112 -0.70777,-1.17516 -0.16915,-0.46294 -0.25373,-0.9704 -0.25373,-1.52238 0,-0.55196 0.0846,-1.05497 0.25373,-1.50901 0.17806,-0.45404 0.41843,-0.84131 0.72113,-1.16182 0.31159,-0.32049 0.6766,-0.56977 1.09504,-0.74783 0.42733,-0.17805 0.89027,-0.26707 1.38883,-0.26708 0.50745,10e-6 0.97039,0.089 1.38883,0.26708 0.42733,0.17806 0.79234,0.42734 1.09504,0.74783 0.30269,0.32051 0.53861,0.70778 0.70777,1.16182 0.16915,0.45404 0.25372,0.95705 0.25373,1.50901 m -2.02983,0 c -10e-6,-0.61428 -0.12465,-1.09503 -0.37392,-1.44224 -0.24038,-0.35611 -0.58759,-0.53416 -1.04162,-0.53417 -0.45405,1e-5 -0.80571,0.17806 -1.05498,0.53417 -0.24928,0.34721 -0.37392,0.82796 -0.37392,1.44224 0,0.6143 0.12464,1.10395 0.37392,1.46896 0.24927,0.35611 0.60093,0.53417 1.05498,0.53417 0.45403,0 0.80124,-0.17806 1.04162,-0.53417 0.24927,-0.36501 0.37391,-0.85466 0.37392,-1.46896" /> + </g> + <g + id="g18273" + style="font-size:13.35415173px;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:#806600;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" + transform="translate(-799.34627,1184.927)"> + <path + inkscape:connector-curvature="0" + id="path18275" + style="font-weight:bold;fill:#806600;marker:none" + d="m 953.68131,-283.72111 c 0,0.45405 0.0534,0.86357 0.16025,1.22858 0.11574,0.36502 0.27598,0.68107 0.48075,0.94815 0.21366,0.25818 0.47184,0.45849 0.77454,0.60093 0.30269,0.14245 0.6499,0.21367 1.04163,0.21367 0.38281,0 0.72557,-0.0712 1.02827,-0.21367 0.31159,-0.14244 0.56977,-0.34275 0.77454,-0.60093 0.21366,-0.26708 0.37391,-0.58313 0.48075,-0.94815 0.11572,-0.36501 0.17359,-0.77453 0.1736,-1.22858 -10e-6,-0.45404 -0.0579,-0.86356 -0.1736,-1.22858 -0.10684,-0.37391 -0.26709,-0.68996 -0.48075,-0.94815 -0.20477,-0.26707 -0.46295,-0.47184 -0.77454,-0.61429 -0.3027,-0.14243 -0.64546,-0.21366 -1.02827,-0.21366 -0.39173,0 -0.73894,0.0757 -1.04163,0.22702 -0.3027,0.14245 -0.56088,0.34721 -0.77454,0.61429 -0.20477,0.25818 -0.36501,0.57423 -0.48075,0.94814 -0.10683,0.36502 -0.16025,0.7701 -0.16025,1.21523 m 7.06435,0 c -1e-5,0.64991 -0.0801,1.23749 -0.24038,1.76275 -0.16026,0.51636 -0.38728,0.9704 -0.68106,1.36212 -0.2849,0.39172 -0.62765,0.71668 -1.02827,0.97485 -0.40063,0.25819 -0.84132,0.44514 -1.32206,0.56088 0.0445,0.17805 0.14244,0.3205 0.29379,0.42733 0.15134,0.11574 0.34275,0.20922 0.57423,0.28044 0.23147,0.0712 0.49855,0.12464 0.80125,0.16025 0.31159,0.0356 0.64544,0.0668 1.00156,0.0935 l -0.42733,1.52237 c -0.69443,-0.0267 -1.29091,-0.0979 -1.78946,-0.21367 -0.48966,-0.10683 -0.90809,-0.25818 -1.25529,-0.45404 -0.33831,-0.19586 -0.60984,-0.43623 -0.8146,-0.72112 -0.19587,-0.28489 -0.34721,-0.61429 -0.45404,-0.98821 -0.55198,-0.0712 -1.06389,-0.22257 -1.53573,-0.45404 -0.47185,-0.24037 -0.88138,-0.56087 -1.22858,-0.9615 -0.34721,-0.40062 -0.61874,-0.88137 -0.8146,-1.44225 -0.19587,-0.56087 -0.2938,-1.19741 -0.2938,-1.90964 0,-0.79234 0.12464,-1.48676 0.37392,-2.08325 0.24928,-0.60538 0.58313,-1.11284 1.00156,-1.52237 0.42733,-0.40952 0.91698,-0.71666 1.46896,-0.92144 0.56087,-0.20475 1.14845,-0.30713 1.76275,-0.30714 0.63209,1e-5 1.22857,0.10239 1.78945,0.30714 0.56087,0.20478 1.05052,0.51192 1.46896,0.92144 0.41842,0.40953 0.74782,0.91699 0.98821,1.52237 0.24036,0.59649 0.36055,1.29091 0.36056,2.08325" /> + <path + inkscape:connector-curvature="0" + id="path18277" + style="font-weight:bold;fill:#806600;marker:none" + d="m 968.33165,-279.32759 c -0.33831,0.0979 -0.77455,0.18695 -1.30871,0.26708 -0.53417,0.089 -1.09504,0.13354 -1.68262,0.13354 -0.59649,0 -1.09504,-0.0801 -1.49566,-0.24037 -0.39173,-0.16025 -0.70332,-0.38282 -0.93479,-0.66771 -0.23148,-0.29379 -0.39618,-0.641 -0.49411,-1.04163 -0.0979,-0.40062 -0.14689,-0.8413 -0.14689,-1.32206 l 0,-3.91276 1.98976,0 0,3.67239 c 0,0.641 0.0846,1.10394 0.25373,1.38883 0.16915,0.28489 0.4852,0.42733 0.94815,0.42733 0.14244,0 0.29379,-0.004 0.45404,-0.0134 0.16024,-0.0178 0.30269,-0.0356 0.42733,-0.0534 l 0,-5.42178 1.98977,0 0,6.78391" /> + <path + inkscape:connector-curvature="0" + id="path18279" + style="font-weight:bold;fill:#806600;marker:none" + d="m 972.20227,-279.08722 -1.98977,0 0,-7.02428 1.98977,0 0,7.02428 m 0.18696,-9.05411 c -10e-6,0.36502 -0.12019,0.65436 -0.36056,0.86802 -0.23148,0.20477 -0.50746,0.30715 -0.82796,0.30714 -0.3205,10e-6 -0.60094,-0.10237 -0.84131,-0.30714 -0.23148,-0.21366 -0.34721,-0.503 -0.34721,-0.86802 0,-0.36501 0.11573,-0.6499 0.34721,-0.85467 0.24037,-0.21366 0.52081,-0.32049 0.84131,-0.3205 0.3205,1e-5 0.59648,0.10684 0.82796,0.3205 0.24037,0.20477 0.36055,0.48966 0.36056,0.85467" /> + <path + inkscape:connector-curvature="0" + id="path18281" + style="font-weight:bold;fill:#806600;marker:none" + d="m 979.34757,-284.77609 c -0.16025,0.17806 -0.37837,0.41844 -0.65435,0.72113 -0.26709,0.3027 -0.55643,0.63655 -0.86802,1.00156 -0.3116,0.36501 -0.62765,0.74783 -0.94814,1.14845 -0.3116,0.40063 -0.59649,0.7879 -0.85467,1.16182 l 3.39195,0 0,1.65591 -5.80905,0 0,-1.17516 c 0.18696,-0.3205 0.40953,-0.66326 0.66771,-1.02827 0.26708,-0.37392 0.54306,-0.74783 0.82795,-1.12175 0.29379,-0.37392 0.58313,-0.73448 0.86802,-1.08169 0.28489,-0.35611 0.54752,-0.6766 0.7879,-0.9615 l -2.99133,0 0,-1.65591 5.58203,0 0,1.33541" /> + <path + inkscape:connector-curvature="0" + id="path18283" + style="font-weight:bold;fill:#806600;marker:none" + d="m 983.22529,-280.47605 c 0.19585,0 0.38281,-0.004 0.56087,-0.0134 0.17805,-0.009 0.3205,-0.0222 0.42733,-0.0401 l 0,-1.50902 c -0.0801,-0.0178 -0.20031,-0.0356 -0.36056,-0.0534 -0.16025,-0.0178 -0.30715,-0.0267 -0.44068,-0.0267 -0.18697,0 -0.36502,0.0134 -0.53417,0.0401 -0.16025,0.0178 -0.3027,0.0579 -0.42733,0.12019 -0.12465,0.0623 -0.22258,0.1469 -0.2938,0.25373 -0.0712,0.10683 -0.10683,0.24037 -0.10683,0.40062 0,0.3116 0.10238,0.52972 0.30715,0.65436 0.21366,0.11573 0.503,0.1736 0.86802,0.1736 m -0.16025,-5.82241 c 0.58758,10e-6 1.07723,0.0668 1.46895,0.20031 0.39172,0.13355 0.70332,0.32496 0.93479,0.57423 0.24037,0.24928 0.40953,0.55198 0.50746,0.90808 0.0979,0.35612 0.14689,0.75229 0.1469,1.18852 l 0,4.13979 c -0.2849,0.0623 -0.68107,0.13354 -1.18852,0.21366 -0.50746,0.089 -1.12175,0.13355 -1.84287,0.13355 -0.45405,0 -0.86803,-0.0401 -1.24194,-0.12019 -0.36502,-0.0801 -0.68106,-0.20922 -0.94815,-0.38727 -0.26708,-0.18696 -0.47184,-0.42733 -0.61429,-0.72113 -0.14244,-0.29379 -0.21366,-0.65435 -0.21366,-1.08168 0,-0.40953 0.0801,-0.75673 0.24037,-1.04163 0.16915,-0.28488 0.39172,-0.5119 0.66771,-0.68106 0.27598,-0.16915 0.59203,-0.28933 0.94814,-0.36056 0.35611,-0.0801 0.72558,-0.12018 1.1084,-0.12019 0.25818,10e-6 0.4852,0.0134 0.68106,0.0401 0.20476,0.0178 0.36946,0.0445 0.4941,0.0801 l 0,-0.18696 c 0,-0.3383 -0.10238,-0.60983 -0.30714,-0.8146 -0.20477,-0.20476 -0.56088,-0.30714 -1.06833,-0.30715 -0.33831,10e-6 -0.67217,0.0267 -1.00156,0.0801 -0.32941,0.0445 -0.6143,0.11129 -0.85467,0.20031 l -0.25373,-1.6025 c 0.11574,-0.0356 0.25818,-0.0712 0.42733,-0.10683 0.17806,-0.0445 0.36947,-0.0801 0.57423,-0.10683 0.20476,-0.0356 0.41843,-0.0623 0.641,-0.0801 0.23147,-0.0267 0.46294,-0.0401 0.69442,-0.0401" /> + <path + inkscape:connector-curvature="0" + id="path18285" + style="font-weight:bold;fill:#806600;marker:none" + d="m 989.93888,-280.51611 c 0.36501,0 0.62319,-0.0356 0.77454,-0.10684 0.15134,-0.0712 0.22701,-0.20921 0.22702,-0.41398 -10e-6,-0.16024 -0.0979,-0.29824 -0.29379,-0.41397 -0.19587,-0.12464 -0.49411,-0.26263 -0.89473,-0.41398 -0.3116,-0.11574 -0.59649,-0.23592 -0.85467,-0.36056 -0.24928,-0.12464 -0.46294,-0.27154 -0.641,-0.44069 -0.17805,-0.17805 -0.31604,-0.38727 -0.41397,-0.62765 -0.0979,-0.24037 -0.1469,-0.52971 -0.1469,-0.86802 0,-0.6588 0.24483,-1.17961 0.73448,-1.56243 0.48965,-0.38281 1.16181,-0.57422 2.01648,-0.57423 0.42732,10e-6 0.83685,0.0401 1.22858,0.12019 0.39171,0.0712 0.70331,0.15135 0.93479,0.24037 l -0.34721,1.54908 c -0.23148,-0.0801 -0.48521,-0.15134 -0.76119,-0.21366 -0.26708,-0.0623 -0.56978,-0.0935 -0.90808,-0.0935 -0.6232,0 -0.93479,0.17361 -0.93479,0.52081 0,0.0801 0.0133,0.15135 0.0401,0.21367 0.0267,0.0623 0.0801,0.12464 0.16025,0.18695 0.0801,0.0534 0.18696,0.11574 0.3205,0.18696 0.14244,0.0623 0.3205,0.13355 0.53417,0.21367 0.43623,0.16025 0.79679,0.3205 1.08168,0.48075 0.28489,0.15135 0.50746,0.3205 0.66771,0.50746 0.16915,0.17805 0.28488,0.37837 0.34721,0.60093 0.0712,0.22257 0.10683,0.48075 0.10683,0.77454 0,0.69442 -0.26263,1.21968 -0.78789,1.57579 -0.51637,0.35611 -1.25084,0.53417 -2.20344,0.53417 -0.62319,0 -1.144,-0.0534 -1.56243,-0.16025 -0.40953,-0.10683 -0.69442,-0.19586 -0.85467,-0.26708 l 0.33386,-1.61586 c 0.3383,0.13355 0.68551,0.24038 1.04162,0.3205 0.35611,0.0712 0.70777,0.10684 1.05498,0.10684" /> + </g> + <text + sodipodi:linespacing="125%" + id="text18287" + y="1105.0916" + x="199.16885" + 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="1105.0916" + x="199.16885" + sodipodi:role="line" + id="tspan18289" /><tspan + id="tspan18291" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1120.0916" + x="199.16885" + sodipodi:role="line">Además puedes <tspan + id="tspan18293" + style="font-weight:bold">exportar <tspan + id="tspan18295" + style="font-weight:normal">y </tspan>sincronizar </tspan></tspan><tspan + id="tspan18297" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1135.0916" + x="199.16885" + sodipodi:role="line">esta agenda fácilmente con tu </tspan><tspan + id="tspan18299" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1150.0916" + x="199.16885" + sodipodi:role="line">ordenador o móvil y así estar al tanto </tspan><tspan + id="tspan18301" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1165.0916" + x="199.16885" + sodipodi:role="line">de los eventos de los grupos </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1180.0916" + x="199.16885" + sodipodi:role="line" + id="tspan18303">en los que participas o que te interesan</tspan><tspan + id="tspan18305" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1195.0916" + x="199.16885" + sodipodi:role="line" /></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="155.57153" + y="1014.3063" + id="text18307" + sodipodi:linespacing="125%"><tspan + id="tspan18309" + sodipodi:role="line" + x="155.57153" + y="1014.3063" + style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan + id="tspan18311" + sodipodi:role="line" + x="155.57153" + y="1029.3063" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400"><tspan + id="tspan18313" + style="font-weight:bold"><tspan + id="tspan18315" + style="font-weight:normal">Podéis </tspan>compartir vuestra </tspan></tspan><tspan + id="tspan18317" + sodipodi:role="line" + x="155.57153" + y="1044.3063" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">agenda con el público general</tspan><tspan + id="tspan18319" + sodipodi:role="line" + x="155.57153" + y="1059.3063" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">para dar así visibilidad a vuestras </tspan><tspan + id="tspan18321" + sodipodi:role="line" + x="155.57153" + y="1074.3063" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">actividades</tspan></text> + <text + sodipodi:linespacing="125%" + id="text18323" + y="1254.787" + x="312.01788" + 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="1254.787" + x="312.01788" + sodipodi:role="line" + id="tspan18325" /><tspan + id="tspan18327" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1269.787" + x="312.01788" + sodipodi:role="line">Si no vas a asistir a un evento, </tspan><tspan + id="tspan18329" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1284.787" + x="312.01788" + sodipodi:role="line">lo puedes dejar de seguir y</tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="1299.787" + x="312.01788" + sodipodi:role="line" + id="tspan18331">no aparecerá en tu agenda</tspan></text> + </g> + <g style="display:none" inkscape:label="en" id="layer8" Modified: trunk/src/main/webapp/tutorials/lists.svg =================================================================== --- trunk/src/main/webapp/tutorials/lists.svg 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/webapp/tutorials/lists.svg 2012-03-24 23:15:23 UTC (rev 1777) @@ -3,6 +3,7 @@ <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#" @@ -31,8 +32,12 @@ id="kunelang" />   - <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> - <style> + <xhtml:link + href="http://fonts.googleapis.com/css?family=Ubuntu" + rel="stylesheet" + type="text/css" /> + <style + id="style21776"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } </style>  @@ -44,10 +49,10 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.1629238" - inkscape:cx="174.94934" + inkscape:cx="150.35088" inkscape:cy="1340.8534" inkscape:document-units="px" - inkscape:current-layer="svg2" + inkscape:current-layer="g22147" showgrid="false" showborder="true" inkscape:showpageshadow="false" @@ -317,7 +322,7 @@ 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" + d="m -215,554.68896 c 0,6.35128 -5.14873,11.5 -11.5,11.5 -6.35127,0 -11.5,-5.14872 -11.5,-11.5 0,-6.35127 5.14873,-11.5 11.5,-11.5 6.35127,0 11.5,5.14873 11.5,11.5 z" sodipodi:ry="11.5" sodipodi:rx="11.5" sodipodi:cy="554.68896" @@ -347,7 +352,7 @@ 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" + d="m 290,379.86218 c 0,6.90356 -7.83502,12.5 -17.5,12.5 -9.66498,0 -17.5,-5.59644 -17.5,-12.5 0,-6.90356 7.83502,-12.5 17.5,-12.5 9.66498,0 17.5,5.59644 17.5,12.5 z" transform="translate(-1008.4256,-287.55371)" /> <g id="g3313" @@ -1547,7 +1552,7 @@ 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" + d="m 110,32.362183 c 0,5.522847 -8.95431,10 -20,10 -11.045695,0 -20,-4.477153 -20,-10 0,-5.522848 8.954305,-10 20,-10 11.04569,0 20,4.477152 20,10 z" sodipodi:ry="10" sodipodi:rx="20" sodipodi:cy="32.362183" @@ -1560,7 +1565,7 @@ 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -1579,14 +1584,14 @@ 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -1605,14 +1610,14 @@ 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 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" + d="m 16,16.362183 c 0,0.552284 -0.447715,1 -1,1 -0.552285,0 -1,-0.447716 -1,-1 0,-0.552285 0.447715,-1 1,-1 0.552285,0 1,0.447715 1,1 z" sodipodi:ry="1" sodipodi:rx="1" sodipodi:cy="16.362183" @@ -1982,6 +1987,150 @@ id="tspan18196">mensajes</tspan>...</tspan></tspan></text> </g> <g + inkscape:groupmode="layer" + id="g22147" + inkscape:label="en-working" + style="display:none"> + <g + style="display:inline" + id="g22149" + transform="translate(106.00677,59.44173)"> + <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.1684" + y="122.68937" + id="text22151" + sodipodi:linespacing="125%" + transform="scale(0.99912117,1.0008796)"><tspan + sodipodi:role="line" + x="101.1684" + y="122.68937" + style="font-size:32px;font-weight:bold;fill:#aa4400" + id="tspan22153">listas</tspan></text> + <text + transform="scale(0.99912117,1.0008796)" + sodipodi:linespacing="125%" + id="text22155" + y="95.114334" + x="101.42439" + 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="tspan22157" + style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" + y="95.114334" + x="101.42439" + sodipodi:role="line">explicando las</tspan></text> + </g> + <text + transform="translate(0,435.82679)" + sodipodi:linespacing="125%" + id="text22159" + 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="tspan22161" + x="149.85907" + y="-168.92439">pulsa con tu ratón para continuar</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="135.67761" + y="406.39865" + id="text22163" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="135.67761" + y="406.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan22165">Lo siento, estamos</tspan><tspan + sodipodi:role="line" + x="135.67761" + y="421.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan22167">diseñando este</tspan><tspan + sodipodi:role="line" + x="135.67761" + y="436.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan22169">tutorial.</tspan><tspan + sodipodi:role="line" + x="135.67761" + y="451.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan22171">Mientras tanto...</tspan><tspan + sodipodi:role="line" + x="135.67761" + y="466.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan22173" /></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="181.83585" + y="650.30011" + id="text22175" + sodipodi:linespacing="125%"><tspan + id="tspan22177" + sodipodi:role="line" + x="181.83585" + y="650.30011" + style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan + id="tspan22179" + sodipodi:role="line" + x="181.83585" + y="665.30011" + style="font-size:12px;font-weight:normal;fill:#aa4400">...darnos tu <tspan + style="font-weight:bold" + id="tspan22181">feedback </tspan></tspan><tspan + id="tspan22183" + sodipodi:role="line" + x="181.83585" + y="680.30011" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">y participar para </tspan><tspan + sodipodi:role="line" + x="181.83585" + y="695.30011" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan22185">mejorar esta </tspan><tspan + id="tspan22187" + sodipodi:role="line" + x="181.83585" + y="710.30011" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">herramienta...</tspan></text> + <text + sodipodi:linespacing="125%" + id="text22189" + y="566.2572" + x="154.17371" + 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="566.2572" + x="154.17371" + sodipodi:role="line" + id="tspan22191">...aquí puedes crear </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="581.2572" + x="154.17371" + sodipodi:role="line" + id="tspan22193">nuevas <tspan + id="tspan22195" + style="font-weight:bold">listas</tspan> y </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:bold;fill:#aa4400" + y="596.2572" + x="154.17371" + sodipodi:role="line" + id="tspan22197"><tspan + style="font-weight:normal" + id="tspan22199"><tspan + id="tspan22201" + style="font-weight:bold">mensajes</tspan>...</tspan></tspan></text> + </g> + <g style="display:none" inkscape:label="en" id="layer8" Modified: trunk/src/main/webapp/tutorials/tasks.svg =================================================================== --- trunk/src/main/webapp/tutorials/tasks.svg 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/webapp/tutorials/tasks.svg 2012-03-24 23:15:23 UTC (rev 1777) @@ -3,6 +3,7 @@ <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#" @@ -31,8 +32,12 @@ id="kunelang" />   - <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> - <style> + <xhtml:link + href="http://fonts.googleapis.com/css?family=Ubuntu" + rel="stylesheet" + type="text/css" /> + <style + id="style26201"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } </style>  @@ -44,10 +49,10 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.8253692" - inkscape:cx="121.6552" + inkscape:cx="52.080234" inkscape:cy="1258.8941" inkscape:document-units="px" - inkscape:current-layer="layer6" + inkscape:current-layer="g26610" showgrid="false" showborder="true" inkscape:showpageshadow="false" @@ -1955,6 +1960,143 @@ style="font-weight:normal">...</tspan></tspan></text> </g> <g + inkscape:groupmode="layer" + id="g26610" + inkscape:label="en-working" + style="display:none"> + <g + style="display:inline" + id="g26612" + transform="translate(106.00677,59.44173)"> + <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.1684" + y="122.68937" + id="text26614" + sodipodi:linespacing="125%" + transform="scale(0.99912117,1.0008796)"><tspan + sodipodi:role="line" + x="101.1684" + y="122.68937" + style="font-size:32px;font-weight:bold;fill:#aa4400" + id="tspan26616">tareas</tspan></text> + <text + transform="scale(0.99912117,1.0008796)" + sodipodi:linespacing="125%" + id="text26618" + y="95.114334" + x="101.42439" + 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="tspan26620" + style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" + y="95.114334" + x="101.42439" + sodipodi:role="line">explicando las</tspan></text> + </g> + <text + transform="translate(0,435.82679)" + sodipodi:linespacing="125%" + id="text26622" + 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="tspan26624" + x="149.85907" + y="-168.92439">pulsa con tu ratón para continuar</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="135.67761" + y="406.39865" + id="text26626" + sodipodi:linespacing="125%"><tspan + sodipodi:role="line" + x="135.67761" + y="406.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan26628">Lo siento, estamos</tspan><tspan + sodipodi:role="line" + x="135.67761" + y="421.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan26630">diseñando este</tspan><tspan + sodipodi:role="line" + x="135.67761" + y="436.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan26632">tutorial.</tspan><tspan + sodipodi:role="line" + x="135.67761" + y="451.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan26634">Mientras tanto...</tspan><tspan + sodipodi:role="line" + x="135.67761" + y="466.39865" + style="font-size:12px;font-weight:normal;fill:#aa4400" + id="tspan26636" /></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="181.83585" + y="650.30011" + id="text26638" + sodipodi:linespacing="125%"><tspan + id="tspan26640" + sodipodi:role="line" + x="181.83585" + y="650.30011" + style="font-size:12px;font-weight:normal;fill:#aa4400" /><tspan + id="tspan26642" + sodipodi:role="line" + x="181.83585" + y="665.30011" + style="font-size:12px;font-weight:normal;fill:#aa4400">...darnos tu <tspan + style="font-weight:bold" + id="tspan26644">feedback </tspan></tspan><tspan + id="tspan26646" + sodipodi:role="line" + x="181.83585" + y="680.30011" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">y participar para </tspan><tspan + sodipodi:role="line" + x="181.83585" + y="695.30011" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan26648">mejorar esta </tspan><tspan + id="tspan26650" + sodipodi:role="line" + x="181.83585" + y="710.30011" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">herramienta...</tspan></text> + <text + sodipodi:linespacing="125%" + id="text26652" + y="566.2572" + x="154.17371" + 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="566.2572" + x="154.17371" + sodipodi:role="line" + id="tspan26654">...aquí puedes crear </tspan><tspan + style="font-size:12px;font-style:normal;font-weight:bold;fill:#aa4400" + y="581.2572" + x="154.17371" + sodipodi:role="line" + id="tspan26656"><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan26658">nuevas </tspan>tareas<tspan + style="font-weight:normal" + id="tspan26660">...</tspan></tspan></text> + </g> + <g style="display:none" inkscape:label="en" id="layer8" Modified: trunk/src/main/webapp/tutorials/wiki.svg =================================================================== --- trunk/src/main/webapp/tutorials/wiki.svg 2012-03-23 17:43:04 UTC (rev 1776) +++ trunk/src/main/webapp/tutorials/wiki.svg 2012-03-24 23:15:23 UTC (rev 1777) @@ -3,6 +3,7 @@ <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#" @@ -31,8 +32,12 @@ id="kunelang" />   - <link xmlns="http://www.w3.org/1999/xhtml" href='http://fonts.googleapis.com/css?family=Ubuntu' rel='stylesheet' type='text/css' /> - <style> + <xhtml:link + href="http://fonts.googleapis.com/css?family=Ubuntu" + rel="stylesheet" + type="text/css" /> + <style + id="style27450"> text { font-family: 'Ubuntu'; text-rendering: geometricPrecision; } </style>  @@ -44,10 +49,10 @@ inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.9126846" - inkscape:cx="290.08937" + inkscape:cx="150.93944" inkscape:cy="990.73615" inkscape:document-units="px" - inkscape:current-layer="layer7" + inkscape:current-layer="g27812" showgrid="false" showborder="true" inkscape:showpageshadow="false" @@ -2078,6 +2083,131 @@ sodipodi:role="line">explained</tspan></text> </g> <g + inkscape:groupmode="layer" + id="g27812" + inkscape:label="en-working" + style="display:none"> + <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="207.26842" + y="166.0929" + id="text27814" + sodipodi:linespacing="125%" + transform="scale(0.99912117,1.0008796)"><tspan + sodipodi:role="line" + x="207.26842" + y="166.0929" + style="font-size:32px;font-weight:bold;fill:#aa4400" + id="tspan27816">wiki</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="149.85907" + y="-168.92439" + id="text27818" + sodipodi:linespacing="125%" + transform="translate(0,435.82679)"><tspan + y="-168.92439" + x="149.85907" + id="tspan27820" + sodipodi:role="line" + style="font-style:italic">click to continue</tspan></text> + <text + sodipodi:linespacing="125%" + id="text27822" + y="409.18921" + x="134.0341" + 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="tspan27824" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="409.18921" + x="134.0341" + sodipodi:role="line">Sorry, we are</tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="424.18921" + x="134.0341" + sodipodi:role="line" + id="tspan27826">still designing </tspan><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="439.18921" + x="134.0341" + sodipodi:role="line" + id="tspan27828">this tutorial.</tspan><tspan + id="tspan27830" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="454.18921" + x="134.0341" + sodipodi:role="line">Meanwhile...</tspan><tspan + id="tspan27832" + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="469.18921" + x="134.0341" + sodipodi:role="line" /></text> + <text + sodipodi:linespacing="125%" + id="text27834" + y="650.30011" + x="181.83585" + 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="650.30011" + x="181.83585" + sodipodi:role="line" + id="tspan27836" /><tspan + style="font-size:12px;font-weight:normal;fill:#aa4400" + y="665.30011" + x="181.83585" + sodipodi:role="line" + id="tspan27838">...give us your <tspan + id="tspan27840" + style="font-weight:bold">feedback </tspan></tspan><tspan + id="tspan27842" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="680.30011" + x="181.83585" + sodipodi:role="line">and participate</tspan><tspan + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + y="695.30011" + x="181.83585" + sodipodi:role="line" + id="tspan27844">to improve this tool...</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="154.17371" + y="566.2572" + id="text27846" + sodipodi:linespacing="125%"><tspan + id="tspan27848" + sodipodi:role="line" + x="154.17371" + y="566.2572" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400">...here you can create</tspan><tspan + sodipodi:role="line" + x="154.17371" + y="581.2572" + style="font-size:12px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan27850">your new <tspan + id="tspan27852" + style="font-weight:bold">wiki pages</tspan>...</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="207.5244" + y="184.92917" + id="text27854" + sodipodi:linespacing="125%" + transform="scale(0.99912117,1.0008796)"><tspan + sodipodi:role="line" + x="207.5244" + y="184.92917" + style="font-size:16px;font-style:normal;font-weight:normal;fill:#aa4400" + id="tspan27856">explained</tspan></text> + </g> + <g style="display:none" inkscape:label="fr" id="layer9"

1 0

23 Mar '12

Author: vjrj_ Date: 2012-03-23 18:43:04 +0100 (Fri, 23 Mar 2012) New Revision: 1776 Added: trunk/img/icons/custom-iconic/ideas.svg trunk/src/main/java/cc/kune/common/client/actions/gwtui/HasMenuItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuShowAction.java trunk/src/main/java/cc/kune/common/client/log/EventBusWithoutLogging.java trunk/src/main/java/cc/kune/core/client/events/MyGroupsChangedEvent.java trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceHelper.java trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarGroupsLink.java trunk/src/main/webapp/css/ trunk/src/main/webapp/css/reset.css Removed: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-all.css trunk/src/main/java/cc/kune/common/public/kune-common.css trunk/src/main/java/cc/kune/core/client/CoreGinModule.java trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetServiceHelper.java trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java trunk/src/main/java/cc/kune/core/client/state/Session.java trunk/src/main/java/cc/kune/core/client/state/impl/SessionDefault.java trunk/src/main/webapp/others/splash/style/main.css trunk/src/main/webapp/ws.html trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java Log: My Groups menu option (thanks to @sembrestels). Other minor improvements. Added: trunk/img/icons/custom-iconic/ideas.svg =================================================================== --- trunk/img/icons/custom-iconic/ideas.svg (rev 0) +++ trunk/img/icons/custom-iconic/ideas.svg 2012-03-23 17:43:04 UTC (rev 1776) @@ -0,0 +1,83 @@ +<?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="32" + height="32" + viewBox="0 0 31.999999 32" + xml:space="preserve" + inkscape:version="0.48.2 r9819" + sodipodi:docname="ideas.svg" + inkscape:export-filename="/tmp/location-grey.png" + inkscape:export-xdpi="45" + inkscape:export-ydpi="45"><metadata + id="metadata13"><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="defs11" /><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="namedview9" + showgrid="true" + inkscape:zoom="11.594073" + inkscape:cx="42.459611" + inkscape:cy="15.224037" + inkscape:window-x="0" + inkscape:window-y="709" + inkscape:window-maximized="0" + inkscape:current-layer="Layer_1"><inkscape:grid + type="xygrid" + id="grid3009" + empspacing="5" + visible="true" + enabled="true" + snapvisiblegridlinesonly="true" /></sodipodi:namedview> +<g + id="g3"> + <path + style="fill:#231f20" + d="m 16.024,4.007 c 3.32,0 6.019,2.7 6.019,6.017 0,1.894 -0.867,3.636 -2.379,4.773 C 18.042084,16.123195 16.999999,17.4375 16,19 15,17 14,16 12.39,14.797 10.875,13.66 10.008,11.918 10.008,10.024 c 0,-3.317 2.699,-6.017 6.016,-6.017 M 16.024,0 C 10.488,0 6,4.488 6,10.024 c 0,3.28 1.547,6.147 3.977,7.976 1.121,0.844 1.57325,4 2.023,5 0.449749,1 0.92143,-1.477118 4,-2 3,0 4,4 4,2 0,-2 1,-3.531174 2.074,-5 2.43,-1.829 3.977,-4.696 3.977,-7.976 C 26.051,4.488 21.562,0 16.024,0 z" + id="path5" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cscccsccsczczcsc" /> + +</g> +<path + style="fill:#231f20;fill-opacity:1;stroke:#231f20;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" + d="M 11,23.920971 21,21" + id="path3614" + inkscape:connector-curvature="0" + sodipodi:nodetypes="cc" /><path + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path4386" + d="M 11,27.920971 21,25" + style="fill:#231f20;fill-opacity:1;stroke:#231f20;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" /><path + sodipodi:type="arc" + style="color:#000000;fill:#231f20;fill-opacity:1;fill-rule:evenodd;stroke:#231f20;stroke-width:4;stroke-linecap:round;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="path4427" + sodipodi:cx="16.427052" + sodipodi:cy="27.5" + sodipodi:rx="2.4270511" + sodipodi:ry="1.5" + d="M 18.854103,27.5 A 2.4270511,1.5 0 1 1 14,27.5 a 2.4270511,1.5 0 1 1 4.854103,0 z" + transform="translate(-0.3901141,1)" /></svg> \ No newline at end of file Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtButtonGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -19,9 +19,7 @@ */ package cc.kune.common.client.actions.gwtui; -import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; @@ -156,14 +154,6 @@ } @Override - public void setToolTipText(final String tooltipText) { - if (tooltipText != null && !tooltipText.isEmpty()) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - tooltip = Tooltip.to(button, key == null ? tooltipText : tooltipText + key.toString()); - } - } - - @Override public void setVisible(final boolean visible) { button.setVisible(visible); } @@ -173,15 +163,4 @@ return !descriptor.isChild(); } - @Override - protected void toogleTooltipVisible() { - if (tooltip != null) { - if (tooltip.isVisibleOrWillBe()) { - tooltip.hide(); - } else { - tooltip.showTemporally(); - } - } - } - } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -26,6 +26,7 @@ import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.Position; import cc.kune.common.client.resources.SubMenuResources; @@ -86,17 +87,18 @@ if (popup != null && popup.isShowing()) { popup.hide(); } + } else if (event.getPropertyName().equals(MenuDescriptor.MENU_SHOW)) { + show(); + } else if (event.getPropertyName().equals(MenuDescriptor.MENU_SELECTION_DOWN)) { + menu.moveSelectionDown(); + } else if (event.getPropertyName().equals(MenuDescriptor.MENU_SELECTION_UP)) { + menu.moveSelectionUp(); + } else if (event.getPropertyName().equals(MenuDescriptor.MENU_SELECT_ITEM)) { + final HasMenuItem item = (HasMenuItem) ((MenuItemDescriptor) descriptor.getValue(MenuDescriptor.MENU_SELECT_ITEM)).getValue(MenuItemDescriptor.UI); + menu.selectItem(item.getMenuItem()); } } }); - descriptor.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(final PropertyChangeEvent event) { - if (event.getPropertyName().equals(MenuDescriptor.MENU_SHOW)) { - show(descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO)); - } - } - }); return this; } @@ -130,8 +132,12 @@ return !descriptor.isChild(); } - public void show(final Object relative) { - createPopup(); + protected abstract void show(); + + public void showRelativeTo(final Object relative) { + if (popup == null) { + createPopup(); + } if (relative instanceof String) { popup.showRelativeTo(RootPanel.get((String) relative)); } else if (relative instanceof UIObject) { Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/AbstractGwtMenuItemGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -34,7 +34,6 @@ import cc.kune.common.client.actions.ui.descrip.MenuTitleItemDescriptor; import cc.kune.common.client.errors.UIException; import cc.kune.common.client.resources.CommonResources; -import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; import com.google.gwt.resources.client.ImageResource; @@ -42,10 +41,12 @@ import com.google.gwt.user.client.DOM; import com.google.gwt.user.client.Element; import com.google.gwt.user.client.Event; +import com.google.gwt.user.client.ui.MenuItem; -public abstract class AbstractGwtMenuItemGui extends AbstractGuiItem { +public abstract class AbstractGwtMenuItemGui extends AbstractGuiItem implements HasMenuItem { private IconLabel iconLabel; + private GwtBaseMenuItem item; private final CommonResources res = CommonResources.INSTANCE; @@ -100,7 +101,7 @@ } else { item = new GwtBaseMenuItem("", true); } - + descriptor.putValue(MenuItemDescriptor.UI, this); final String id = descriptor.getId(); if (id != null) { item.ensureDebugId(id); @@ -164,6 +165,11 @@ return item; } + @Override + public MenuItem getMenuItem() { + return item; + } + private AbstractGwtMenuGui getParentMenu(final GuiActionDescrip descriptor) { return ((AbstractGwtMenuGui) descriptor.getParent().getValue(ParentWidget.PARENT_UI)); } @@ -227,16 +233,6 @@ } @Override - protected void setToolTipText(final String text) { - if (text != null) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - // FIXME This doesn't works... (don't show the tooltip) - Tooltip.to(iconLabel, key == null ? text : text + key.toString()); - layout(); - } - } - - @Override public void setVisible(final boolean visible) { item.setVisible(visible); iconLabel.setVisible(visible); Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtIconLabelGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -20,9 +20,7 @@ package cc.kune.common.client.actions.gwtui; import cc.kune.common.client.actions.AbstractAction; -import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; @@ -97,12 +95,6 @@ } @Override - public void setToolTipText(final String tooltip) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - iconLabel.setTooltip(key == null ? tooltip : tooltip + key.toString()); - } - - @Override public boolean shouldBeAdded() { return true; } 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-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -23,7 +23,6 @@ import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; -import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.client.ui.IconLabel; import com.google.gwt.event.dom.client.ClickEvent; @@ -67,7 +66,7 @@ @Override public void onClick(final ClickEvent event) { event.stopPropagation(); - show(button); + show(); } }); final String id = descriptor.getId(); @@ -139,9 +138,9 @@ } @Override - public void setToolTipText(final String tooltip) { + public void setToolTipText(final String tooltipText) { if (notStandAlone) { - Tooltip.to(button, tooltip); + setToolTipTextNextTo(button, tooltipText); } } @@ -154,4 +153,13 @@ } } + @Override + protected void show() { + if (notStandAlone) { + showRelativeTo(button); + } else { + showRelativeTo(descriptor.getValue(MenuDescriptor.MENU_SHOW_NEAR_TO)); + } + } + } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtMenuSeparatorGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -59,10 +59,6 @@ } @Override - protected void setToolTipText(final String text) { - } - - @Override public boolean shouldBeAdded() { return false; } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtSubMenuGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -22,14 +22,17 @@ import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.ui.IconLabel; +import cc.kune.common.shared.utils.TextUtils; import com.google.gwt.user.client.ui.MenuItem; -public class GwtSubMenuGui extends AbstractGwtMenuGui { +public class GwtSubMenuGui extends AbstractGwtMenuGui implements HasMenuItem { private IconLabel iconLabel; private MenuItem item; + private AbstractGwtMenuGui parentMenu; @Override public AbstractGuiItem create(final GuiActionDescrip descriptor) { @@ -38,8 +41,7 @@ item = new MenuItem("", menu); iconLabel = new IconLabel(""); configureItemFromProperties(); - final AbstractGwtMenuGui parentMenu = ((AbstractGwtMenuGui) descriptor.getParent().getValue( - PARENT_UI)); + parentMenu = ((AbstractGwtMenuGui) descriptor.getParent().getValue(PARENT_UI)); final int position = descriptor.getPosition(); if (position == GuiActionDescrip.NO_POSITION) { parentMenu.add(item); @@ -47,9 +49,15 @@ parentMenu.insert(position, item); } descriptor.putValue(ParentWidget.PARENT_UI, this); + descriptor.putValue(MenuItemDescriptor.UI, this); return this; } + @Override + public MenuItem getMenuItem() { + return item; + } + private void layout() { item.setHTML(iconLabel.toString()); } @@ -85,7 +93,9 @@ @Override public void setToolTipText(final String tooltip) { - item.setTitle(tooltip); + if (TextUtils.notEmpty(tooltip)) { + item.setTitle(tooltip); + } } @Override @@ -94,4 +104,10 @@ iconLabel.setVisible(visible); layout(); } + + @Override + protected void show() { + parentMenu.show(); + // FIXME: item.selectItem + } } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -83,11 +83,6 @@ } @Override - protected void setToolTipText(final String text) { - toolbar.setTitle(text); - } - - @Override public boolean shouldBeAdded() { return true; } Modified: trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/GwtToolbarSeparatorGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -80,10 +80,6 @@ } @Override - protected void setToolTipText(final String text) { - } - - @Override public void setVisible(final boolean visible) { widget.setVisible(visible); } Added: trunk/src/main/java/cc/kune/common/client/actions/gwtui/HasMenuItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gwtui/HasMenuItem.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/gwtui/HasMenuItem.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -0,0 +1,7 @@ +package cc.kune.common.client.actions.gwtui; + +import com.google.gwt.user.client.ui.MenuItem; + +public interface HasMenuItem { + MenuItem getMenuItem(); +} Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtButtonGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -19,9 +19,7 @@ */ package cc.kune.common.client.actions.gxtui; -import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.ui.AbstractChildGuiItem; import cc.kune.common.client.actions.ui.AbstractGuiItem; import cc.kune.common.client.actions.ui.ParentWidget; @@ -133,21 +131,6 @@ } @Override - protected void setToolTipText(final String tooltip) { - if (tooltip != null && !tooltip.isEmpty()) { - final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); - if (key == null) { - // button.setToolTip(new GxtDefTooltip(tooltip)); - button.setTitle(tooltip); - } else { - // button.setToolTip(new GxtDefTooltip(tooltip + - // key.toString())); - button.setTitle(tooltip + key.toString()); - } - } - } - - @Override public void setVisible(final boolean visible) { if (button.isRendered()) { // ?? Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/AbstractGxtMenuItemGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -32,7 +32,6 @@ import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuRadioItemDescriptor; import cc.kune.common.client.errors.NotImplementedException; -import cc.kune.common.shared.utils.TextUtils; import com.extjs.gxt.ui.client.event.MenuEvent; import com.extjs.gxt.ui.client.event.SelectionListener; @@ -161,13 +160,6 @@ } @Override - protected void setToolTipText(final String tooltip) { - if (TextUtils.notEmpty(tooltip)) { - item.setToolTip(new GxtDefTooltip(tooltip)); - } - } - - @Override public void setVisible(final boolean visible) { item.setVisible(visible); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuSeparatorGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -65,10 +65,6 @@ } @Override - protected void setToolTipText(final String text) { - } - - @Override public boolean shouldBeAdded() { return false; } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtMenuTitleItemGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -87,7 +87,7 @@ } @Override - protected void setToolTipText(final String tooltip) { + public void setToolTipText(final String tooltip) { if (TextUtils.notEmpty(tooltip)) { item.setToolTip(new GxtDefTooltip(tooltip)); } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -97,9 +97,4 @@ protected void setText(final String text) { } - @Override - protected void setToolTipText(final String text) { - toolbar.setTitle(text); - } - } Modified: trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/gxtui/GxtToolbarSeparatorGui.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -77,11 +77,6 @@ } @Override - protected void setToolTipText(final String text) { - // do nothing - } - - @Override public boolean shouldBeAdded() { return false; } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/AbstractGuiItem.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -22,19 +22,23 @@ import cc.kune.common.client.actions.AbstractAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.PropertyChangeEvent; import cc.kune.common.client.actions.PropertyChangeListener; import cc.kune.common.client.actions.ui.descrip.DropTarget; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.errors.NotImplementedException; +import cc.kune.common.client.tooltip.Tooltip; import cc.kune.common.shared.utils.TextUtils; import com.google.gwt.resources.client.ImageResource; import com.google.gwt.user.client.ui.Composite; +import com.google.gwt.user.client.ui.Widget; public abstract class AbstractGuiItem extends Composite implements GuiBinding { protected GuiActionDescrip descriptor; + protected Tooltip tooltip; public AbstractGuiItem() { super(); @@ -116,13 +120,13 @@ // the action, if not we only pass the menuitem return descriptor.hasTarget() ? descriptor.getTarget() : descriptor.isChild() ? descriptor.getParent().getTarget() : ActionEvent.NO_TARGET; - }; + } private void setDropTarget(final DropTarget dropTarget) { if (dropTarget != null) { dropTarget.init(this); } - } + }; protected abstract void setEnabled(boolean enabled); @@ -170,8 +174,20 @@ protected abstract void setText(String text); - protected abstract void setToolTipText(String text); + public void setToolTipText(final String tooltipText) { + if (shouldBeAdded()) { + setToolTipTextNextTo(getWidget(), tooltipText); + } + } + public void setToolTipTextNextTo(final Widget widget, final String tooltipText) { + if (tooltipText != null && !tooltipText.isEmpty()) { + final KeyStroke key = (KeyStroke) descriptor.getValue(Action.ACCELERATOR_KEY); + final String compountTooltip = key == null ? tooltipText : tooltipText + key.toString(); + tooltip = Tooltip.to(widget, compountTooltip); + } + } + private void setVisible(final Boolean visible) { // if you have problems with setVisible check if the GuiItem calls // configureItemFromProperties on creation @@ -183,8 +199,13 @@ return true; } - protected void toogleTooltipVisible() { - // do nothing by default - return; + public void toogleTooltipVisible() { + if (tooltip != null) { + if (tooltip.isVisibleOrWillBe()) { + tooltip.hide(); + } else { + tooltip.showTemporally(); + } + } } } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/AbstractGuiActionDescrip.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -27,6 +27,8 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ChangeableObject; import cc.kune.common.client.actions.KeyStroke; +import cc.kune.common.client.actions.Shortcut; +import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import com.google.gwt.i18n.client.HasDirection.Direction; @@ -36,7 +38,7 @@ public abstract class AbstractGuiActionDescrip extends ChangeableObject implements GuiActionDescrip { /** The action. */ - private final AbstractAction action; + private AbstractAction action; private final List<GuiAddCondition> addConditions; @@ -178,6 +180,10 @@ return result; } + public void setAction(final AbstractAction action) { + this.action = action; + } + @Override public void setDropTarget(final DropTarget dropTarget) { putValue(DROP_TARGET, dropTarget); @@ -258,10 +264,22 @@ putValue(VISIBLE, visible); } + /** + * Toggle the value of a boolean property + * + * @param property + * the property + */ + protected void toggle(final String property) { + // Action detects changes in values, then we fire a change (whatever) to + // fire this method in the UI + final Object value = getValue(property); + putValue(property, value == null ? true : !((Boolean) value)); + } + @Override public void toggleTooltipVisible() { - final Object value = getValue(TOOGLE_TOOLTIP_VISIBLE); - putValue(TOOGLE_TOOLTIP_VISIBLE, value == null ? true : !(Boolean) value); + toggle(TOOGLE_TOOLTIP_VISIBLE); } @Override @@ -278,6 +296,12 @@ } @Override + public GuiActionDescrip withAction(final AbstractAction action) { + setAction(action); + return this; + } + + @Override public GuiActionDescrip withIcon(final Object icon) { super.putValue(Action.SMALL_ICON, icon); return this; @@ -308,12 +332,26 @@ } @Override - public GuiActionDescrip withShortcut(final KeyStroke shortcut) { + public GuiActionDescrip withShortcut(final KeyStroke shortcut, final GlobalShortcutRegister register) { putValue(Action.ACCELERATOR_KEY, shortcut); + register.put(shortcut, action); return this; } @Override + public GuiActionDescrip withShortcut(final String keys, final GlobalShortcutRegister register) { + final boolean hasCtrl = keys.contains("Ctrl"); + final boolean hasAlt = keys.contains("Alt"); + final boolean hasMeta = keys.contains("Meta"); + final boolean hasShift = keys.contains("Shift"); + final Character key = keys.charAt(keys.length() - 1); + final KeyStroke shortcut = Shortcut.getShortcut(hasCtrl, hasAlt, hasShift, hasMeta, key); + putValue(Action.ACCELERATOR_KEY, shortcut); + register.put(shortcut, action); + return this; + } + + @Override public GuiActionDescrip withStyles(final String styles) { setStyles(styles); return this; Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/GuiActionDescrip.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -23,83 +23,246 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.KeyStroke; import cc.kune.common.client.actions.PropertyChangeListener; +import cc.kune.common.client.shortcuts.GlobalShortcutRegister; import com.google.gwt.i18n.client.HasDirection.Direction; +// TODO: Auto-generated Javadoc +/** + * The Interface GuiActionDescrip. + */ public interface GuiActionDescrip { + /** The Constant DROP_TARGET. */ public static final String DROP_TARGET = "dropTarget"; + /** The Constant NO_PARENT. */ public static final AbstractGuiActionDescrip NO_PARENT = new NoParentGuiActionDescriptor(); + /** The Constant NO_POSITION. */ public static final int NO_POSITION = -1; /** - * {@link #TARGET} is used to associate a {@link #AbstractGuiActionDescrip} - * with an object like groups, group names, users, and so on, and used to - * execute actions against these targets + * The Constant TARGET. {@link #TARGET} is used to associate a + * {@link #AbstractGuiActionDescrip} with an object like groups, group names, + * users, and so on, and used to execute actions against these targets */ public static final String TARGET = "target"; + /** The Constant TOOGLE_TOOLTIP_VISIBLE. */ public static final String TOOGLE_TOOLTIP_VISIBLE = "toogle-tooltip-visible"; + + /** The Constant VISIBLE. */ public static final String VISIBLE = "visibleprop"; + /** + * Adds the. + * + * @param addCondition + * the add condition + */ void add(final GuiAddCondition addCondition); + /** + * Adds the property change listener. + * + * @param listener + * the listener + */ void addPropertyChangeListener(final PropertyChangeListener listener); + /** + * Fire. + * + * @param event + * the event + */ void fire(final ActionEvent event); + /** + * Gets the action. + * + * @return the action + */ AbstractAction getAction(); + /** + * Gets the direction. + * + * @return the direction + */ Direction getDirection(); + /** + * Gets the id. + * + * @return the id + */ String getId(); + /** + * Gets the keys. + * + * @return the keys + */ Object[] getKeys(); + /** + * Gets the location. + * + * @return the location + */ String getLocation(); + /** + * Gets the parent. + * + * @return the parent + */ GuiActionDescrip getParent(); + /** + * Gets the position. + * + * @return the position + */ int getPosition(); + /** + * Gets the property change listeners. + * + * @return the property change listeners + */ PropertyChangeListener[] getPropertyChangeListeners(); + /** + * Gets the target. + * + * @return the target + */ Object getTarget(); + /** + * Gets the type. + * + * @return the type + */ Class<?> getType(); + /** + * Gets the value. + * + * @param key + * the key + * @return the value + */ Object getValue(final String key); + /** + * Checks for target. + * + * @return true, if successful + */ boolean hasTarget(); + /** + * Checks if is child. + * + * @return true, if is child + */ boolean isChild(); + /** + * Checks if is enabled. + * + * @return true, if is enabled + */ boolean isEnabled(); + /** + * Checks if is rTL. + * + * @return true, if is rTL + */ boolean isRTL(); + /** + * Checks if is visible. + * + * @return true, if is visible + */ boolean isVisible(); + /** + * Must be added. + * + * @return true, if successful + */ boolean mustBeAdded(); + /** + * Put value. + * + * @param key + * the key + * @param value + * the value + */ public void putValue(final String key, final Object value); + /** + * Removes the property change listener. + * + * @param listener + * the listener + */ void removePropertyChangeListener(final PropertyChangeListener listener); + /** + * Sets the drop target. + * + * @param dropTarget + * the new drop target + */ void setDropTarget(DropTarget dropTarget); + /** + * Sets the enabled. + * + * @param enabled + * the new enabled + */ void setEnabled(final boolean enabled); + /** + * Sets the id. + * + * @param id + * the new id + */ void setId(final String id); + /** + * Sets the location. + * + * @param location + * the new location + */ void setLocation(final String location); + /** + * Sets the parent. + * + * @param parent + * the new parent + */ void setParent(final GuiActionDescrip parent); /** + * Sets the parent. + * * @param parent + * the parent * @param addToParent * if yes, the action will be added directly to the parent, useful to * attach menu items (or other child actions) directly to its parent @@ -108,42 +271,156 @@ */ void setParent(GuiActionDescrip parent, boolean addToParent); + /** + * Sets the position. + * + * @param position + * the new position + */ void setPosition(final int position); + /** + * Sets the rTL. + * + * @param isRTL + * the new rTL + */ void setRTL(final boolean isRTL); + /** + * Sets the styles. + * + * @param styles + * the new styles + */ void setStyles(final String styles); + /** + * Sets the target. + * + * @param object + * the new target + */ void setTarget(final Object object); + /** + * Sets the visible. + * + * @param visible + * the new visible + */ void setVisible(final boolean visible); + /** + * Toggle tooltip visible. + */ void toggleTooltipVisible(); + /** + * Toogle visible. + */ void toogleVisible(); + /** + * With action. + * + * @param action + * the action + * @return the gui action descrip + */ + GuiActionDescrip withAction(AbstractAction action); + + /** + * With icon. + * + * @param icon + * the icon + * @return the gui action descrip + */ GuiActionDescrip withIcon(Object icon); + /** + * With icon cls. + * + * @param icon + * the icon + * @return the gui action descrip + */ GuiActionDescrip withIconCls(String icon); + /** + * With id. + * + * @param id + * the id + * @return the gui action descrip + */ GuiActionDescrip withId(String id); + /** + * With parent. + * + * @param parent + * the parent + * @return the gui action descrip + */ GuiActionDescrip withParent(GuiActionDescrip parent); /** + * With parent. + * * @param parent + * the parent * @param addToParent * if yes, the action will be added directly to the parent, useful to * attach menu items (or other child actions) directly to its parent * without any other check (for instance session status, etc) + * @return the gui action descrip */ GuiActionDescrip withParent(GuiActionDescrip parent, boolean addToParent); - GuiActionDescrip withShortcut(KeyStroke keystroke); + /** + * With shortcut. + * + * @param keystroke + * the keystroke + * @return the gui action descrip + */ + GuiActionDescrip withShortcut(KeyStroke keystroke, GlobalShortcutRegister register); + /** + * With shortcut. + * + * @param keys + * the keys (for instance "Ctrl+A") + * @return the gui action descrip + */ + GuiActionDescrip withShortcut(String keys, GlobalShortcutRegister register); + + /** + * With styles. + * + * @param styles + * the styles + * @return the gui action descrip + */ GuiActionDescrip withStyles(String styles); + /** + * With text. + * + * @param text + * the text + * @return the gui action descrip + */ GuiActionDescrip withText(String text); + /** + * With tool tip. + * + * @param tooltip + * the tooltip + * @return the gui action descrip + */ GuiActionDescrip withToolTip(String tooltip); } Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuDescriptor.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -31,7 +31,10 @@ public static final String MENU_HIDE = "hidemenu"; public static final String MENU_ONHIDE = "menuonhide"; public static final String MENU_ONSHOW = "menuonshow"; - protected static final String MENU_RIGHTICON = "menurighicon"; + protected static final String MENU_RIGHTICON = "menurighticon"; + public static final String MENU_SELECT_ITEM = "menuselitem"; + public static final String MENU_SELECTION_DOWN = "menuseldown"; + public static final String MENU_SELECTION_UP = "menuselup"; public static final String MENU_SHOW = "showmenu"; public static final String MENU_SHOW_NEAR_TO = "showmenunearto"; protected static final String MENU_STANDALONE = "menustandalone"; @@ -51,6 +54,8 @@ putValue(MENU_SHOW, false); putValue(MENU_CLEAR, false); putValue(MENU_STANDALONE, false); + putValue(MENU_SELECTION_DOWN, false); + putValue(MENU_SELECTION_UP, false); } public MenuDescriptor(final String text) { @@ -75,9 +80,7 @@ @Override public void clear() { - // Action detects changes in values, then we fire a change (whatever) to - // fire this method in the UI - putValue(MENU_CLEAR, !((Boolean) getValue(MENU_CLEAR))); + toggle(MENU_CLEAR); super.clear(); } @@ -91,13 +94,25 @@ } public void hide() { - putValue(MENU_HIDE, !((Boolean) getValue(MENU_HIDE))); + toggle(MENU_HIDE); } public boolean isStandalone() { return (Boolean) super.getValue(MENU_STANDALONE); } + public void moveSelectionDown() { + toggle(MENU_SELECTION_DOWN); + } + + public void moveSelectionUp() { + toggle(MENU_SELECTION_UP); + } + + public void selectMenu(final MenuItemDescriptor item) { + putValue(MENU_SELECT_ITEM, item); + } + public void setMenuPosition(final Position position) { putValue(MENU_SHOW_NEAR_TO, position); } @@ -125,7 +140,7 @@ * Show the menu (remember to set the menu position before) */ public void show() { - putValue(MENU_SHOW, !((Boolean) getValue(MENU_SHOW))); + toggle(MENU_SHOW); } /** Modified: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuItemDescriptor.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -23,6 +23,8 @@ public class MenuItemDescriptor extends AbstractGuiActionDescrip { + public static String UI = "menuitem-ui"; + public static MenuItemDescriptor build(final AbstractAction action) { return new MenuItemDescriptor(action); } Added: trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuShowAction.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuShowAction.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/actions/ui/descrip/MenuShowAction.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -0,0 +1,23 @@ +package cc.kune.common.client.actions.ui.descrip; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.ActionEvent; + +import com.google.inject.Singleton; + +@Singleton +public class MenuShowAction extends AbstractExtendedAction { + + private MenuDescriptor menu; + + @Override + public void actionPerformed(final ActionEvent event) { + menu.show(); + menu.moveSelectionDown(); + } + + public void setMenu(final MenuDescriptor menu) { + this.menu = menu; + } + +} \ No newline at end of file Added: trunk/src/main/java/cc/kune/common/client/log/EventBusWithoutLogging.java =================================================================== --- trunk/src/main/java/cc/kune/common/client/log/EventBusWithoutLogging.java (rev 0) +++ trunk/src/main/java/cc/kune/common/client/log/EventBusWithoutLogging.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -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.common.client.log; + +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.SimpleEventBus; + +public class EventBusWithoutLogging extends SimpleEventBus { + @Override + public void fireEvent(final GwtEvent<?> event) { + super.fireEvent(event); + } +} Modified: trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-all.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-all.css 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/public/gxt/css/gxt-all.css 2012-03-23 17:43:04 UTC (rev 1776) @@ -1,4 +1,4 @@ -html,body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquote,th,td{margin:0;padding:0;}img,body,html{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}ol,ul {list-style:none;}caption,th {text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;}q:before,q:after{content:'';} +html,body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,p,blockquote,th,td{margin:0;padding:0;}img,body,html{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}ol,ul {list-style:none;}caption,th {text-align:left;}h1,h2,h3,h4,h5,h6{/* font-size:100%; */}q:before,q:after{content:'';} .x-contrast-test { background: url(../images/default/s.gif); visibility: hidden; Modified: trunk/src/main/java/cc/kune/common/public/kune-common.css =================================================================== --- trunk/src/main/java/cc/kune/common/public/kune-common.css 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/common/public/kune-common.css 2012-03-23 17:43:04 UTC (rev 1776) @@ -1,10 +1,10 @@ /* Here the styles of cc.kune.commom (reused by other projects like gadgets and so on) */ .k-popup-top-centered { - + } .k-popup-bottom-centered { /* z-index:100000; */ - + } .k-floatleft,.k-fl { @@ -21,24 +21,24 @@ } .k-opacity80 { - kfilter: alpha(opacity = - 80); + kfilter: alpha(opacity = + 80); -moz-opacity: 0.80; -khtml-opacity: 0.80; opacity: 0.80; } .k-opacity90 { - kfilter: alpha(opacity = - 90); + kfilter: alpha(opacity = + 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; } .k-opacity95 { - kfilter: alpha(opacity = - 95); + kfilter: alpha(opacity = + 95); -moz-opacity: 0.95; -khtml-opacity: 0.95; opacity: 0.95; @@ -46,8 +46,8 @@ .gwt-PopupPanelGlass { background-color: #f7ebe3 !important; - kfilter: alpha(opacity = - 68) !important; + kfilter: alpha(opacity = + 68) !important; -moz-opacity: 0.68 !important; -khtml-opacity: 0.68 !important; opacity: 0.68 !important; @@ -166,7 +166,7 @@ } .k-dialog-btn-area div { /* margin: 10px */ - + } .k-dialog-btn { @@ -185,13 +185,13 @@ } .k-dialog-close-btn-dialog { - top: -26px; + top: -26px; left: 1px; } .k-dialog-close-btn-normal { top: 10px; - left: 0px; + left: 0px; } .k-dialog-firstBtn { @@ -316,7 +316,7 @@ -webkit-border-bottom-left-radius: 5px; -moz-border-radius-bottomleft: 5px; border-bottom-left-radius: 5px; - kfilter: alpha(opacity = 90); + kfilter: alpha(opacity = 90); -moz-opacity: 0.90; -khtml-opacity: 0.90; opacity: 0.90; @@ -498,7 +498,7 @@ .k-iconlabel-right { float: left; - /* margin-left: 5px; */ + /* margin-left: 5px; */ } .k-menuimtem-title { @@ -514,7 +514,6 @@ margin-top: 4px; } - .gwt-MenuBar-vertical .subMenuIcon-selected { background: none repeat scroll 0 0 #808080; } @@ -569,13 +568,13 @@ _border-left-color: pink; _border-bottom-color: pink; _border-right-color: pink; - _filter: chroma(color = pink); + _filter: chroma(color = pink); } /* end tooltip */ /* tabbar */ .gwt-DecoratedTabBar { - + } .gwt-DecoratedTabBar .gwt-TabBarFirst { @@ -583,7 +582,7 @@ } .gwt-DecoratedTabBar .gwt-TabBarRest { - + } .gwt-DecoratedTabBar .gwt-TabBarItem { @@ -725,4 +724,36 @@ -webkit-border-radius: 3px; border-radius: 3px; padding: 3px; -} \ No newline at end of file +} + +/* Menu separators */ + +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator { + width: 1px; + padding: 0px; + margin: 0px; + border: 0px; + border-left: 1px solid #888888; + background: white; +} + +.gwt-MenuBar-horizontal .gwt-MenuItemSeparator .menuSeparatorInner { + width: 1px; + height: 1px; + background: white; +} + +.gwt-MenuBar-vertical .gwt-MenuItemSeparator { + padding: 2px 0px; +} + +.gwt-MenuBar-vertical .gwt-MenuItemSeparator .menuSeparatorInner { + height: 1px; + padding: 0px; + border: 0px; + border-top: 1px solid #777777; + background: #ddddee; + overflow: hidden; +} + +/* END Menu separators */ \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/CoreGinModule.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/CoreGinModule.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -32,6 +32,8 @@ import cc.kune.core.client.actions.ActionRegistryByType; import cc.kune.core.client.actions.xml.XMLActionsParser; import cc.kune.core.client.auth.AnonUsersManager; +import cc.kune.core.client.auth.LoginRememberManager; +import cc.kune.core.client.auth.LoginRememberManagerImpl; import cc.kune.core.client.auth.Register; import cc.kune.core.client.auth.RegisterPanel; import cc.kune.core.client.auth.RegisterPresenter; @@ -41,8 +43,6 @@ 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.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; @@ -69,12 +69,13 @@ import cc.kune.core.client.rpcservices.ContentServiceHelper; import cc.kune.core.client.rpcservices.SocialNetServiceHelper; import cc.kune.core.client.sitebar.ErrorsDialog; +import cc.kune.core.client.sitebar.MyGroupsMenu; import cc.kune.core.client.sitebar.SiteUserOptions; import cc.kune.core.client.sitebar.SiteUserOptionsPresenter; import cc.kune.core.client.sitebar.SitebarActions; import cc.kune.core.client.sitebar.SitebarActionsPanel; import cc.kune.core.client.sitebar.SitebarActionsPresenter; -import cc.kune.core.client.sitebar.SitebarNewGroupLink; +import cc.kune.core.client.sitebar.SitebarGroupsLink; import cc.kune.core.client.sitebar.SitebarSignInLink; import cc.kune.core.client.sitebar.SitebarSignOutLink; import cc.kune.core.client.sitebar.SitebarSignOutLink.BeforeSignOut; @@ -237,9 +238,10 @@ s(ContentServiceHelper.class); s(SocialNetServiceHelper.class); + s(MyGroupsMenu.class); s(SiteUserOptionsPresenter.class); s(SiteUserOptions.class, SiteUserOptionsPresenter.class); - s(SitebarNewGroupLink.class); + s(SitebarGroupsLink.class); s(SitebarSignInLink.class); s(SitebarSignOutLink.class); @@ -247,5 +249,4 @@ s(XMLActionsParser.class); s(Services.class, GWTServices.class); } - } 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-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/auth/SignInForm.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -50,6 +50,15 @@ * >this</a>. */ public SignInForm(final I18nTranslationService i18n) { + final Listener<FieldEvent> enterListener = new Listener<FieldEvent>() { + @Override + public void handleEvent(final FieldEvent fe) { + if (fe.getEvent().getKeyCode() == 13) { + onAcceptCallback.onSuccess(); + } + } + }; + super.addStyleName("kune-Margin-Large-trbl"); loginNickOrEmailField = new TextField<String>() { @Override @@ -70,6 +79,7 @@ loginNickOrEmailField.render(RootPanel.get(LOGIN_ID).getElement()); ComponentHelper.doAttach(loginNickOrEmailField); super.add(loginNickOrEmailField); + loginNickOrEmailField.addListener(Events.OnKeyPress, enterListener); loginPassField = new TextField<String>() { @Override @@ -91,15 +101,7 @@ 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) { - if (fe.getEvent().getKeyCode() == 13) { - onAcceptCallback.onSuccess(); - } - } - }); + loginPassField.addListener(Events.OnKeyPress, enterListener); super.add(loginPassField); } Added: trunk/src/main/java/cc/kune/core/client/events/MyGroupsChangedEvent.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/events/MyGroupsChangedEvent.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/events/MyGroupsChangedEvent.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -0,0 +1,55 @@ +package cc.kune.core.client.events; + +import com.google.gwt.event.shared.EventHandler; +import com.google.gwt.event.shared.GwtEvent; +import com.google.gwt.event.shared.HandlerRegistration; +import com.google.gwt.event.shared.HasHandlers; + +public class MyGroupsChangedEvent extends GwtEvent<MyGroupsChangedEvent.MyGroupsChangedHandler> { + + public interface HasMyGroupsChangedHandlers extends HasHandlers { + HandlerRegistration addMyGroupsChangedHandler(MyGroupsChangedHandler handler); + } + + public interface MyGroupsChangedHandler extends EventHandler { + public void onMyGroupsChanged(MyGroupsChangedEvent event); + } + + private static final Type<MyGroupsChangedHandler> TYPE = new Type<MyGroupsChangedHandler>(); + + public static void fire(final HasHandlers source) { + source.fireEvent(new MyGroupsChangedEvent()); + } + + public static Type<MyGroupsChangedHandler> getType() { + return TYPE; + } + + public MyGroupsChangedEvent() { + } + + @Override + protected void dispatch(final MyGroupsChangedHandler handler) { + handler.onMyGroupsChanged(this); + } + + @Override + public boolean equals(final Object obj) { + return super.equals(obj); + } + + @Override + public Type<MyGroupsChangedHandler> getAssociatedType() { + return TYPE; + } + + @Override + public int hashCode() { + return super.hashCode(); + } + + @Override + public String toString() { + return "MyGroupsChangedEvent[" + "]"; + } +} 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-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/groups/newgroup/NewGroupPresenter.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -26,6 +26,7 @@ import cc.kune.core.client.auth.SignIn; import cc.kune.core.client.errors.GroupLongNameInUseException; import cc.kune.core.client.errors.GroupShortNameInUseException; +import cc.kune.core.client.events.MyGroupsChangedEvent; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.GroupServiceAsync; @@ -192,6 +193,9 @@ getView().hide(); reset(); getView().unMask(); + // Add the new group to your info + session.getCurrentUserInfo().getGroupsIsAdmin().add(state.getGroup()); + MyGroupsChangedEvent.fire(getEventBus()); Scheduler.get().scheduleDeferred(new ScheduledCommand() { @Override public void execute() { @@ -201,7 +205,8 @@ @Override public void run() { ShowHelpContainerEvent.fire(getEventBus(), state.getStateToken().getTool()); - }}.schedule(2000); + } + }.schedule(2000); } }); } Added: trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceHelper.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceHelper.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/GroupServiceHelper.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -0,0 +1,15 @@ +package cc.kune.core.client.rpcservices; + +import com.google.inject.Inject; +import com.google.inject.Provider; + +public class GroupServiceHelper { + + @SuppressWarnings("unused") + private final Provider<GroupServiceAsync> groupService; + + @Inject + public GroupServiceHelper(final Provider<GroupServiceAsync> groupService) { + this.groupService = groupService; + } +} Modified: trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetServiceHelper.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetServiceHelper.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/rpcservices/SocialNetServiceHelper.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -1,16 +1,21 @@ package cc.kune.core.client.rpcservices; 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.events.MyGroupsChangedEvent; 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.SocialNetworkDataDTO; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; import com.google.inject.Provider; public class SocialNetServiceHelper { + private final EventBus eventbus; private final I18nTranslationService i18n; private final Session session; private final Provider<SocialNetServiceAsync> snServiceProvider; @@ -18,9 +23,11 @@ @Inject public SocialNetServiceHelper(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final Provider<SocialNetServiceAsync> snServiceProvider) { + final EventBus eventbus, final I18nTranslationService i18n, + final Provider<SocialNetServiceAsync> snServiceProvider) { this.stateManager = stateManager; this.session = session; + this.eventbus = eventbus; this.i18n = i18n; this.snServiceProvider = snServiceProvider; } @@ -54,4 +61,28 @@ NotifyUser.info(i18n.t("Member type changed")); stateManager.setSocialNetwork(result); } + + public void unJoinGroup(final StateToken groupToken) { + NotifyUser.askConfirmation(i18n.t("Leave this group"), i18n.t("Are you sure?"), + new OnAcceptCallback() { + @Override + public void onSuccess() { + NotifyUser.showProgress(); + snServiceProvider.get().unJoinGroup(session.getUserHash(), groupToken, + new AsyncCallbackSimple<Void>() { + @Override + public void onSuccess(final Void result) { + NotifyUser.hideProgress(); + NotifyUser.info(i18n.t("Removed as member")); + stateManager.refreshCurrentStateWithoutCache(); + session.getCurrentUserInfo().getGroupsIsAdmin().remove( + session.getCurrentState().getGroup()); + session.getCurrentUserInfo().getGroupsIsCollab().remove( + session.getCurrentState().getGroup()); + MyGroupsChangedEvent.fire(eventbus); + } + }); + } + }); + } } Added: trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/MyGroupsMenu.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -0,0 +1,101 @@ +package cc.kune.core.client.sitebar; + +import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.MenuShowAction; +import cc.kune.common.client.shortcuts.GlobalShortcutRegister; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.events.MyGroupsChangedEvent; +import cc.kune.core.client.events.UserSignInOrSignOutEvent; +import cc.kune.core.client.events.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.services.ClientFileDownloadUtils; +import cc.kune.core.client.sitebar.SitebarGroupsLink.SitebarNewGroupAction; +import cc.kune.core.client.sn.actions.GotoGroupAction; +import cc.kune.core.client.state.Session; +import cc.kune.core.shared.dto.GroupDTO; +import cc.kune.core.shared.dto.UserInfoDTO; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; +import com.google.inject.Provider; +import com.google.inject.Singleton; + +@Singleton +public class MyGroupsMenu extends MenuDescriptor { + public static final String MENU_ID = "k-sitebar-my-group"; + private final Provider<ClientFileDownloadUtils> downloadProvider; + private final GotoGroupAction gotoGroupAction; + private final SitebarNewGroupAction newGroupAction; + private final Session session; + private final SitebarActions siteOptions; + + @Inject + public MyGroupsMenu(final I18nTranslationService i18n, + final Provider<ClientFileDownloadUtils> downloadProvider, final CoreResources res, + final Session session, final GotoGroupAction gotoGroupAction, + final SitebarNewGroupAction newGroupAction, final SitebarActions siteOptions, + final GlobalShortcutRegister global, final MenuShowAction menuShowAction, final EventBus eventBus) { + super(menuShowAction); + this.session = session; + this.newGroupAction = newGroupAction; + this.siteOptions = siteOptions; + // menuShowAction.setMenu(this); + setId(MENU_ID); + setParent(siteOptions.getRightToolbar()); + setStyles("k-no-backimage, k-btn-sitebar"); + this.downloadProvider = downloadProvider; + this.gotoGroupAction = gotoGroupAction; + withText(i18n.t("Your groups")); + withToolTip(i18n.t("See your groups or create a new one")); + withIcon(res.arrowdownsitebar()); + withShortcut("Alt+G", global); + eventBus.addHandler(MyGroupsChangedEvent.getType(), + new MyGroupsChangedEvent.MyGroupsChangedHandler() { + @Override + public void onMyGroupsChanged(final MyGroupsChangedEvent event) { + regenerateMenu(session.isLogged()); + } + }); + + session.onUserSignInOrSignOut(true, new UserSignInOrSignOutHandler() { + @Override + public void onUserSignInOrSignOut(final UserSignInOrSignOutEvent event) { + regenerateMenu(event.isLogged()); + } + }); + + } + + private void addPartipationToMenu(final GroupDTO group) { + // FIXME, better user URL in GuiDescritors... + final String logoImageUrl = session.getSiteUrl() + "/" + downloadProvider.get().getGroupLogo(group); + final MenuItemDescriptor participant = new MenuItemDescriptor(gotoGroupAction); + participant.setTarget(group); + participant.withText(group.getLongName()).withIcon(logoImageUrl).setParent(this, true); + } + + private void regenerateMenu(final boolean isLogged) { + if (isLogged) { + if (session.userIsJoiningGroups()) { + MyGroupsMenu.this.clear(); + setVisible(true); + final UserInfoDTO userInfoDTO = session.getCurrentUserInfo(); + for (final GroupDTO group : userInfoDTO.getGroupsIsAdmin()) { + addPartipationToMenu(group); + } + for (final GroupDTO group : userInfoDTO.getGroupsIsCollab()) { + addPartipationToMenu(group); + } + new MenuSeparatorDescriptor(MyGroupsMenu.this); + new MenuItemDescriptor(MyGroupsMenu.this, newGroupAction); + siteOptions.refreshActions(); + } else { + setVisible(false); + } + } else { + setVisible(false); + } + } +} Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SiteUserOptionsPresenter.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -19,33 +19,26 @@ \*/ package cc.kune.core.client.sitebar; -import java.util.Set; - import cc.kune.common.client.actions.AbstractExtendedAction; import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.GuiActionDescrip; import cc.kune.common.client.actions.ui.descrip.MenuDescriptor; import cc.kune.common.client.actions.ui.descrip.MenuItemDescriptor; -import cc.kune.common.client.actions.ui.descrip.SubMenuDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.events.UserSignInEvent; -import cc.kune.core.client.events.UserSignOutEvent; import cc.kune.core.client.events.UserSignInEvent.UserSignInHandler; +import cc.kune.core.client.events.UserSignOutEvent; import cc.kune.core.client.events.UserSignOutEvent.UserSignOutHandler; import cc.kune.core.client.resources.CoreMessages; import cc.kune.core.client.resources.CoreResources; -import cc.kune.core.client.services.ClientFileDownloadUtils; -import cc.kune.core.client.sn.actions.GotoGroupAction; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; -import cc.kune.core.shared.dto.GroupDTO; import cc.kune.core.shared.dto.UserInfoDTO; import com.google.inject.Inject; -import com.google.inject.Provider; import com.google.inject.Singleton; @Singleton @@ -53,10 +46,7 @@ public static final MenuDescriptor LOGGED_USER_MENU = new MenuDescriptor(); public static final String LOGGED_USER_MENU_ID = "kune-sump-lum"; - private final Provider<ClientFileDownloadUtils> downloadProvider; - private final GotoGroupAction gotoGroupAction; private final I18nTranslationService i18n; - private SubMenuDescriptor partiMenu; private final CoreResources res; private ToolbarSeparatorDescriptor separator; private final Session session; @@ -65,16 +55,13 @@ @Inject public SiteUserOptionsPresenter(final Session session, final StateManager stateManager, - final Provider<ClientFileDownloadUtils> downloadProvider, final I18nTranslationService i18n, - final CoreResources img, final SitebarActions siteOptions, final GotoGroupAction gotoGroupAction) { + final I18nTranslationService i18n, final CoreResources img, final SitebarActions siteOptions) { super(); this.session = session; this.stateManager = stateManager; - this.downloadProvider = downloadProvider; this.i18n = i18n; this.res = img; this.siteOptions = siteOptions; - this.gotoGroupAction = gotoGroupAction; createActions(); separator.setVisible(false); session.onUserSignIn(true, new UserSignInHandler() { @@ -103,24 +90,12 @@ descriptor.setParent(LOGGED_USER_MENU, true); } - private void addPartipation(final GroupDTO group) { - final String logoImageUrl = downloadProvider.get().getGroupLogo(group); - final MenuItemDescriptor participant = new MenuItemDescriptor(gotoGroupAction); - participant.setTarget(group); - participant.putValue(Action.NAME, group.getLongName()); - participant.putValue(Action.SMALL_ICON, logoImageUrl); - participant.setParent(partiMenu, true); - // siteOptions.getRightToolbar().add(participant); - } - private void createActions() { LOGGED_USER_MENU.setId(LOGGED_USER_MENU_ID); LOGGED_USER_MENU.setParent(siteOptions.getRightToolbar()); LOGGED_USER_MENU.setStyles("k-no-backimage, k-btn-sitebar"); LOGGED_USER_MENU.setRightIcon(res.arrowdownsitebar()); separator = new ToolbarSeparatorDescriptor(Type.separator, siteOptions.getRightToolbar()); - partiMenu = new SubMenuDescriptor(i18n.t("Your groups")); - addActionImpl(partiMenu); final AbstractExtendedAction userHomeAction = new AbstractExtendedAction() { @Override @@ -143,16 +118,6 @@ LOGGED_USER_MENU.setVisible(true); LOGGED_USER_MENU.setEnabled(true); setLoggedUserName(userInfoDTO.getShortName()); - partiMenu.clear(); - final Set<GroupDTO> groupsIsAdmin = userInfoDTO.getGroupsIsAdmin(); - final Set<GroupDTO> groupsIsCollab = userInfoDTO.getGroupsIsCollab(); - for (final GroupDTO group : groupsIsAdmin) { - addPartipation(group); - } - for (final GroupDTO group : groupsIsCollab) { - addPartipation(group); - } - partiMenu.setEnabled((groupsIsAdmin.size() + groupsIsCollab.size()) > 0); siteOptions.refreshActions(); } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarActionsPresenter.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -65,12 +65,13 @@ void showErrorDialog(); } private static final ToolbarDescriptor LEFT_TOOLBAR = new ToolbarDescriptor(); - private static final MenuDescriptor OPTIONS_MENU = new MenuDescriptor(); + private static final MenuDescriptor MORE_MENU = new MenuDescriptor(); private static final ToolbarDescriptor RIGHT_TOOLBAR = new ToolbarDescriptor(); public static final String SITE_OPTIONS_MENU = "kune-sop-om"; private final CommonResources commonRes; private final I18nTranslationService i18n; - private final Provider<SitebarNewGroupLink> newGroupLink; + private final Provider<MyGroupsMenu> myGroupsMenu; + private final Provider<SitebarGroupsLink> newGroupLink; private final CoreResources res; private final Provider<SitebarSignInLink> signInLink; private final Provider<SitebarSignOutLink> signOutLink; @@ -78,27 +79,27 @@ @Inject public SitebarActionsPresenter(final EventBus eventBus, final SitebarActionsView view, final SitebarActionsProxy proxy, final I18nTranslationService i18n, - final Provider<SitebarNewGroupLink> newGroupLink, final Provider<SitebarSignOutLink> signOutLink, + final Provider<SitebarGroupsLink> newGroupLink, final Provider<SitebarSignOutLink> signOutLink, final Provider<SitebarSignInLink> signInLink, final CoreResources res, - final CommonResources commonRes) { + final CommonResources commonRes, final Provider<MyGroupsMenu> myGroupsMenu) { super(eventBus, view, proxy); this.i18n = i18n; this.newGroupLink = newGroupLink; this.signOutLink = signOutLink; this.signInLink = signInLink; + this.myGroupsMenu = myGroupsMenu; this.res = res; this.commonRes = commonRes; init(); } private MenuItemDescriptor createGotoKune() { - final MenuItemDescriptor gotoKuneDevSite = new MenuItemDescriptor(OPTIONS_MENU, - new AbstractAction() { - @Override - public void actionPerformed(final ActionEvent event) { - KuneWindowUtils.open("http://kune.ourproject.org/"); - } - }); + final MenuItemDescriptor gotoKuneDevSite = new MenuItemDescriptor(MORE_MENU, new AbstractAction() { + @Override + public void actionPerformed(final ActionEvent event) { + KuneWindowUtils.open("http://kune.ourproject.org/"); + } + }); gotoKuneDevSite.putValue(Action.NAME, i18n.t("kune development site")); gotoKuneDevSite.putValue(Action.SMALL_ICON, res.kuneIcon16()); return gotoKuneDevSite; @@ -110,7 +111,7 @@ } public MenuDescriptor getOptionsMenu() { - return OPTIONS_MENU; + return MORE_MENU; } @Override @@ -119,14 +120,14 @@ } private void init() { - OPTIONS_MENU.withId(SITE_OPTIONS_MENU); + MORE_MENU.withId(SITE_OPTIONS_MENU); } @ProxyEvent public void onAppStart(final AppStartEvent event) { - OPTIONS_MENU.putValue(Action.NAME, i18n.t("More")); - OPTIONS_MENU.putValue(Action.SMALL_ICON, res.arrowdownsitebar()); - OPTIONS_MENU.setStyles("k-no-backimage, k-btn-sitebar"); + MORE_MENU.withText(i18n.t("More")); + MORE_MENU.withIcon(res.arrowdownsitebar()); + MORE_MENU.setStyles("k-no-backimage, k-btn-sitebar"); // OPTIONS_MENU.putValue(AbstractGxtMenuGui.MENU_POSITION, // AbstractGxtMenuGui.MenuPosition.bl); @@ -170,17 +171,17 @@ // shortcutReg.put(shortcut, aboutAction); signInLink.get(); - signOutLink.get(); - new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); + myGroupsMenu.get(); newGroupLink.get(); new ToolbarSeparatorDescriptor(Type.separator, RIGHT_TOOLBAR); createGotoKune(); - MenuItemDescriptor.build(OPTIONS_MENU, bugsAction); - MenuItemDescriptor.build(OPTIONS_MENU, errorAction); - MenuItemDescriptor.build(OPTIONS_MENU, aboutAction); - MenuSeparatorDescriptor.build(OPTIONS_MENU); - MenuItemDescriptor.build(OPTIONS_MENU, wavePowered); - OPTIONS_MENU.setParent(RIGHT_TOOLBAR); + MenuItemDescriptor.build(MORE_MENU, bugsAction); + MenuItemDescriptor.build(MORE_MENU, errorAction); + MenuItemDescriptor.build(MORE_MENU, aboutAction); + MenuSeparatorDescriptor.build(MORE_MENU); + MenuItemDescriptor.build(MORE_MENU, wavePowered); + MORE_MENU.setParent(RIGHT_TOOLBAR); + signOutLink.get(); refreshActionsImpl(); } Copied: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarGroupsLink.java (from rev 1747, trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java) =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarGroupsLink.java (rev 0) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarGroupsLink.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -0,0 +1,93 @@ +/* + * + * Copyright (C) 2007-2011 The kune development team (see CREDITS for details) + * This file is part of kune. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package cc.kune.core.client.sitebar; + +import cc.kune.common.client.actions.AbstractExtendedAction; +import cc.kune.common.client.actions.ActionEvent; +import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.shared.i18n.I18nTranslationService; +import cc.kune.core.client.events.MyGroupsChangedEvent; +import cc.kune.core.client.events.UserSignInOrSignOutEvent; +import cc.kune.core.client.events.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; +import cc.kune.core.client.resources.CoreResources; +import cc.kune.core.client.state.Session; +import cc.kune.core.client.state.SiteTokens; +import cc.kune.core.client.state.StateManager; + +import com.google.gwt.event.shared.EventBus; +import com.google.inject.Inject; + +public class SitebarGroupsLink extends ButtonDescriptor { + public static class SitebarNewGroupAction extends AbstractExtendedAction { + + private final StateManager stateManager; + + @Inject + public SitebarNewGroupAction(final StateManager stateManager, final I18nTranslationService i18n) { + super(); + this.stateManager = stateManager; + withText(i18n.t("Create New Group")); + withToolTip(i18n.t("Create a new group for your initiative or organization " + + "(NGO, collective, academic group...)")); + } + + @Override + public void actionPerformed(final ActionEvent event) { + stateManager.gotoHistoryToken(SiteTokens.NEW_GROUP); + } + } + + public static final String NEW_GROUP_BTN_ID = "k-site-newgroup-btn"; + private final Session session; + + @Inject + public SitebarGroupsLink(final SitebarNewGroupAction newGroupAction, + final SitebarActions sitebarActions, final I18nTranslationService i18n, final EventBus eventBus, + final CoreResources coreResources, final Session session) { + super(newGroupAction); + this.session = session; + withId(NEW_GROUP_BTN_ID).withStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); + withParent(sitebarActions.getRightToolbar()); + eventBus.addHandler(MyGroupsChangedEvent.getType(), + new MyGroupsChangedEvent.MyGroupsChangedHandler() { + @Override + public void onMyGroupsChanged(final MyGroupsChangedEvent event) { + recalculate(session.isNotLogged()); + } + }); + session.onUserSignInOrSignOut(true, new UserSignInOrSignOutHandler() { + @Override + public void onUserSignInOrSignOut(final UserSignInOrSignOutEvent event) { + final boolean notLogged = !event.isLogged(); + recalculate(notLogged); + } + }); + + } + + private void recalculate(final boolean notLogged) { + if (notLogged) { + setVisible(true); + } else { + setVisible(!session.userIsJoiningGroups()); + } + } + +} Deleted: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarNewGroupLink.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -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.sitebar; - -import cc.kune.common.client.actions.AbstractExtendedAction; -import cc.kune.common.client.actions.Action; -import cc.kune.common.client.actions.ActionEvent; -import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.common.shared.i18n.I18nTranslationService; -import cc.kune.core.client.state.SiteTokens; -import cc.kune.core.client.state.StateManager; - -import com.google.inject.Inject; - -public class SitebarNewGroupLink extends ButtonDescriptor { - public static class SitebarNewGroupAction extends AbstractExtendedAction { - - private final StateManager stateManager; - - @Inject - public SitebarNewGroupAction(final StateManager stateManager, final I18nTranslationService i18n) { - super(); - this.stateManager = stateManager; - putValue(Action.NAME, i18n.t("Create New Group")); - - putValue(Action.TOOLTIP, i18n.t("Create a new group for your initiative or organization " - + "(NGO, collective, academic group...)")); - } - - @Override - public void actionPerformed(final ActionEvent event) { - stateManager.gotoHistoryToken(SiteTokens.NEW_GROUP); - } - - } - - public static final String NEW_GROUP_BTN_ID = "k-site-newgroup-btn"; - - @Inject - public SitebarNewGroupLink(final SitebarNewGroupAction action, final SitebarActions sitebarActions) { - super(action); - withId(NEW_GROUP_BTN_ID).withStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); - withParent(sitebarActions.getRightToolbar()); - } -} Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignInLink.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -23,10 +23,10 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; -import cc.kune.core.client.events.UserSignInEvent; -import cc.kune.core.client.events.UserSignInEvent.UserSignInHandler; -import cc.kune.core.client.events.UserSignOutEvent; -import cc.kune.core.client.events.UserSignOutEvent.UserSignOutHandler; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; +import cc.kune.core.client.events.UserSignInOrSignOutEvent; +import cc.kune.core.client.events.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; import cc.kune.core.client.i18n.I18nUITranslationService; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.SiteTokens; @@ -72,17 +72,15 @@ setVisible(!session.isLogged()); setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); setParent(sitebarActions.getRightToolbar()); - session.onUserSignIn(true, new UserSignInHandler() { + final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, + sitebarActions.getRightToolbar()); + session.onUserSignInOrSignOut(true, new UserSignInOrSignOutHandler() { @Override - public void onUserSignIn(final UserSignInEvent event) { - SitebarSignInLink.this.setVisible(false); + public void onUserSignInOrSignOut(final UserSignInOrSignOutEvent event) { + final boolean logged = event.isLogged(); + SitebarSignInLink.this.setVisible(!logged); + separator.setVisible(!logged); } }); - session.onUserSignOut(true, new UserSignOutHandler() { - @Override - public void onUserSignOut(final UserSignOutEvent event) { - SitebarSignInLink.this.setVisible(true); - } - }); } } Modified: trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/sitebar/SitebarSignOutLink.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -24,19 +24,18 @@ import cc.kune.common.client.actions.ActionEvent; import cc.kune.common.client.actions.BeforeActionCollection; import cc.kune.common.client.actions.ui.descrip.ButtonDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor; +import cc.kune.common.client.actions.ui.descrip.ToolbarSeparatorDescriptor.Type; import cc.kune.common.client.errors.UIException; import cc.kune.common.client.notify.ProgressHideEvent; import cc.kune.common.client.notify.ProgressShowEvent; import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.core.client.auth.WaveClientSimpleAuthenticator; -import cc.kune.core.client.cookies.CookiesManager; import cc.kune.core.client.errors.ErrorHandler; import cc.kune.core.client.errors.SessionExpiredException; import cc.kune.core.client.errors.UserMustBeLoggedException; -import cc.kune.core.client.events.UserSignInEvent; -import cc.kune.core.client.events.UserSignOutEvent; -import cc.kune.core.client.events.UserSignInEvent.UserSignInHandler; -import cc.kune.core.client.events.UserSignOutEvent.UserSignOutHandler; +import cc.kune.core.client.events.UserSignInOrSignOutEvent; +import cc.kune.core.client.events.UserSignInOrSignOutEvent.UserSignInOrSignOutHandler; import cc.kune.core.client.rpcservices.UserServiceAsync; import cc.kune.core.client.state.Session; @@ -54,7 +53,6 @@ public static class SitebarSignOutAction extends AbstractExtendedAction { private final BeforeSignOut beforeSignOut; - private final CookiesManager cookiesManager; private final EventBus eventBus; private final Session session; private final Provider<UserServiceAsync> userService; @@ -63,13 +61,11 @@ @Inject public SitebarSignOutAction(final EventBus eventBus, final I18nTranslationService i18n, final BeforeSignOut beforeSignOut, final Provider<UserServiceAsync> userService, - final Session session, final CookiesManager cookiesManager, - final WaveClientSimpleAuthenticator waveAuth) { + final Session session, final WaveClientSimpleAuthenticator waveAuth) { super(); this.eventBus = eventBus; this.userService = userService; this.session = session; - this.cookiesManager = cookiesManager; this.beforeSignOut = beforeSignOut; this.waveAuth = waveAuth; putValue(Action.NAME, i18n.t("Sign out")); @@ -126,20 +122,18 @@ final ErrorHandler errorHandler, final Session session, final SitebarActions sitebarActions) { super(action); setId(SITE_SIGN_OUT); + final ToolbarSeparatorDescriptor separator = new ToolbarSeparatorDescriptor(Type.separator, + sitebarActions.getRightToolbar()); setParent(sitebarActions.getRightToolbar()); setVisible(session.isLogged()); setStyles("k-no-backimage, k-btn-sitebar, k-fl, k-noborder, k-nobackcolor"); - session.onUserSignIn(true, new UserSignInHandler() { + session.onUserSignInOrSignOut(true, new UserSignInOrSignOutHandler() { @Override - public void onUserSignIn(final UserSignInEvent event) { - SitebarSignOutLink.this.setVisible(true); + public void onUserSignInOrSignOut(final UserSignInOrSignOutEvent event) { + final boolean logged = event.isLogged(); + SitebarSignOutLink.this.setVisible(logged); + separator.setVisible(logged); } }); - session.onUserSignOut(true, new UserSignOutHandler() { - @Override - public void onUserSignOut(final UserSignOutEvent event) { - SitebarSignOutLink.this.setVisible(false); - } - }); } } Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/JoinGroupAction.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -26,6 +26,7 @@ import cc.kune.common.shared.i18n.I18nTranslationService; import cc.kune.common.shared.utils.SimpleResponseCallback; import cc.kune.core.client.auth.SignIn; +import cc.kune.core.client.events.MyGroupsChangedEvent; import cc.kune.core.client.resources.CoreResources; import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetServiceAsync; @@ -37,20 +38,23 @@ import cc.kune.core.shared.dto.AccessRolDTO; import cc.kune.core.shared.dto.SocialNetworkRequestResult; +import com.google.gwt.event.shared.EventBus; import com.google.inject.Inject; import com.google.inject.Provider; public class JoinGroupAction extends SNRolAction { + private final EventBus eventBus; private final Provider<SignIn> signIn; @Inject public JoinGroupAction(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final CoreResources res, + final I18nTranslationService i18n, final CoreResources res, final EventBus eventBus, final Provider<SocialNetServiceAsync> snServiceProvider, final Provider<SignIn> signIn, final AccessRightsClientManager rightsClientManager) { super(stateManager, session, i18n, res, snServiceProvider, rightsClientManager, AccessRolDTO.Viewer, false, true, false); + this.eventBus = eventBus; this.signIn = signIn; putValue(NAME, i18n.t("Join")); putValue(TOOLTIP, i18n.t("Request to Join in this group")); @@ -80,6 +84,9 @@ switch ((result)) { case accepted: NotifyUser.info(i18n.t("You are now member of this group")); + session.getCurrentUserInfo().getGroupsIsCollab().add( + session.getCurrentState().getGroup()); + MyGroupsChangedEvent.fire(eventBus); stateManager.refreshCurrentStateWithoutCache(); break; case denied: Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromCurrentGroupAction.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -21,12 +21,10 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -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.resources.CoreResources; -import cc.kune.core.client.rpcservices.AsyncCallbackSimple; import cc.kune.core.client.rpcservices.SocialNetServiceAsync; +import cc.kune.core.client.rpcservices.SocialNetServiceHelper; import cc.kune.core.client.state.AccessRightsClientManager; import cc.kune.core.client.state.Session; import cc.kune.core.client.state.StateManager; @@ -36,14 +34,17 @@ import com.google.inject.Provider; public class UnJoinFromCurrentGroupAction extends SNRolAction { + private final Provider<SocialNetServiceHelper> snServiceHelper; @Inject public UnJoinFromCurrentGroupAction(final StateManager stateManager, final Session session, final I18nTranslationService i18n, final CoreResources res, - final Provider<SocialNetServiceAsync> snServiceProvider, - final AccessRightsClientManager rightsClientManager) { - super(stateManager, session, i18n, res, snServiceProvider, rightsClientManager, AccessRolDTO.Editor, - true, false, true); + final Provider<SocialNetServiceHelper> snServiceHelper, + final AccessRightsClientManager rightsClientManager, + final Provider<SocialNetServiceAsync> snService) { + super(stateManager, session, i18n, res, snService, rightsClientManager, AccessRolDTO.Editor, true, + false, true); + this.snServiceHelper = snServiceHelper; putValue(NAME, i18n.t("Leave this group")); // putValue(TOOLTIP, i18n.t("I want to leave this group")); putValue(Action.SMALL_ICON, res.del()); @@ -52,22 +53,7 @@ @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.askConfirmation(i18n.t("Leave this group"), i18n.t("Are you sure?"), - new OnAcceptCallback() { - @Override - public void onSuccess() { - NotifyUser.showProgress(); - snServiceProvider.get().unJoinGroup(session.getUserHash(), - session.getCurrentState().getStateToken(), new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Removed as member")); - stateManager.refreshCurrentStateWithoutCache(); - } - }); - } - }); + snServiceHelper.get().unJoinGroup(session.getCurrentState().getStateToken()); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/sn/actions/UnJoinFromThisGroupAction.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -21,16 +21,11 @@ import cc.kune.common.client.actions.Action; import cc.kune.common.client.actions.ActionEvent; -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.SocialNetServiceAsync; +import cc.kune.core.client.rpcservices.SocialNetServiceHelper; 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.dto.AccessRolDTO; import cc.kune.core.shared.dto.GroupDTO; @@ -44,20 +39,13 @@ */ public class UnJoinFromThisGroupAction extends RolAction { - private final I18nTranslationService i18n; - private final Session session; - private final Provider<SocialNetServiceAsync> snServiceProvider; - private final StateManager stateManager; + private final Provider<SocialNetServiceHelper> snServiceProvider; @Inject - public UnJoinFromThisGroupAction(final StateManager stateManager, final Session session, - final I18nTranslationService i18n, final CoreResources res, - final Provider<SocialNetServiceAsync> snServiceProvider, + public UnJoinFromThisGroupAction(final I18nTranslationService i18n, final CoreResources res, + final Provider<SocialNetServiceHelper> snServiceProvider, final AccessRightsClientManager rightsClientManager) { super(AccessRolDTO.Editor, true); - this.stateManager = stateManager; - this.session = session; - this.i18n = i18n; this.snServiceProvider = snServiceProvider; putValue(NAME, i18n.t("Leave this group")); // putValue(TOOLTIP, i18n.t("I want to leave this group")); @@ -67,22 +55,7 @@ @Override public void actionPerformed(final ActionEvent event) { - NotifyUser.askConfirmation(i18n.t("Leave this group"), i18n.t("Are you sure?"), - new OnAcceptCallback() { - @Override - public void onSuccess() { - NotifyUser.showProgress(); - snServiceProvider.get().unJoinGroup(session.getUserHash(), - ((GroupDTO) event.getTarget()).getStateToken(), new AsyncCallbackSimple<Void>() { - @Override - public void onSuccess(final Void result) { - NotifyUser.hideProgress(); - NotifyUser.info(i18n.t("Removed as member")); - stateManager.refreshCurrentStateWithoutCache(); - } - }); - } - }); + snServiceProvider.get().unJoinGroup(((GroupDTO) event.getTarget()).getStateToken()); } } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/state/Session.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/Session.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/state/Session.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -161,4 +161,11 @@ void signOut(); + /** + * User is joining to some groups (as admin or collaborator). + * + * @return true, if successful + */ + boolean userIsJoiningGroups(); + } \ No newline at end of file Modified: trunk/src/main/java/cc/kune/core/client/state/impl/SessionDefault.java =================================================================== --- trunk/src/main/java/cc/kune/core/client/state/impl/SessionDefault.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/java/cc/kune/core/client/state/impl/SessionDefault.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -376,4 +376,9 @@ setUserHash(null); setCurrentUserInfo(null, null); } + + @Override + public boolean userIsJoiningGroups() { + return currentUserInfo.getGroupsIsAdmin().size() + currentUserInfo.getGroupsIsCollab().size() > 0; + } } Added: trunk/src/main/webapp/css/reset.css =================================================================== --- trunk/src/main/webapp/css/reset.css (rev 0) +++ trunk/src/main/webapp/css/reset.css 2012-03-23 17:43:04 UTC (rev 1776) @@ -0,0 +1,7 @@ +/* +Copyright (c) 2009, Yahoo! Inc. All rights reserved. +Code licensed under the BSD License: +http://developer.yahoo.net/yui/license.txt +version: 2.8.0r4 +*/ +html{color:#000;background:#FFF;}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,button,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var,optgroup{font-style:inherit;font-weight:inherit;}del,ins{text-decoration:none;}li{list-style:none;}caption,th{text-align:left;}h1,h2,h3,h4,h5,h6{}q:before,q:after{content:'';}abbr,acronym{border:0;font-variant:normal;}sup{vertical-align:baseline;}sub{vertical-align:baseline;}legend{color:#000;}input,button,textarea,select,optgroup,option{font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;}input,button,textarea,select{*font-size:100%;} Modified: trunk/src/main/webapp/others/splash/style/main.css =================================================================== --- trunk/src/main/webapp/others/splash/style/main.css 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/webapp/others/splash/style/main.css 2012-03-23 17:43:04 UTC (rev 1776) @@ -87,12 +87,6 @@ } h1 { - float: left; - width: 180px; - height: 43px; - margin: 6px 10px 0 10px; - background-image: url(../images/logo_on_black.png); - background-repeat: no-repeat; } h1 a { Modified: trunk/src/main/webapp/ws.html =================================================================== --- trunk/src/main/webapp/ws.html 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/main/webapp/ws.html 2012-03-23 17:43:04 UTC (rev 1776) @@ -33,8 +33,6 @@ <meta name="hablar.width" content="550px" /> <meta name="hablar.height" content="400px" /> <link rel="shortcut icon" href="ws/favicon.ico" /> -<link rel="stylesheet" type="text/css" - href="http://yui.yahooapis.com/2.8.0r4/build/reset/reset-min.css">  <script type="text/javascript"> WebFontConfig = { @@ -55,8 +53,7 @@ <link href='http://fonts.googleapis.com/css?family=Ubuntu:regular,italic,bold,bolditalic' rel='stylesheet' type='text/css'> - +<link type="text/css" rel="stylesheet" href="css/reset.css"> <link type="text/css" rel="stylesheet" href="ws/gxt/css/gxt-all.css"> <link type="text/css" rel="stylesheet" href="ws/gxt/css/gxt-gray.css"> <link type="text/css" rel="stylesheet" Modified: trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java =================================================================== --- trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java 2012-03-21 17:42:15 UTC (rev 1775) +++ trunk/src/test/java/cc/kune/selenium/spaces/SitePageObject.java 2012-03-23 17:43:04 UTC (rev 1776) @@ -23,7 +23,7 @@ import org.openqa.selenium.support.FindBy; import cc.kune.core.client.notify.confirm.UserConfirmPanel; -import cc.kune.core.client.sitebar.SitebarNewGroupLink; +import cc.kune.core.client.sitebar.SitebarGroupsLink; import cc.kune.core.client.sitebar.search.SitebarSearchPanel; import cc.kune.core.client.sitebar.spaces.SpaceSelectorPresenter.SpaceSelectorView; import cc.kune.selenium.PageObject; @@ -39,7 +39,7 @@ public WebElement groupSpaceBtn; @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.HOME_SPACE_ID) public WebElement homeSpaceBtn; - @FindBy(id = SeleniumConstants.GWTDEV + SitebarNewGroupLink.NEW_GROUP_BTN_ID) + @FindBy(id = SeleniumConstants.GWTDEV + SitebarGroupsLink.NEW_GROUP_BTN_ID) public WebElement newGroupBtn; @FindBy(id = SeleniumConstants.GWTDEV + SpaceSelectorView.PUBLIC_SPACE_ID) public WebElement publicSpaceBtn;

1 0

r1775 - in trunk: img/screenshots src/main/java/cc/kune/chat/client src/main/java/cc/kune/chat/client/actions
by Vicente J. Ruiz Jurado 21 Mar '12

21 Mar '12

Author: vjrj_ Date: 2012-03-21 18:42:15 +0100 (Wed, 21 Mar 2012) New Revision: 1775 Modified: trunk/img/screenshots/kune-home-stats.png trunk/img/screenshots/kune-register.png trunk/src/main/java/cc/kune/chat/client/ChatClient.java trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java Log: Minor changes in chat reconnect Modified: trunk/img/screenshots/kune-home-stats.png =================================================================== (Binary files differ) Modified: trunk/img/screenshots/kune-register.png =================================================================== (Binary files differ) Modified: trunk/src/main/java/cc/kune/chat/client/ChatClient.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2012-03-21 12:25:32 UTC (rev 1774) +++ trunk/src/main/java/cc/kune/chat/client/ChatClient.java 2012-03-21 17:42:15 UTC (rev 1775) @@ -33,7 +33,7 @@ boolean isBuddy(XmppURI jid); - boolean isLoggedIn(); + boolean isXmppLoggedIn(); Room joinRoom(String roomName, String userAlias); Modified: trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2012-03-21 12:25:32 UTC (rev 1774) +++ trunk/src/main/java/cc/kune/chat/client/ChatClientDefault.java 2012-03-21 17:42:15 UTC (rev 1775) @@ -379,7 +379,7 @@ } @Override - public boolean isLoggedIn() { + public boolean isXmppLoggedIn() { return xmppSession.isReady(); } @@ -436,7 +436,7 @@ @Override public boolean loginIfNecessary() { - if (!isLoggedIn()) { + if (!isXmppLoggedIn() && session.isLogged()) { doLogin(); return true; } @@ -448,7 +448,7 @@ if (dialogVisible()) { dialog.hide(); } - if (isLoggedIn()) { + if (isXmppLoggedIn()) { xmppSession.logout(); } } 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-21 12:25:32 UTC (rev 1774) +++ trunk/src/main/java/cc/kune/chat/client/actions/ChatSitebarActions.java 2012-03-21 17:42:15 UTC (rev 1775) @@ -167,7 +167,7 @@ @Override public void run() { final Presence awayPresence = Presence.build(NO_STATUS, Show.away); - if (chatClient.isLoggedIn()) { + if (chatClient.isXmppLoggedIn()) { presenceManager.changeOwnPresence(awayPresence); updateMenuPresence(awayPresence); } @@ -196,7 +196,7 @@ public void onWindowFocus(final WindowFocusEvent event) { if (event.isHasFocus()) { awayTimer.cancel(); - if (chatClient.isLoggedIn()) { + if (chatClient.isXmppLoggedIn()) { new Timer() { @Override public void run() { @@ -220,7 +220,7 @@ public void run() { ChatSitebarActions.this.chatClient.loginIfNecessary(); } - }.schedule(4000); + }.schedule(2000); break; case DISCONNECTED: case RECONNECTING: Modified: trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java =================================================================== --- trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2012-03-21 12:25:32 UTC (rev 1774) +++ trunk/src/main/java/cc/kune/chat/client/actions/StartChatWithMemberAction.java 2012-03-21 17:42:15 UTC (rev 1775) @@ -48,7 +48,7 @@ @Override public void actionPerformed(final ActionEvent event) { chatClient.get().show(); - if (chatClient.get().isLoggedIn()) { + if (chatClient.get().isXmppLoggedIn()) { String username = null; if (event.getTarget() instanceof GroupDTO) { username = ((GroupDTO) event.getTarget()).getShortName();

1 0

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

Jump to page: