Merge branch 'master' of https://github.com/takezoe/gitbucket.git

etc/icons.svg

@@ -24,17 +24,28 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.98994949"
+     inkscape:zoom="0.24748737"
-     inkscape:cx="377.073"
+     inkscape:cx="629.30023"
-     inkscape:cy="804.25693"
+     inkscape:cy="281.44758"
      inkscape:document-units="px"
      inkscape:current-layer="layer1-9"
      showgrid="false"
      inkscape:window-width="1366"
-     inkscape:window-height="705"
+     inkscape:window-height="706"
-     inkscape:window-x="-8"
+     inkscape:window-x="1912"
      inkscape:window-y="-8"
-     inkscape:window-maximized="1" />
+     inkscape:window-maximized="1"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="false"
+     inkscape:snap-page="false"
+     inkscape:snap-bbox="true"
+     inkscape:bbox-paths="false"
+     inkscape:bbox-nodes="false"
+     inkscape:snap-to-guides="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3080" />
+  </sodipodi:namedview>
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -55,14 +66,52 @@
        id="layer1-9"
        inkscape:label="Layer 1"
        transform="matrix(0.66004549,0,0,0.66004549,12.445368,29.409765)">
+      <path
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:1.51504707px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 865.73247,686.51304 c 0,0 19.28074,14.1795 55.09542,13.7739 35.81468,-0.4056 45.91286,-13.7739 45.91286,-13.7739 l 31.84606,-118.8515 -163.46293,0 z"
+         id="path4000"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="czcccc" />
+      <path
+         style="fill:none;stroke:#b3b3b3;stroke-width:25.84518814;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 306.9072,1201.5096 c 0,0 3.44333,-28.5633 47.63498,-35.4849 15.10377,-2.3655 48.7968,-8.2798 48.7968,-42.5816"
+         id="path3207"
+         inkscape:connector-curvature="0"
+         inkscape:transform-center-x="-6.1348784"
+         sodipodi:nodetypes="csc"
+         inkscape:transform-center-y="1.9434039e-005" />
+      <path
+         style="fill:none;stroke:#b3b3b3;stroke-width:26.60422707;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 76.384718,1086.1545 c 0,82.8617 105.181182,77.9295 105.181182,77.9295"
+         id="path4318"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:1.18291342;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect3935"
+         width="266.2222"
+         height="35.127476"
+         x="-4.6761055"
+         y="865.6405" />
+      <path
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:11.34059906;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 664.11762,675.10023 -74.94096,87.54344 20.17642,-92.15099 z"
+         id="path3894-1"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:28.84111404;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect3088-5-5"
+         width="169.03172"
+         height="105.81662"
+         x="547.64557"
+         y="573.36456" />
       <path
          inkscape:connector-curvature="0"
          id="path3850"
-         d="m 472.30989,191.42833 0,-128.577242 c 0,0 1.85983,-15.30681 -16.73849,-15.30681 -18.59831,0 -51.14538,0 -51.14538,0"
+         d="m 445.03908,191.42833 0,-128.577242 c 0,0 1.85983,-15.30681 -16.73849,-15.30681 -18.59831,0 -51.14538,0 -51.14538,0"
-         style="fill:none;stroke:#008000;stroke-width:22.72570638;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#008000;stroke-width:22.7257061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          id="path2991"
-         transform="translate(-110.30458,-163.64471)"
+         transform="translate(-137.57539,-163.64471)"
          d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
          sodipodi:ry="104.28571"
          sodipodi:rx="104.28571"
@@ -79,71 +128,71 @@
          sodipodi:cx="255.71428"
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          sodipodi:type="arc"
-         transform="matrix(0.83611704,0,0,0.83611704,-67.553199,-115.22257)" />
+         transform="matrix(0.83611704,0,0,0.83611704,-94.824045,-115.22257)" />
       <rect
          id="rect2995"
          y="54.447956"
-         x="131.64735"
+         x="104.3765"
          height="99.221695"
          width="29.189819"
          style="fill:#008000;stroke:#ffffff;stroke-width:1.11112404" />
       <rect
          id="rect2997"
          y="173.24185"
-         x="131.90559"
+         x="104.63474"
          height="26.258072"
          width="29.724136"
          style="fill:#008000;stroke:#ffffff;stroke-width:0.57680577" />
       <rect
          y="68.361099"
-         x="357.45975"
+         x="330.18893"
          height="104.27071"
          width="3.2554624"
          id="rect3818"
-         style="fill:#ffffff;stroke:#008000;stroke-width:22.72570638;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:#ffffff;stroke:#008000;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         transform="matrix(1.0049237,0,0,0.61497516,6.8767865,56.890898)"
+         transform="matrix(1.0049237,0,0,0.61497516,-20.394061,56.890898)"
          d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
          sodipodi:ry="35.140915"
          sodipodi:rx="21.718279"
          sodipodi:cy="230.89374"
          sodipodi:cx="351.02802"
          id="path3795-4"
-         style="fill:#ffffff;stroke:#008000;stroke-width:12.04511132;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:#ffffff;stroke:#008000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
          sodipodi:type="arc" />
       <path
-         transform="matrix(1.0049237,0,0,0.61497516,5.3412605,-93.432709)"
+         transform="matrix(1.0049237,0,0,0.61497516,-21.929587,-93.432709)"
          d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
          sodipodi:ry="35.140915"
          sodipodi:rx="21.718279"
          sodipodi:cy="230.89374"
          sodipodi:cx="351.02802"
          id="path3795"
-         style="fill:#ffffff;stroke:#008000;stroke-width:12.04511132;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:#ffffff;stroke:#008000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
          sodipodi:type="arc" />
       <path
-         transform="matrix(1.0049237,0,0,0.61497516,119.6654,56.992418)"
+         transform="matrix(1.0049237,0,0,0.61497516,92.394578,56.992418)"
          d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
          sodipodi:ry="35.140915"
          sodipodi:rx="21.718279"
          sodipodi:cy="230.89374"
          sodipodi:cx="351.02802"
          id="path3795-4-0"
-         style="fill:#ffffff;stroke:#008000;stroke-width:12.04511132;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:#ffffff;stroke:#008000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
          sodipodi:type="arc" />
       <path
          inkscape:connector-curvature="0"
          id="path3852"
-         d="m 432.02527,10.803052 0,70.691447 -45.58896,-32.134619 z"
+         d="m 404.75446,10.803052 0,70.691447 L 359.1655,49.35988 z"
          style="fill:#008000;stroke:#008000;stroke-width:0.83335358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <path
          inkscape:connector-curvature="0"
          id="path3850-4"
-         d="m 475.96369,446.18012 0,-128.57725 c 0,0 1.85984,-15.30681 -16.73848,-15.30681 -18.59831,0 -51.14539,0 -51.14539,0"
+         d="m 448.69288,446.18012 0,-128.57725 c 0,0 1.85984,-15.30681 -16.73848,-15.30681 -18.59831,0 -51.14539,0 -51.14539,0"
-         style="fill:none;stroke:#800000;stroke-width:22.72570610000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:none;stroke:#800000;stroke-width:22.7257061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
       <path
          id="path2991-8"
-         transform="translate(-106.65077,91.107081)"
+         transform="translate(-133.92158,91.107081)"
          d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
          sodipodi:ry="104.28571"
          sodipodi:rx="104.28571"
@@ -160,69 +209,69 @@
          sodipodi:cx="255.71428"
          style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          sodipodi:type="arc"
-         transform="matrix(0.83611704,0,0,0.83611704,-63.899387,139.52922)" />
+         transform="matrix(0.83611704,0,0,0.83611704,-91.170233,139.52922)" />
       <rect
          id="rect2995-2"
          y="309.19974"
-         x="135.30116"
+         x="108.03028"
          height="99.221687"
          width="29.189819"
-         style="fill:#800000;stroke:#ffffff;stroke-width:1.11112404000000000" />
+         style="fill:#800000;stroke:#ffffff;stroke-width:1.11112404" />
       <rect
          id="rect2997-4"
          y="427.99362"
-         x="135.5594"
+         x="108.28852"
          height="26.258072"
          width="29.724136"
-         style="fill:#800000;stroke:#ffffff;stroke-width:0.57680577000000000" />
+         style="fill:#800000;stroke:#ffffff;stroke-width:0.57680577" />
       <rect
          y="323.11288"
-         x="361.11356"
+         x="333.84274"
          height="104.27072"
          width="3.2554622"
          id="rect3818-5"
-         style="fill:#ffffff;stroke:#800000;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-dasharray:none" />
+         style="fill:#ffffff;stroke:#800000;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
       <path
-         transform="matrix(1.0049237,0,0,0.61497516,10.530593,311.64269)"
+         transform="matrix(1.0049237,0,0,0.61497516,-16.740254,311.64269)"
          d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
          sodipodi:ry="35.140915"
          sodipodi:rx="21.718279"
          sodipodi:cy="230.89374"
          sodipodi:cx="351.02802"
          id="path3795-4-5"
-         style="fill:#ffffff;stroke:#800000;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:#ffffff;stroke:#800000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
          sodipodi:type="arc" />
       <path
-         transform="matrix(1.0049237,0,0,0.61497516,8.9950734,161.31908)"
+         transform="matrix(1.0049237,0,0,0.61497516,-18.275774,161.31908)"
          d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
          sodipodi:ry="35.140915"
          sodipodi:rx="21.718279"
          sodipodi:cy="230.89374"
          sodipodi:cx="351.02802"
          id="path3795-1"
-         style="fill:#ffffff;stroke:#800000;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:#ffffff;stroke:#800000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
          sodipodi:type="arc" />
       <path
-         transform="matrix(1.0049237,0,0,0.61497516,123.31921,311.7442)"
+         transform="matrix(1.0049237,0,0,0.61497516,96.048392,311.7442)"
          d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
          sodipodi:ry="35.140915"
          sodipodi:rx="21.718279"
          sodipodi:cy="230.89374"
          sodipodi:cx="351.02802"
          id="path3795-4-0-7"
-         style="fill:#ffffff;stroke:#800000;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none"
+         style="fill:#ffffff;stroke:#800000;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
          sodipodi:type="arc" />
       <path
          inkscape:connector-curvature="0"
          id="path3852-1"
-         d="m 435.67907,265.55484 0,70.69144 -45.58895,-32.13461 z"
+         d="m 408.40826,265.55484 0,70.69144 -45.58895,-32.13461 z"
-         style="fill:#800000;stroke:#800000;stroke-width:0.83335358000000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         style="fill:#800000;stroke:#800000;stroke-width:0.83335358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
       <rect
          style="fill:#cccccc"
          id="rect2985"
          width="308.26331"
          height="308.26331"
-         x="674.87054"
+         x="647.59973"
          y="19.593252" />
       <path
          sodipodi:type="arc"
@@ -232,14 +281,471 @@
          sodipodi:cy="327.36218"
          sodipodi:rx="35"
          sodipodi:ry="35"
-         d="m 281.42857,327.36218 a 35,35 0 1 1 -70,0 35,35 0 1 1 70,0 z"
+         d="m 281.42857,327.36218 c 0,19.32997 -15.67003,35 -35,35 -19.32996,0 -35,-15.67003 -35,-35 0,-19.32996 15.67004,-35 35,-35 19.32997,0 35,15.67004 35,35 z"
-         transform="matrix(2.9255147,0,0,2.9255147,110.55201,-813.70029)" />
+         transform="matrix(2.9255147,0,0,2.9255147,83.281176,-813.70029)" />
       <path
          style="fill:#ffffff;stroke:#ffffff;stroke-width:1.59620917px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-         d="m 742.7364,327.54005 179.96463,0 -89.85466,-201.67002 z"
+         d="m 715.46559,327.54005 179.96463,0 -89.85466,-201.67002 z"
          id="path2993-2"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="cccc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3850-1"
+         d="m 447.16245,696.53224 0,-128.57724 c 0,0 1.85984,-15.30681 -16.73848,-15.30681 -18.59831,0 -51.14539,0 -51.14539,0"
+         style="fill:none;stroke:#b3b3b3;stroke-width:22.7257061;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         id="path2991-7"
+         transform="translate(-135.45201,341.45921)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,-92.700665,389.88135)" />
+      <rect
+         id="rect2995-0"
+         y="559.55188"
+         x="106.49989"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:1.11112404" />
+      <rect
+         id="rect2997-9"
+         y="678.34576"
+         x="106.75813"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:0.57680577" />
+      <rect
+         y="573.46503"
+         x="332.31235"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-18.270676,561.99481)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-19.806206,411.67121)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,94.517962,562.09633)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-0-2"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3852-4"
+         d="m 406.87783,515.90696 0,70.69145 -45.58895,-32.13462 z"
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.83335358px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:32.11899948;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect3088"
+         width="188.24272"
+         height="117.84301"
+         x="578.56567"
+         y="534.50873" />
+      <path
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:11.66586208;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="M 667.1767,647.76042 746.75901,734.99486 725.333,643.16913 z"
+         id="path3894"
+         inkscape:connector-curvature="0" />
+      <rect
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:28.84111404;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect3088-5"
+         width="169.03172"
+         height="105.81661"
+         x="595.6264"
+         y="533.38885" />
+      <path
+         id="path2991-7-7"
+         transform="matrix(0.81013086,0,0,0.81013086,-79.003905,648.21364)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#b3b3b3;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-1"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.56153831,0,0,0.56153831,-15.312437,720.57846)" />
+      <path
+         id="path2991-7-1"
+         transform="translate(167.79377,599.09604)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-5"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,210.54515,647.51817)" />
+      <rect
+         id="rect2995-0-2"
+         y="817.18872"
+         x="409.74567"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:1.11112404" />
+      <rect
+         id="rect2997-9-7"
+         y="935.98169"
+         x="410.00391"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:0.57680577" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.92446065;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 383.15829,850.33665 -64.6851,-36.2114 10.70013,55.95688 53.98497,-19.74548 z"
+         id="rect4046-3"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:1.98877633;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 372.50197,843.46474 -43.65605,-24.43447 6.99871,38.15621 36.65734,-13.72174 z"
+         id="rect4046"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.92446065;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 462.88559,934.94792 64.6851,36.21128 -10.70013,-55.95672 -53.98497,19.74544 z"
+         id="rect4046-3-2"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:1.98877633;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 471.91864,943.98419 43.65605,24.43442 -6.99871,-38.15607 -36.65734,13.72165 z"
+         id="rect4046-1"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2991-7-79"
+         transform="translate(439.9024,596.03518)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-54"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,482.65378,644.45731)" />
+      <rect
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:7.27556181;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         id="rect4271"
+         width="55.131588"
+         height="89.475853"
+         x="1123.0723"
+         y="8.2489862"
+         transform="matrix(0.69198127,0.72191545,-0.69198127,0.72191545,0,0)" />
+      <rect
+         id="rect2995-0-3-3"
+         y="1106.4344"
+         x="-89.869194"
+         height="57.711208"
+         width="24.529409"
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.77681416"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+      <rect
+         id="rect2995-0-3-2"
+         y="7.221128"
+         x="1139.5251"
+         height="82.866272"
+         width="24.378254"
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:0.92796957"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <rect
+         id="rect2995-0-3"
+         y="814.12781"
+         x="681.85431"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:1.11112404" />
+      <rect
+         id="rect2997-9-1"
+         y="920.67749"
+         x="724.96454"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:0.57680577" />
+      <rect
+         y="1088.6628"
+         x="76.264809"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-274.3181,1077.1951)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-7"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-275.85363,926.87175)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-161.78913,1021.9512)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-7-7"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <rect
+         y="1087.278"
+         x="304.77451"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-8-4"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:22.7257061;stroke-miterlimit:4;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-45.808546,1075.8101)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-7-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,-47.344075,925.48675)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4-8"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,53.509086,972.5163)"
+         d="m 372.74629,230.89374 c 0,19.40779 -9.7236,35.14091 -21.71827,35.14091 -11.99468,0 -21.71828,-15.73312 -21.71828,-35.14091 0,-19.40779 9.7236,-35.14092 21.71828,-35.14092 11.99467,0 21.71827,15.73313 21.71827,35.14092 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4-8-2"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:12.04511166;stroke-miterlimit:4;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:6.68107271;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         id="path3992-4"
+         sodipodi:cx="490.42908"
+         sodipodi:cy="950.84186"
+         sodipodi:rx="18.487062"
+         sodipodi:ry="26.506598"
+         d="m 508.91614,950.84186 c 0,14.63919 -8.27694,26.5066 -18.48706,26.5066 -10.21013,0 -18.48707,-11.86741 -18.48707,-26.5066 0,-14.63919 8.27694,-26.5066 18.48707,-26.5066 10.21012,0 18.48706,11.86741 18.48706,26.5066 z"
+         transform="matrix(4.8923198,0,0,1.0737805,-1482.0573,-466.94845)" />
+      <path
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:12.98546886;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 967.57233,525.26244 0,30.6797 -28.50183,0 0,41.2377 28.50183,0 0,27.1288 41.19027,0 0,-27.1288 29.354,0 0,-41.2377 -29.354,0 0,-30.6797 -41.19027,0 z"
+         id="rect2995-0-2-7"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path2991-7-2"
+         transform="translate(717.27126,597.74227)"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#b3b3b3;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-7"
+         d="m 359.99999,290.93362 c 0,57.59541 -46.6903,104.28572 -104.28571,104.28572 -57.59541,0 -104.28571,-46.69031 -104.28571,-104.28572 0,-57.5954 46.6903,-104.28571 104.28571,-104.28571 57.59541,0 104.28571,46.69031 104.28571,104.28571 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.7638244,0,0,0.7638244,777.85958,666.54744)" />
+      <rect
+         id="rect2995-0-6"
+         y="-220.76018"
+         x="1298.3352"
+         height="189.71017"
+         width="28.775486"
+         style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:1.52545774"
+         transform="matrix(0.67068946,0.74173826,-0.74173826,0.67068946,0,0)" />
+      <g
+         id="g4284"
+         transform="translate(-77.916708,-8.657412)">
+        <path
+           sodipodi:nodetypes="czcczcc"
+           inkscape:connector-curvature="0"
+           id="rect4201"
+           d="m 568.37427,1080.8464 c 0,0 55.60005,-9.5933 75.06243,-8.6574 19.46238,0.9359 40.43273,8.6574 40.43273,8.6574 l 0,141.4674 c 0,0 -20.97035,-7.7215 -40.43273,-8.6574 -19.46238,-0.9359 -75.06243,8.6574 -75.06243,8.6574 z"
+           style="fill:#ffffff;stroke:#b3b3b3;stroke-width:14.36538029;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4" />
+        <rect
+           y="1108.1473"
+           x="597.4068"
+           height="5.4857273"
+           width="55.265846"
+           id="rect4203"
+           style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <rect
+           y="1142.7776"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2"
+           style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <rect
+           y="1176.1093"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-3"
+           style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="czc"
+           inkscape:connector-curvature="0"
+           id="path4245"
+           d="m 563.55369,1233.6274 c 0,0 59.11965,-16.1473 81.00954,-14.7566 21.8899,1.3907 46.29117,14.7566 46.29117,14.7566"
+           style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:19.6372261;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <g
+           transform="matrix(-1.0032405,0,0,1,1329.8708,99.560238)"
+           id="g4277">
+          <path
+             style="fill:#ffffff;stroke:#b3b3b3;stroke-width:14.36538124;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4"
+             d="m 519.67634,980.83663 c 0,0 55.60005,-9.5933 75.06243,-8.6574 19.46238,0.9359 40.43272,8.6574 40.43272,8.6574 l 0,141.46737 c 0,0 -20.97034,-7.7215 -40.43272,-8.6574 -19.46238,-0.9359 -75.06243,8.6574 -75.06243,8.6574 z"
+             id="rect4201-2"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czcczcc" />
+          <rect
+             style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             id="rect4203-21"
+             width="55.26585"
+             height="5.4857273"
+             x="548.70886"
+             y="1008.1376" />
+          <rect
+             style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             id="rect4203-2-6"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1042.7678" />
+          <rect
+             style="fill:#ffffff;stroke:#b3b3b3;stroke-width:11.82844734;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+             id="rect4203-2-3-8"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1076.0995" />
+          <path
+             style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:19.6372261;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             d="m 514.85576,1133.6176 c 0,0 59.11965,-16.1473 81.00954,-14.7566 21.8899,1.3907 46.29116,14.7566 46.29116,14.7566"
+             id="path4245-5"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czc" />
+        </g>
+      </g>
+      <g
+         id="g3107"
+         transform="matrix(0.53086704,-0.53086704,0.53086704,0.53086704,-205.0028,934.47839)">
+        <rect
+           y="1165.7029"
+           x="793.91357"
+           height="177.36816"
+           width="131.91675"
+           id="rect3075"
+           style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:19.58793259;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <rect
+           transform="matrix(0.69911762,0.71500668,-0.71500668,0.69911762,0,0)"
+           y="145.59781"
+           x="1379.6274"
+           height="95.711494"
+           width="95.711456"
+           id="rect3075-1"
+           style="fill:#b3b3b3;stroke:#b3b3b3;stroke-width:12.25645447;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none" />
+        <path
+           transform="matrix(1.5150471,0,0,1.5150471,-201.2129,-64.133761)"
+           d="m 710,812.36218 c 0,5.52285 -4.47715,10 -10,10 -5.52285,0 -10,-4.47715 -10,-10 0,-5.52284 4.47715,-10 10,-10 5.52285,0 10,4.47716 10,10 z"
+           sodipodi:ry="10"
+           sodipodi:rx="10"
+           sodipodi:cy="812.36218"
+           sodipodi:cx="700"
+           id="path3100"
+           style="fill:#ffffff;stroke:#ffffff;stroke-width:12.69999981;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+           sodipodi:type="arc" />
+      </g>
+      <path
+         style="fill:#b3b3b3;stroke:#ffffff;stroke-width:12.98546886;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 937.41093,1044.4944 0,30.6797 -28.50183,0 0,41.2377 28.50183,0 0,27.1288 41.19033,0 0,-27.1288 29.35404,0 0,-41.2377 -29.35404,0 0,-30.6797 -41.19033,0 z"
+         id="rect2995-0-2-7-7"
+         inkscape:connector-curvature="0" />
     </g>
   </g>
 </svg>

src/main/scala/app/DashboardController.scala

@@ -103,7 +103,9 @@ trait DashboardControllerBase extends ControllerBase {
         page,
         countIssue(condition.copy(state = "open"), filterUser, true, repositories: _*),
         countIssue(condition.copy(state = "closed"), filterUser, true, repositories: _*),
-        condition),
+        condition,
+        None,
+        false),
       getPullRequestCountGroupByUser(condition.state == "closed", userName, None),
       getRepositoryNamesOfUser(userName).map { RepoName =>
         (userName, RepoName, counts.collectFirst { case (_, RepoName, count) => count }.getOrElse(0))

src/main/scala/app/PullRequestsController.scala

@@ -106,12 +106,16 @@ trait PullRequestsControllerBase extends ControllerBase {
         try {
           // mark issue as merged and close.
           val loginAccount = context.loginAccount.get
-          createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Merge", "merge")
+          createComment(repository.owner, repository.name, loginAccount.userName, issueId, form.message, "merge")
           createComment(repository.owner, repository.name, loginAccount.userName, issueId, "Close", "close")
           updateClosed(repository.owner, repository.name, issueId, true)
+
+          // record activity
           recordMergeActivity(repository.owner, repository.name, loginAccount.userName, issueId, form.message)
 
-          // fetch pull request to working repository
+          // TODO apply ref comment
+
+          // fetch pull request to temporary working repository
           val pullRequestBranchName = s"gitbucket-pullrequest-${issueId}"
 
           git.fetch
@@ -301,7 +305,7 @@ trait PullRequestsControllerBase extends ControllerBase {
 
     recordPullRequestActivity(repository.owner, repository.name, loginUserName, issueId, form.title)
 
-    redirect(s"/${repository.owner}/${repository.name}/pulls/${issueId}")
+    redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
   })
 
   /**

src/main/scala/service/ActivityService.scala

@@ -6,23 +6,23 @@ import Database.threadLocalSession
 
 trait ActivityService {
 
-  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] = {
+  def getActivitiesByUser(activityUserName: String, isPublic: Boolean): List[Activity] =
-    val q = Query(Activities)
+    Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
+      .filter { case (t1, t2) =>
+        if(isPublic){
+          (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind)
+        } else {
+          (t1.activityUserName is activityUserName.bind)
+        }
+      }
+      .sortBy { case (t1, t2) => t1.activityId desc }
+      .map    { case (t1, t2) => t1 }
+      .take(30)
+      .list
 
-    (if(isPublic){
-      q filter { case (t1, t2) => (t1.activityUserName is activityUserName.bind) && (t2.isPrivate is false.bind) }
-    } else {
-      q filter { case (t1, t2) => t1.activityUserName is activityUserName.bind }
-    })
-    .sortBy { case (t1, t2) => t1.activityId desc }
-    .map    { case (t1, t2) => t1 }
-    .take(30)
-    .list
-  }
-  
   def getRecentActivities(): List[Activity] =
-    Query(Activities)
+    Activities
       .innerJoin(Repositories).on((t1, t2) => t1.byRepository(t2.userName, t2.repositoryName))
       .filter { case (t1, t2) => t2.isPrivate is false.bind }
       .sortBy { case (t1, t2) => t1.activityId desc }
@@ -112,7 +112,7 @@ trait ActivityService {
   
   def recordCreateBranchActivity(userName: String, repositoryName: String, activityUserName: String, branchName: String) =
     Activities.autoInc insert(userName, repositoryName, activityUserName,
-      "create_tag",
+      "create_branch",
       s"[user:${activityUserName}] created branch [tag:${userName}/${repositoryName}#${branchName}] at [repo:${userName}/${repositoryName}]",
       None,
       currentDate)

src/main/twirl/helper/activities.scala.html

@@ -1,45 +1,86 @@
 @(activities: List[model.Activity])(implicit context: app.Context)
 @import context._
 @import view.helpers._
+
 @if(activities.isEmpty){
   No activity
 } else {
   @activities.map { activity =>
     <div class="block">
-      <div class="muted small">@datetime(activity.activityDate)</div>
+      @(activity.activityType match {
-      <div class="strong">
+        case "open_issue"        => detailActivity(activity, "activity-issue.png")
-        @avatar(activity.activityUserName, 16)
+        case "comment_issue"     => detailActivity(activity, "activity-comment.png")
-        @activityMessage(activity.message)
+        case "close_issue"       => detailActivity(activity, "activity-issue-close.png")
-      </div>
+        case "reopen_issue"      => detailActivity(activity, "activity-issue-reopen.png")
-      @activity.additionalInfo.map { additionalInfo =>
+        case "open_pullreq"      => detailActivity(activity, "activity-merge.png")
-        @if(additionalInfo.nonEmpty){
+        case "merge_pullreq"     => detailActivity(activity, "activity-merge.png")
-          @(activity.activityType match {
+        case "create_repository" => simpleActivity(activity, "activity-create-repository.png")
-            case "create_wiki" => {
+        case "create_branch"     => simpleActivity(activity, "activity-branch.png")
-              <div class="small activity-message">Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div>
+        case "create_tag"        => simpleActivity(activity, "activity-tag.png")
-            }
+        case "fork"              => simpleActivity(activity, "activity-fork.png")
-            case "edit_wiki" => {
+        case "push"  => customActivity(activity, "activity-commit.png"){
-              <div class="small activity-message">Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${additionalInfo}"}>{additionalInfo}</a>.</div>
+          <div class="small activity-message">
-            }
+            {activity.additionalInfo.get.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
-            case "push" => {
+              if(i == 3){
-              <div class="small activity-message">
+                <div>...</div>
-                {additionalInfo.split("\n").reverse.take(4).zipWithIndex.map{ case (commit, i) =>
+              } else {
-                  if(i == 3){
+                <div>
-                    <div>...</div>
+                   <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit.substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
-                  } else {
+                    <span>{commit.substring(41)}</span>
-                    <div>
+                </div>
-                      <a href={s"${path}/${activity.userName}/${activity.repositoryName}/commit/${commit.substring(0, 40)}"} class="monospace">{commit.substring(0, 7)}</a>
+              }
-                      <span>{commit.substring(41)}</span>
+            }}
-                    </div>
+          </div>
-                  }
-                }}
-              </div>
-            }
-            case _ => {
-              <div class=" activity-message">{additionalInfo}</div>
-            }
-          })
         }
-      }
+        case "create_wiki" => customActivity(activity, "activity-wiki.png"){
+          <div class="small activity-message">
+            Created <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>.
+          </div>
+        }
+        case "edit_wiki" => customActivity(activity, "activity-wiki.png"){
+          <div class="small activity-message">
+            Edited <a href={s"${path}/${activity.userName}/${activity.repositoryName}/wiki/${activity.additionalInfo.get}"}>{activity.additionalInfo.get}</a>.
+          </div>
+        }
+      })
     </div>
   }
 }
+
+@detailActivity(activity: model.Activity, image: String) = {
+  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
+  <div class="activity-content">
+    <div class="muted small">@datetime(activity.activityDate)</div>
+    <div class="strong">
+      @avatar(activity.activityUserName, 16)
+      @activityMessage(activity.message)
+    </div>
+    @activity.additionalInfo.map { additionalInfo =>
+      <div class=" activity-message">@additionalInfo</div>
+    }
+  </div>
+}
+
+@customActivity(activity: model.Activity, image: String)(additionalInfo: Any) = {
+  <div class="activity-icon-large"><img src="@assets/common/images/@image"/></div>
+  <div class="activity-content">
+    <div class="muted small">@datetime(activity.activityDate)</div>
+    <div class="strong">
+      @avatar(activity.activityUserName, 16)
+      @activityMessage(activity.message)
+    </div>
+    @additionalInfo
+  </div>
+}
+
+@simpleActivity(activity: model.Activity, image: String) = {
+  <div class="activity-icon-small"><img src="@assets/common/images/@image"/></div>
+  <div class="activity-content">
+    <div>
+      @avatar(activity.activityUserName, 16)
+      @activityMessage(activity.message)
+      <span class="muted small">@datetime(activity.activityDate)</span>
+    </div>
+  </div>
+}
+

src/main/twirl/issues/commentlist.scala.html

@@ -6,7 +6,7 @@
 @import context._
 @import view.helpers._
 @comments.map { comment =>
-  @if(comment.action != "close" && comment.action != "reopen" && comment.action != "merge"){
+  @if(comment.action != "close" && comment.action != "reopen"){
     <div class="issue-avatar-image">@avatar(comment.commentedUserName, 48)</div>
     <div class="box issue-comment-box" id="comment-@comment.commentId">
       <div class="box-header-small">
@@ -14,7 +14,7 @@
         <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> commented
         <span class="pull-right">
           @datetime(comment.registeredDate)
-          @if(comment.action != "commit" && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
+          @if(comment.action != "commit" && comment.action != "merge" && (hasWritePermission || loginAccount.map(_.userName == comment.commentedUserName).getOrElse(false))){
             <a href="#" data-comment-id="@comment.commentId"><i class="icon-pencil"></i></a>
           }
         </span>

src/main/twirl/pulls/compare.scala.html

@@ -14,7 +14,7 @@
 @import org.eclipse.jgit.diff.DiffEntry.ChangeType
 @html.main("Pull Requests - " + repository.owner + "/" + repository.name){
   @html.header("pulls", repository)
-  <div style="border: 1px solid #eee; background-color: #f8f8f8; margin-bottom: 10px; padding: 8px;">
+  <div class="pullreq-info">
     <div id="compare-info">
       <a href="#" id="edit-compare-condition" class="btn btn-mini pull-right">Edit</a>
       <span class="label label-info monospace">@originRepository.owner:@originId</span> ... <span class="label label-info monospace">@forkedRepository.owner:@forkedId</span>

src/main/twirl/pulls/list.scala.html

@@ -24,7 +24,7 @@
         @if(loginAccount.isDefined){
         <li@if(filter.map(_ == loginAccount.get.userName).getOrElse(false)){ class="active"}>
           <a href="@url(repository)/pulls/@loginAccount.map(_.userName)">
-            <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count)</span>
+            <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span>
             Yours
           </a>
         </li>
@@ -44,7 +44,7 @@
       }
       </ul>
     </div>
-    @listparts(issues, page, openCount, closedCount, condition)
+    @listparts(issues, page, openCount, closedCount, condition, Some(repository), hasWritePermission)
   </div>
 }
 

src/main/twirl/pulls/listparts.scala.html

@@ -2,18 +2,20 @@
   page: Int,
   openCount: Int,
   closedCount: Int,
-  condition: service.IssuesService.IssueSearchCondition)(implicit context: app.Context)
+  condition: service.IssuesService.IssueSearchCondition,
+  repository: Option[service.RepositoryService.RepositoryInfo],
+  hasWritePermission: Boolean)(implicit context: app.Context)
 @import context._
 @import view.helpers._
 <div class="span9">
-  @*
+  @repository.map { repository =>
-  @if(hasWritePermission){
+    @if(hasWritePermission){
-  <div class="pull-right">
+      <div class="pull-right">
-    @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 7, condition.toURL)
+        @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.PullRequestService.PullRequestLimit, 7, condition.toURL)
-    <a href="@url(repository)/compare" class="btn btn-success">New pull request</a>
+        <a href="@url(repository)/compare" class="btn btn-success">New pull request</a>
-  </div>
+      </div>
+    }
   }
-  *@
   <div class="btn-group">
     <a class="btn@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
       <a class="btn@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>

src/main/twirl/pulls/pullreq.scala.html

@@ -14,6 +14,24 @@
 @import view.helpers._
 @html.main("%s - Pull Request #%d - %s/%s".format(issue.title, issue.issueId, repository.owner, repository.name)){
   @html.header("pulls", repository)
+  <div class="pullreq-info">
+    @if(issue.closed) {
+      @comments.find(_.action == "merge").map{ comment =>
+        <span class="label label-info">Merged</span>
+        <a href="@url(comment.commentedUserName)" class="username strong">@comment.commentedUserName</a> merged @commits.flatten.size @plural(commits.flatten.size, "commit")
+        into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
+        at @datetime(comment.registeredDate)
+      }.getOrElse {
+        <span class="label label-important">Closed</span>
+        <a href="@url(issue.openedUserName)" class="username strong">@issue.openedUserName</a> wants to merge @commits.flatten.size @plural(commits.flatten.size, "commit")
+        into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
+      }
+    } else {
+      <span class="label label-success">Open</span>
+      <a href="@url(issue.openedUserName)" class="username strong">@issue.openedUserName</a> wants to merge @commits.flatten.size @plural(commits.flatten.size, "commit")
+      into <code>@pullreq.requestUserName:@pullreq.requestBranch</code> from <code>@pullreq.userName:@pullreq.branch</code>
+    }
+  </div>
   <ul class="nav nav-tabs" id="pullreq-tab">
     <li class="active"><a href="#discussion">Discussion</a></li>
     <li><a href="#commits">Commits <span class="badge">@commits.flatten.size</span></a></li>

src/main/webapp/assets/common/css/gitbucket.css

@@ -362,6 +362,23 @@ ul.nav-stacked.side-menu li.active a:hover {
   -moz-border-radius-bottomleft: 0px;
 }
 
+/****************************************************************************/
+/* Activity */
+/****************************************************************************/
+div.activity-icon-large {
+  position: absolute;
+  padding-top: 8px;
+}
+
+div.activity-icon-small {
+  position: absolute;
+  padding-left: 8px;
+}
+
+div.activity-content {
+  margin-left: 40px;
+}
+
 /****************************************************************************/
 /* Repository Viewer */
 /****************************************************************************/
@@ -616,6 +633,16 @@ div.issue-comment-action {
           border-radius: 5px;
 }
 
+/****************************************************************************/
+/* Pull Request */
+/****************************************************************************/
+div.pullreq-info {
+  border: 1px solid #ddd;
+  background-color: #f8f8f8;
+  margin-bottom: 10px;
+  padding: 8px;
+}
+
 /****************************************************************************/
 /* Wiki */
 /****************************************************************************/