Update version number to 2.0.

(refs #383 )Disable "New Issue" button in the new issue creation page.
(refs #346 )Add group members as collaborator when transfer repository to the group.
2026-05-08 06:27:01 +02:00 · 2014-05-31 10:38:31 +09:00 · 2014-05-29 01:55:10 +09:00 · 2014-05-25 18:14:53 +09:00 · 2014-05-20 21:26:51 +09:00 · 2014-05-19 00:29:29 +09:00
293 changed files with 232869 additions and 2593 deletions
--- a/README.md
+++ b/README.md
@@ -1,12 +1,15 @@
-GitBucket
+GitBucket [![Gitter chat](https://badges.gitter.im/takezoe/gitbucket.png)](https://gitter.im/takezoe/gitbucket) [![Build Status](https://buildhive.cloudbees.com/job/takezoe/job/gitbucket/badge/icon)](https://buildhive.cloudbees.com/job/takezoe/job/gitbucket/)
 =========

 GitBucket is the easily installable Github clone written with Scala.

+
+Features
+--------
 The current version of GitBucket provides a basic features below:

- Public / Private Git repository (http access only)
- Repository viewer (some advanced features such as online file editing are not implemented)
+- Public / Private Git repository (http and ssh access)
+- Repository viewer and online file editing
 - Repository search (Code and Issues)
 - Wiki
 - Issues
@@ -20,7 +23,6 @@ The current version of GitBucket provides a basic features below:

 Following features are not implemented, but we will make them in the future release!

- File editing in repository viewer
 - Comment for the changeset
 - Network graph
 - Statistics
@@ -51,6 +53,24 @@ To upgrade GitBucket, only replace gitbucket.war. All GitBucket data is stored i
 For Installation on Windows Server with IIS see [this wiki page](https://github.com/takezoe/gitbucket/wiki/Installation-on-IIS-and-Helicontech-Zoo)

 ### Mac OS X
+#### Installing Via Homebrew
+
+    $ brew install gitbucket
+    ==> Downloading https://github.com/takezoe/gitbucket/releases/download/1.10/gitbucket.war
+    ######################################################################## 100.0%
+    ==> Caveats
+    Note: When using launchctl the port will be 8080.
+
+    To have launchd start gitbucket at login:
+        ln -sfv /usr/local/opt/gitbucket/*.plist ~/Library/LaunchAgents
+    Then to load gitbucket now:
+        launchctl load ~/Library/LaunchAgents/homebrew.mxcl.gitbucket.plist
+    Or, if you don't want/need launchctl, you can just run:
+        java -jar /usr/local/opt/gitbucket/libexec/gitbucket.war
+    ==> Summary
+    /usr/local/Cellar/gitbucket/1.10: 3 files, 42M, built in 11 seconds
+
+#### Manual Installation
 On OS X, copy the [gitbucket.plist](https://raw.github.com/takezoe/gitbucket/master/contrib/macosx/gitbucket.plist) file to `~/Library/LaunchAgents/`

 Run the following commands in `Terminal` to
@@ -60,6 +80,12 @@ Run the following commands in `Terminal` to

 Release Notes
 --------
+### 1.13 - 29 Apr 2014
+- Direct file editing in the repository viewer using AceEditor
+- File attachment for issues
+- Atom feed of user activity
+- Fix some bugs
+
 ### 1.12 - 29 Mar 2014
 - SSH repository access is available
 - Allow users can create and management their groups
--- a/etc/icons.svg
+++ b/etc/icons.svg
@@ -2,6 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->

 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
   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#"
@@ -16,7 +17,16 @@
   inkscape:version="0.48.4 r9939"
   sodipodi:docname="icons.svg">
  <defs
-     id="defs4" />
+     id="defs4">
+    <linearGradient
+       id="linearGradient4044"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4046" />
+    </linearGradient>
+  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
@@ -24,15 +34,15 @@
     borderopacity="1.0"
     inkscape:pageopacity="0.0"
     inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="450.21999"
-     inkscape:cy="97.51519"
+     inkscape:zoom="0.7"
+     inkscape:cx="482.58197"
+     inkscape:cy="-83.92636"
     inkscape:document-units="px"
     inkscape:current-layer="layer1-9"
     showgrid="false"
     inkscape:window-width="1366"
-     inkscape:window-height="706"
-     inkscape:window-x="1912"
+     inkscape:window-height="715"
+     inkscape:window-x="-8"
     inkscape:window-y="-8"
     inkscape:window-maximized="1"
     inkscape:snap-global="false"
@@ -978,6 +988,716 @@
         id="path4310"
         inkscape:connector-curvature="0"
         sodipodi:nodetypes="ccscc" />
+      <path
+         id="path2991-7-1-4"
+         transform="translate(668.66057,1115.0272)"
+         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-8"
+         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,711.41194,1163.4493)" />
+      <rect
+         id="rect2995-0-2-8"
+         y="1378.4849"
+         x="916.58545"
+         height="99.396141"
+         width="20.706863"
+         style="fill:#b3b3b3;stroke:none;stroke-width:0.93666755999999995" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.92446065;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 884.0251,1366.2678 -64.6851,-36.2114 10.70013,55.9569 53.98497,-19.7455 z"
+         id="rect4046-3-4"
+         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 873.36878,1359.3959 -43.65605,-24.4345 6.99871,38.1562 36.65734,-13.7217 z"
+         id="rect4046-5"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#b3b3b3;stroke-width:13.63542366;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 1162.2186,1316.0972 c -0.2525,22.2049 -0.505,44.4098 -0.7575,66.6147 3.3299,0.032 6.6599,0.063 9.9898,0.095 -2.3515,2.3672 -4.703,4.7345 -7.0544,7.1018 31.3741,31.374 62.7482,62.7482 94.1223,94.1223 23.3412,-23.3412 46.6824,-46.6824 70.0236,-70.0236 -31.3741,-31.3899 -62.7483,-62.7798 -94.1224,-94.1697 -2.6197,2.6356 -5.2395,5.2711 -7.8593,7.9067 0.032,-3.6298 0.063,-7.2596 0.095,-10.8894 -21.4789,-0.2525 -42.9579,-0.505 -64.4368,-0.7575 z"
+         id="rect3075-11"
+         inkscape:connector-curvature="0" />
+      <rect
+         id="rect2995-0-2-8-6"
+         y="899.99463"
+         x="-1417.3273"
+         height="99.396141"
+         width="20.706863"
+         style="fill:#b3b3b3;stroke:none;stroke-width:0.93666755999999995"
+         transform="matrix(0,-1,1,0,0,0)" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:10.37699986;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 1172.5522,1326.6744 c -0.1922,16.8985 -0.3844,33.7973 -0.5765,50.6959 2.5342,0.024 5.0684,0.047 7.6026,0.072 -1.7896,1.8014 -3.5792,3.6031 -5.3686,5.4047 23.8766,23.8766 47.7533,47.7533 71.63,71.6301 17.7636,-17.7634 35.5269,-35.5268 53.2902,-53.2902 -23.8766,-23.8888 -47.7534,-47.7775 -71.6302,-71.6662 -1.9936,2.0058 -3.9873,4.0114 -5.9811,6.0172 0.024,-2.7624 0.047,-5.5247 0.072,-8.2872 -16.3463,-0.1921 -32.6925,-0.3843 -49.0386,-0.5764 z"
+         id="rect3075-11-7"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;stroke:#b3b3b3;stroke-width:6.57334423;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
+         id="path3100-2"
+         sodipodi:cx="700"
+         sodipodi:cy="812.36218"
+         sodipodi:rx="10"
+         sodipodi:ry="10"
+         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"
+         transform="matrix(1.2362333,-1.2362333,1.2362333,1.2362333,-667.98357,1217.7251)" />
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:#b3b3b3;stroke-width:10.80681515;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4114"
+         width="45.086407"
+         height="62.401226"
+         x="-133.16023"
+         y="1850.2394"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+      <path
+         id="path2991-7-6"
+         transform="translate(1090.5728,-207.2632)"
+         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:#a0a0a0;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-8"
+         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:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,1133.3242,-158.84107)" />
+      <rect
+         id="rect2995-0-8"
+         y="10.829478"
+         x="1332.5247"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#a0a0a0;stroke:#ffffff;stroke-width:1.11112404000000000;fill-opacity:1" />
+      <rect
+         id="rect2997-9-2"
+         y="129.62337"
+         x="1332.7828"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#a0a0a0;stroke:#ffffff;stroke-width:0.57680577000000000;fill-opacity:1" />
+      <g
+         id="g4284-1"
+         transform="translate(670.07237,-816.24186)"
+         style="stroke:#a0a0a0;stroke-opacity:1">
+        <path
+           sodipodi:nodetypes="czcczcc"
+           inkscape:connector-curvature="0"
+           id="rect4201-26"
+           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:#a0a0a0;stroke-width:14.36538028999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+        <rect
+           y="1108.1473"
+           x="597.4068"
+           height="5.4857273"
+           width="55.265846"
+           id="rect4203-0"
+           style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="1142.7776"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-4"
+           style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <rect
+           y="1176.1093"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-3-9"
+           style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="czc"
+           inkscape:connector-curvature="0"
+           id="path4245-4"
+           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:#a0a0a0;stroke-width:19.63722609999999900;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-6"
+           style="stroke:#a0a0a0;stroke-opacity:1">
+          <path
+             style="fill:#ffffff;stroke:#a0a0a0;stroke-width:14.36538124000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+             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-0"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czcczcc" />
+          <rect
+             style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4203-21-3"
+             width="55.26585"
+             height="5.4857273"
+             x="548.70886"
+             y="1008.1376" />
+          <rect
+             style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4203-2-6-6"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1042.7678" />
+          <rect
+             style="fill:#ffffff;stroke:#a0a0a0;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+             id="rect4203-2-3-8-2"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1076.0995" />
+          <path
+             style="fill:#b3b3b3;stroke:#a0a0a0;stroke-width:19.63722609999999900;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-4"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czc" />
+        </g>
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3850-1-1"
+         d="m 1409.5992,670.87038 0,-128.57724 c 0,0 1.8599,-15.30681 -16.7384,-15.30681 -18.5984,0 -51.1454,0 -51.1454,0"
+         style="fill:none;stroke:#a0a0a0;stroke-width:22.72570610000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="547.80316"
+         x="1294.749"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-7"
+         style="fill:#ffffff;stroke:#a0a0a0;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,944.16607,536.33294)"
+         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-4"
+         style="fill:#ffffff;stroke:#a0a0a0;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,942.63054,386.00935)"
+         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-0"
+         style="fill:#ffffff;stroke:#a0a0a0;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,1056.9547,536.43446)"
+         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-9"
+         style="fill:#ffffff;stroke:#a0a0a0;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3852-4-4"
+         d="m 1369.3146,490.2451 0,70.69144 -45.5889,-32.13462 z"
+         style="fill:#a0a0a0;stroke:#a0a0a0;stroke-width:0.83335358000000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1" />
+      <rect
+         style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:10.82955647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953"
+         width="15.304287"
+         height="97.947441"
+         x="1474.2273"
+         y="-367.14282"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <rect
+         style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:10.82955647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-8"
+         width="15.304287"
+         height="97.947441"
+         x="-281.45197"
+         y="-1573.058"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+      <rect
+         style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:10.82955647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-82"
+         width="15.304287"
+         height="97.947441"
+         x="-412.46057"
+         y="-1617.4926"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+      <rect
+         style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:10.82955647;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-82-4"
+         width="15.304287"
+         height="97.947441"
+         x="-1617.2937"
+         y="306.0546"
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
+      <g
+         id="g4016"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,3107.8871,982.01044)">
+        <rect
+           transform="scale(-1,-1)"
+           y="-1119.1083"
+           x="-1370.8767"
+           height="105.80523"
+           width="33.87508"
+           id="rect3953-82-4-1-4"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:16.74562263;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-1207.0963"
+           x="-1358.6217"
+           height="113.43421"
+           width="9.3650599"
+           id="rect3953-82-4-1-7-0"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:9.11664104;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           transform="matrix(1.5972925,0,0,1.509886,-99.098035,-27.987625)"
+           d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
+           sodipodi:ry="26.263966"
+           sodipodi:rx="26.263966"
+           sodipodi:cy="838.20984"
+           sodipodi:cx="910.14746"
+           id="path3226"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:7.14799976;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:type="arc" />
+        <path
+           transform="matrix(1.1933397,0,0,1.5429659,269.38527,-37.350485)"
+           d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
+           sodipodi:ry="26.263966"
+           sodipodi:rx="26.263966"
+           sodipodi:cy="838.20984"
+           sodipodi:cx="910.14746"
+           id="path3226-9"
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           sodipodi:type="arc" />
+      </g>
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:none"
+         id="rect4027"
+         width="73.460579"
+         height="107.13"
+         x="1722.2299"
+         y="-207.2868"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <g
+         id="g4022"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,1095.262,-713.65443)">
+        <rect
+           transform="scale(-1,-1)"
+           y="-1121.4039"
+           x="-1505.5544"
+           height="105.80523"
+           width="33.87508"
+           id="rect3953-82-4-1"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:16.74562263;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           transform="scale(-1,-1)"
+           y="-1222.4006"
+           x="-1494.0955"
+           height="113.43421"
+           width="9.3650599"
+           id="rect3953-82-4-1-7"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:9.11664104;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect3182"
+           d="m 1469.5507,1220.8203 20.5952,52.7426 20.6425,-52.7426 -2.0832,-5.35 -37.0713,0 -2.0832,5.35 z"
+           style="fill:#a0a0a0;fill-opacity:1;stroke:#a0a0a0;stroke-width:7.02416945;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <path
+         id="path2991-7-6-1"
+         transform="translate(1482.3625,-199.43254)"
+         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:#3c3c3c;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-8-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:#3c3c80;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         sodipodi:type="arc"
+         transform="matrix(0.83611704,0,0,0.83611704,1525.1139,-151.0104)" />
+      <rect
+         id="rect2995-0-8-4"
+         y="18.660131"
+         x="1724.3145"
+         height="99.221687"
+         width="29.189819"
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#ffffff;stroke-width:1.11112404000000000" />
+      <rect
+         id="rect2997-9-2-0"
+         y="137.45401"
+         x="1724.5726"
+         height="26.258072"
+         width="29.724136"
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#ffffff;stroke-width:0.57680577000000000" />
+      <g
+         id="g4284-1-9"
+         transform="translate(1061.8621,-808.41119)"
+         style="stroke:#3c3c3c;stroke-opacity:1">
+        <path
+           sodipodi:nodetypes="czcczcc"
+           inkscape:connector-curvature="0"
+           id="rect4201-26-4"
+           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:#3c3c3c;stroke-width:14.36538028999999900;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1" />
+        <rect
+           y="1108.1473"
+           x="597.4068"
+           height="5.4857273"
+           width="55.265846"
+           id="rect4203-0-8"
+           style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           y="1142.7776"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-4-8"
+           style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           y="1176.1093"
+           x="598.48895"
+           height="5.4857273"
+           width="55.26585"
+           id="rect4203-2-3-9-2"
+           style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           sodipodi:nodetypes="czc"
+           inkscape:connector-curvature="0"
+           id="path4245-4-4"
+           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:#3c3c3c;stroke-width:19.63722609999999900;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-6-5"
+           style="stroke:#3c3c3c;stroke-opacity:1">
+          <path
+             style="fill:#ffffff;stroke:#3c3c3c;stroke-width:14.36538124000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1"
+             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-0-5"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czcczcc" />
+          <rect
+             style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect4203-21-3-1"
+             width="55.26585"
+             height="5.4857273"
+             x="548.70886"
+             y="1008.1376" />
+          <rect
+             style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect4203-2-6-6-7"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1042.7678" />
+          <rect
+             style="fill:#ffffff;stroke:#3c3c3c;stroke-width:11.82844734000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+             id="rect4203-2-3-8-2-1"
+             width="55.26585"
+             height="5.4857273"
+             x="549.79102"
+             y="1076.0995" />
+          <path
+             style="fill:#b3b3b3;stroke:#3c3c3c;stroke-width:19.63722609999999900;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-4-1"
+             inkscape:connector-curvature="0"
+             sodipodi:nodetypes="czc" />
+        </g>
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         id="path3850-1-1-5"
+         d="m 1801.3889,678.70099 0,-128.5772 c 0,0 1.8599,-15.3068 -16.7384,-15.3068 -18.5984,0 -51.1454,0 -51.1454,0"
+         style="fill:none;stroke:#3c3c3c;stroke-width:22.72570610000000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <rect
+         y="555.63385"
+         x="1686.5388"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-7-2"
+         style="fill:#ffffff;stroke:#3c3c3c;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,1335.9558,544.16359)"
+         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-4-7"
+         style="fill:#ffffff;stroke:#3c3c3c;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,1334.4203,393.83999)"
+         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-0-6"
+         style="fill:#ffffff;stroke:#3c3c3c;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,1448.7444,544.26509)"
+         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-9-1"
+         style="fill:#ffffff;stroke:#3c3c3c;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         sodipodi:type="arc" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path3852-4-4-4"
+         d="m 1761.1043,498.07579 0,70.6914 -45.5889,-32.1346 z"
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:0.83335358000000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:10.82955647000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-2"
+         width="15.304287"
+         height="97.947441"
+         x="1756.8015"
+         y="-638.64288"
+         transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)" />
+      <rect
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:10.82955647000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-8-3"
+         width="15.304287"
+         height="97.947441"
+         x="-552.95203"
+         y="-1855.6323"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+      <rect
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:10.82955647000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-82-2"
+         width="15.304287"
+         height="97.947441"
+         x="-683.96063"
+         y="-1900.0669"
+         transform="matrix(-0.70710678,0.70710678,-0.70710678,-0.70710678,0,0)" />
+      <rect
+         style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:10.82955647000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect3953-82-4-2"
+         width="15.304287"
+         height="97.947441"
+         x="-1899.8679"
+         y="577.55469"
+         transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
+      <g
+         id="g4138">
+        <rect
+           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+           y="2055.4602"
+           x="403.84506"
+           height="105.80523"
+           width="33.87508"
+           id="rect3953-82-4-1-4-6"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:16.74562263000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)"
+           y="1967.4722"
+           x="416.10007"
+           height="113.43421"
+           width="9.3650599"
+           id="rect3953-82-4-1-7-0-8"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:9.11664103999999930;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           transform="matrix(-1.1294564,1.1294564,-1.0676506,-1.0676506,3589.5398,939.55844)"
+           d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
+           sodipodi:ry="26.263966"
+           sodipodi:rx="26.263966"
+           sodipodi:cy="838.20984"
+           sodipodi:cx="910.14746"
+           id="path3226-5"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:7.14799976000000030;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           sodipodi:type="arc" />
+        <path
+           transform="matrix(-0.84381859,0.84381859,-1.0910416,-1.0910416,3335.6033,1206.736)"
+           d="m 936.41143,838.20984 c 0,14.50519 -11.75878,26.26396 -26.26397,26.26396 -14.50519,0 -26.26396,-11.75877 -26.26396,-26.26396 0,-14.50519 11.75877,-26.26397 26.26396,-26.26397 14.50519,0 26.26397,11.75878 26.26397,26.26397 z"
+           sodipodi:ry="26.263966"
+           sodipodi:rx="26.263966"
+           sodipodi:cy="838.20984"
+           sodipodi:cx="910.14746"
+           id="path3226-9-7"
+           style="fill:#ffffff;fill-opacity:1;stroke:none"
+           sodipodi:type="arc" />
+        <rect
+           transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
+           y="-476.95105"
+           x="2003.8865"
+           height="107.13"
+           width="73.460579"
+           id="rect4027-6"
+           style="fill:#ffffff;fill-opacity:1;stroke:none" />
+        <rect
+           transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
+           y="429.19318"
+           x="-2057.9661"
+           height="105.80523"
+           width="33.87508"
+           id="rect3953-82-4-1-8"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:16.74562263000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <rect
+           transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)"
+           y="328.19647"
+           x="-2046.5071"
+           height="113.43421"
+           width="9.3650599"
+           id="rect3953-82-4-1-7-9"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:9.11664103999999930;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+        <path
+           inkscape:connector-curvature="0"
+           id="rect3182-2"
+           d="m 1662.9307,1196.5558 -22.7317,51.8577 51.8911,-22.6982 2.31,-5.2561 -26.2134,-26.2134 -5.256,2.31 z"
+           style="fill:#3c3c3c;fill-opacity:1;stroke:#3c3c3c;stroke-width:7.02416944999999960;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+      </g>
+      <path
+         id="path2991-7-1-4-1"
+         transform="translate(-154.10522,1432.0357)"
+         d="m 359.99999,290.93362 a 104.28571,104.28571 0 1 1 -208.57142,0 104.28571,104.28571 0 1 1 208.57142,0 z"
+         sodipodi:ry="104.28571"
+         sodipodi:rx="104.28571"
+         sodipodi:cy="290.93362"
+         sodipodi:cx="255.71428"
+         style="fill:#bebeff;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         id="path2993-4-5-8-7"
+         d="m 359.99999,290.93362 a 104.28571,104.28571 0 1 1 -208.57142,0 104.28571,104.28571 0 1 1 208.57142,0 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,-111.35384,1480.4578)" />
+      <rect
+         id="rect2995-0-2-8-4"
+         y="1695.4933"
+         x="93.81971"
+         height="99.396141"
+         width="20.706863"
+         style="fill:#bebefa;stroke:none;fill-opacity:1" />
+      <path
+         style="fill:#ffffff;stroke:#ffffff;stroke-width:2.92446065;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none"
+         d="m 61.259358,1683.2763 -64.6850999,-36.2114 10.7001,55.9569 53.9849999,-19.7455 z"
+         id="rect4046-3-4-0"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#bebeff;stroke:#bebeff;stroke-width:1.98877633000000010;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1;stroke-opacity:1"
+         d="m 50.602958,1676.4044 -43.6559999,-24.4345 6.9986999,38.1562 36.6573,-13.7217 z"
+         id="rect4046-5-9"
+         inkscape:connector-curvature="0" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#bebefa;stroke-width:13.63542366000000100;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         d="m 339.45286,1633.1057 c -0.2525,22.2049 -0.505,44.4098 -0.7575,66.6147 3.3299,0.032 6.6598,0.063 9.9898,0.095 -2.3515,2.3672 -4.703,4.7345 -7.0544,7.1018 31.3741,31.374 62.7482,62.7482 94.1222,94.1223 23.3413,-23.3412 46.6825,-46.6824 70.0237,-70.0236 -31.3741,-31.3899 -62.7483,-62.7798 -94.1224,-94.1697 -2.6197,2.6356 -5.2395,5.2711 -7.8593,7.9067 0.032,-3.6298 0.063,-7.2596 0.095,-10.8894 -21.4789,-0.2525 -42.9579,-0.505 -64.4368,-0.7575 z"
+         id="rect3075-11-4"
+         inkscape:connector-curvature="0" />
+      <rect
+         id="rect2995-0-2-8-6-8"
+         y="77.228889"
+         x="-1734.3357"
+         height="99.396141"
+         width="20.706863"
+         style="fill:#bebefa;stroke:none;fill-opacity:1"
+         transform="matrix(0,-1,1,0,0,0)" />
+      <path
+         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:10.37699986;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 349.78646,1643.6829 c -0.1922,16.8985 -0.3844,33.7973 -0.5765,50.6959 2.5342,0.024 5.0684,0.047 7.6026,0.072 -1.7896,1.8014 -3.5792,3.6031 -5.3686,5.4047 23.8766,23.8766 47.7533,47.7533 71.63,71.6301 17.7636,-17.7634 35.5269,-35.5268 53.2902,-53.2902 -23.8766,-23.8888 -47.7534,-47.7775 -71.6302,-71.6662 -1.9936,2.0058 -3.9873,4.0114 -5.9811,6.0172 0.024,-2.7624 0.047,-5.5247 0.072,-8.2872 -16.3463,-0.1921 -32.6925,-0.3843 -49.0386,-0.5764 z"
+         id="rect3075-11-7-8"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:type="arc"
+         style="fill:#ffffff;stroke:#bebefa;stroke-width:6.57334423000000000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
+         id="path3100-2-2"
+         sodipodi:cx="700"
+         sodipodi:cy="812.36218"
+         sodipodi:rx="10"
+         sodipodi:ry="10"
+         d="m 710,812.36218 a 10,10 0 1 1 -20,0 10,10 0 1 1 20,0 z"
+         transform="matrix(1.2362333,-1.2362333,1.2362333,1.2362333,-1490.7493,1534.7336)" />
+      <rect
+         style="fill:#ffffff;fill-opacity:1;stroke:#bebeff;stroke-width:10.80681515000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         id="rect4114-4"
+         width="45.086407"
+         height="62.401226"
+         x="-939.10236"
+         y="1492.6151"
+         transform="matrix(0.70710678,-0.70710678,0.70710678,0.70710678,0,0)" />
+      <path
+         style="fill:none;stroke:#bebeff;stroke-width:25.84518814000000100;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+         d="m 655.10691,1790.494 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-5"
+         inkscape:connector-curvature="0"
+         inkscape:transform-center-x="-9.2946303"
+         sodipodi:nodetypes="csc"
+         inkscape:transform-center-y="2.9369479e-005" />
+      <rect
+         y="1676.2623"
+         x="652.97418"
+         height="104.27072"
+         width="3.2554622"
+         id="rect3818-4-8-4-5"
+         style="fill:#ffffff;stroke:#bebefa;stroke-width:22.72570610000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,302.39116,1664.7945)"
+         d="m 372.74629,230.89374 a 21.718279,35.140915 0 1 1 -43.43655,0 21.718279,35.140915 0 1 1 43.43655,0 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-4-8-7-8-1"
+         style="fill:#ffffff;stroke:#bebeff;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,300.85563,1514.4712)"
+         d="m 372.74629,230.89374 a 21.718279,35.140915 0 1 1 -43.43655,0 21.718279,35.140915 0 1 1 43.43655,0 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4-8-7"
+         style="fill:#ffffff;stroke:#bebeff;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
+      <path
+         transform="matrix(1.0049237,0,0,0.61497516,401.70879,1561.5007)"
+         d="m 372.74629,230.89374 a 21.718279,35.140915 0 1 1 -43.43655,0 21.718279,35.140915 0 1 1 43.43655,0 z"
+         sodipodi:ry="35.140915"
+         sodipodi:rx="21.718279"
+         sodipodi:cy="230.89374"
+         sodipodi:cx="351.02802"
+         id="path3795-8-4-8-2-1"
+         style="fill:#ffffff;stroke:#bebeff;stroke-width:12.04511166000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         sodipodi:type="arc" />
    </g>
  </g>
 </svg>
--- a/project/build.scala
+++ b/project/build.scala
@@ -15,6 +15,7 @@ object MyBuild extends Build {
    "gitbucket",
    file("."),
    settings = Defaults.defaultSettings ++ ScalatraPlugin.scalatraWithJRebel ++ Seq(
+      sourcesInBase := false,
      organization := Organization,
      name := Name,
      version := Version,
@@ -36,7 +37,7 @@ object MyBuild extends Build {
        "org.apache.commons" % "commons-compress" % "1.5",
        "org.apache.commons" % "commons-email" % "1.3.1",
        "org.apache.httpcomponents" % "httpclient" % "4.3",
-        "org.apache.sshd" % "apache-sshd" % "0.10.0",
+        "org.apache.sshd" % "apache-sshd" % "0.11.0",
        "com.typesafe.slick" %% "slick" % "1.0.1",
        "com.novell.ldap" % "jldap" % "2009-10-07",
        "com.h2database" % "h2" % "1.3.173",
--- a/src/main/resources/update/1_13.sql
+++ b/src/main/resources/update/1_13.sql
@@ -0,0 +1 @@
+DROP TABLE COMMIT_LOG;
--- a/src/main/scala/ScalatraBootstrap.scala
+++ b/src/main/scala/ScalatraBootstrap.scala
@@ -1,6 +1,6 @@
 import _root_.servlet.{BasicAuthenticationFilter, TransactionFilter}
 import app._
-import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
+//import jp.sf.amateras.scalatra.forms.ValidationJavaScriptProvider
 import org.scalatra._
 import javax.servlet._
 import java.util.EnumSet
@@ -28,7 +28,6 @@ class ScalatraBootstrap extends LifeCycle {
    context.mount(new IssuesController, "/*")
    context.mount(new PullRequestsController, "/*")
    context.mount(new RepositorySettingsController, "/*")
-    context.mount(new ValidationJavaScriptProvider, "/assets/common/js/*")

    // Create GITBUCKET_HOME directory if it does not exist
    val dir = new java.io.File(_root_.util.Directory.GitBucketHome)
--- a/src/main/scala/app/AccountController.scala
+++ b/src/main/scala/app/AccountController.scala
@@ -5,6 +5,7 @@ import util._
 import util.StringUtil._
 import util.Directory._
 import util.ControlUtil._
+import ssh.SshUtil
 import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import org.scalatra.i18n.Messages
@@ -49,7 +50,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {

  val sshKeyForm = mapping(
    "title"     -> trim(label("Title", text(required, maxlength(100)))),
-    "publicKey" -> trim(label("Key"  , text(required)))
+    "publicKey" -> trim(label("Key"  , text(required, validPublicKey)))
  )(SshKeyForm.apply)

  case class NewGroupForm(groupName: String, url: Option[String], fileId: Option[String], members: String)
@@ -111,13 +112,19 @@ trait AccountControllerBase extends AccountManagementControllerBase {
          val members = getGroupMembers(account.userName)
          _root_.account.html.repositories(account,
            if(account.isGroupAccount) Nil else getGroupsByUserName(userName),
-            getVisibleRepositories(context.loginAccount, baseUrl, Some(userName)),
+            getVisibleRepositories(context.loginAccount, context.baseUrl, Some(userName)),
            context.loginAccount.exists(x => members.exists { member => member.userName == x.userName && member.isManager }))
        }
      }
    } getOrElse NotFound
  }

+  get("/:userName.atom") {
+    val userName = params("userName")
+    contentType = "application/atom+xml; type=feed"
+    helper.xml.feed(getActivitiesByUser(userName, true))
+  }
+
  get("/:userName/_avatar"){
    val userName = params("userName")
    getAccountByUserName(userName).flatMap(_.image).map { image =>
@@ -285,7 +292,7 @@ trait AccountControllerBase extends AccountManagementControllerBase {
   */
  post("/new", newRepositoryForm)(usersOnly { form =>
    LockUtil.lock(s"${form.owner}/${form.name}/create"){
-      if(getRepository(form.owner, form.name, baseUrl).isEmpty){
+      if(getRepository(form.owner, form.name, context.baseUrl).isEmpty){
        val ownerAccount  = getAccountByUserName(form.owner).get
        val loginAccount  = context.loginAccount.get
        val loginUserName = loginAccount.userName
@@ -348,61 +355,42 @@ trait AccountControllerBase extends AccountManagementControllerBase {
    val loginUserName  = loginAccount.userName

    LockUtil.lock(s"${loginUserName}/${repository.name}/create"){
-      if(repository.owner == loginUserName){
-        // redirect to the repository
-        redirect(s"/${repository.owner}/${repository.name}")
+      if(repository.owner == loginUserName || getRepository(loginAccount.userName, repository.name, baseUrl).isDefined){
+        // redirect to the repository if repository already exists
+        redirect(s"/${loginUserName}/${repository.name}")
      } else {
-        getForkedRepositories(repository.owner, repository.name).find(_._1 == loginUserName).map { case (owner, name) =>
-          // redirect to the repository
-          redirect(s"/${owner}/${name}")
-        } getOrElse {
-          // Insert to the database at first
-          val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
-          val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)
+        // Insert to the database at first
+        val originUserName = repository.repository.originUserName.getOrElse(repository.owner)
+        val originRepositoryName = repository.repository.originRepositoryName.getOrElse(repository.name)

-          createRepository(
-            repositoryName       = repository.name,
-            userName             = loginUserName,
-            description          = repository.repository.description,
-            isPrivate            = repository.repository.isPrivate,
-            originRepositoryName = Some(originRepositoryName),
-            originUserName       = Some(originUserName),
-            parentRepositoryName = Some(repository.name),
-            parentUserName       = Some(repository.owner)
-          )
+        createRepository(
+          repositoryName       = repository.name,
+          userName             = loginUserName,
+          description          = repository.repository.description,
+          isPrivate            = repository.repository.isPrivate,
+          originRepositoryName = Some(originRepositoryName),
+          originUserName       = Some(originUserName),
+          parentRepositoryName = Some(repository.name),
+          parentUserName       = Some(repository.owner)
+        )

-          // Insert default labels
-          insertDefaultLabels(loginUserName, repository.name)
+        // Insert default labels
+        insertDefaultLabels(loginUserName, repository.name)

-          // clone repository actually
-          JGitUtil.cloneRepository(
-            getRepositoryDir(repository.owner, repository.name),
-            getRepositoryDir(loginUserName, repository.name))
+        // clone repository actually
+        JGitUtil.cloneRepository(
+          getRepositoryDir(repository.owner, repository.name),
+          getRepositoryDir(loginUserName, repository.name))

-          // Create Wiki repository
-          JGitUtil.cloneRepository(
-            getWikiRepositoryDir(repository.owner, repository.name),
-            getWikiRepositoryDir(loginUserName, repository.name))
+        // Create Wiki repository
+        JGitUtil.cloneRepository(
+          getWikiRepositoryDir(repository.owner, repository.name),
+          getWikiRepositoryDir(loginUserName, repository.name))

-          // insert commit id
-          using(Git.open(getRepositoryDir(loginUserName, repository.name))){ git =>
-            JGitUtil.getRepositoryInfo(loginUserName, repository.name, baseUrl).branchList.foreach { branch =>
-              JGitUtil.getCommitLog(git, branch) match {
-                case Right((commits, _)) => commits.foreach { commit =>
-                  if(!existsCommitId(loginUserName, repository.name, commit.id)){
-                    insertCommitId(loginUserName, repository.name, commit.id)
-                  }
-                }
-                case Left(_) => ???
-              }
-            }
-          }
-
-          // Record activity
-          recordForkActivity(repository.owner, repository.name, loginUserName)
-          // redirect to the repository
-          redirect(s"/${loginUserName}/${repository.name}")
-        }
+        // Record activity
+        recordForkActivity(repository.owner, repository.name, loginUserName)
+        // redirect to the repository
+        redirect(s"/${loginUserName}/${repository.name}")
      }
    }
  })
@@ -435,4 +423,11 @@ trait AccountControllerBase extends AccountManagementControllerBase {
      }) None else Some("Must select one manager at least.")
    }
  }
+
+  private def validPublicKey: Constraint = new Constraint(){
+    override def validate(name: String, value: String, messages: Messages): Option[String] = SshUtil.str2PublicKey(value) match {
+     case Some(_) => None
+     case None => Some("Key is invalid.")
+    }
+  }
 }
--- a/src/main/scala/app/ControllerBase.scala
+++ b/src/main/scala/app/ControllerBase.scala
@@ -11,8 +11,7 @@ import jp.sf.amateras.scalatra.forms._
 import org.apache.commons.io.FileUtils
 import model.Account
 import service.{SystemSettingsService, AccountService}
-import javax.servlet.http.{HttpServletResponse, HttpSession, HttpServletRequest}
-import java.text.SimpleDateFormat
+import javax.servlet.http.{HttpServletResponse, HttpServletRequest}
 import javax.servlet.{FilterChain, ServletResponse, ServletRequest}
 import org.scalatra.i18n._

@@ -139,9 +138,10 @@ abstract class ControllerBase extends ScalatraFilter
 */
 case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){

-  lazy val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath)
-
-  lazy val currentPath = request.getRequestURI.substring(request.getContextPath.length)
+  val path = settings.baseUrl.getOrElse(request.getContextPath)
+  val currentPath = request.getRequestURI.substring(request.getContextPath.length)
+  val baseUrl = settings.baseUrl(request)
+  val host = new java.net.URL(baseUrl).getHost

  /**
   * Get object from cache.
@@ -163,7 +163,7 @@ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount:
 /**
 * Base trait for controllers which manages account information.
 */
-trait AccountManagementControllerBase extends ControllerBase with FileUploadControllerBase {
+trait AccountManagementControllerBase extends ControllerBase {
  self: AccountService  =>

  protected def updateImage(userName: String, fileId: Option[String], clearImage: Boolean): Unit =
@@ -174,9 +174,9 @@ trait AccountManagementControllerBase extends ControllerBase with FileUploadCont
      }
    } else {
      fileId.map { fileId =>
-        val filename = "avatar." + FileUtil.getExtension(getUploadedFilename(fileId).get)
+        val filename = "avatar." + FileUtil.getExtension(session.getAndRemove(Keys.Session.Upload(fileId)).get)
        FileUtils.moveFile(
-          getTemporaryFile(fileId),
+          new java.io.File(getTemporaryDir(session.getId), fileId),
          new java.io.File(getUserUploadDir(userName), filename)
        )
        updateAvatarImage(userName, Some(filename))
@@ -196,28 +196,3 @@ trait AccountManagementControllerBase extends ControllerBase with FileUploadCont
  }

 }
-
-/**
- * Base trait for controllers which needs file uploading feature.
- */
-trait FileUploadControllerBase {
-
-  def generateFileId: String =
-    new SimpleDateFormat("yyyyMMddHHmmSSsss").format(new java.util.Date(System.currentTimeMillis))
-
-  def TemporaryDir(implicit session: HttpSession): java.io.File =
-    new java.io.File(GitBucketHome, s"tmp/_upload/${session.getId}")
-
-  def getTemporaryFile(fileId: String)(implicit session: HttpSession): java.io.File =
-    new java.io.File(TemporaryDir, fileId)
-
-  //  def removeTemporaryFile(fileId: String)(implicit session: HttpSession): Unit =
-  //    getTemporaryFile(fileId).delete()
-
-  def removeTemporaryFiles()(implicit session: HttpSession): Unit =
-    FileUtils.deleteDirectory(TemporaryDir)
-
-  def getUploadedFilename(fileId: String)(implicit session: HttpSession): Option[String] =
-    session.getAndRemove[String](Keys.Session.Upload(fileId))
-
-}
--- a/src/main/scala/app/DashboardController.scala
+++ b/src/main/scala/app/DashboardController.scala
@@ -49,7 +49,7 @@ trait DashboardControllerBase extends ControllerBase {
    )

    val userName = context.loginAccount.get.userName
-    val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
+    val repositories = getUserRepositories(userName, context.baseUrl).map(repo => repo.owner -> repo.name)
    val filterUser = Map(filter -> userName)
    val page = IssueSearchCondition.page(request)
    // 
@@ -80,7 +80,7 @@ trait DashboardControllerBase extends ControllerBase {
    }.copy(repo = repository))

    val userName = context.loginAccount.get.userName
-    val repositories = getUserRepositories(userName, baseUrl).map(repo => repo.owner -> repo.name)
+    val repositories = getUserRepositories(userName, context.baseUrl).map(repo => repo.owner -> repo.name)
    val filterUser = Map(filter -> userName)
    val page = IssueSearchCondition.page(request)

--- a/src/main/scala/app/FileUploadController.scala
+++ b/src/main/scala/app/FileUploadController.scala
@@ -1,31 +1,44 @@
 package app

-import _root_.util.{Keys, FileUtil}
+import util.{Keys, FileUtil}
 import util.ControlUtil._
+import util.Directory._
 import org.scalatra._
-import org.scalatra.servlet.{MultipartConfig, FileUploadSupport}
+import org.scalatra.servlet.{MultipartConfig, FileUploadSupport, FileItem}
 import org.apache.commons.io.FileUtils

 /**
 * Provides Ajax based file upload functionality.
 *
- * This servlet saves uploaded file as temporary file and returns the unique id.
- * You can get uploaded file using [[app.FileUploadControllerBase#getTemporaryFile()]] with this id.
+ * This servlet saves uploaded file.
 */
-class FileUploadController extends ScalatraServlet with FileUploadSupport with FileUploadControllerBase {
+class FileUploadController extends ScalatraServlet with FileUploadSupport {

  configureMultipartHandling(MultipartConfig(maxFileSize = Some(3 * 1024 * 1024)))

  post("/image"){
-    fileParams.get("file") match {
-      case Some(file) if(FileUtil.isImage(file.name)) => defining(generateFileId){ fileId =>
-        FileUtils.writeByteArrayToFile(getTemporaryFile(fileId), file.get)
-        session += Keys.Session.Upload(fileId) -> file.name
-        Ok(fileId)
-      }
-      case None => BadRequest
+    execute { (file, fileId) =>
+      FileUtils.writeByteArrayToFile(new java.io.File(getTemporaryDir(session.getId), fileId), file.get)
+      session += Keys.Session.Upload(fileId) -> file.name
    }
  }

-}
+  post("/image/:owner/:repository"){
+    execute { (file, fileId) =>
+      FileUtils.writeByteArrayToFile(new java.io.File(
+        getAttachedDir(params("owner"), params("repository")),
+        fileId + "." + FileUtil.getExtension(file.getName)), file.get)
+    }
+  }

+  private def execute(f: (FileItem, String) => Unit) = fileParams.get("file") match {
+    case Some(file) if(FileUtil.isImage(file.name)) =>
+      defining(FileUtil.generateFileId){ fileId =>
+        f(file, fileId)
+
+        Ok(fileId)
+      }
+    case _ => BadRequest
+  }
+
+}
--- a/src/main/scala/app/IndexController.scala
+++ b/src/main/scala/app/IndexController.scala
@@ -21,8 +21,8 @@ trait IndexControllerBase extends ControllerBase {
    val loginAccount = context.loginAccount

    html.index(getRecentActivities(),
-      getVisibleRepositories(loginAccount, baseUrl),
-      loginAccount.map{ account => getUserRepositories(account.userName, baseUrl) }.getOrElse(Nil)
+      getVisibleRepositories(loginAccount, context.baseUrl),
+      loginAccount.map{ account => getUserRepositories(account.userName, context.baseUrl) }.getOrElse(Nil)
    )
  }

@@ -46,6 +46,11 @@ trait IndexControllerBase extends ControllerBase {
    redirect("/")
  }

+  get("/activities.atom"){
+    contentType = "application/atom+xml; type=feed"
+    helper.xml.feed(getRecentActivities())
+  }
+
  /**
   * Set account information into HttpSession and redirect.
   */
--- a/src/main/scala/app/IssuesController.scala
+++ b/src/main/scala/app/IssuesController.scala
@@ -118,7 +118,7 @@ trait IssuesControllerBase extends ControllerBase {

      // notifications
      Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
-        Notifier.msgIssue(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
+        Notifier.msgIssue(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
      }

      redirect(s"/${owner}/${name}/issues/${issueId}")
@@ -273,6 +273,17 @@ trait IssuesControllerBase extends ControllerBase {
    }
  })

+  get("/:owner/:repository/_attached/:file")(referrersOnly { repository =>
+    (Directory.getAttachedDir(repository.owner, repository.name) match {
+      case dir if(dir.exists && dir.isDirectory) =>
+        dir.listFiles.find(_.getName.startsWith(params("file") + ".")).map { file =>
+          contentType = FileUtil.getMimeType(file.getName)
+          file
+        }
+      case _ => None
+    }) getOrElse NotFound
+  })
+
  val assignedUserName = (key: String) => params.get(key) filter (_.trim != "")
  val milestoneId: String => Option[Int] = (key: String) => params.get(key).flatMap(_.toIntOpt)

@@ -342,13 +353,13 @@ trait IssuesControllerBase extends ControllerBase {
          case f =>
            content foreach {
              f.toNotify(repository, issueId, _){
-                Notifier.msgComment(s"${baseUrl}/${owner}/${name}/${
+                Notifier.msgComment(s"${context.baseUrl}/${owner}/${name}/${
                  if(issue.isPullRequest) "pull" else "issues"}/${issueId}#comment-${commentId}")
              }
            }
            action foreach {
              f.toNotify(repository, issueId, _){
-                Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/issues/${issueId}")
+                Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/issues/${issueId}")
              }
            }
        }
--- a/src/main/scala/app/PullRequestsController.scala
+++ b/src/main/scala/app/PullRequestsController.scala
@@ -100,7 +100,7 @@ trait PullRequestsControllerBase extends ControllerBase {
        pulls.html.mergeguide(
          checkConflictInPullRequest(owner, name, pullreq.branch, pullreq.requestUserName, name, pullreq.requestBranch, issueId),
          pullreq,
-          s"${baseUrl}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
+          s"${context.baseUrl}/git/${pullreq.requestUserName}/${pullreq.requestRepositoryName}.git")
      }
    } getOrElse NotFound
  })
@@ -111,7 +111,7 @@ trait PullRequestsControllerBase extends ControllerBase {
      val userName   = context.loginAccount.get.userName
      if(repository.repository.defaultBranch != branchName){
        using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-          git.branchDelete().setBranchNames(branchName).call()
+          git.branchDelete().setForce(true).setBranchNames(branchName).call()
          recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
        }
      }
@@ -177,14 +177,8 @@ trait PullRequestsControllerBase extends ControllerBase {
            val (commits, _) = getRequestCompareInfo(owner, name, pullreq.commitIdFrom,
              pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.commitIdTo)

-            commits.flatten.foreach { commit =>
-              if(!existsCommitId(owner, name, commit.id)){
-                insertCommitId(owner, name, commit.id)
-              }
-            }
-
            // close issue by content of pull request
-            val defaultBranch = getRepository(owner, name, baseUrl).get.repository.defaultBranch
+            val defaultBranch = getRepository(owner, name, context.baseUrl).get.repository.defaultBranch
            if(pullreq.branch == defaultBranch){
              commits.flatten.foreach { commit =>
                closeIssuesFromMessage(commit.fullMessage, loginAccount.userName, owner, name)
@@ -207,7 +201,7 @@ trait PullRequestsControllerBase extends ControllerBase {

            // notifications
            Notifier().toNotify(repository, issueId, "merge"){
-              Notifier.msgStatus(s"${baseUrl}/${owner}/${name}/pull/${issueId}")
+              Notifier.msgStatus(s"${context.baseUrl}/${owner}/${name}/pull/${issueId}")
            }

            redirect(s"/${owner}/${name}/pull/${issueId}")
@@ -220,7 +214,7 @@ trait PullRequestsControllerBase extends ControllerBase {
  get("/:owner/:repository/compare")(referrersOnly { forkedRepository =>
    (forkedRepository.repository.originUserName, forkedRepository.repository.originRepositoryName) match {
      case (Some(originUserName), Some(originRepositoryName)) => {
-        getRepository(originUserName, originRepositoryName, baseUrl).map { originRepository =>
+        getRepository(originUserName, originRepositoryName, context.baseUrl).map { originRepository =>
          using(
            Git.open(getRepositoryDir(originUserName, originRepositoryName)),
            Git.open(getRepositoryDir(forkedRepository.owner, forkedRepository.name))
@@ -257,7 +251,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
        }
      };
-      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+      originRepository <- getRepository(originOwner, originRepositoryName, context.baseUrl)
    ) yield {
      using(
        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
@@ -266,7 +260,7 @@ trait PullRequestsControllerBase extends ControllerBase {
        val originBranch = JGitUtil.getDefaultBranch(oldGit, originRepository, tmpOriginBranch).get._2
        val forkedBranch = JGitUtil.getDefaultBranch(newGit, forkedRepository, tmpForkedBranch).get._2

-        val forkedId = getForkedCommitId(oldGit, newGit,
+        val forkedId = JGitUtil.getForkedCommitId(oldGit, newGit,
          originRepository.owner, originRepository.name, originBranch,
          forkedRepository.owner, forkedRepository.name, forkedBranch)

@@ -309,7 +303,7 @@ trait PullRequestsControllerBase extends ControllerBase {
          getForkedRepositories(forkedRepository.owner, forkedRepository.name).find(_._1 == originOwner).map(_._2)
        }
      };
-      originRepository <- getRepository(originOwner, originRepositoryName, baseUrl)
+      originRepository <- getRepository(originOwner, originRepositoryName, context.baseUrl)
    ) yield {
      using(
        Git.open(getRepositoryDir(originRepository.owner, originRepository.name)),
@@ -362,7 +356,7 @@ trait PullRequestsControllerBase extends ControllerBase {

    // notifications
    Notifier().toNotify(repository, issueId, form.content.getOrElse("")){
-      Notifier.msgPullRequest(s"${baseUrl}/${repository.owner}/${repository.name}/pull/${issueId}")
+      Notifier.msgPullRequest(s"${context.baseUrl}/${repository.owner}/${repository.name}/pull/${issueId}")
    }

    redirect(s"/${repository.owner}/${repository.name}/pull/${issueId}")
@@ -438,24 +432,8 @@ trait PullRequestsControllerBase extends ControllerBase {
      (defaultOwner, value)
    }

-  /**
-   * Extracts all repository names from [[service.RepositoryService.RepositoryTreeNode]] as flat list.
-   */
-  private def getRepositoryNames(node: RepositoryTreeNode): List[String] =
-    node.owner :: node.children.map { child => getRepositoryNames(child) }.flatten
-
-  /**
-   * Returns the identifier of the root commit (or latest merge commit) of the specified branch.
-   */
-  private def getForkedCommitId(oldGit: Git, newGit: Git, userName: String, repositoryName: String, branch: String,
-      requestUserName: String, requestRepositoryName: String, requestBranch: String): String =
-    JGitUtil.getCommitLogs(newGit, requestBranch, true){ commit =>
-      existsCommitId(userName, repositoryName, commit.getName) && JGitUtil.getBranchesOfCommit(oldGit, commit.getName).contains(branch)
-    }.head.id
-
  private def getRequestCompareInfo(userName: String, repositoryName: String, branch: String,
-      requestUserName: String, requestRepositoryName: String, requestCommitId: String): (Seq[Seq[CommitInfo]], Seq[DiffInfo]) = {
-
+      requestUserName: String, requestRepositoryName: String, requestCommitId: String): (Seq[Seq[CommitInfo]], Seq[DiffInfo]) =
    using(
      Git.open(getRepositoryDir(userName, repositoryName)),
      Git.open(getRepositoryDir(requestUserName, requestRepositoryName))
@@ -473,7 +451,6 @@ trait PullRequestsControllerBase extends ControllerBase {

      (commits, diffs)
    }
-  }

  private def searchPullRequests(userName: Option[String], repository: RepositoryService.RepositoryInfo) =
    defining(repository.owner, repository.name){ case (owner, repoName) =>
--- a/src/main/scala/app/RepositorySettingsController.scala
+++ b/src/main/scala/app/RepositorySettingsController.scala
@@ -72,7 +72,7 @@ trait RepositorySettingsControllerBase extends ControllerBase {
      repository.owner,
      repository.name,
      form.description,
-      form.defaultBranch,
+      if(repository.branchList.isEmpty) "master" else form.defaultBranch,
      repository.repository.parentUserName.map { _ =>
        repository.repository.isPrivate
      } getOrElse form.isPrivate
--- a/src/main/scala/app/RepositoryViewerController.scala
+++ b/src/main/scala/app/RepositoryViewerController.scala
@@ -1,8 +1,9 @@
 package app

+import _root_.util.JGitUtil.CommitInfo
 import util.Directory._
 import util.Implicits._
-import util.ControlUtil._
+import _root_.util.ControlUtil._
 import _root_.util._
 import service._
 import org.scalatra._
@@ -12,17 +13,53 @@ import org.eclipse.jgit.lib._
 import org.apache.commons.io.FileUtils
 import org.eclipse.jgit.treewalk._
 import java.util.zip.{ZipEntry, ZipOutputStream}
-import scala.Some
+import jp.sf.amateras.scalatra.forms._
+import org.eclipse.jgit.dircache.DirCache
+import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}

-class RepositoryViewerController extends RepositoryViewerControllerBase 
+class RepositoryViewerController extends RepositoryViewerControllerBase
  with RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator

 /**
 * The repository viewer.
 */
-trait RepositoryViewerControllerBase extends ControllerBase { 
+trait RepositoryViewerControllerBase extends ControllerBase {
  self: RepositoryService with AccountService with ActivityService with ReferrerAuthenticator with CollaboratorsAuthenticator =>

+  case class EditorForm(
+    branch: String,
+    path: String,
+    content: String,
+    message: Option[String],
+    charset: String,
+    newFileName: String,
+    oldFileName: Option[String]
+  )
+
+  case class DeleteForm(
+    branch: String,
+    path: String,
+    message: Option[String],
+    fileName: String
+  )
+
+  val editorForm = mapping(
+    "branch"      -> trim(label("Branch", text(required))),
+    "path"        -> trim(label("Path", text())),
+    "content"     -> trim(label("Content", text(required))),
+    "message"     -> trim(label("Message", optional(text()))),
+    "charset"     -> trim(label("Charset", text(required))),
+    "newFileName" -> trim(label("Filename", text(required))),
+    "oldFileName" -> trim(label("Old filename", optional(text())))
+  )(EditorForm.apply)
+
+  val deleteForm = mapping(
+    "branch"   -> trim(label("Branch", text(required))),
+    "path"     -> trim(label("Path", text())),
+    "message"  -> trim(label("Message", optional(text()))),
+    "fileName" -> trim(label("Filename", text(required)))
+  )(DeleteForm.apply)
+
  /**
   * Returns converted HTML from Markdown for preview.
   */
@@ -71,6 +108,68 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    }
  })

+  get("/:owner/:repository/new/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
+    repo.html.editor(branch, repository, if(path.length == 0) Nil else path.split("/").toList,
+      None, JGitUtil.ContentInfo("text", None, Some("UTF-8")))
+  })
+
+  get("/:owner/:repository/edit/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
+
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+
+      getPathObjectId(git, path, revCommit).map { objectId =>
+        val paths = path.split("/")
+        repo.html.editor(branch, repository, paths.take(paths.size - 1).toList, Some(paths.last),
+          JGitUtil.getContentInfo(git, path, objectId))
+      } getOrElse NotFound
+    }
+  })
+
+  get("/:owner/:repository/remove/*")(collaboratorsOnly { repository =>
+    val (branch, path) = splitPath(repository, multiParams("splat").head)
+    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(branch))
+
+      getPathObjectId(git, path, revCommit).map { objectId =>
+        val paths = path.split("/")
+        repo.html.delete(branch, repository, paths.take(paths.size - 1).toList, paths.last,
+          JGitUtil.getContentInfo(git, path, objectId))
+      } getOrElse NotFound
+    }
+  })
+
+  post("/:owner/:repository/create", editorForm)(collaboratorsOnly { (form, repository) =>
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), None, form.content, form.charset,
+      form.message.getOrElse(s"Create ${form.newFileName}"))
+
+    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
+      if(form.path.length == 0) form.newFileName else s"${form.path}/${form.newFileName}"
+    }")
+  })
+
+  post("/:owner/:repository/update", editorForm)(collaboratorsOnly { (form, repository) =>
+    commitFile(repository, form.branch, form.path, Some(form.newFileName), form.oldFileName, form.content, form.charset,
+      if(form.oldFileName.exists(_ == form.newFileName)){
+        form.message.getOrElse(s"Update ${form.newFileName}")
+      } else {
+        form.message.getOrElse(s"Rename ${form.oldFileName.get} to ${form.newFileName}")
+      })
+
+    redirect(s"/${repository.owner}/${repository.name}/blob/${form.branch}/${
+      if(form.path.length == 0) form.newFileName else s"${form.path}/${form.newFileName}"
+    }")
+  })
+
+  post("/:owner/:repository/remove", deleteForm)(collaboratorsOnly { (form, repository) =>
+    commitFile(repository, form.branch, form.path, None, Some(form.fileName), "", "",
+      form.message.getOrElse(s"Delete ${form.fileName}"))
+
+    redirect(s"/${repository.owner}/${repository.name}/tree/${form.branch}${if(form.path.length == 0) "" else form.path}")
+  })
+
  /**
   * Displays the file content of the specified branch or commit.
   */
@@ -80,19 +179,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {

    using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
      val revCommit = JGitUtil.getRevCommitFromId(git, git.getRepository.resolve(id))
-
-      @scala.annotation.tailrec
-      def getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
-        case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
-        case true  => getPathObjectId(path, walk)
-        case false => None
-      }
-
-      using(new TreeWalk(git.getRepository)){ treeWalk =>
-        treeWalk.addTree(revCommit.getTree)
-        treeWalk.setRecursive(true)
-        getPathObjectId(path, treeWalk)
-      } map { objectId =>
+      getPathObjectId(git, path, revCommit).map { objectId =>
        if(raw){
          // Download
          defining(JGitUtil.getContentFromId(git, objectId, false).get){ bytes =>
@@ -100,25 +187,8 @@ trait RepositoryViewerControllerBase extends ControllerBase {
            bytes
          }
        } else {
-          // Viewer
-          val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
-          val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
-          val bytes  = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
-
-          val content = if(viewer == "other"){
-            if(bytes.isDefined && FileUtil.isText(bytes.get)){
-              // text
-              JGitUtil.ContentInfo("text", bytes.map(StringUtil.convertFromByteArray))
-            } else {
-              // binary
-              JGitUtil.ContentInfo("binary", None)
-            }
-          } else {
-            // image or large
-            JGitUtil.ContentInfo(viewer, None)
-          }
-
-          repo.html.blob(id, repository, path.split("/").toList, content, new JGitUtil.CommitInfo(revCommit))
+          repo.html.blob(id, repository, path.split("/").toList, JGitUtil.getContentInfo(git, path, objectId),
+            new JGitUtil.CommitInfo(revCommit), hasWritePermission(repository.owner, repository.name, context.loginAccount))
        }
      } getOrElse NotFound
    }
@@ -164,7 +234,7 @@ trait RepositoryViewerControllerBase extends ControllerBase {
    val userName   = context.loginAccount.get.userName
    if(repository.repository.defaultBranch != branchName){
      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
-        git.branchDelete().setBranchNames(branchName).call()
+        git.branchDelete().setForce(true).setBranchNames(branchName).call()
        recordDeleteBranchActivity(repository.owner, repository.name, userName, branchName)
      }
    }
@@ -234,13 +304,13 @@ trait RepositoryViewerControllerBase extends ControllerBase {
      getRepository(
        repository.repository.originUserName.getOrElse(repository.owner),
        repository.repository.originRepositoryName.getOrElse(repository.name),
-        baseUrl),
+        context.baseUrl),
      getForkedRepositories(
        repository.repository.originUserName.getOrElse(repository.owner),
        repository.repository.originRepositoryName.getOrElse(repository.name)),
      repository)
  })
-  
+
  private def splitPath(repository: service.RepositoryService.RepositoryInfo, path: String): (String, String) = {
    val id = repository.branchList.collectFirst {
      case branch if(path == branch || path.startsWith(branch + "/")) => branch
@@ -252,11 +322,11 @@ trait RepositoryViewerControllerBase extends ControllerBase {
  }


-  private val readmeFiles = Seq("readme.md", "readme.markdown")
+  private val readmeFiles = view.helpers.renderableSuffixes.map(suffix => s"readme${suffix}") ++ Seq("readme.txt", "readme")

  /**
   * Provides HTML of the file list.
-   * 
+   *
   * @param repository the repository information
   * @param revstr the branch name or commit id(optional)
   * @param path the directory path (optional)
@@ -264,31 +334,99 @@ trait RepositoryViewerControllerBase extends ControllerBase {
   */
  private def fileList(repository: RepositoryService.RepositoryInfo, revstr: String = "", path: String = ".") = {
    if(repository.commitCount == 0){
-      repo.html.guide(repository)
+      repo.html.guide(repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } else {
      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
        //val revisions = Seq(if(revstr.isEmpty) repository.repository.defaultBranch else revstr, repository.branchList.head)
        // get specified commit
        JGitUtil.getDefaultBranch(git, repository, revstr).map { case (objectId, revision) =>
-          defining(JGitUtil.getRevCommitFromId(git, objectId)){ revCommit =>
-          // get files
+          defining(JGitUtil.getRevCommitFromId(git, objectId)) { revCommit =>
+            // get files
            val files = JGitUtil.getFileList(git, revision, path)
+            val parentPath = if (path == ".") Nil else path.split("/").toList
            // process README.md or README.markdown
            val readme = files.find { file =>
              readmeFiles.contains(file.name.toLowerCase)
            }.map { file =>
-              file -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(
+              val path = (file.name :: parentPath.reverse).reverse
+              path -> StringUtil.convertFromByteArray(JGitUtil.getContentFromId(
                Git.open(getRepositoryDir(repository.owner, repository.name)), file.id, true).get)
            }

            repo.html.files(revision, repository,
              if(path == ".") Nil else path.split("/").toList, // current path
              new JGitUtil.CommitInfo(revCommit), // latest commit
-              files, readme)
+              files, readme, hasWritePermission(repository.owner, repository.name, context.loginAccount))
          }
        } getOrElse NotFound
      }
    }
  }
-  
+
+  private def commitFile(repository: service.RepositoryService.RepositoryInfo,
+                         branch: String, path: String, newFileName: Option[String], oldFileName: Option[String],
+                         content: String, charset: String, message: String) = {
+
+    val newPath = newFileName.map { newFileName => if(path.length == 0) newFileName else s"${path}/${newFileName}" }
+    val oldPath = oldFileName.map { oldFileName => if(path.length == 0) oldFileName else s"${path}/${oldFileName}" }
+
+    LockUtil.lock(s"${repository.owner}/${repository.name}"){
+      using(Git.open(getRepositoryDir(repository.owner, repository.name))){ git =>
+        val loginAccount = context.loginAccount.get
+        val builder  = DirCache.newInCore.builder()
+        val inserter = git.getRepository.newObjectInserter()
+        val headName = s"refs/heads/${branch}"
+        val headTip  = git.getRepository.resolve(s"refs/heads/${branch}")
+
+        JGitUtil.processTree(git, headTip){ (path, tree) =>
+          if(!newPath.exists(_ == path) && !oldPath.exists(_ == path)){
+            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+          }
+        }
+
+        newPath.foreach { newPath =>
+          builder.add(JGitUtil.createDirCacheEntry(newPath, FileMode.REGULAR_FILE,
+            inserter.insert(Constants.OBJ_BLOB, content.getBytes(charset))))
+        }
+        builder.finish()
+
+        val commitId = JGitUtil.createNewCommit(git, inserter, headTip, builder.getDirCache.writeTree(inserter),
+          loginAccount.fullName, loginAccount.mailAddress, message)
+
+        inserter.flush()
+        inserter.release()
+
+        // update refs
+        val refUpdate = git.getRepository.updateRef(headName)
+        refUpdate.setNewObjectId(commitId)
+        refUpdate.setForceUpdate(false)
+        refUpdate.setRefLogIdent(new PersonIdent(loginAccount.fullName, loginAccount.mailAddress))
+        //refUpdate.setRefLogMessage("merged", true)
+        refUpdate.update()
+
+        // record activity
+        recordPushActivity(repository.owner, repository.name, loginAccount.userName, branch,
+          List(new CommitInfo(JGitUtil.getRevCommitFromId(git, commitId))))
+
+        // TODO invoke hook
+
+      }
+    }
+  }
+
+  private def getPathObjectId(git: Git, path: String, revCommit: RevCommit): Option[ObjectId] = {
+    @scala.annotation.tailrec
+    def _getPathObjectId(path: String, walk: TreeWalk): Option[ObjectId] = walk.next match {
+      case true if(walk.getPathString == path) => Some(walk.getObjectId(0))
+      case true  => _getPathObjectId(path, walk)
+      case false => None
+    }
+
+    using(new TreeWalk(git.getRepository)){ treeWalk =>
+      treeWalk.addTree(revCommit.getTree)
+      treeWalk.setRecursive(true)
+      _getPathObjectId(path, treeWalk)
+    }
+  }
+
 }
--- a/src/main/scala/app/SystemSettingsController.scala
+++ b/src/main/scala/app/SystemSettingsController.scala
@@ -55,6 +55,10 @@ trait SystemSettingsControllerBase extends ControllerBase {
  post("/admin/system", form)(adminOnly { form =>
    saveSystemSettings(form)

+    if(form.ssh && SshServer.isActive && context.settings.sshPort != form.sshPort){
+      SshServer.stop()
+    }
+
    if(form.ssh && !SshServer.isActive && form.baseUrl.isDefined){
      SshServer.start(request.getServletContext,
        form.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
--- a/src/main/scala/app/WikiController.scala
+++ b/src/main/scala/app/WikiController.scala
@@ -36,7 +36,8 @@ trait WikiControllerBase extends ControllerBase {
  
  get("/:owner/:repository/wiki")(referrersOnly { repository =>
    getWikiPage(repository.owner, repository.name, "Home").map { page =>
-      wiki.html.page("Home", page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
+      wiki.html.page("Home", page, getWikiPageList(repository.owner, repository.name),
+        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/Home/_edit")
  })
  
@@ -44,7 +45,8 @@ trait WikiControllerBase extends ControllerBase {
    val pageName = StringUtil.urlDecode(params("page"))

    getWikiPage(repository.owner, repository.name, pageName).map { page =>
-      wiki.html.page(pageName, page, repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
+      wiki.html.page(pageName, page, getWikiPageList(repository.owner, repository.name),
+        repository, hasWritePermission(repository.owner, repository.name, context.loginAccount))
    } getOrElse redirect(s"/${repository.owner}/${repository.name}/wiki/${StringUtil.urlEncode(pageName)}/_edit")
  })
  
--- a/src/main/scala/model/Activity.scala
+++ b/src/main/scala/model/Activity.scala
@@ -13,12 +13,6 @@ object Activities extends Table[Activity]("ACTIVITY") with BasicTemplate {
  def autoInc = userName ~ repositoryName ~ activityUserName ~ activityType ~ message ~ additionalInfo.? ~ activityDate returning activityId
 }

-object CommitLog extends Table[(String, String, String)]("COMMIT_LOG") with BasicTemplate {
-  def commitId = column[String]("COMMIT_ID")
-  def * = userName ~ repositoryName ~ commitId
-  def byPrimaryKey(userName: String, repositoryName: String, commitId: String) = byRepository(userName, repositoryName) && (this.commitId is commitId.bind)
-}
-
 case class Activity(
  activityId: Int,
  userName: String,
--- a/src/main/scala/service/AccountService.scala
+++ b/src/main/scala/service/AccountService.scala
@@ -34,19 +34,34 @@ trait AccountService {
  /**
   * Authenticate by LDAP.
   */
-  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String) = {
+  private def ldapAuthentication(settings: SystemSettings, userName: String, password: String): Option[Account] = {
    LDAPUtil.authenticate(settings.ldap.get, userName, password) match {
      case Right(ldapUserInfo) => {
        // Create or update account by LDAP information
-        getAccountByUserName(userName, true) match {
-          case Some(x) if(!x.isRemoved) => updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+        getAccountByUserName(ldapUserInfo.userName, true) match {
+          case Some(x) if(!x.isRemoved) => {
+            updateAccount(x.copy(mailAddress = ldapUserInfo.mailAddress, fullName = ldapUserInfo.fullName))
+            getAccountByUserName(ldapUserInfo.userName)
+          }
          case Some(x) if(x.isRemoved)  => {
            logger.info(s"LDAP Authentication Failed: Account is already registered but disabled..")
            defaultAuthentication(userName, password)
          }
-          case None => createAccount(userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None)
+          case None => getAccountByMailAddress(ldapUserInfo.mailAddress, true) match {
+            case Some(x) if(!x.isRemoved) => {
+              updateAccount(x.copy(fullName = ldapUserInfo.fullName))
+              getAccountByUserName(ldapUserInfo.userName)
+            }
+            case Some(x) if(x.isRemoved)  => {
+              logger.info(s"LDAP Authentication Failed: Account is already registered but disabled..")
+              defaultAuthentication(userName, password)
+            }
+            case None => {
+              createAccount(ldapUserInfo.userName, "", ldapUserInfo.fullName, ldapUserInfo.mailAddress, false, None)
+              getAccountByUserName(ldapUserInfo.userName)
+            }
+          }
        }
-        getAccountByUserName(userName)
      }
      case Left(errorMessage) => {
        logger.info(s"LDAP Authentication Failed: ${errorMessage}")
@@ -83,14 +98,14 @@ trait AccountService {
      isGroupAccount = false,
      isRemoved      = false)

-  def updateAccount(account: Account): Unit = 
+  def updateAccount(account: Account): Unit =
    Accounts
      .filter { a => a.userName is account.userName.bind }
      .map    { a => a.password ~ a.fullName ~ a.mailAddress ~ a.isAdmin ~ a.url.? ~ a.registeredDate ~ a.updatedDate ~ a.lastLoginDate.? ~ a.removed }
      .update (
-        account.password, 
-        account.fullName, 
-        account.mailAddress, 
+        account.password,
+        account.fullName,
+        account.mailAddress,
        account.isAdmin,
        account.url,
        account.registeredDate,
--- a/src/main/scala/service/ActivityService.scala
+++ b/src/main/scala/service/ActivityService.scala
@@ -153,19 +153,6 @@ trait ActivityService {
      Some(message),
      currentDate)

-  def insertCommitId(userName: String, repositoryName: String, commitId: String) = {
-    CommitLog insert (userName, repositoryName, commitId)
-  }
-
-  def insertAllCommitIds(userName: String, repositoryName: String, commitIds: List[String]) =
-    CommitLog insertAll (commitIds.map(commitId => (userName, repositoryName, commitId)): _*)
-
-  def getAllCommitIds(userName: String, repositoryName: String): List[String] =
-    Query(CommitLog).filter(_.byRepository(userName, repositoryName)).map(_.commitId).list
-
-  def existsCommitId(userName: String, repositoryName: String, commitId: String): Boolean =
-    Query(CommitLog).filter(_.byPrimaryKey(userName, repositoryName, commitId)).firstOption.isDefined
-  
-  private def cut(value: String, length: Int): String = 
+  private def cut(value: String, length: Int): String =
    if(value.length > length) value.substring(0, length) + "..." else value
 }
--- a/src/main/scala/service/PullRequestService.scala
+++ b/src/main/scala/service/PullRequestService.scala
@@ -3,7 +3,6 @@ package service
 import scala.slick.driver.H2Driver.simple._
 import Database.threadLocalSession
 import model._
-import util.ControlUtil._

 trait PullRequestService { self: IssuesService =>
  import PullRequestService._
@@ -15,8 +14,10 @@ trait PullRequestService { self: IssuesService =>
      }
    }

-  def updateCommitIdTo(owner: String, repository: String, issueId: Int, commitIdTo: String): Unit =
-    Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId)).map(_.commitIdTo).update(commitIdTo)
+  def updateCommitId(owner: String, repository: String, issueId: Int, commitIdTo: String, commitIdFrom: String): Unit =
+    Query(PullRequests).filter(_.byPrimaryKey(owner, repository, issueId))
+                       .map(pr => pr.commitIdTo ~ pr.commitIdFrom)
+                       .update((commitIdTo, commitIdFrom))

  def getPullRequestCountGroupByUser(closed: Boolean, owner: String, repository: Option[String]): List[PullRequestCount] =
    Query(PullRequests)
--- a/src/main/scala/service/RepositoryService.scala
+++ b/src/main/scala/service/RepositoryService.scala
@@ -40,69 +40,72 @@ trait RepositoryService { self: AccountService =>
  }

  def renameRepository(oldUserName: String, oldRepositoryName: String, newUserName: String, newRepositoryName: String): Unit = {
-    (Query(Repositories) filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
-      Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)
+    getAccountByUserName(newUserName).foreach { account =>
+      (Query(Repositories) filter { t => t.byRepository(oldUserName, oldRepositoryName) } firstOption).map { repository =>
+        Repositories insert repository.copy(userName = newUserName, repositoryName = newRepositoryName)

-      val webHooks      = Query(WebHooks     ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val milestones    = Query(Milestones   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val issueId       = Query(IssueId      ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val issues        = Query(Issues       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val pullRequests  = Query(PullRequests ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val labels        = Query(Labels       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val issueComments = Query(IssueComments).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val issueLabels   = Query(IssueLabels  ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val collaborators = Query(Collaborators).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val commitLog     = Query(CommitLog    ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
-      val activities    = Query(Activities   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val webHooks      = Query(WebHooks     ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val milestones    = Query(Milestones   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueId       = Query(IssueId      ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issues        = Query(Issues       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val pullRequests  = Query(PullRequests ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val labels        = Query(Labels       ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueComments = Query(IssueComments).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val issueLabels   = Query(IssueLabels  ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val activities    = Query(Activities   ).filter(_.byRepository(oldUserName, oldRepositoryName)).list
+        val collaborators = Query(Collaborators).filter(_.byRepository(oldUserName, oldRepositoryName)).list

-      Repositories.filter { t =>
-        (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind)
-      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+        Repositories.filter { t =>
+          (t.originUserName is oldUserName.bind) && (t.originRepositoryName is oldRepositoryName.bind)
+        }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)

-      Repositories.filter { t =>
-        (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind)
-      }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)
+        Repositories.filter { t =>
+          (t.parentUserName is oldUserName.bind) && (t.parentRepositoryName is oldRepositoryName.bind)
+        }.map { t => t.originUserName ~ t.originRepositoryName }.update(newUserName, newRepositoryName)

-      PullRequests.filter { t =>
-        t.requestRepositoryName is oldRepositoryName.bind
-      }.map { t => t.requestUserName ~ t.requestRepositoryName }.update(newUserName, newRepositoryName)
+        PullRequests.filter { t =>
+          t.requestRepositoryName is oldRepositoryName.bind
+        }.map { t => t.requestUserName ~ t.requestRepositoryName }.update(newUserName, newRepositoryName)

-      deleteRepository(oldUserName, oldRepositoryName)
+        deleteRepository(oldUserName, oldRepositoryName)

-      WebHooks      .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      Milestones    .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      IssueId       .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
-      Issues        .insertAll(issues        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      PullRequests  .insertAll(pullRequests  .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      Labels        .insertAll(labels        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      IssueLabels   .insertAll(issueLabels   .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      Collaborators .insertAll(collaborators .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
-      CommitLog     .insertAll(commitLog     .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
-      Activities    .insertAll(activities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        WebHooks      .insertAll(webHooks      .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        Milestones    .insertAll(milestones    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        IssueId       .insertAll(issueId       .map(_.copy(_1       = newUserName, _2             = newRepositoryName)) :_*)
+        Issues        .insertAll(issues        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        PullRequests  .insertAll(pullRequests  .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        IssueComments .insertAll(issueComments .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        Labels        .insertAll(labels        .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        IssueLabels   .insertAll(issueLabels   .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        Activities    .insertAll(activities    .map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        if(account.isGroupAccount){
+          Collaborators.insertAll(getGroupMembers(newUserName).map(m => Collaborator(newUserName, newRepositoryName, m.userName)) :_*)
+        } else {
+          Collaborators.insertAll(collaborators.map(_.copy(userName = newUserName, repositoryName = newRepositoryName)) :_*)
+        }

-      // Update activity messages
-      val updateActivities = Activities.filter { t =>
-        (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
-        (t.message like s"%:${oldUserName}/${oldRepositoryName}#%")
-      }.map { t => t.activityId ~ t.message }.list
+        // Update activity messages
+        val updateActivities = Activities.filter { t =>
+          (t.message like s"%:${oldUserName}/${oldRepositoryName}]%") ||
+          (t.message like s"%:${oldUserName}/${oldRepositoryName}#%")
+        }.map { t => t.activityId ~ t.message }.list

-      updateActivities.foreach { case (activityId, message) =>
-        Activities.filter(_.activityId is activityId.bind).map(_.message).update(
-          message
-            .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
-            .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
-            .replace(s"[tag:${oldUserName}/${oldRepositoryName}#"    ,s"[tag:${newUserName}/${newRepositoryName}#")
-            .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#")
-            .replace(s"[issue:${oldUserName}/${oldRepositoryName}#"  ,s"[issue:${newUserName}/${newRepositoryName}#")
-        )
+        updateActivities.foreach { case (activityId, message) =>
+          Activities.filter(_.activityId is activityId.bind).map(_.message).update(
+            message
+              .replace(s"[repo:${oldUserName}/${oldRepositoryName}]"   ,s"[repo:${newUserName}/${newRepositoryName}]")
+              .replace(s"[branch:${oldUserName}/${oldRepositoryName}#" ,s"[branch:${newUserName}/${newRepositoryName}#")
+              .replace(s"[tag:${oldUserName}/${oldRepositoryName}#"    ,s"[tag:${newUserName}/${newRepositoryName}#")
+              .replace(s"[pullreq:${oldUserName}/${oldRepositoryName}#",s"[pullreq:${newUserName}/${newRepositoryName}#")
+              .replace(s"[issue:${oldUserName}/${oldRepositoryName}#"  ,s"[issue:${newUserName}/${newRepositoryName}#")
+          )
+        }
      }
    }
  }

  def deleteRepository(userName: String, repositoryName: String): Unit = {
    Activities    .filter(_.byRepository(userName, repositoryName)).delete
-    CommitLog     .filter(_.byRepository(userName, repositoryName)).delete
    Collaborators .filter(_.byRepository(userName, repositoryName)).delete
    IssueLabels   .filter(_.byRepository(userName, repositoryName)).delete
    Labels        .filter(_.byRepository(userName, repositoryName)).delete
--- a/src/main/scala/service/SystemSettingsService.scala
+++ b/src/main/scala/service/SystemSettingsService.scala
@@ -7,11 +7,7 @@ import javax.servlet.http.HttpServletRequest

 trait SystemSettingsService {

-  def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl.getOrElse {
-    defining(request.getRequestURL.toString){ url =>
-      url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
-    }
-  }.replaceFirst("/$", "")
+  def baseUrl(implicit request: HttpServletRequest): String = loadSystemSettings().baseUrl(request)

  def saveSystemSettings(settings: SystemSettings): Unit = {
    defining(new java.util.Properties()){ props =>
@@ -110,7 +106,13 @@ object SystemSettingsService {
    sshPort: Option[Int],
    smtp: Option[Smtp],
    ldapAuthentication: Boolean,
-    ldap: Option[Ldap])
+    ldap: Option[Ldap]){
+    def baseUrl(request: HttpServletRequest): String = baseUrl.getOrElse {
+      defining(request.getRequestURL.toString){ url =>
+        url.substring(0, url.length - (request.getRequestURI.length - request.getContextPath.length))
+      }
+    }.replaceFirst("/$", "")
+  }

  case class Ldap(
    host: String,
--- a/src/main/scala/service/WikiService.scala
+++ b/src/main/scala/service/WikiService.scala
@@ -175,17 +175,9 @@ trait WikiService {
            val inserter = git.getRepository.newObjectInserter()
            val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")

-            using(new RevWalk(git.getRepository)){ revWalk =>
-              using(new TreeWalk(git.getRepository)){ treeWalk =>
-                val index = treeWalk.addTree(revWalk.parseTree(headId))
-                treeWalk.setRecursive(true)
-                while(treeWalk.next){
-                  val path = treeWalk.getPathString
-                  val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-                  if(revertInfo.find(x => x.filePath == path).isEmpty){
-                    builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-                  }
-                }
+            JGitUtil.processTree(git, headId){ (path, tree) =>
+              if(revertInfo.find(x => x.filePath == path).isEmpty){
+                builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
              }
            }

@@ -226,22 +218,14 @@ trait WikiService {
        var removed  = false

        if(headId != null){
-          using(new RevWalk(git.getRepository)){ revWalk =>
-            using(new TreeWalk(git.getRepository)){ treeWalk =>
-              val index = treeWalk.addTree(revWalk.parseTree(headId))
-              treeWalk.setRecursive(true)
-              while(treeWalk.next){
-                val path = treeWalk.getPathString
-                val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-                if(path == currentPageName + ".md" && currentPageName != newPageName){
-                  removed = true
-                } else if(path != newPageName + ".md"){
-                  builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-                } else {
-                  created = false
-                  updated = JGitUtil.getContentFromId(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
-                }
-              }
+          JGitUtil.processTree(git, headId){ (path, tree) =>
+            if(path == currentPageName + ".md" && currentPageName != newPageName){
+              removed = true
+            } else if(path != newPageName + ".md"){
+              builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+            } else {
+              created = false
+              updated = JGitUtil.getContentFromId(git, tree.getEntryObjectId, true).map(new String(_, "UTF-8") != content).getOrElse(false)
            }
          }
        }
@@ -262,7 +246,7 @@ trait WikiService {
              message
            })

-          Some(newHeadId)
+          Some(newHeadId.getName)
        } else None
      }
    }
@@ -280,26 +264,17 @@ trait WikiService {
        val headId   = git.getRepository.resolve(Constants.HEAD + "^{commit}")
        var removed  = false

-        using(new RevWalk(git.getRepository)){ revWalk =>
-          using(new TreeWalk(git.getRepository)){ treeWalk =>
-            val index = treeWalk.addTree(revWalk.parseTree(headId))
-            treeWalk.setRecursive(true)
-            while(treeWalk.next){
-              val path = treeWalk.getPathString
-              val tree = treeWalk.getTree(index, classOf[CanonicalTreeParser])
-              if(path != pageName + ".md"){
-                builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
-              } else {
-                removed = true
-              }
-            }
-          }
-
-          if(removed){
-            builder.finish()
-            JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer, mailAddress, message)
+        JGitUtil.processTree(git, headId){ (path, tree) =>
+          if(path != pageName + ".md"){
+            builder.add(JGitUtil.createDirCacheEntry(path, tree.getEntryFileMode, tree.getEntryObjectId))
+          } else {
+            removed = true
          }
        }
+        if(removed){
+          builder.finish()
+          JGitUtil.createNewCommit(git, inserter, headId, builder.getDirCache.writeTree(inserter), committer, mailAddress, message)
+        }
      }
    }
  }
--- a/src/main/scala/servlet/AutoUpdateListener.scala
+++ b/src/main/scala/servlet/AutoUpdateListener.scala
@@ -9,6 +9,7 @@ import org.slf4j.LoggerFactory
 import util.Directory._
 import util.ControlUtil._
 import org.eclipse.jgit.api.Git
+import util.Directory

 object AutoUpdate {
  
@@ -50,6 +51,33 @@ object AutoUpdate {
   * The history of versions. A head of this sequence is the current BitBucket version.
   */
  val versions = Seq(
+    new Version(2, 0){
+      override def update(conn: Connection): Unit = {
+        import eu.medsea.mimeutil.{MimeUtil2, MimeType}
+
+        val mimeUtil = new MimeUtil2()
+        mimeUtil.registerMimeDetector("eu.medsea.mimeutil.detector.MagicMimeMimeDetector")
+
+        super.update(conn)
+        using(conn.createStatement.executeQuery("SELECT USER_NAME, REPOSITORY_NAME FROM REPOSITORY")){ rs =>
+          while(rs.next){
+            defining(Directory.getAttachedDir(rs.getString("USER_NAME"), rs.getString("REPOSITORY_NAME"))){ dir =>
+              if(dir.exists && dir.isDirectory){
+                dir.listFiles.foreach { file =>
+                  if(file.getName.indexOf('.') < 0){
+                    val mimeType = MimeUtil2.getMostSpecificMimeType(mimeUtil.getMimeTypes(file, new MimeType("application/octet-stream"))).toString
+                    if(mimeType.startsWith("image/")){
+                      file.renameTo(new File(file.getParent, file.getName + "." + mimeType.split("/")(1)))
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    Version(1, 13),
    Version(1, 12),
    Version(1, 11),
    Version(1, 10),
--- a/src/main/scala/servlet/BasicAuthenticationFilter.scala
+++ b/src/main/scala/servlet/BasicAuthenticationFilter.scala
@@ -3,6 +3,7 @@ package servlet
 import javax.servlet._
 import javax.servlet.http._
 import service.{SystemSettingsService, AccountService, RepositoryService}
+import model.Account
 import org.slf4j.LoggerFactory
 import util.Implicits._
 import util.ControlUtil._
@@ -38,9 +39,12 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
              request.getHeader("Authorization") match {
                case null => requireAuth(response)
                case auth => decodeAuthHeader(auth).split(":") match {
-                  case Array(username, password) if(isWritableUser(username, password, repository)) => {
-                    request.setAttribute(Keys.Request.UserName, username)
-                    chain.doFilter(req, wrappedResponse)
+                  case Array(username, password) => getWritableUser(username, password, repository) match {
+                    case Some(account) => {
+                      request.setAttribute(Keys.Request.UserName, account.userName)
+                      chain.doFilter(req, wrappedResponse)
+                    }
+                    case None => requireAuth(response)
                  }
                  case _ => requireAuth(response)
                }
@@ -61,10 +65,10 @@ class BasicAuthenticationFilter extends Filter with RepositoryService with Accou
    }
  }

-  private def isWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo): Boolean =
+  private def getWritableUser(username: String, password: String, repository: RepositoryService.RepositoryInfo): Option[Account] =
    authenticate(loadSystemSettings(), username, password) match {
-      case Some(account) => hasWritePermission(repository.owner, repository.name, Some(account))
-      case None => false
+      case x @ Some(account) if(hasWritePermission(repository.owner, repository.name, x)) => x
+      case _ => None
    }

  private def requireAuth(response: HttpServletResponse): Unit = {
--- a/src/main/scala/servlet/GitRepositoryServlet.scala
+++ b/src/main/scala/servlet/GitRepositoryServlet.scala
@@ -16,6 +16,7 @@ import service._
 import WebHookService._
 import org.eclipse.jgit.api.Git
 import util.JGitUtil.CommitInfo
+import service.IssuesService.IssueSearchCondition

 /**
 * Provides Git repository via HTTP.
@@ -80,7 +81,9 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]
      logger.debug("repository:" + owner + "/" + repository)

      if(!repository.endsWith(".wiki")){
-        receivePack.setPostReceiveHook(new CommitLogHook(owner, repository, pusher, baseUrl(request)))
+        val hook = new CommitLogHook(owner, repository, pusher, baseUrl(request))
+        receivePack.setPreReceiveHook(hook)
+        receivePack.setPostReceiveHook(hook)
      }
      receivePack
    }
@@ -89,11 +92,25 @@ class GitBucketReceivePackFactory extends ReceivePackFactory[HttpServletRequest]

 import scala.collection.JavaConverters._

-class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String) extends PostReceiveHook
+class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl: String) extends PostReceiveHook with PreReceiveHook
  with RepositoryService with AccountService with IssuesService with ActivityService with PullRequestService with WebHookService {
  
  private val logger = LoggerFactory.getLogger(classOf[CommitLogHook])
-  
+  private var existIds: Seq[String] = Nil
+
+  def onPreReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
+    try {
+      using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
+        existIds = JGitUtil.getAllCommitIds(git)
+      }
+    } catch {
+      case ex: Exception => {
+        logger.error(ex.toString, ex)
+        throw ex
+      }
+    }
+  }
+
  def onPostReceive(receivePack: ReceivePack, commands: java.util.Collection[ReceiveCommand]): Unit = {
    try {
      using(Git.open(Directory.getRepositoryDir(owner, repository))) { git =>
@@ -110,26 +127,20 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
            }
          }

-          // Extract new commit and apply issue comment
-          val newCommits = if(commits.size > 1000){
-            val existIds = getAllCommitIds(owner, repository)
-            commits.flatMap { commit =>
-              if(!existIds.contains(commit.id)){
-                createIssueComment(commit)
-                Some(commit)
-              } else None
-            }
-          } else {
-            commits.flatMap { commit =>
-              if(!existsCommitId(owner, repository, commit.id)){
-                createIssueComment(commit)
-                Some(commit)
-              } else None
-            }
-          }
+          // Retrieve all issue count in the repository
+          val issueCount =
+            countIssue(IssueSearchCondition(state = "open"), Map.empty, false, owner -> repository) +
+            countIssue(IssueSearchCondition(state = "closed"), Map.empty, false, owner -> repository)

-          // batch insert all new commit id
-          insertAllCommitIds(owner, repository, newCommits.map(_.id))
+          // Extract new commit and apply issue comment
+          val newCommits = commits.flatMap { commit =>
+            if (!existIds.contains(commit.id)) {
+              if (issueCount > 0) {
+                createIssueComment(commit)
+              }
+              Some(commit)
+            } else None
+          }

          // record activity
          if(refName(1) == "heads"){
@@ -158,10 +169,13 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
          }

          // close issues
-          val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch
-          if(refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE){
-            git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach { commit =>
-              closeIssuesFromMessage(commit.getFullMessage, pusher, owner, repository)
+          if(issueCount > 0) {
+            val defaultBranch = getRepository(owner, repository, baseUrl).get.repository.defaultBranch
+            if (refName(1) == "heads" && branchName == defaultBranch && command.getType == ReceiveCommand.Type.UPDATE) {
+              git.log.addRange(command.getOldId, command.getNewId).call.asScala.foreach {
+                commit =>
+                  closeIssuesFromMessage(commit.getFullMessage, pusher, owner, repository)
+              }
            }
          }

@@ -204,14 +218,18 @@ class CommitLogHook(owner: String, repository: String, pusher: String, baseUrl:
  private def updatePullRequests(branch: String) =
    getPullRequestsByRequest(owner, repository, branch, false).foreach { pullreq =>
      if(getRepository(pullreq.userName, pullreq.repositoryName, baseUrl).isDefined){
-        using(Git.open(Directory.getRepositoryDir(pullreq.userName, pullreq.repositoryName))){ git =>
-          git.fetch
+        using(Git.open(Directory.getRepositoryDir(pullreq.userName, pullreq.repositoryName)),
+              Git.open(Directory.getRepositoryDir(pullreq.requestUserName, pullreq.requestRepositoryName))){ (oldGit, newGit) =>
+          oldGit.fetch
            .setRemote(Directory.getRepositoryDir(owner, repository).toURI.toString)
            .setRefSpecs(new RefSpec(s"refs/heads/${branch}:refs/pull/${pullreq.issueId}/head").setForceUpdate(true))
            .call

-          val commitIdTo = git.getRepository.resolve(s"refs/pull/${pullreq.issueId}/head").getName
-          updateCommitIdTo(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo)
+          val commitIdTo = oldGit.getRepository.resolve(s"refs/pull/${pullreq.issueId}/head").getName
+          val commitIdFrom = JGitUtil.getForkedCommitId(oldGit, newGit,
+            pullreq.userName, pullreq.repositoryName, pullreq.branch,
+            pullreq.requestUserName, pullreq.requestRepositoryName, pullreq.requestBranch)
+          updateCommitId(pullreq.userName, pullreq.repositoryName, pullreq.issueId, commitIdTo, commitIdFrom)
        }
      }
    }
--- a/src/main/scala/servlet/SessionCleanupListener.scala
+++ b/src/main/scala/servlet/SessionCleanupListener.scala
@@ -1,15 +1,16 @@
 package servlet

 import javax.servlet.http.{HttpSessionEvent, HttpSessionListener}
-import app.FileUploadControllerBase
+import org.apache.commons.io.FileUtils
+import util.Directory._

 /**
 * Removes session associated temporary files when session is destroyed.
 */
-class SessionCleanupListener extends HttpSessionListener with FileUploadControllerBase {
+class SessionCleanupListener extends HttpSessionListener {

  def sessionCreated(se: HttpSessionEvent): Unit = {}

-  def sessionDestroyed(se: HttpSessionEvent): Unit = removeTemporaryFiles()(se.getSession)
+  def sessionDestroyed(se: HttpSessionEvent): Unit = FileUtils.deleteDirectory(getTemporaryDir(se.getSession.getId))

 }
--- a/src/main/scala/ssh/GitCommand.scala
+++ b/src/main/scala/ssh/GitCommand.scala
@@ -106,7 +106,9 @@ class GitReceivePack(context: ServletContext, owner: String, repoName: String, b
          val repository = git.getRepository
          val receive = new ReceivePack(repository)
          if(!repoName.endsWith(".wiki")){
-            receive.setPostReceiveHook(new CommitLogHook(owner, repoName, user, baseUrl))
+            val hook = new CommitLogHook(owner, repoName, user, baseUrl)
+            receive.setPreReceiveHook(hook)
+            receive.setPostReceiveHook(hook)
          }
          receive.receive(in, out, err)
        }
--- a/src/main/scala/ssh/SshServerListener.scala
+++ b/src/main/scala/ssh/SshServerListener.scala
@@ -31,6 +31,7 @@ object SshServer {
  def stop() = {
    if(active.compareAndSet(true, false)){
      server.stop(true)
+      logger.info("SSH Server is stopped.")
    }
  }

@@ -45,16 +46,17 @@ object SshServer {
 */
 class SshServerListener extends ServletContextListener with SystemSettingsService {

+  private val logger = LoggerFactory.getLogger(classOf[SshServerListener])
+
  override def contextInitialized(sce: ServletContextEvent): Unit = {
    val settings = loadSystemSettings()
    if(settings.ssh){
-      if(settings.baseUrl.isEmpty){
-        // TODO use logger?
-        println("Could not start SshServer because the baseUrl is not configured.")
-      } else {
-        SshServer.start(sce.getServletContext,
-          settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort),
-          settings.baseUrl.get)
+      settings.baseUrl match {
+        case None =>
+          logger.error("Could not start SshServer because the baseUrl is not configured.")
+        case Some(baseUrl) =>
+          SshServer.start(sce.getServletContext,
+            settings.sshPort.getOrElse(SystemSettingsService.DefaultSshPort), baseUrl)
      }
    }
  }
--- a/src/main/scala/ssh/SshUtil.scala
+++ b/src/main/scala/ssh/SshUtil.scala
@@ -28,6 +28,9 @@ object SshUtil {
    }
  }

-  def fingerPrint(key: String): String = KeyUtils.getFingerPrint(str2PublicKey(key).get)
+  def fingerPrint(key: String): Option[String] = str2PublicKey(key) match {
+    case Some(publicKey) => Some(KeyUtils.getFingerPrint(publicKey))
+    case None => None
+  }

 }
--- a/src/main/scala/util/ControlUtil.scala
+++ b/src/main/scala/util/ControlUtil.scala
@@ -37,15 +37,4 @@ object ControlUtil {
  def using[T](treeWalk: TreeWalk)(f: TreeWalk => T): T =
    try f(treeWalk) finally treeWalk.release()

-
-//  def withTmpRefSpec[T](ref: RefSpec, git: Git)(f: RefSpec => T): T = {
-//    try {
-//      f(ref)
-//    } finally {
-//      val refUpdate = git.getRepository.updateRef(ref.getDestination)
-//      refUpdate.setForceUpdate(true)
-//      refUpdate.delete()
-//    }
-//  }
-
 }
--- a/src/main/scala/util/Directory.scala
+++ b/src/main/scala/util/Directory.scala
@@ -29,24 +29,10 @@ object Directory {
  }).getAbsolutePath

  val GitBucketConf = new File(GitBucketHome, "gitbucket.conf")
-  
+
  val RepositoryHome = s"${GitBucketHome}/repositories"

  val DatabaseHome = s"${GitBucketHome}/data"
-  
-  /**
-   * Repository names of the specified user.
-   */
-  def getRepositories(owner: String): List[String] =
-    defining(new File(s"${RepositoryHome}/${owner}")){ dir =>
-      if(dir.exists){
-        dir.listFiles.filter { file =>
-          file.isDirectory && !file.getName.endsWith(".wiki.git")
-        }.map(_.getName.replaceFirst("\\.git$", "")).toList
-      } else {
-        Nil
-      }
-    }

  /**
   * Substance directory of the repository.
@@ -54,11 +40,23 @@ object Directory {
  def getRepositoryDir(owner: String, repository: String): File =
    new File(s"${RepositoryHome}/${owner}/${repository}.git")

+  /**
+   * Directory for files which are attached to issue.
+   */
+  def getAttachedDir(owner: String, repository: String): File =
+    new File(s"${RepositoryHome}/${owner}/${repository}/issues")
+
  /**
   * Directory for uploaded files by the specified user.
   */
  def getUserUploadDir(userName: String): File = new File(s"${GitBucketHome}/data/${userName}/files")

+  /**
+   * Root of temporary directories for the upload file.
+   */
+  def getTemporaryDir(sessionId: String): File =
+    new File(s"${GitBucketHome}/tmp/_upload/${sessionId}")
+
  /**
   * Root of temporary directories for the specified repository.
   */
--- a/src/main/scala/util/FileUtil.scala
+++ b/src/main/scala/util/FileUtil.scala
@@ -4,9 +4,10 @@ import org.apache.commons.io.FileUtils
 import java.net.URLConnection
 import java.io.File
 import util.ControlUtil._
+import scala.util.Random

 object FileUtil {
-  
+
  def getMimeType(name: String): String =
    defining(URLConnection.getFileNameMap()){ fileNameMap =>
      fileNameMap.getContentTypeFor(name) match {
@@ -26,32 +27,12 @@ object FileUtil {
  }

  def isImage(name: String): Boolean = getMimeType(name).startsWith("image/")
-  
+
  def isLarge(size: Long): Boolean = (size > 1024 * 1000)
-  
+
  def isText(content: Array[Byte]): Boolean = !content.contains(0)

-//  def createZipFile(dest: File, dir: File): Unit = {
-//    def addDirectoryToZip(out: ZipArchiveOutputStream, dir: File, path: String): Unit = {
-//      dir.listFiles.map { file =>
-//        if(file.isFile){
-//          out.putArchiveEntry(new ZipArchiveEntry(path + "/" + file.getName))
-//          out.write(FileUtils.readFileToByteArray(file))
-//          out.closeArchiveEntry
-//        } else if(file.isDirectory){
-//          addDirectoryToZip(out, file, path + "/" + file.getName)
-//        }
-//      }
-//    }
-//
-//    using(new ZipArchiveOutputStream(dest)){ out =>
-//      addDirectoryToZip(out, dir, dir.getName)
-//    }
-//  }
-
-  def getFileName(path: String): String = defining(path.lastIndexOf('/')){ i =>
-    if(i >= 0) path.substring(i + 1) else path
-  }
+  def generateFileId: String = System.currentTimeMillis + Random.alphanumeric.take(10).mkString

  def getExtension(name: String): String =
    name.lastIndexOf('.') match {
--- a/src/main/scala/util/JGitUtil.scala
+++ b/src/main/scala/util/JGitUtil.scala
@@ -92,8 +92,9 @@ object JGitUtil {
   *
   * @param viewType "image", "large" or "other"
   * @param content the string content
+   * @param charset the character encoding
   */
-  case class ContentInfo(viewType: String, content: Option[String])
+  case class ContentInfo(viewType: String, content: Option[String], charset: Option[String])

  /**
   * The tag data.
@@ -137,7 +138,7 @@ object JGitUtil {
    using(Git.open(getRepositoryDir(owner, repository))){ git =>
      try {
        // get commit count
-        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10000).sum
+        val commitCount = git.log.all.call.iterator.asScala.map(_ => 1).take(10001).sum

        RepositoryInfo(
          owner, repository, s"${baseUrl}/git/${owner}/${repository}.git",
@@ -371,7 +372,12 @@ object JGitUtil {

      if(commits.length >= 2){
        // not initial commit
-        val oldCommit = commits(1)
+        val oldCommit = if(revCommit.getParentCount >= 2) {
+          // merge commit
+          revCommit.getParents.head
+        } else {
+          commits(1)
+        }
        (getDiffs(git, oldCommit.getName, id, fetchContent), Some(oldCommit.getName))

      } else {
@@ -480,7 +486,7 @@ object JGitUtil {
  }

  def createNewCommit(git: Git, inserter: ObjectInserter, headId: AnyObjectId, treeId: AnyObjectId,
-                              fullName: String, mailAddress: String, message: String): String = {
+                              fullName: String, mailAddress: String, message: String): ObjectId = {
    val newCommit = new CommitBuilder()
    newCommit.setCommitter(new PersonIdent(fullName, mailAddress))
    newCommit.setAuthor(new PersonIdent(fullName, mailAddress))
@@ -498,7 +504,7 @@ object JGitUtil {
    refUpdate.setNewObjectId(newHeadId)
    refUpdate.update()

-    newHeadId.getName
+    newHeadId
  }

  /**
@@ -549,6 +555,26 @@ object JGitUtil {
    }
  }

+  def getContentInfo(git: Git, path: String, objectId: ObjectId): ContentInfo = {
+    // Viewer
+    val large  = FileUtil.isLarge(git.getRepository.getObjectDatabase.open(objectId).getSize)
+    val viewer = if(FileUtil.isImage(path)) "image" else if(large) "large" else "other"
+    val bytes  = if(viewer == "other") JGitUtil.getContentFromId(git, objectId, false) else None
+
+    if(viewer == "other"){
+      if(bytes.isDefined && FileUtil.isText(bytes.get)){
+        // text
+        ContentInfo("text", Some(StringUtil.convertFromByteArray(bytes.get)), Some(StringUtil.detectEncoding(bytes.get)))
+      } else {
+        // binary
+        ContentInfo("binary", None, None)
+      }
+    } else {
+      // image or large
+      ContentInfo(viewer, None, None)
+    }
+  }
+
  /**
   * Get object content of the given object id as byte array from the Git repository.
   *
@@ -570,4 +596,42 @@ object JGitUtil {
    case e: MissingObjectException => None
  }

+  /**
+   * Returns all commit id in the specified repository.
+   */
+  def getAllCommitIds(git: Git): Seq[String] = if(isEmpty(git)) {
+    Nil
+  } else {
+    val existIds = new scala.collection.mutable.ListBuffer[String]()
+    val i = git.log.all.call.iterator
+    while(i.hasNext){
+      existIds += i.next.name
+    }
+    existIds.toSeq
+  }
+
+  def processTree(git: Git, id: ObjectId)(f: (String, CanonicalTreeParser) => Unit) = {
+    using(new RevWalk(git.getRepository)){ revWalk =>
+      using(new TreeWalk(git.getRepository)){ treeWalk =>
+        val index = treeWalk.addTree(revWalk.parseTree(id))
+        treeWalk.setRecursive(true)
+        while(treeWalk.next){
+          f(treeWalk.getPathString, treeWalk.getTree(index, classOf[CanonicalTreeParser]))
+        }
+      }
+    }
+  }
+
+  /**
+   * Returns the identifier of the root commit (or latest merge commit) of the specified branch.
+   */
+  def getForkedCommitId(oldGit: Git, newGit: Git,
+                        userName: String, repositoryName: String, branch: String,
+                        requestUserName: String, requestRepositoryName: String, requestBranch: String): String =
+    defining(getAllCommitIds(oldGit)){ existIds =>
+      getCommitLogs(newGit, requestBranch, true) { commit =>
+        existIds.contains(commit.name) && getBranchesOfCommit(oldGit, commit.getName).contains(branch)
+      }.head.id
+    }
+
 }
--- a/src/main/scala/util/LDAPUtil.scala
+++ b/src/main/scala/util/LDAPUtil.scala
@@ -49,7 +49,7 @@ object LDAPUtil {
    ){ conn =>
      findMailAddress(conn, userDN, ldapSettings.mailAttribute) match {
        case Some(mailAddress) => Right(LDAPUserInfo(
-          userName    = userName,
+          userName    = getUserNameFromMailAddress(userName),
          fullName    = ldapSettings.fullNameAttribute.flatMap { fullNameAttribute =>
            findFullName(conn, userDN, fullNameAttribute)
          }.getOrElse(userName),
@@ -59,6 +59,13 @@ object LDAPUtil {
    }
  }

+  private def getUserNameFromMailAddress(userName: String): String = {
+    (userName.indexOf('@') match {
+      case i if i >= 0 => userName.substring(0, i)
+      case i           => userName
+    }).replaceAll("[^a-zA-Z0-9\\-_.]", "").replaceAll("^[_\\-]", "")
+  }
+
  private def bind[A](host: String, port: Int, dn: String, password: String, tls: Boolean, keystore: String, error: String)
                  (f: LDAPConnection => Either[String, A]): Either[String, A] = {
    if (tls) {
--- a/src/main/scala/view/AvatarImageProvider.scala
+++ b/src/main/scala/view/AvatarImageProvider.scala
@@ -17,7 +17,7 @@ trait AvatarImageProvider { self: RequestCache =>
      // by user name
      getAccountByUserName(userName).map { account =>
        if(account.image.isEmpty && context.settings.gravatar){
-          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g"""
        } else {
          s"""${context.path}/${account.userName}/_avatar"""
        }
@@ -28,13 +28,13 @@ trait AvatarImageProvider { self: RequestCache =>
      // by mail address
      getAccountByMailAddress(mailAddress).map { account =>
        if(account.image.isEmpty && context.settings.gravatar){
-          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}"""
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(account.mailAddress.toLowerCase)}?s=${size}&d=retro&r=g"""
        } else {
          s"""${context.path}/${account.userName}/_avatar"""
        }
      } getOrElse {
        if(context.settings.gravatar){
-          s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}"""
+          s"""https://www.gravatar.com/avatar/${StringUtil.md5(mailAddress.toLowerCase)}?s=${size}&d=retro&r=g"""
        } else {
          s"""${context.path}/_unknown/_avatar"""
        }
@@ -42,9 +42,9 @@ trait AvatarImageProvider { self: RequestCache =>
    }

    if(tooltip){
-      Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title="${userName}"/>""")
+      Html(s"""<img src="${src}" class="${if(size > 20){"avatar"} else {"avatar-mini"}}" style="width: ${size}px; height: ${size}px;" data-toggle="tooltip" title="${userName}"/>""")
    } else {
-      Html(s"""<img src="${src}" class="avatar" style="width: ${size}px; height: ${size}px;" />""")
+      Html(s"""<img src="${src}" class="${if(size > 20){"avatar"} else {"avatar-mini"}}" style="width: ${size}px; height: ${size}px;" />""")
    }
  }

--- a/src/main/scala/view/Markdown.scala
+++ b/src/main/scala/view/Markdown.scala
@@ -89,7 +89,8 @@ class GitBucketHtmlSerializer(
  ) with LinkConverter with RequestCache {

  override protected def printImageTag(imageNode: SuperNode, url: String): Unit =
-    printer.print("<img src=\"").print(fixUrl(url)).print("\"  alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/>")
+    printer.print("<a target=\"_blank\" href=\"").print(fixUrl(url)).print("\">")
+           .print("<img src=\"").print(fixUrl(url)).print("\"  alt=\"").printEncoded(printChildrenToString(imageNode)).print("\"/></a>")

  override protected def printLink(rendering: LinkRenderer.Rendering): Unit = {
    printer.print('<').print('a')
@@ -101,7 +102,7 @@ class GitBucketHtmlSerializer(
  }

  private def fixUrl(url: String): String = {
-    if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://")){
+    if(!enableWikiLink || url.startsWith("http://") || url.startsWith("https://") || url.startsWith("#")){
      url
    } else {
      repository.httpUrl.replaceFirst("/git/", "/").replaceFirst("\\.git$", "") + "/wiki/_blob/" + url
--- a/src/main/scala/view/helpers.scala
+++ b/src/main/scala/view/helpers.scala
@@ -15,6 +15,11 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   */
  def datetime(date: Date): String = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(date)

+  /**
+   * Format java.util.Date to "yyyy-MM-dd'T'hh:mm:ss'Z'".
+   */
+  def datetimeRFC3339(date: Date): String = new SimpleDateFormat("yyyy-MM-dd'T'hh:mm:ss'Z'").format(date).replaceAll("(\\d\\d)(\\d\\d)$","$1:$2")
+
  /**
   * Format java.util.Date to "yyyy-MM-dd".
   */
@@ -27,6 +32,14 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
  def plural(count: Int, singular: String, plural: String = ""): String =
    if(count == 1) singular else if(plural.isEmpty) singular + "s" else plural

+  private[this] val renderersBySuffix: Seq[(String, (List[String], String, String, service.RepositoryService.RepositoryInfo, Boolean, Boolean, app.Context) => Html)] =
+    Seq(
+      ".md" -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context)),
+      ".markdown" -> ((filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context) => markdown(fileContent, repository, enableWikiLink, enableRefsLink)(context))
+    )
+
+  def renderableSuffixes: Seq[String] = renderersBySuffix.map(_._1)
+
  /**
   * Converts Markdown of Wiki pages to HTML.
   */
@@ -34,6 +47,21 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
               enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html =
    Html(Markdown.toHtml(value, repository, enableWikiLink, enableRefsLink))

+  def renderMarkup(filePath: List[String], fileContent: String, branch: String,
+                   repository: service.RepositoryService.RepositoryInfo,
+                   enableWikiLink: Boolean, enableRefsLink: Boolean)(implicit context: app.Context): Html = {
+
+    val fileNameLower = filePath.reverse.head.toLowerCase
+    renderersBySuffix.find { case (suffix, _) => fileNameLower.endsWith(suffix) } match {
+      case Some((_, handler)) => handler(filePath, fileContent, branch, repository, enableWikiLink, enableRefsLink, context)
+      case None => Html(
+        s"<tt>${
+          fileContent.split("(\\r\\n)|\\n").map(xml.Utility.escape(_)).mkString("<br/>")
+        }</tt>"
+      )
+    }
+  }
+
  /**
   * Returns &lt;img&gt; which displays the avatar icon for the given user name.
   * This method looks up Gravatar if avatar icon has not been configured in user settings.
@@ -135,6 +163,45 @@ object helpers extends AvatarImageProvider with LinkConverter with RequestCache
   */
  def isPast(date: Date): Boolean = System.currentTimeMillis > date.getTime

+  /**
+   * Returns file type for AceEditor.
+   */
+  def editorType(fileName: String): String = {
+    fileName.toLowerCase match {
+      case x if(x.endsWith(".bat"))     => "batchfile"
+      case x if(x.endsWith(".java"))    => "java"
+      case x if(x.endsWith(".scala"))   => "scala"
+      case x if(x.endsWith(".js"))      => "javascript"
+      case x if(x.endsWith(".css"))     => "css"
+      case x if(x.endsWith(".md"))      => "markdown"
+      case x if(x.endsWith(".html"))    => "html"
+      case x if(x.endsWith(".xml"))     => "xml"
+      case x if(x.endsWith(".c"))       => "c_cpp"
+      case x if(x.endsWith(".cpp"))     => "c_cpp"
+      case x if(x.endsWith(".coffee"))  => "coffee"
+      case x if(x.endsWith(".ejs"))     => "ejs"
+      case x if(x.endsWith(".hs"))      => "haskell"
+      case x if(x.endsWith(".json"))    => "json"
+      case x if(x.endsWith(".jsp"))     => "jsp"
+      case x if(x.endsWith(".jsx"))     => "jsx"
+      case x if(x.endsWith(".cl"))      => "lisp"
+      case x if(x.endsWith(".clojure")) => "lisp"
+      case x if(x.endsWith(".lua"))     => "lua"
+      case x if(x.endsWith(".php"))     => "php"
+      case x if(x.endsWith(".py"))      => "python"
+      case x if(x.endsWith(".rdoc"))    => "rdoc"
+      case x if(x.endsWith(".rhtml"))   => "rhtml"
+      case x if(x.endsWith(".ruby"))    => "ruby"
+      case x if(x.endsWith(".sh"))      => "sh"
+      case x if(x.endsWith(".sql"))     => "sql"
+      case x if(x.endsWith(".tcl"))     => "tcl"
+      case x if(x.endsWith(".vbs"))     => "vbscript"
+      case x if(x.endsWith(".tcl"))     => "tcl"
+      case x if(x.endsWith(".yml"))     => "yaml"
+      case _ => "plain_text"
+    }
+  }
+
  /**
   * Implicit conversion to add mkHtml() to Seq[Html].
   */
--- a/src/main/twirl/account/activity.scala.html
+++ b/src/main/twirl/account/activity.scala.html
@@ -2,5 +2,8 @@
@import context._
@import view.helpers._
@main(account, groupNames, "activity"){
+  <div class="pull-right">
+    <a href="@path/@{account.userName}.atom"><img src="@assets/common/images/feed.png" alt="activities"></a>
+  </div>
  @helper.html.activities(activities)
 }
--- a/src/main/twirl/account/edit.scala.html
+++ b/src/main/twirl/account/edit.scala.html
@@ -2,60 +2,62 @@
@import context._
@import view.helpers._
@html.main("Edit your profile"){
-<div class="row-fluid">
-  <div class="span3">
-    @menu("profile", settings.ssh)
-  </div>
-  <div class="span9">
-    @helper.html.information(info)
-    <form action="@url(account.userName)/_edit" method="POST" validate="true">
-    <div class="box">
-      <div class="box-header">Profile</div>
-      <div class="box-content">
-        <div class="row-fluid">
-          <div class="span6">
-            @if(account.password.nonEmpty){
+<div class="container">
+  <div class="row-fluid">
+    <div class="span3">
+      @menu("profile", settings.ssh)
+    </div>
+    <div class="span9">
+      @helper.html.information(info)
+      <form action="@url(account.userName)/_edit" method="POST" validate="true">
+      <div class="box">
+        <div class="box-header">Profile</div>
+        <div class="box-content">
+          <div class="row-fluid">
+            <div class="span6">
+              @if(account.password.nonEmpty){
+                <fieldset>
+                  <label for="password" class="strong">
+                    Password (input to change password):
+                  </label>
+                  <input type="password" name="password" id="password" value=""/>
+                  <span id="error-password" class="error"></span>
+                </fieldset>
+              }
              <fieldset>
-                <label for="password" class="strong">
-                  Password (input to change password):
-                </label>
-                <input type="password" name="password" id="password" value=""/>
-                <span id="error-password" class="error"></span>
+                <label for="fullName" class="strong">Full Name:</label>
+                <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
+                <span id="error-fullName" class="error"></span>
              </fieldset>
-            }
-            <fieldset>
-              <label for="fullName" class="strong">Full Name:</label>
-              <input type="text" name="fullName" id="fullName" value="@account.fullName"/>
-              <span id="error-fullName" class="error"></span>
-            </fieldset>
-            <fieldset>
-              <label for="mailAddress" class="strong">Mail Address:</label>
-              <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
-              <span id="error-mailAddress" class="error"></span>
-            </fieldset>
-            <fieldset>
-              <label for="url" class="strong">URL (optional):</label>
-              <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
-              <span id="error-url" class="error"></span>
-            </fieldset>
+              <fieldset>
+                <label for="mailAddress" class="strong">Mail Address:</label>
+                <input type="text" name="mailAddress" id="mailAddress" value="@account.mailAddress"/>
+                <span id="error-mailAddress" class="error"></span>
+              </fieldset>
+              <fieldset>
+                <label for="url" class="strong">URL (optional):</label>
+                <input type="text" name="url" id="url" style="width: 300px;" value="@account.url"/>
+                <span id="error-url" class="error"></span>
+              </fieldset>
+            </div>
+            <div class="span6">
+              <fieldset>
+                <label for="avatar" class="strong">Image (optional):</label>
+                @helper.html.uploadavatar(Some(account))
+              </fieldset>
+            </div>
          </div>
-          <div class="span6">
-            <fieldset>
-              <label for="avatar" class="strong">Image (optional):</label>
-              @helper.html.uploadavatar(Some(account))
-            </fieldset>
+          <div style="margin-top: 20px;">
+            <div class="pull-right">
+              <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
+            </div>
+            <input type="submit" class="btn btn-success" value="Save"/>
+            <a href="@url(account.userName)" class="btn">Cancel</a>
          </div>
        </div>
-        <div style="margin-top: 20px;">
-          <div class="pull-right">
-            <a href="@path/@account.userName/_delete" class="btn btn-danger" id="delete">Delete account</a>
-          </div>
-          <input type="submit" class="btn btn-success" value="Save"/>
-          <a href="@url(account.userName)" class="btn">Cancel</a>
-        </div>
      </div>
-    </div>
-  </form>
+    </form>
+  </div>
 </div>
 }
 <script>
--- a/src/main/twirl/account/group.scala.html
+++ b/src/main/twirl/account/group.scala.html
@@ -2,7 +2,7 @@
@import context._
@import view.helpers._
@html.main(if(account.isEmpty) "Create group" else "Edit group"){
-<div>
+<div class="container">
  <form id="form" method="post" action="@if(account.isEmpty){@path/groups/new} else {@path/@account.get.userName/_editgroup}" validate="true">
      <div class="row-fluid">
        <div class="span5">
--- a/src/main/twirl/account/main.scala.html
+++ b/src/main/twirl/account/main.scala.html
@@ -3,54 +3,56 @@
@import context._
@import view.helpers._
@html.main(account.userName){
-  <div class="container-fluid">
-    <div class="row-fluid">
-      <div class="span4">
-        <div class="block">
-          <div class="account-image">@avatar(account.userName, 200)</div>
-          <div class="account-fullname">@account.fullName</div>
-          <div class="account-username">@account.userName</div>
-        </div>
-        <div class="block">
-          @if(account.url.isDefined){
-            <div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
-          }
-          <div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
-        </div>
-        @if(groupNames.nonEmpty){
-          <div>
-            <div>Groups</div>
-            @groupNames.map { groupName =>
-              <a href="@url(groupName)">@avatar(groupName, 36, tooltip = true)</a>
-            }
+  <div class="container">
+    <div class="container-fluid">
+      <div class="row-fluid">
+        <div class="span4">
+          <div class="block">
+            <div class="account-image">@avatar(account.userName, 200)</div>
+            <div class="account-fullname">@account.fullName</div>
+            <div class="account-username">@account.userName</div>
          </div>
-        }
+          <div class="block">
+            @if(account.url.isDefined){
+              <div><i class="icon-home"></i> <a href="@account.url">@account.url</a></div>
+            }
+            <div><i class="icon-time"></i> <span class="muted">Joined on</span> @date(account.registeredDate)</div>
+          </div>
+          @if(groupNames.nonEmpty){
+            <div>
+              <div>Groups</div>
+              @groupNames.map { groupName =>
+                <a href="@url(groupName)">@avatar(groupName, 36, tooltip = true)</a>
+              }
+            </div>
+          }

-      </div>
-      <div class="span8">
-        <ul class="nav nav-tabs">
-          <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
-          @if(account.isGroupAccount){
-            <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
-          } else {
-            <li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
-          }
-          @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
-            <li class="pull-right">
-              <div class="button-group">
-                <a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a>
-              </div>
-            </li>
-          }
-          @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
-            <li class="pull-right">
-              <div class="button-group">
-                <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
-              </div>
-            </li>
-          }
-        </ul>
-        @body
+        </div>
+        <div class="span8">
+          <ul class="nav nav-tabs" style="margin-bottom: 5px;">
+            <li@if(active == "repositories"){ class="active"}><a href="@url(account.userName)?tab=repositories">Repositories</a></li>
+            @if(account.isGroupAccount){
+              <li@if(active == "members"){ class="active"}><a href="@url(account.userName)?tab=members">Members</a></li>
+            } else {
+              <li@if(active == "activity"){ class="active"}><a href="@url(account.userName)?tab=activity">Public Activity</a></li>
+            }
+            @if(loginAccount.isDefined && loginAccount.get.userName == account.userName){
+              <li class="pull-right">
+                <div class="button-group">
+                  <a href="@url(account.userName)/_edit" class="btn">Edit Your Profile</a>
+                </div>
+              </li>
+            }
+            @if(loginAccount.isDefined && account.isGroupAccount && isGroupManager){
+              <li class="pull-right">
+                <div class="button-group">
+                  <a href="@url(account.userName)/_editgroup" class="btn">Edit Group</a>
+                </div>
+              </li>
+            }
+          </ul>
+          @body
+        </div>
      </div>
    </div>
  </div>
--- a/src/main/twirl/account/register.scala.html
+++ b/src/main/twirl/account/register.scala.html
@@ -2,6 +2,7 @@
@import context._
@import view.helpers._
@html.main("Create your account"){
+<div class="container">
  <h3>Create your account</h3>
  <form action="@path/register" method="POST" validate="true">
    <div class="row-fluid">
@@ -45,4 +46,5 @@
      <input type="submit" class="btn btn-success" value="Create account"/>
    </fieldset>
  </form>
+</div>
 }
--- a/src/main/twirl/account/repositories.scala.html
+++ b/src/main/twirl/account/repositories.scala.html
@@ -9,19 +9,24 @@
  } else {
    @repositories.map { repository =>
      <div class="block">
-        <div class="block-header">
-          <a href="@url(repository)">@repository.name</a>
-          @if(repository.repository.isPrivate){
-            <i class="icon-lock"></i>
-          }
+        <div class="repository-icon">
+          @helper.html.repositoryicon(repository, true)
+        </div>
+        <div class="repository-content">
+          <div class="block-header">
+            <a href="@url(repository)">@repository.name</a>
+            @if(repository.repository.isPrivate){
+              <i class="icon-lock"></i>
+            }
+          </div>
+          @if(repository.repository.originUserName.isDefined){
+            <div class="small muted">forked from <a href="@path/@repository.repository.parentUserName/@repository.repository.parentRepositoryName">@repository.repository.parentUserName/@repository.repository.parentRepositoryName</a></div>
+          }
+          @if(repository.repository.description.isDefined){
+            <div>@repository.repository.description</div>
+          }
+          <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
        </div>
-        @if(repository.repository.originUserName.isDefined){
-          <div class="small muted">forked from <a href="@path/@repository.repository.parentUserName/@repository.repository.parentRepositoryName">@repository.repository.parentUserName/@repository.repository.parentRepositoryName</a></div>
-        }
-        @if(repository.repository.description.isDefined){
-          <div>@repository.repository.description</div>
-        }
-        <div><span class="muted small">Last updated: @datetime(repository.repository.lastActivityDate)</span></div>
      </div>
    }
  }
--- a/src/main/twirl/account/ssh.scala.html
+++ b/src/main/twirl/account/ssh.scala.html
@@ -2,44 +2,46 @@
@import context._
@import view.helpers._
@html.main("SSH Keys"){
-<div class="row-fluid">
-  <div class="span3">
-    @menu("ssh", settings.ssh)
-  </div>
-  <div class="span9">
-    <div class="box">
-      <div class="box-header">SSH Keys</div>
-      <div class="box-content">
-        @if(sshKeys.isEmpty){
-          No keys
-        }
-        @sshKeys.zipWithIndex.map { case (key, i) =>
-          @if(i != 0){
-            <hr>
-          }
-          <strong>@key.title</strong> (@_root_.ssh.SshUtil.fingerPrint(key.publicKey))
-          <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
-        }
-      </div>
+<div class="container">
+  <div class="row-fluid">
+    <div class="span3">
+      @menu("ssh", settings.ssh)
    </div>
-    <form method="POST" action="@path/@account.userName/_ssh" validate="true">
+    <div class="span9">
      <div class="box">
-        <div class="box-header">Add an SSH Key</div>
+        <div class="box-header">SSH Keys</div>
        <div class="box-content">
-          <fieldset>
-            <label for="title" class="strong">Title</label>
-            <div><span id="error-title" class="error"></span></div>
-            <input type="text" name="title" id="title" style="width: 400px;"/>
-          </fieldset>
-          <fieldset>
-            <label for="publicKey" class="strong">Key</label>
-            <div><span id="error-publicKey" class="error"></span></div>
-            <textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea>
-          </fieldset>
-          <input type="submit" class="btn btn-success" value="Add"/>
+          @if(sshKeys.isEmpty){
+            No keys
+          }
+          @sshKeys.zipWithIndex.map { case (key, i) =>
+            @if(i != 0){
+              <hr>
+            }
+            <strong>@key.title</strong> (@_root_.ssh.SshUtil.fingerPrint(key.publicKey).getOrElse("Key is invalid."))
+            <a href="@path/@account.userName/_ssh/delete/@key.sshKeyId" class="btn btn-mini btn-danger pull-right">Delete</a>
+          }
        </div>
      </div>
-    </form>
+      <form method="POST" action="@path/@account.userName/_ssh" validate="true">
+        <div class="box">
+          <div class="box-header">Add an SSH Key</div>
+          <div class="box-content">
+            <fieldset>
+              <label for="title" class="strong">Title</label>
+              <div><span id="error-title" class="error"></span></div>
+              <input type="text" name="title" id="title" style="width: 400px;"/>
+            </fieldset>
+            <fieldset>
+              <label for="publicKey" class="strong">Key</label>
+              <div><span id="error-publicKey" class="error"></span></div>
+              <textarea name="publicKey" id="publicKey" style="width: 600px; height: 250px;"></textarea>
+            </fieldset>
+            <input type="submit" class="btn btn-success" value="Add"/>
+          </div>
+        </div>
+      </form>
+    </div>
  </div>
 </div>
-}
+}
--- a/src/main/twirl/admin/menu.scala.html
+++ b/src/main/twirl/admin/menu.scala.html
@@ -1,22 +1,24 @@
@(active: String)(body: Html)(implicit context: app.Context)
@import context._
-<div class="row-fluid">
-  <div class="span3">
-    <div class="box">
-      <ul class="nav nav-tabs nav-stacked side-menu">
-        <li@if(active=="users"){ class="active"}>
-          <a href="@path/admin/users">User Management</a>
-        </li>
-        <li@if(active=="system"){ class="active"}>
-          <a href="@path/admin/system">System Settings</a>
-        </li>
-        <li>
-          <a href="@path/console/login.jsp">H2 Console</a>
-        </li>
-     </ul>
-   </div>
+<div class="container">
+  <div class="row-fluid">
+    <div class="span3">
+      <div class="box">
+        <ul class="nav nav-tabs nav-stacked side-menu">
+          <li@if(active=="users"){ class="active"}>
+            <a href="@path/admin/users">User Management</a>
+          </li>
+          <li@if(active=="system"){ class="active"}>
+            <a href="@path/admin/system">System Settings</a>
+          </li>
+          <li>
+            <a href="@path/console/login.jsp">H2 Console</a>
+          </li>
+       </ul>
+     </div>
+    </div>
+    <div class="span9">
+      @body
+    </div>
  </div>
-  <div class="span9">
-    @body
-  </div>
-</div>
+</div>
--- a/src/main/twirl/dashboard/issues.scala.html
+++ b/src/main/twirl/dashboard/issues.scala.html
@@ -8,41 +8,43 @@
@import context._
@import view.helpers._
@html.main("Your Issues"){
-@dashboard.html.tab("issues")
-<div class="row-fluid">
-  <div class="span3">
-    <ul class="nav nav-pills nav-stacked">
-      <li@if(filter == "all"){ class="active"}>
-        <a href="@path/dashboard/issues/repos@condition.toURL">
-          <span class="count-right">@allCount</span>
-          In your repositories
-        </a>
-      </li>
-      <li@if(filter == "assigned"){ class="active"}>
-        <a href="@path/dashboard/issues/assigned@condition.toURL">
-          <span class="count-right">@assignedCount</span>
-          Assigned to you
-        </a>
-      </li>
-      <li@if(filter == "created_by"){ class="active"}>
-        <a href="@path/dashboard/issues/created_by@condition.toURL">
-          <span class="count-right">@createdByCount</span>
-          Created by you
-        </a>
-      </li>
-    </ul>
-    <hr/>
-    <ul class="nav nav-pills nav-stacked small">
-      @repositories.map { case (owner, name, count) =>
-      <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
-        <a href="@condition.copy(repo = Some(owner + "/" + name)).toURL">
-          <span class="count-right">@count</span>
-          @owner/@name
-        </a>
-      </li>
-      }
-    </ul>
+<div class="container">
+  @dashboard.html.tab("issues")
+  <div class="row-fluid">
+    <div class="span3">
+      <ul class="nav nav-pills nav-stacked">
+        <li@if(filter == "all"){ class="active"}>
+          <a href="@path/dashboard/issues/repos@condition.toURL">
+            <span class="count-right">@allCount</span>
+            In your repositories
+          </a>
+        </li>
+        <li@if(filter == "assigned"){ class="active"}>
+          <a href="@path/dashboard/issues/assigned@condition.toURL">
+            <span class="count-right">@assignedCount</span>
+            Assigned to you
+          </a>
+        </li>
+        <li@if(filter == "created_by"){ class="active"}>
+          <a href="@path/dashboard/issues/created_by@condition.toURL">
+            <span class="count-right">@createdByCount</span>
+            Created by you
+          </a>
+        </li>
+      </ul>
+      <hr/>
+      <ul class="nav nav-pills nav-stacked small">
+        @repositories.map { case (owner, name, count) =>
+        <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
+          <a href="@condition.copy(repo = Some(owner + "/" + name)).toURL">
+            <span class="count-right">@count</span>
+            @owner/@name
+          </a>
+        </li>
+        }
+      </ul>
+    </div>
+    @listparts
  </div>
-  @listparts
 </div>
 }
--- a/src/main/twirl/dashboard/pulls.scala.html
+++ b/src/main/twirl/dashboard/pulls.scala.html
@@ -6,35 +6,37 @@
@import context._
@import view.helpers._
@html.main("Your Issues"){
-@dashboard.html.tab("pulls")
-<div class="row-fluid">
-  <div class="span3">
-    <ul class="nav nav-pills nav-stacked">
-      <li@if(filter == "created_by"){ class="active"}>
-        <a href="@path/dashboard/pulls/owned@condition.toURL">
-          <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span>
-          Yours
-        </a>
-      </li>
-      <li@if(filter == "not_created_by"){ class="active"}>
-        <a href="@path/dashboard/pulls/public@condition.toURL">
-          <span class="count-right">@counts.filter(_.userName != loginAccount.get.userName).map(_.count).sum</span>
-          Public
-        </a>
-      </li>
-    </ul>
-    <hr/>
-    <ul class="nav nav-pills nav-stacked small">
-      @repositories.map { case (owner, name, count) =>
-      <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
-        <a href="@path/dashboard/pulls/for/@owner/@name">
-          <span class="count-right">@count</span>
-          @owner/@name
-        </a>
-      </li>
-      }
-    </ul>
+<div class="container">
+  @dashboard.html.tab("pulls")
+  <div class="row-fluid">
+    <div class="span3">
+      <ul class="nav nav-pills nav-stacked">
+        <li@if(filter == "created_by"){ class="active"}>
+          <a href="@path/dashboard/pulls/owned@condition.toURL">
+            <span class="count-right">@counts.find(_.userName == loginAccount.get.userName).map(_.count).getOrElse(0)</span>
+            Yours
+          </a>
+        </li>
+        <li@if(filter == "not_created_by"){ class="active"}>
+          <a href="@path/dashboard/pulls/public@condition.toURL">
+            <span class="count-right">@counts.filter(_.userName != loginAccount.get.userName).map(_.count).sum</span>
+            Public
+          </a>
+        </li>
+      </ul>
+      <hr/>
+      <ul class="nav nav-pills nav-stacked small">
+        @repositories.map { case (owner, name, count) =>
+        <li@if(condition.repo == Some(owner + "/" + name)){ class="active"}>
+          <a href="@path/dashboard/pulls/for/@owner/@name">
+            <span class="count-right">@count</span>
+            @owner/@name
+          </a>
+        </li>
+        }
+      </ul>
+    </div>
+    @listparts
  </div>
-  @listparts
 </div>
 }
--- a/src/main/twirl/dashboard/tab.scala.html
+++ b/src/main/twirl/dashboard/tab.scala.html
@@ -1,9 +1,13 @@
@(active: String = "")(implicit context: app.Context)
@import context._
+@import view.helpers._
 <ul class="nav nav-tabs">
  <li@if(active == ""){ class="active"}><a href="@path/">News Feed</a></li>
  @if(loginAccount.isDefined){
    <li@if(active == "pulls" ){ class="active"}><a href="@path/dashboard/pulls">Pull Requests</a></li>
    <li@if(active == "issues"){ class="active"}><a href="@path/dashboard/issues/repos">Issues</a></li>
  }
+  @if(active == ""){
+    <li class="pull-right"><a href="@path/activities.atom"><img src="@assets/common/images/feed.png" alt="activities"></a></li>
+  }
 </ul>
--- a/src/main/twirl/header.scala.html
+++ b/src/main/twirl/header.scala.html
@@ -1,73 +0,0 @@
-@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-
-@if(repository.commitCount > 0){
-  <div class="pull-right">
-    <div class="input-prepend">
-      <a href="@path/@repository.owner/@repository.name/fork" class="btn" style="margin-bottom: 10px;">Fork</a>
-      <span class="add-on count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
-    </div>
-  </div>
-}
-<div class="head">
-  @if(repository.repository.isPrivate){
-  <img src="@assets/common/images/repo_private_lg.png"/>
-  } else {
-    @if(repository.repository.originUserName.isDefined){
-      <img src="@assets/common/images/repo_fork_lg.png"/>
-    } else {
-      <img src="@assets/common/images/repo_public_lg.png"/>
-    }
-  }
-  <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
-  
-  @defining(repository.repository){ x =>
-    @if(repository.repository.originRepositoryName.isDefined){
-      <div class="forked">
-        forked from <a href="@path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
-      </div>
-    }
-  }
-</div>
-@repository.repository.description.map { description =>
-  <p>@description</p>
-}
-<table class="global-nav box-header">
-  <tr>
-    <th class="box-header@if(active=="code"){ active}">
-      <a href="@url(repository)">Code</a>
-    </th>
-    <th class="box-header@if(active=="issues"){ active}">
-      <a href="@url(repository)/issues">Issues</a>
-      @if(repository.issueCount > 0){
-        <span class="badge">@repository.issueCount</span>
-      }
-    </th>
-    <th class="box-header@if(active=="pulls"){ active}">
-      <a href="@url(repository)/pulls">Pull Requests</a>
-      @if(repository.pullCount > 0){
-        <span class="badge">@repository.pullCount</span>
-      }
-    </th>
-    <th class="box-header@if(active=="wiki"){ active}">
-      <a href="@url(repository)/wiki">Wiki</a>
-    </th>
-    <th class="box-header@if(active=="network"){ active}">
-      <a href="@url(repository)/network/members">Network</a>
-    </th>
-    @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
-    <th class="box-header@if(active=="settings"){ active}">
-      <a href="@url(repository)/settings">Settings</a>
-    </th>
-    }
-  </tr>
-</table>
-<script type="text/javascript">
-$(function(){
-  $('table.global-nav th.box-header').click(function(){
-    location.href = $(this).find('a').attr('href');
-    return false;
-  });
-});
-</script>
--- a/src/main/twirl/helper/attached.scala.html
+++ b/src/main/twirl/helper/attached.scala.html
@@ -0,0 +1,27 @@
+@(owner: String, repository: String)(textarea: Html)(implicit context: app.Context)
+@import context._
+<div class="muted attachable">
+  @textarea
+  <div class="clickable">Attach images by dragging &amp; dropping, or selecting them.</div>
+</div>
+@defining("(id=\")([\\w\\-]*)(\")".r.findFirstMatchIn(textarea.body).map(_.group(2))){ textareaId =>
+<script>
+$(function(){
+  $([$('#@textareaId').closest('div')[0], $('#@textareaId').next('div')[0]]).dropzone({
+    url: '@path/upload/image/@owner/@repository',
+    maxFilesize: 10,
+    acceptedFiles: 'image/*',
+    dictInvalidFileType: 'Unfortunately, we don\'t support that file type. Try again with a PNG, GIF, or JPG.',
+    previewTemplate: "<div class=\"dz-preview\">\n  <div class=\"dz-progress\"><span class=\"dz-upload\" data-dz-uploadprogress>Uploading your images...</span></div>\n  <div class=\"dz-error-message\"><span data-dz-errormessage></span></div>\n</div>",
+    success: function(file, id) {
+      var images = '\n![' + file.name.split('.')[0] + '](@baseUrl/@owner/@repository/_attached/' + id + ')';
+      $('#@textareaId').val($('#@textareaId').val() + images);
+      $(file.previewElement).prevAll('div.dz-preview').addBack().remove();
+    }
+  });
+
+  // Adjust clickable area width
+  $('#@textareaId').next('div.clickable').css('width', ($('#@textareaId').width() + 8) + 'px');
+});
+</script>
+}
--- a/src/main/twirl/helper/copy.scala.html
+++ b/src/main/twirl/helper/copy.scala.html
@@ -1,5 +1,5 @@
-@(id: String, value: String, prepend: Boolean = false)(html: Html)
-<div class="input-append@if(prepend){ input-prepend}">
+@(id: String, value: String)(html: Html)
+<div class="input-append" style="margin-bottom: 0px;">
  @html
  <span id="@id" class="add-on btn" data-clipboard-text="@value" data-placement="bottom" title="copy to clipboard"><i class="icon-check"></i></span>
 </div>
--- a/src/main/twirl/helper/diff.scala.html
+++ b/src/main/twirl/helper/diff.scala.html
@@ -81,56 +81,7 @@
 <script type="text/javascript" src="@assets/jsdifflib/difflib.js"></script>
 <script type="text/javascript" src="@assets/jsdifflib/diffview.js"></script>
 <link href="@assets/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
-<style type="text/css">
-table.inlinediff {
-  width: 100%;
-}
-
-table.inlinediff thead {
-  display: none;
-}
-
-td.insert, td.equal, td.delete {
-  width: 100%;
-}
-</style>
 <script>
-function diffUsingJS(oldTextId, newTextId, outputId) {
-  // get the baseText and newText values from the two textboxes, and split them into lines
-  var oldText = document.getElementById(oldTextId).value;
-  if(oldText == ''){
-    var oldLines = [];
-  } else {
-    var oldLines = difflib.stringAsLines(oldText);
-  }
-    
-  var newText = document.getElementById(newTextId).value
-  if(newText == ''){
-    var newLines = [];
-  } else {
-    var newLines = difflib.stringAsLines(newText);
-  }
-
-  // create a SequenceMatcher instance that diffs the two sets of lines
-  var sm = new difflib.SequenceMatcher(oldLines, newLines);
-
-  // get the opcodes from the SequenceMatcher instance
-  // opcodes is a list of 3-tuples describing what changes should be made to the base text
-  // in order to yield the new text
-  var opcodes = sm.get_opcodes();
-  var diffoutputdiv = document.getElementById(outputId);
-  while (diffoutputdiv.firstChild) diffoutputdiv.removeChild(diffoutputdiv.firstChild);
-
-  // build the diff view and add it to the current DOM
-  diffoutputdiv.appendChild(diffview.buildView({
-    baseTextLines: oldLines,
-    newTextLines: newLines,
-    opcodes: opcodes,
-    contextSize: 4,
-    viewType: 1
-  }));
-}
-
 $(function(){
  @if(showIndex){
    $('#toggle-file-list').click(function(){
--- a/src/main/twirl/helper/dropdown.scala.html
+++ b/src/main/twirl/helper/dropdown.scala.html
@@ -1,6 +1,6 @@
@(value: String = "", prefix: String = "", mini: Boolean = true, style: String = "", right: Boolean = false)(body: Html)
 <div class="btn-group"@if(style.nonEmpty){ style="@style"}>
-  <button class="btn dropdown-toggle@if(mini){ btn-mini}" data-toggle="dropdown">
+  <button class="btn dropdown-toggle@if(mini){ btn-mini} else { btn-small}" data-toggle="dropdown">
    @if(value.isEmpty){
      <i class="icon-cog"></i>
    } else {
--- a/src/main/twirl/helper/feed.scala.xml
+++ b/src/main/twirl/helper/feed.scala.xml
@@ -0,0 +1,27 @@
+@(activities: List[model.Activity])(implicit context: app.Context)<?xml version="1.0" encoding="UTF-8"?>
+@import context._
+@import view.helpers._
+<feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/" xml:lang="en-US">
+  <id>tag:@context.host,2013:gitbucket</id>
+  <title>Gitbucket's activities</title>
+  <link type="application/atom+xml" rel="self" href="@context.baseUrl/activities.atom"/>
+  <author>
+    <name>Gitbucket</name>
+    <uri>@context.baseUrl</uri>
+  </author>
+  <updated>@datetimeRFC3339(if(activities.isEmpty) new java.util.Date else activities.map(_.activityDate).max)</updated>
+  @activities.map { activity =>
+  <entry>
+    <id>tag:@context.host,@date(activity.activityDate):activity:@activity.activityId</id>
+    <published>@datetimeRFC3339(activity.activityDate)</published>
+    <updated>@datetimeRFC3339(activity.activityDate)</updated>
+    <link type="text/html" rel="alternate" href="@context.baseUrl/@activity.userName/@activity.repositoryName" />
+    <title type="html">@activity.activityType</title>
+    <author>
+      <name>@activity.activityUserName</name>
+      <uri>@url(activity.activityUserName)</uri>
+    </author>
+    <content type="html">@activityMessage(activity.message)</content>
+  </entry>
+  }
+</feed>
--- a/src/main/twirl/helper/preview.scala.html
+++ b/src/main/twirl/helper/preview.scala.html
@@ -3,19 +3,21 @@
@import context._
@import view.helpers._
 <div class="tabbable">
-  <ul class="nav nav-tabs">
+  <ul class="nav nav-tabs" style="height: 37px;">
    <li class="active"><a href="#tab1" data-toggle="tab">Write</a></li>
    <li><a href="#tab2" data-toggle="tab" id="preview">Preview</a></li>
-    @*
-    <li class="pull-right">
-      <a href="http://daringfireball.net/projects/markdown/syntax" target="_blank">Markdown Syntax Guide</a>
-    </li>
-    *@
  </ul>
  <div class="tab-content">
    <div class="tab-pane active" id="tab1">
      <span id="error-content" class="error"></span>
-      <textarea id="content" name="content"@if(style.nonEmpty){ style="@style"} placeholder="@placeholder">@content</textarea>
+      @textarea = {
+        <textarea id="content" name="content"@if(style.nonEmpty){ style="@style"} placeholder="@placeholder">@content</textarea>
+      }
+      @if(enableWikiLink){
+        @textarea
+      } else {
+        @helper.html.attached(repository.owner, repository.name)(textarea)
+      }
    </div>
    <div class="tab-pane" id="tab2">
      <div class="markdown-body" id="preview-area">
--- a/src/main/twirl/helper/repositoryicon.scala.html
+++ b/src/main/twirl/helper/repositoryicon.scala.html
@@ -0,0 +1,12 @@
+@(repository: service.RepositoryService.RepositoryInfo, large: Boolean)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@if(repository.repository.isPrivate){
+  <img src="@assets/common/images/repo_private@{if(large){"_lg"}}.png"/>
+} else {
+  @if(repository.repository.originUserName.isDefined){
+    <img src="@assets/common/images/repo_fork@{if(large){"_lg"}}.png"/>
+  } else {
+    <img src="@assets/common/images/repo_public@{if(large){"_lg"}}.png"/>
+  }
+}
--- a/src/main/twirl/helper/uploadavatar.scala.html
+++ b/src/main/twirl/helper/uploadavatar.scala.html
@@ -4,9 +4,7 @@
  @if(account.nonEmpty && account.get.image.nonEmpty){
    <img src="@path/@account.get.userName/_avatar" style="with: 120px; height: 120px;"/>
  } else {
-    <div id="clickable">
-      <a href="https://www.gravatar.com/" target="_blank">Gravatar</a> is used
-    </div>
+    <div id="clickable">Upload Image</div>
  }
 </div>
@if(account.nonEmpty && account.get.image.nonEmpty){
@@ -21,7 +19,6 @@ $(function(){
  var dropzone = new Dropzone('div#clickable', {
    url: '@path/upload/image',
    previewsContainer: 'div#avatar',
-    paramName: 'file',
    parallelUploads: 1,
    thumbnailWidth: 120,
    thumbnailHeight: 120
--- a/src/main/twirl/index.scala.html
+++ b/src/main/twirl/index.scala.html
@@ -4,83 +4,67 @@
@import context._
@import view.helpers._
@main("GitBucket"){
-@dashboard.html.tab()
-<div class="row-fluid">
-  <div class="span8">
-    @helper.html.activities(activities)
-  </div>
-  <div class="span4">
-    @if(loginAccount.isEmpty){
-      @signinform(settings)
-    } else {
-      <table class="table table-bordered">
-        <tr>
-          <th class="metal">
-            <div class="pull-right">
-              <a href="@path/new" class="btn btn-success btn-mini">New repository</a>
-            </div>
-            Your repositories (@userRepositories.size)
-          </th>
-        </tr>
-        @if(userRepositories.isEmpty){
-          <tr>
-            <td>No repositories</td>
-          </tr>
+  <div class="container">
+    @dashboard.html.tab()
+    <div class="row-fluid">
+      <div class="span8">
+        @helper.html.activities(activities)
+      </div>
+      <div class="span4">
+        @if(loginAccount.isEmpty){
+          @signinform(settings)
        } else {
-          @userRepositories.map { repository =>
+          <table class="table table-bordered">
            <tr>
-              <td>
-                @if(repository.repository.isPrivate){
-                  <img src="@assets/common/images/repo_private.png"/>
-                } else {
-                  @if(repository.repository.originUserName.isDefined){
-                    <img src="@assets/common/images/repo_fork.png"/>
-                  } else {
-                    <img src="@assets/common/images/repo_public.png"/>
-                  }
-                }
-                @if(repository.owner == loginAccount.get.userName){
-                  <a href="@url(repository)"><span class="strong">@repository.name</span></a>
-                } else {
-                  <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
-                }
-              </td>
+              <th class="metal">
+                <div class="pull-right">
+                  <a href="@path/new" class="btn btn-success btn-mini">New repository</a>
+                </div>
+                Your repositories (@userRepositories.size)
+              </th>
            </tr>
-          }
-        }
-      </table>
-    }
-    
-    <table class="table table-bordered">
-      <tr>
-        <th class="metal">
-          Recent updated repositories
-        </th>
-      </tr>
-      @if(recentRepositories.isEmpty){
-        <tr>
-          <td>No repositories</td>
-        </tr>
-      } else {
-        @recentRepositories.map { repository =>
-          <tr>
-            <td>
-              @if(repository.repository.isPrivate){
-                <img src="@assets/common/images/repo_private.png"/>
-              } else {
-                @if(repository.repository.originUserName.isDefined){
-                  <img src="@assets/common/images/repo_fork.png"/>
-                } else {
-                  <img src="@assets/common/images/repo_public.png"/>
-                }
+            @if(userRepositories.isEmpty){
+              <tr>
+                <td>No repositories</td>
+              </tr>
+            } else {
+              @userRepositories.map { repository =>
+                <tr>
+                  <td>
+                    @helper.html.repositoryicon(repository, false)
+                    @if(repository.owner == loginAccount.get.userName){
+                      <a href="@url(repository)"><span class="strong">@repository.name</span></a>
+                    } else {
+                      <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
+                    }
+                  </td>
+                </tr>
              }
-              <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
-            </td>
-          </tr>
+            }
+          </table>
        }
-      }
-    </table>
+        <table class="table table-bordered">
+          <tr>
+            <th class="metal">
+              Recent updated repositories
+            </th>
+          </tr>
+          @if(recentRepositories.isEmpty){
+            <tr>
+              <td>No repositories</td>
+            </tr>
+          } else {
+            @recentRepositories.map { repository =>
+              <tr>
+                <td>
+                  @helper.html.repositoryicon(repository, false)
+                  <a href="@url(repository)">@repository.owner/<span class="strong">@repository.name</span></a>
+                </td>
+              </tr>
+            }
+          }
+        </table>
+      </div>
+    </div>
  </div>
-
-</div>
-}
+}
--- a/src/main/twirl/issues/commentform.scala.html
+++ b/src/main/twirl/issues/commentform.scala.html
@@ -8,7 +8,7 @@
    <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
      <div class="box issue-comment-box">
      <div class="box-content">
-        @helper.html.preview(repository, "", false, true, "width: 680px; height: 100px; max-height: 150px;", elastic = true)
+        @helper.html.preview(repository, "", false, true, "width: 635px; height: 100px; max-height: 150px;", elastic = true)
      </div>
    </div>
    <div class="pull-right">
--- a/src/main/twirl/issues/create.scala.html
+++ b/src/main/twirl/issues/create.scala.html
@@ -6,85 +6,86 @@
@import context._
@import view.helpers._
@html.main(s"New Issue - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("issues", repository)
-  @tab("", repository)
-  <form action="@url(repository)/issues/new" method="POST" validate="true">
-  <div class="row-fluid">
-    <div class="span9">
-      <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
-      <div class="box issue-box">
-        <div class="box-content">
-          <span id="error-title" class="error"></span>
-          <input type="text" name="title" value="" placeholder="Title" style="width: 600px;"/>
-          <div>
-            <span id="label-assigned">No one is assigned</span>
-            @if(hasWritePermission){
-              <input type="hidden" name="assignedUserName" value=""/>
-              @helper.html.dropdown() {
-                <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
-                @collaborators.map { collaborator =>
-                  <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-while"></i>@avatar(collaborator, 20) @collaborator</a></li>
-                }
-              }
-            }
-            <div class="pull-right">
-              <span id="label-milestone">No milestone</span>
+  @html.menu("issues", repository){
+    @tab("", true, repository)
+    <form action="@url(repository)/issues/new" method="POST" validate="true">
+    <div class="row-fluid">
+      <div class="span9">
+        <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
+        <div class="box issue-box">
+          <div class="box-content">
+            <span id="error-title" class="error"></span>
+            <input type="text" name="title" value="" placeholder="Title" style="width: 565px;"/>
+            <div>
+              <span id="label-assigned">No one is assigned</span>
              @if(hasWritePermission){
-                <input type="hidden" name="milestoneId" value=""/>
+                <input type="hidden" name="assignedUserName" value=""/>
                @helper.html.dropdown() {
-                  <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
-                  @milestones.filter(_.closedDate.isEmpty).map { milestone =>
-                    <li>
-                      <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
-                        <i class="icon-while"></i> @milestone.title
-                        <div class="small" style="padding-left: 20px;">
-                          @milestone.dueDate.map { dueDate =>
-                            @if(isPast(dueDate)){
-                              <img src="@assets/common/images/alert_mono.png"/>Due in @date(dueDate)
-                            } else {
-                              <span class="muted">Due in @date(dueDate)</span>
-                            }
-                          }.getOrElse {
-                            <span class="muted">No due date</span>
-                          }
-                        </div>
-                      </a>
-                    </li>
+                  <li><a href="javascript:void(0);" class="assign" data-name=""><i class="icon-remove-circle"></i> Clear assignee</a></li>
+                  @collaborators.map { collaborator =>
+                    <li><a href="javascript:void(0);" class="assign" data-name="@collaborator"><i class="icon-while"></i>@avatar(collaborator, 20) @collaborator</a></li>
                  }
                }
              }
+              <div class="pull-right">
+                <span id="label-milestone">No milestone</span>
+                @if(hasWritePermission){
+                  <input type="hidden" name="milestoneId" value=""/>
+                  @helper.html.dropdown() {
+                    <li><a href="javascript:void(0);" class="milestone" data-id=""><i class="icon-remove-circle"></i> No milestone</a></li>
+                    @milestones.filter(_.closedDate.isEmpty).map { milestone =>
+                      <li>
+                        <a href="javascript:void(0);" class="milestone" data-id="@milestone.milestoneId" data-title="@milestone.title">
+                          <i class="icon-while"></i> @milestone.title
+                          <div class="small" style="padding-left: 20px;">
+                            @milestone.dueDate.map { dueDate =>
+                              @if(isPast(dueDate)){
+                                <img src="@assets/common/images/alert_mono.png"/>Due in @date(dueDate)
+                              } else {
+                                <span class="muted">Due in @date(dueDate)</span>
+                              }
+                            }.getOrElse {
+                              <span class="muted">No due date</span>
+                            }
+                          </div>
+                        </a>
+                      </li>
+                    }
+                  }
+                }
+              </div>
+            </div>
+            <hr>
+            @helper.html.preview(repository, "", false, true, "width: 565px; height: 200px; max-height: 250px;", elastic = true)
+          </div>
+        </div>
+        <div class="pull-right">
+          <input type="submit" class="btn btn-success" value="Submit new issue"/>
+        </div>
+      </div>
+      <div class="span3">
+        @if(hasWritePermission){
+          <span class="strong">Add Labels</span>
+          <div>
+            <div id="label-list">
+              <ul class="label-list nav nav-pills nav-stacked">
+                @labels.map { label =>
+                  <li>
+                    <a href="javascript:void(0);" class="toggle-label" data-label="@label.labelName" data-bgcolor="@label.color" data-fgcolor="@label.fontColor">
+                      <span style="background-color: #@label.color;" class="label-color">&nbsp;&nbsp;</span>
+                      @label.labelName
+                    </a>
+                  </li>
+                }
+              </ul>
+              <input type="hidden" name="labelNames" value=""/>
            </div>
          </div>
-          <hr>
-          @helper.html.preview(repository, "", false, true, "width: 600px; height: 200px; max-height: 250px;", elastic = true)
-        </div>
-      </div>
-      <div class="pull-right">
-        <input type="submit" class="btn btn-success" value="Submit new issue"/>
+        }
      </div>
    </div>
-    <div class="span3">
-      @if(hasWritePermission){
-        <span class="strong">Add Labels</span>
-        <div>
-          <div id="label-list">
-            <ul class="label-list nav nav-pills nav-stacked">
-              @labels.map { label =>
-                <li>
-                  <a href="javascript:void(0);" class="toggle-label" data-label="@label.labelName" data-bgcolor="@label.color" data-fgcolor="@label.fontColor">
-                    <span style="background-color: #@label.color;" class="label-color">&nbsp;&nbsp;</span>
-                    @label.labelName
-                  </a>
-                </li>
-              }
-            </ul>
-            <input type="hidden" name="labelNames" value=""/>
-          </div>
-        </div>
-      }
-    </div>
-  </div>
-  </form>
+    </form>
+  }
 }
 <script>
 $(function(){
--- a/src/main/twirl/issues/editcomment.scala.html
+++ b/src/main/twirl/issues/editcomment.scala.html
@@ -1,7 +1,9 @@
@(content: String, commentId: Int, owner: String, repository: String)(implicit context: app.Context)
@import context._
 <span id="error-edit-content-@commentId" class="error"></span>
-<textarea style="width: 680px; height: 100px;" id="edit-content-@commentId">@content</textarea>
+@helper.html.attached(owner, repository){
+  <textarea style="width: 635px; height: 100px;" id="edit-content-@commentId">@content</textarea>
+}
 <div>
  <input type="button" id="update-comment-@commentId" class="btn btn-small" value="Update Comment"/>
  <input type="button" id="cancel-comment-@commentId" class="btn btn-small btn-danger pull-right" value="Cancel"/>
--- a/src/main/twirl/issues/editissue.scala.html
+++ b/src/main/twirl/issues/editissue.scala.html
@@ -1,8 +1,10 @@
@(title: String, content: Option[String], issueId: Int, owner: String, repository: String)(implicit context: app.Context)
@import context._
 <span id="error-edit-title" class="error"></span>
-<input type="text" style="width: 680px;" id="edit-title" value="@title"/>
-<textarea style="width: 680px; height: 100px; max-height: 300px;" id="edit-content">@content.getOrElse("")</textarea>
+<input type="text" style="width: 635px;" id="edit-title" value="@title"/>
+@helper.html.attached(owner, repository){
+  <textarea style="width: 635px; height: 100px; max-height: 300px;" id="edit-content">@content.getOrElse("")</textarea>
+}
 <div>
  <input type="button" id="update" class="btn btn-small" value="Update Issue"/>
  <input type="button" id="cancel" class="btn btn-small btn-danger pull-right" value="Cancel"/>
--- a/src/main/twirl/issues/issue.scala.html
+++ b/src/main/twirl/issues/issue.scala.html
@@ -9,31 +9,32 @@
@import context._
@import view.helpers._
@html.main(s"${issue.title} - Issue #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("issues", repository)
-  @tab("issues", repository)
-  <ul class="nav nav-tabs">
-    <li class="pull-left"><a href="@url(repository)/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>
-    <li class="pull-right">Issue #@issue.issueId</li>
-  </ul>
-  <div class="row-fluid">
-    <div class="span10">
-      @issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository)
-      @commentlist(issue, comments, hasWritePermission, repository)
-      @commentform(issue, hasWritePermission, repository)
-    </div>
-    <div class="span2">
-      @if(issue.closed) {
-        <span class="label label-important issue-status">Closed</span>
-      } else {
-        <span class="label label-success issue-status">Open</span>
-      }
-      <div class="small" style="text-align: center;">
-        @defining(comments.filter( _.action.contains("comment") ).size){ count =>
-          <span class="strong">@count</span> @plural(count, "comment")
-        }
+  @html.menu("issues", repository){
+    @tab("issues", false, repository)
+    <ul class="nav nav-tabs pull-left fill-width">
+      <li class="pull-left"><a href="@url(repository)/issues"><i class="icon-arrow-left"></i> Back to issue list</a></li>
+      <li class="pull-right">Issue #@issue.issueId</li>
+    </ul>
+    <div class="row-fluid">
+      <div class="span10">
+        @issuedetail(issue, comments, collaborators, milestones, hasWritePermission, repository)
+        @commentlist(issue, comments, hasWritePermission, repository)
+        @commentform(issue, hasWritePermission, repository)
+      </div>
+      <div class="span2">
+        @if(issue.closed) {
+          <span class="label label-important issue-status">Closed</span>
+        } else {
+          <span class="label label-success issue-status">Open</span>
+        }
+        <div class="small" style="text-align: center;">
+          @defining(comments.filter( _.action.contains("comment") ).size){ count =>
+            <span class="strong">@count</span> @plural(count, "comment")
+          }
+        </div>
+        <hr/>
+        @issues.html.labels(issue, issueLabels, labels, hasWritePermission, repository)
      </div>
-      <hr/>
-      @issues.html.labels(issue, issueLabels, labels, hasWritePermission, repository)
    </div>
-  </div>
+  }
 }
--- a/src/main/twirl/issues/list.scala.html
+++ b/src/main/twirl/issues/list.scala.html
@@ -16,129 +16,130 @@
@import context._
@import view.helpers._
@html.main(s"Issues - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("issues", repository)
-  @tab("issues", repository)
-  <div class="row-fluid">
-    <div class="span3">
-      <ul class="nav nav-pills nav-stacked">
-        <li@if(filter == "all"){ class="active"}>
-          <a href="@url(repository)/issues@condition.toURL">
-            <span class="count-right">@allCount</span>
-            Everyone's Issues
-          </a>
-        </li>
-        @if(loginAccount.isDefined){
-        <li@if(filter == "assigned"){ class="active"}>
-          <a href="@url(repository)/issues/assigned/@loginAccount.map(_.userName)@condition.toURL">
-            <span class="count-right">@assignedCount</span>
-            Assigned to you
-          </a>
-        </li>
-        <li@if(filter == "created_by"){ class="active"}>
-          <a href="@url(repository)/issues/created_by/@loginAccount.map(_.userName)@condition.toURL">
-            <span class="count-right">@createdByCount</span>
-            Created by you
-          </a>
-        </li>
-        }
-      </ul>
-      <hr/>
-      @if(condition.milestoneId.isEmpty){
-        <span class="muted small">No milestone selected</span>
-      } else {
-        @if(condition.milestoneId.get.isEmpty){
-          <span class="muted small">Issues with no milestone</span>
+  @html.menu("issues", repository){
+    @tab("issues", false, repository)
+    <div class="row-fluid">
+      <div class="span3">
+        <ul class="nav nav-pills nav-stacked">
+          <li@if(filter == "all"){ class="active"}>
+            <a href="@url(repository)/issues@condition.toURL">
+              <span class="count-right">@allCount</span>
+              Everyone's Issues
+            </a>
+          </li>
+          @if(loginAccount.isDefined){
+          <li@if(filter == "assigned"){ class="active"}>
+            <a href="@url(repository)/issues/assigned/@loginAccount.map(_.userName)@condition.toURL">
+              <span class="count-right">@assignedCount</span>
+              Assigned to you
+            </a>
+          </li>
+          <li@if(filter == "created_by"){ class="active"}>
+            <a href="@url(repository)/issues/created_by/@loginAccount.map(_.userName)@condition.toURL">
+              <span class="count-right">@createdByCount</span>
+              Created by you
+            </a>
+          </li>
+          }
+        </ul>
+        <hr/>
+        @if(condition.milestoneId.isEmpty){
+          <span class="muted small">No milestone selected</span>
        } else {
-          <span class="muted small">Milestone:</span> @milestones.find(_.milestoneId == condition.milestoneId.get.get).map(_.title)
-        }
-      }
-      @helper.html.dropdown() {
-        @if(condition.milestoneId.isDefined){
-          <li>
-            <a href="@condition.copy(milestoneId = None).toURL">
-              <i class="icon-remove-circle"></i> Clear milestone filter
-            </a>
-          </li>
-        }
-        <li>
-           <a href="@condition.copy(milestoneId = Some(None)).toURL">
-             @helper.html.checkicon(condition.milestoneId == Some(None)) Issues with no milestone
-           </a>
-        </li>
-        @milestones.filter(_.closedDate.isEmpty).map { milestone =>
-          <li>
-            <a href="@condition.copy(milestoneId = Some(Some(milestone.milestoneId))).toURL">
-              @helper.html.checkicon(condition.milestoneId == Some(Some(milestone.milestoneId))) @milestone.title
-              <div class="small" style="padding-left: 20px;">
-                @milestone.dueDate.map { dueDate =>
-                  @if(isPast(dueDate)){
-                    <img src="@assets/common/images/alert_mono.png"/>Due in @date(dueDate)
-                  } else {
-                    <span class="muted">Due in @date(dueDate)</span>
-                  }
-                }.getOrElse {
-                  <span class="muted">No due date</span>
-                }
-              </div>
-            </a>
-          </li>
-        }
-      }
-      @if(condition.milestoneId.isDefined && condition.milestoneId.get.isDefined){
-        @milestones.find(_.milestoneId == condition.milestoneId.get.get).map { milestone =>
-          <div style="margin-top: 4px;">
-            @_root_.issues.milestones.html.progress(openCount + closedCount, closedCount, false)
-          </div>
-          <span class="muted small">@openCount open issues</span>
-          @if(milestone.closedDate.isDefined){
-            @milestone.closedDate.map { closedDate =>
-              <span class="small">Closed in @date(closedDate)</span>
-            }
+          @if(condition.milestoneId.get.isEmpty){
+            <span class="muted small">Issues with no milestone</span>
          } else {
-            @milestone.dueDate.map { dueDate =>
-              @if(isPast(dueDate)){
-                <img src="@assets/common/images/alert.png"/><span class="small milestone-alert">Due in @date(dueDate)</span>
-              } else {
-                <span class="small">Due in @date(dueDate)</span>
+            <span class="muted small">Milestone:</span> @milestones.find(_.milestoneId == condition.milestoneId.get.get).map(_.title)
+          }
+        }
+        @helper.html.dropdown() {
+          @if(condition.milestoneId.isDefined){
+            <li>
+              <a href="@condition.copy(milestoneId = None).toURL">
+                <i class="icon-remove-circle"></i> Clear milestone filter
+              </a>
+            </li>
+          }
+          <li>
+             <a href="@condition.copy(milestoneId = Some(None)).toURL">
+               @helper.html.checkicon(condition.milestoneId == Some(None)) Issues with no milestone
+             </a>
+          </li>
+          @milestones.filter(_.closedDate.isEmpty).map { milestone =>
+            <li>
+              <a href="@condition.copy(milestoneId = Some(Some(milestone.milestoneId))).toURL">
+                @helper.html.checkicon(condition.milestoneId == Some(Some(milestone.milestoneId))) @milestone.title
+                <div class="small" style="padding-left: 20px;">
+                  @milestone.dueDate.map { dueDate =>
+                    @if(isPast(dueDate)){
+                      <img src="@assets/common/images/alert_mono.png"/>Due in @date(dueDate)
+                    } else {
+                      <span class="muted">Due in @date(dueDate)</span>
+                    }
+                  }.getOrElse {
+                    <span class="muted">No due date</span>
+                  }
+                </div>
+              </a>
+            </li>
+          }
+        }
+        @if(condition.milestoneId.isDefined && condition.milestoneId.get.isDefined){
+          @milestones.find(_.milestoneId == condition.milestoneId.get.get).map { milestone =>
+            <div style="margin-top: 4px;">
+              @_root_.issues.milestones.html.progress(openCount + closedCount, closedCount, false)
+            </div>
+            <span class="muted small">@openCount open issues</span>
+            @if(milestone.closedDate.isDefined){
+              @milestone.closedDate.map { closedDate =>
+                <span class="small">Closed in @date(closedDate)</span>
+              }
+            } else {
+              @milestone.dueDate.map { dueDate =>
+                @if(isPast(dueDate)){
+                  <img src="@assets/common/images/alert.png"/><span class="small milestone-alert">Due in @date(dueDate)</span>
+                } else {
+                  <span class="small">Due in @date(dueDate)</span>
+                }
              }
            }
          }
        }
-      }
-      <hr/>
-      <span class="strong">Labels</span>
-      <div>
-        <div id="label-list">
-          <ul class="label-list nav nav-pills nav-stacked">
-            @labels.map { label =>
-              <li>
-                <a href="@condition.copy(labels = (if(condition.labels.contains(label.labelName)) condition.labels - label.labelName else condition.labels + label.labelName)).toURL"
-                   @if(condition.labels.contains(label.labelName)){style="background-color: #@label.color; color: #@label.fontColor;"}>
-                  <span class="count-right">@labelCounts.getOrElse(label.labelName, 0)</span>
-                  <span style="background-color: #@label.color;" class="label-color">&nbsp;&nbsp;</span>
-                  @label.labelName
-                </a>
-              </li>
-             }
-          </ul>
-        </div>
-      </div>
-      @if(hasWritePermission){
        <hr/>
-        <input type="button" class="btn btn-block" id="manageLabel" data-toggle="button" value="Manage Labels"/>
-        <br/>
-        <span class="strong">New label</span>
-        @_root_.issues.labels.html.edit(None, repository)
-      }
+        <span class="strong">Labels</span>
+        <div>
+          <div id="label-list">
+            <ul class="label-list nav nav-pills nav-stacked">
+              @labels.map { label =>
+                <li>
+                  <a href="@condition.copy(labels = (if(condition.labels.contains(label.labelName)) condition.labels - label.labelName else condition.labels + label.labelName)).toURL"
+                     @if(condition.labels.contains(label.labelName)){style="background-color: #@label.color; color: #@label.fontColor;"}>
+                    <span class="count-right">@labelCounts.getOrElse(label.labelName, 0)</span>
+                    <span style="background-color: #@label.color;" class="label-color">&nbsp;&nbsp;</span>
+                    @label.labelName
+                  </a>
+                </li>
+               }
+            </ul>
+          </div>
+        </div>
+        @if(hasWritePermission){
+          <hr/>
+          <input type="button" class="btn btn-block" id="manageLabel" data-toggle="button" value="Manage Labels"/>
+          <br/>
+          <span class="strong">New label</span>
+          @_root_.issues.labels.html.edit(None, repository)
+        }
+      </div>
+      @***** show issue list *****@
+      @listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
    </div>
-    @***** show issue list *****@
-    @listparts(issues, page, openCount, closedCount, condition, collaborators, milestones, labels, Some(repository), hasWritePermission)
-  </div>
-  @if(hasWritePermission){
-    <form id="batcheditForm" method="POST">
-      <input type="hidden" name="value"/>
-      <input type="hidden" name="checked"/>
-    </form>
+    @if(hasWritePermission){
+      <form id="batcheditForm" method="POST">
+        <input type="hidden" name="value"/>
+        <input type="hidden" name="checked"/>
+      </form>
+    }
  }
 }
@if(hasWritePermission){
--- a/src/main/twirl/issues/listparts.scala.html
+++ b/src/main/twirl/issues/listparts.scala.html
@@ -26,8 +26,8 @@
        @helper.html.paginator(page, (if(condition.state == "open") openCount else closedCount), service.IssuesService.IssueLimit, 7, condition.toURL)
      </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>
+        <a class="btn btn-small@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
+        <a class="btn btn-small@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
      </div>
      @helper.html.dropdown(
        value  = (condition.sort, condition.direction) match {
--- a/src/main/twirl/issues/milestones/edit.scala.html
+++ b/src/main/twirl/issues/milestones/edit.scala.html
@@ -2,38 +2,39 @@
@import context._
@import view.helpers._
@html.main(s"Milestones - ${repository.owner}/${repository.name}"){
-  @html.header("milestones", repository)
-  @issues.html.tab("milestones", repository)
-  <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true">
-    <fieldset>
-      <label for="title"><string>Title</string></label>
-      <input type="text" id="title" name="title" style="width: 400px;" value="@milestone.map(_.title)"/>
-      <span id="error-title" class="error"></span>
-    </fieldset>
-    <fieldset>
-      <label for="description" class="strong">Description</label>
-      <textarea id="description" name="description" style="width: 500px; height: 150px;">@milestone.map(_.description)</textarea>
-      <span id="error-description" class="error"></span>
-    </fieldset>
-    <fieldset>
-      <label for="dueDate" class="strong">Due Date</label>
-      @helper.html.datepicker("dueDate", milestone.flatMap(_.dueDate))
-      <span id="error-dueDate" class="error"></span>
-    </fieldset>
-    <hr>
-    <div class="pull-right">
-      @if(milestone.isEmpty){
-        <input type="submit" class="btn" value="Create milestone"/>
-      } else {
-        @if(milestone.get.closedDate.isDefined){
-          <input type="button" class="btn" value="Open" id="open"
-                 onclick="location.href='@url(repository)/issues/milestones/@milestone.get.milestoneId/close';"/>
+  @html.menu("milestones", repository){
+    @issues.html.tab("milestones", false, repository)
+    <form method="POST" action="@url(repository)/issues/milestones/@if(milestone.isEmpty){new}else{@milestone.get.milestoneId/edit}" validate="true">
+      <fieldset>
+        <label for="title"><string>Title</string></label>
+        <input type="text" id="title" name="title" style="width: 400px;" value="@milestone.map(_.title)"/>
+        <span id="error-title" class="error"></span>
+      </fieldset>
+      <fieldset>
+        <label for="description" class="strong">Description</label>
+        <textarea id="description" name="description" style="width: 500px; height: 150px;">@milestone.map(_.description)</textarea>
+        <span id="error-description" class="error"></span>
+      </fieldset>
+      <fieldset>
+        <label for="dueDate" class="strong">Due Date</label>
+        @helper.html.datepicker("dueDate", milestone.flatMap(_.dueDate))
+        <span id="error-dueDate" class="error"></span>
+      </fieldset>
+      <hr>
+      <div class="pull-right">
+        @if(milestone.isEmpty){
+          <input type="submit" class="btn" value="Create milestone"/>
        } else {
-          <input type="button" class="btn" value="Close" id="close"
-                 onclick="location.href='@url(repository)/issues/milestones/@milestone.get.milestoneId/open';"/>
+          @if(milestone.get.closedDate.isDefined){
+            <input type="button" class="btn" value="Open" id="open"
+                   onclick="location.href='@url(repository)/issues/milestones/@milestone.get.milestoneId/close';"/>
+          } else {
+            <input type="button" class="btn" value="Close" id="close"
+                   onclick="location.href='@url(repository)/issues/milestones/@milestone.get.milestoneId/open';"/>
+          }
+          <input type="submit" class="btn" value="Update milestone"/>
        }
-        <input type="submit" class="btn" value="Update milestone"/>
-      }
-    </div>
-  </form>
+      </div>
+    </form>
+  }
 }
--- a/src/main/twirl/issues/milestones/list.scala.html
+++ b/src/main/twirl/issues/milestones/list.scala.html
@@ -5,95 +5,96 @@
@import context._
@import view.helpers._
@html.main(s"Milestones - ${repository.owner}/${repository.name}"){
-  @html.header("issues", repository)
-  @issues.html.tab("milestones", repository)
-  <div class="row-fluid">
-    <div class="span3">
-      <ul class="nav nav-pills nav-stacked">
-        <li@if(state == "open"){ class="active"}>
-          <a href="?state=open">
-            <span class="count-right">@milestones.filter(_._1.closedDate.isEmpty).size</span>
-            Open Milestones
-          </a>
-        </li>
-        <li@if(state == "closed"){ class="active"}>
-          <a href="?state=closed">
-            <span class="count-right">@milestones.filter(_._1.closedDate.isDefined).size</span>
-            Closed Milestones
-          </a>
-        </li>
-      </ul>
-      @if(hasWritePermission){
-        <hr>
-        <a href="@url(repository)/issues/milestones/new" class="btn btn-block">Create a new milestone</a>
-      }
-    </div>
-    <div class="span9">
-      <table class="table table-bordered table-hover">
-        @defining(milestones.filter { case (milestone, _, _) =>
-          milestone.closedDate.map(_ => state == "closed").getOrElse(state == "open")
-        }){ milestones =>
-          @milestones.map { case (milestone, openCount, closedCount) =>
-          <tr>
-            <td>
-              <div class="milestone row-fluid">
-                <div class="span4">
-                  <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open" class="milestone-title">@milestone.title</a><br>
-                  @if(milestone.closedDate.isDefined){
-                    <span class="muted">Closed @datetime(milestone.closedDate.get)</span>
-                  } else {
-                    @milestone.dueDate.map { dueDate =>
-                      @if(isPast(dueDate)){
-                        <img src="@assets/common/images/alert.png"/><span class="muted milestone-alert">Due in @date(dueDate)</span>
-                      } else {
-                        <span class="muted">Due in @date(dueDate)</span>
-                      }
-                    }.getOrElse {
-                      <span class="muted">No due date</span>
-                    }
-                  }
-                </div>
-                <div class="span8">
-                  <div class="milestone-menu">
-                    <div class="pull-right">
-                      @if(hasWritePermission){
-                        <a href="@url(repository)/issues/milestones/@milestone.milestoneId/edit">Edit
-                        @if(milestone.closedDate.isDefined){
-                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/open">Open</a>
-                        } else {
-                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/close">Close</a>
-                        }
-                        <a href="@url(repository)/issues/milestones/@milestone.milestoneId/delete" class="delete">Delete</a>
-                      }
-                      <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open">Browse issues</a>
-                    </div>
-                    <span class="muted">@closedCount closed - @openCount open</span>
-                  </div>
-                  @progress(openCount + closedCount, closedCount, true)
-                </div>
-              </div>
-              @if(milestone.description.isDefined){
-                <div class="milestone-description">
-                  @markdown(milestone.description.get, repository, false, false)
-                </div>
-              }
-            </td>
-          </tr>
-          }
-          @if(milestones.isEmpty){
-          <tr>
-            <td style="padding: 20px; background-color: #eee; text-align: center;">
-              No milestones to show.
-              @if(hasWritePermission){
-                <a href="@url(repository)/issues/milestones/new">Create a new milestone.</a>
-              }
-            </td>
-          </tr>
-          }
+  @html.menu("issues", repository){
+    @issues.html.tab("milestones", false, repository)
+    <div class="row-fluid">
+      <div class="span3">
+        <ul class="nav nav-pills nav-stacked">
+          <li@if(state == "open"){ class="active"}>
+            <a href="?state=open">
+              <span class="count-right">@milestones.filter(_._1.closedDate.isEmpty).size</span>
+              Open Milestones
+            </a>
+          </li>
+          <li@if(state == "closed"){ class="active"}>
+            <a href="?state=closed">
+              <span class="count-right">@milestones.filter(_._1.closedDate.isDefined).size</span>
+              Closed Milestones
+            </a>
+          </li>
+        </ul>
+        @if(hasWritePermission){
+          <hr>
+          <a href="@url(repository)/issues/milestones/new" class="btn btn-block">Create a new milestone</a>
        }
-      </table>
+      </div>
+      <div class="span9">
+        <table class="table table-bordered table-hover">
+          @defining(milestones.filter { case (milestone, _, _) =>
+            milestone.closedDate.map(_ => state == "closed").getOrElse(state == "open")
+          }){ milestones =>
+            @milestones.map { case (milestone, openCount, closedCount) =>
+            <tr>
+              <td>
+                <div class="milestone row-fluid">
+                  <div class="span4">
+                    <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open" class="milestone-title">@milestone.title</a><br>
+                    @if(milestone.closedDate.isDefined){
+                      <span class="muted">Closed @datetime(milestone.closedDate.get)</span>
+                    } else {
+                      @milestone.dueDate.map { dueDate =>
+                        @if(isPast(dueDate)){
+                          <img src="@assets/common/images/alert.png"/><span class="muted milestone-alert">Due in @date(dueDate)</span>
+                        } else {
+                          <span class="muted">Due in @date(dueDate)</span>
+                        }
+                      }.getOrElse {
+                        <span class="muted">No due date</span>
+                      }
+                    }
+                  </div>
+                  <div class="span8">
+                    <div class="milestone-menu">
+                      <div class="pull-right">
+                        @if(hasWritePermission){
+                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/edit">Edit
+                          @if(milestone.closedDate.isDefined){
+                            <a href="@url(repository)/issues/milestones/@milestone.milestoneId/open">Open</a>
+                          } else {
+                            <a href="@url(repository)/issues/milestones/@milestone.milestoneId/close">Close</a>
+                          }
+                          <a href="@url(repository)/issues/milestones/@milestone.milestoneId/delete" class="delete">Delete</a>
+                        }
+                        <a href="@url(repository)/issues?milestone=@milestone.milestoneId&state=open">Browse issues</a>
+                      </div>
+                      <span class="muted">@closedCount closed - @openCount open</span>
+                    </div>
+                    @progress(openCount + closedCount, closedCount, true)
+                  </div>
+                </div>
+                @if(milestone.description.isDefined){
+                  <div class="milestone-description">
+                    @markdown(milestone.description.get, repository, false, false)
+                  </div>
+                }
+              </td>
+            </tr>
+            }
+            @if(milestones.isEmpty){
+            <tr>
+              <td style="padding: 20px; background-color: #eee; text-align: center;">
+                No milestones to show.
+                @if(hasWritePermission){
+                  <a href="@url(repository)/issues/milestones/new">Create a new milestone.</a>
+                }
+              </td>
+            </tr>
+            }
+          }
+        </table>
+      </div>
    </div>
-  </div>
+  }
 }
 <script>
 $(function(){
--- a/src/main/twirl/issues/tab.scala.html
+++ b/src/main/twirl/issues/tab.scala.html
@@ -1,13 +1,17 @@
-@(active: String, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@(active: String, create: Boolean, repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
@import context._
@import view.helpers._
-<ul class="nav nav-tabs">
+<ul class="nav nav-tabs pull-left fill-width">
  <li@if(active == "issues"){ class="active"}><a href="@url(repository)/issues">Browse Issues</a></li>
  <li@if(active == "milestones"){ class="active"}><a href="@url(repository)/issues/milestones">Milestones</a></li>
  @if(loginAccount.isDefined){
  <li class="pull-right">
    <div class="btn-group">
-      <a class="btn btn-success" href="@url(repository)/issues/new">New Issue</a>
+      @if(create){
+        <a class="btn btn-small btn-success" href="#" disabled="disabled">New Issue</a>
+      } else {
+        <a class="btn btn-small btn-success" href="@url(repository)/issues/new">New Issue</a>
+      }
    </div>
  </li>
  }
--- a/src/main/twirl/main.scala.html
+++ b/src/main/twirl/main.scala.html
@@ -72,9 +72,7 @@
        </div>
      </form>
    </div>
-    <div class="container body">
-      @body
-    </div>
+    @body
    <script>
      $(function(){
        $('#search').submit(function(){
--- a/src/main/twirl/menu.scala.html
+++ b/src/main/twirl/menu.scala.html
@@ -0,0 +1,173 @@
+@(active: String,
+  repository: service.RepositoryService.RepositoryInfo,
+  id: Option[String] = None,
+  expand: Boolean = false)(body: Html)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+
+@sidemenu(path: String, name: String, label: String, count: Int = 0) = {
+  <li @if(active == name){class="active"}>
+    <div class="@if(active == name){margin} else {gradient} pull-left"></div>
+    <a href="@url(repository)@path"@* @if(!expand){data-toggle="tooltip" data-placement="left" data-original-title="Code"}*@>
+      @if(active == name){
+        <img src="@assets/common/images/menu-@{name}-active.png">
+      } else {
+        <img src="@assets/common/images/menu-@{name}-active.png" class="menu-icon-active" style="display:none;">
+        <img src="@assets/common/images/menu-@{name}.png"        class="menu-icon">
+      }
+      @if(expand){ @label}
+      @if(expand && count > 0){
+        <div class="pull-right"><span class="label">@count</span></div>
+      }
+    </a>
+  </li>
+}
+
+<div class="container">
+  @if(repository.commitCount > 0){
+    <div class="pull-right">
+      <div class="input-prepend">
+        <a href="@path/@repository.owner/@repository.name/fork" class="btn btn-small" style="margin-bottom: 10px;">Fork</a>
+        <span class="add-on count"><a href="@url(repository)/network/members">@repository.forkedCount</a></span>
+      </div>
+    </div>
+  }
+  <div class="head">
+    @helper.html.repositoryicon(repository, true)
+    <a href="@url(repository.owner)">@repository.owner</a> / <a href="@url(repository)" class="strong">@repository.name</a>
+
+    @defining(repository.repository){ x =>
+      @if(repository.repository.originRepositoryName.isDefined){
+        <div class="forked">
+          forked from <a href="@path/@x.parentUserName/@x.parentRepositoryName">@x.parentUserName/@x.parentRepositoryName</a>
+        </div>
+      }
+    }
+  </div>
+</div>
+<hr style="margin-bottom: 20px;"/>
+<div class="container body">
+  <div style="width: @if(expand){170px} else {40px};" class="pull-right">
+    <ul class="sidemenu">
+      <li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
+      @sidemenu(""       , "code"  , "Code")
+      @sidemenu("/issues", "issues", "Issues", repository.issueCount)
+      @sidemenu("/pulls" , "pulls" , "Pull Requests", repository.pullCount)
+      @sidemenu("/wiki"  , "wiki"  , "Wiki")
+      @if(loginAccount.isDefined && (loginAccount.get.isAdmin || repository.managers.contains(loginAccount.get.userName))){
+        @sidemenu("/settings", "settings", "Settings")
+      }
+      <li style="height: 12px"><div class="gradient pull-left" style="height: 12px"></div></li>
+    </ul>
+    @if(expand){
+      <div class="small">
+        <strong id="repository-url-proto">HTTP</strong> <span class="mute">clone URL</span>
+      </div>
+      @helper.html.copy("repository-url-copy", repository.httpUrl){
+        <input type="text" value="@repository.httpUrl" id="repository-url" readonly>
+      }
+      @if(settings.ssh && loginAccount.isDefined){
+        <div class="small">
+          <span class="mute">You can clone <a href="javascript:void(0);" id="repository-url-http">HTTP</a> or <a href="javascript:void(0);" id="repository-url-ssh">SSH</a>.</span>
+        </div>
+      }
+      @id.map { id =>
+        <div style="margin-top: 10px;">
+          <a href="@{url(repository)}/archive/@{encodeRefName(id)}.zip" class="btn btn-small" style="width: 147px;"><i class="icon-download-alt"></i>Download ZIP</a>
+        </div>
+      }
+    }
+  </div>
+  <div style="margin-right: @if(expand){180px} else {50px};">
+    @if(expand){
+      @repository.repository.description.map { description =>
+        <p class="description">@description</p>
+      }
+      <div style="border: 1px solid #eee; padding: 4px; margin-bottom: 10px;">
+        <table class="fill-width">
+          <tr>
+            <td style="width: 33%; text-align: center;">
+              <a href="@url(repository)/commits/@encodeRefName(id.getOrElse(""))" class="header-link">
+                <img src="@assets/common/images/header-commits-hover.png" class="header-icon-hover" style="display: none;"/>
+                <img src="@assets/common/images/header-commits.png"       class="header-icon"/>
+                <strong>@repository.commitCount</strong> commits
+              </a>
+            </td>
+            <td style="width: 33%; text-align: center;">
+              <a href="@url(repository)/branches" class="header-link" class="header-link">
+                <img src="@assets/common/images/header-branches-hover.png" class="header-icon-hover" style="display: none;"/>
+                <img src="@assets/common/images/header-branches.png"       class="header-icon"/>
+                <strong>@repository.branchList.length</strong> branches
+              </a>
+            </td>
+            <td style="width: 33%; text-align: center;">
+              <a href="@url(repository)/tags" class="header-link" class="header-link">
+                <img src="@assets/common/images/header-tags-hover.png" class="header-icon-hover" style="display: none;"/>
+                <img src="@assets/common/images/header-tags.png"       class="header-icon"/>
+                <strong>@repository.tags.length</strong> releases
+              </a>
+            </td>
+          </tr>
+        </table>
+      </div>
+    }
+    @body
+  </div>
+</div>
+<script>
+$(function(){
+  $('a.header-link').mouseover(function(e){
+    var target = e.target;
+    if(e.target.tagName != 'A'){
+      target = e.target.parentElement;
+    }
+    $(target).children('strong'               ).css('color', '#0088cc');
+    $(target).children('img.header-icon-hover').css('display', 'inline');
+    $(target).children('img.header-icon'      ).css('display', 'none');
+  });
+
+  $('a.header-link').mouseout(function(e){
+    var target = e.target;
+    if(e.target.tagName != 'A'){
+      target = e.target.parentElement;
+    }
+    $(target).children('strong'               ).css('color', 'black');
+    $(target).children('img.header-icon-hover').css('display', 'none');
+    $(target).children('img.header-icon'      ).css('display', 'inline');
+  });
+
+  $('ul.sidemenu a').mouseover(function(e){
+    var target = e.target;
+    if(e.target.tagName == "IMG"){
+      target = e.target.parentElement;
+    }
+    $(target).prev    ('div.gradient'        ).css('border-left', '1px solid silver');
+    $(target).children('img.menu-icon-active').css('display', 'inline');
+    $(target).children('img.menu-icon'       ).css('display', 'none');
+  });
+
+  $('ul.sidemenu a').mouseout(function(e){
+    var target = e.target;
+    if(e.target.tagName == "IMG"){
+      target = e.target.parentElement;
+    }
+    $(target).prev    ('div.gradient'        ).css('border-left', '1px solid #eee');
+    $(target).children('img.menu-icon-active').css('display', 'none');
+    $(target).children('img.menu-icon'       ).css('display', 'inline');
+  });
+
+  @if(settings.ssh && loginAccount.isDefined){
+    $('#repository-url-http').click(function(){
+      $('#repository-url-proto').text('HTTP');
+      $('#repository-url').val('@repository.httpUrl');
+      $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
+    });
+
+    $('#repository-url-ssh').click(function(){
+      $('#repository-url-proto').text('SSH');
+      $('#repository-url').val('@repository.sshUrl(settings.sshPort.getOrElse(service.SystemSettingsService.DefaultSshPort), loginAccount.get.userName)');
+      $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
+    });
+  }
+});
+</script>
--- a/src/main/twirl/pulls/compare.scala.html
+++ b/src/main/twirl/pulls/compare.scala.html
@@ -12,77 +12,78 @@
@import context._
@import view.helpers._
@html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("pulls", repository)
-  <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>
+  @html.menu("pulls", repository){
+    <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>
+      </div>
+      <div id="compare-edit" style="display: none;">
+        <a href="#" id="cancel-condition-editing" class="pull-right"><i class="icon-remove-circle"></i></a>
+        @helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork") {
+          @members.map { case (owner, name) =>
+            <li><a href="#" class="origin-owner" data-owner="@owner" data-name="@name">@helper.html.checkicon(owner == originRepository.owner) @owner/@name</a></li>
+          }
+        }
+        @helper.html.dropdown(originId, "base") {
+          @originRepository.branchList.map { branch =>
+            <li><a href="#" class="origin-branch" data-branch="@encodeRefName(branch)">@helper.html.checkicon(branch == originId) @branch</a></li>
+          }
+        }
+        ...
+        @helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork") {
+          @members.map { case (owner, name) =>
+            <li><a href="#" class="forked-owner" data-owner="@owner" data-name="@name">@helper.html.checkicon(owner == forkedRepository.owner) @owner/@name</a></li>
+          }
+        }
+        @helper.html.dropdown(forkedId, "compare") {
+          @forkedRepository.branchList.map { branch =>
+            <li><a href="#" class="forked-branch" data-branch="@encodeRefName(branch)">@helper.html.checkicon(branch == forkedId) @branch</a></li>
+          }
+        }
+      </div>
    </div>
-    <div id="compare-edit" style="display: none;">
-      <a href="#" id="cancel-condition-editing" class="pull-right"><i class="icon-remove-circle"></i></a>
-      @helper.html.dropdown(originRepository.owner + "/" + originRepository.name, "base fork") {
-        @members.map { case (owner, name) =>
-          <li><a href="#" class="origin-owner" data-owner="@owner" data-name="@name">@helper.html.checkicon(owner == originRepository.owner) @owner/@name</a></li>
-        }
-      }
-      @helper.html.dropdown(originId, "base") {
-        @originRepository.branchList.map { branch =>
-          <li><a href="#" class="origin-branch" data-branch="@encodeRefName(branch)">@helper.html.checkicon(branch == originId) @branch</a></li>
-        }
-      }
-      ...
-      @helper.html.dropdown(forkedRepository.owner + "/" + forkedRepository.name, "head fork") {
-        @members.map { case (owner, name) =>
-          <li><a href="#" class="forked-owner" data-owner="@owner" data-name="@name">@helper.html.checkicon(owner == forkedRepository.owner) @owner/@name</a></li>
-        }
-      }
-      @helper.html.dropdown(forkedId, "compare") {
-        @forkedRepository.branchList.map { branch =>
-          <li><a href="#" class="forked-branch" data-branch="@encodeRefName(branch)">@helper.html.checkicon(branch == forkedId) @branch</a></li>
-        }
-      }
-    </div>
-  </div>
-  @if(commits.nonEmpty && hasWritePermission){
-    <div style="margin-bottom: 10px;" id="create-pull-request">
-      <a href="#" class="btn" id="show-form">Click to create a pull request for this comparison</a>
-    </div>
-    <div id="pull-request-form" class="box" style="display: none;">
-        <div class="box-content">
-          <form method="POST" action="@path/@originRepository.owner/@originRepository.name/pulls/new" validate="true">
-            <div style="width: 260px; position: absolute; margin-left: 635px;">
-              <div class="check-conflict" style="display: none;">
-                <img src="@assets/common/images/indicator.gif"/> Checking...
+    @if(commits.nonEmpty && hasWritePermission){
+      <div style="margin-bottom: 10px;" id="create-pull-request">
+        <a href="#" class="btn" id="show-form">Click to create a pull request for this comparison</a>
+      </div>
+      <div id="pull-request-form" class="box" style="display: none;">
+          <div class="box-content">
+            <form method="POST" action="@path/@originRepository.owner/@originRepository.name/pulls/new" validate="true">
+              <div style="width: 240px; position: absolute; margin-left: 610px;">
+                <div class="check-conflict" style="display: none;">
+                  <img src="@assets/common/images/indicator.gif"/> Checking...
+                </div>
              </div>
-            </div>
-            <div style="width: 620px; border-right: 1px solid #d4d4d4;">
-              <span class="error" id="error-title"></span>
-              <input type="text" name="title" style="width: 600px" placeholder="Title"/>
-              @helper.html.preview(repository, "", false, true, "width: 600px; height: 200px;")
-              <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
-              <input type="hidden" name="targetBranch" value="@originId"/>
-              <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
-              <input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/>
-              <input type="hidden" name="requestBranch" value="@forkedId"/>
-              <input type="hidden" name="commitIdFrom" value="@sourceId"/>
-              <input type="hidden" name="commitIdTo" value="@commitId"/>
-            </div>
-          </form>
-        </div>
-    </div>
-  }
-  @if(commits.isEmpty){
-    <table class="table table-bordered table-hover table-issues">
-      <tr>
-        <td style="padding: 20px; background-color: #eee; text-align: center;">
-          <h4>There isn't anything to compare.</h4>
-          <span class="strong">@originRepository.owner:@originId</span> and <span class="strong">@forkedRepository.owner:@forkedId</span> are identical.
-        </td>
-      </tr>
-    </table>
-  } else {
-    @pulls.html.commits(commits, repository)
-    @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true)
+              <div style="width: 600px; border-right: 1px solid #d4d4d4;">
+                <span class="error" id="error-title"></span>
+                <input type="text" name="title" style="width: 580px" placeholder="Title"/>
+                @helper.html.preview(repository, "", false, true, "width: 580px; height: 200px;")
+                <input type="hidden" name="targetUserName" value="@originRepository.owner"/>
+                <input type="hidden" name="targetBranch" value="@originId"/>
+                <input type="hidden" name="requestUserName" value="@forkedRepository.owner"/>
+                <input type="hidden" name="requestRepositoryName" value="@forkedRepository.name"/>
+                <input type="hidden" name="requestBranch" value="@forkedId"/>
+                <input type="hidden" name="commitIdFrom" value="@sourceId"/>
+                <input type="hidden" name="commitIdTo" value="@commitId"/>
+              </div>
+            </form>
+          </div>
+      </div>
+    }
+    @if(commits.isEmpty){
+      <table class="table table-bordered table-hover table-issues">
+        <tr>
+          <td style="padding: 20px; background-color: #eee; text-align: center;">
+            <h4>There isn't anything to compare.</h4>
+            <span class="strong">@originRepository.owner:@originId</span> and <span class="strong">@forkedRepository.owner:@forkedId</span> are identical.
+          </td>
+        </tr>
+      </table>
+    } else {
+      @pulls.html.commits(commits, repository)
+      @helper.html.diff(diffs, repository, Some(commitId), Some(sourceId), true)
+    }
  }
 }
 <script>
--- a/src/main/twirl/pulls/discussion.scala.html
+++ b/src/main/twirl/pulls/discussion.scala.html
@@ -27,7 +27,7 @@
                Merge pull request #@issue.issueId from @{pullreq.requestUserName}/@{pullreq.requestBranch}
              </div>
              <span id="error-message" class="error"></span>
-              <textarea name="message" style="width: 680px; height: 80px;">@issue.title</textarea>
+              <textarea name="message" style="width: 635px; height: 80px;">@issue.title</textarea>
              <div>
                <input type="button" class="btn" value="Cancel" id="cancel-merge-pull-request"/>
                <input type="submit" class="btn btn-success" value="Confirm merge"/>
--- a/src/main/twirl/pulls/list.scala.html
+++ b/src/main/twirl/pulls/list.scala.html
@@ -11,40 +11,41 @@
@import context._
@import view.helpers._
@html.main(s"Pull Requests - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("pulls", repository)
-  <div class="row-fluid">
-    <div class="span3">
-      <ul class="nav nav-pills nav-stacked">
-        <li@if(filter.isEmpty){ class="active"}>
-          <a href="@url(repository)/pulls">
-            <span class="count-right">@allCount</span>
-            All Requests
-          </a>
-        </li>
-        @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).getOrElse(0)</span>
-            Yours
-          </a>
-        </li>
+  @html.menu("pulls", repository){
+    <div class="row-fluid">
+      <div class="span3">
+        <ul class="nav nav-pills nav-stacked">
+          <li@if(filter.isEmpty){ class="active"}>
+            <a href="@url(repository)/pulls">
+              <span class="count-right">@allCount</span>
+              All Requests
+            </a>
+          </li>
+          @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).getOrElse(0)</span>
+              Yours
+            </a>
+          </li>
+          }
+        </ul>
+        <hr>
+        <ul class="nav nav-pills nav-stacked small">
+        @counts.map { user =>
+          @if(loginAccount.isEmpty || loginAccount.get.userName != user.userName){
+          <li@if(filter.map(_ == user.userName).getOrElse(false)){ class="active"}>
+            <a href="@url(repository)/pulls/@user.userName">
+             <span class="count-right">@user.count</span>
+              @user.userName
+            </a>
+          </li>
+          }
        }
-      </ul>
-      <hr>
-      <ul class="nav nav-pills nav-stacked small">
-      @counts.map { user =>
-        @if(loginAccount.isEmpty || loginAccount.get.userName != user.userName){
-        <li@if(filter.map(_ == user.userName).getOrElse(false)){ class="active"}>
-          <a href="@url(repository)/pulls/@user.userName">
-           <span class="count-right">@user.count</span>
-            @user.userName
-          </a>
-        </li>
-        }
-      }
-      </ul>
+        </ul>
+      </div>
+      @listparts(issues, page, openCount, closedCount, condition, Some(repository), hasWritePermission)
    </div>
-    @listparts(issues, page, openCount, closedCount, condition, Some(repository), hasWritePermission)
-  </div>
+  }
 }

--- a/src/main/twirl/pulls/listparts.scala.html
+++ b/src/main/twirl/pulls/listparts.scala.html
@@ -17,8 +17,8 @@
    }
  }
  <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>
+    <a class="btn btn-small@if(condition.state == "open"){ active}" href="@condition.copy(state = "open").toURL">@openCount Open</a>
+    <a class="btn btn-small@if(condition.state == "closed"){ active}" href="@condition.copy(state = "closed").toURL">@closedCount Closed</a>
  </div>
  @helper.html.dropdown(
    value  = (condition.sort, condition.direction) match {
--- a/src/main/twirl/pulls/pullreq.scala.html
+++ b/src/main/twirl/pulls/pullreq.scala.html
@@ -12,42 +12,43 @@
@import context._
@import view.helpers._
@html.main(s"${issue.title} - Pull Request #${issue.issueId} - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("pulls", repository)
-  @defining(dayByDayCommits.flatten){ commits =>
-    <div class="pullreq-info">
-      @if(issue.closed) {
-        @comments.find(_.action == "merge").map{ comment =>
-          <span class="label label-info">Merged</span>
-          @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
-          into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
-          at @datetime(comment.registeredDate)
-        }.getOrElse {
-          <span class="label label-important">Closed</span>
+  @html.menu("pulls", repository){
+    @defining(dayByDayCommits.flatten){ commits =>
+      <div class="pullreq-info">
+        @if(issue.closed) {
+          @comments.find(_.action == "merge").map{ comment =>
+            <span class="label label-info">Merged</span>
+            @user(comment.commentedUserName, styleClass="username strong") merged @commits.size @plural(commits.size, "commit")
+            into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
+            at @datetime(comment.registeredDate)
+          }.getOrElse {
+            <span class="label label-important">Closed</span>
+            @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
+            into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
+          }
+        } else {
+          <span class="label label-success">Open</span>
          @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
          into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</code>
        }
-      } else {
-        <span class="label label-success">Open</span>
-        @user(issue.openedUserName, styleClass="username strong") wants to merge @commits.size @plural(commits.size, "commit")
-        into <code>@pullreq.userName:@pullreq.branch</code> from <code>@pullreq.requestUserName:@pullreq.requestBranch</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.size</span></a></li>
-      <li><a href="#files">Files Changed <span class="badge">@diffs.size</span></a></li>
-    </ul>
-    <div class="tab-content">
-      <div class="tab-pane active" id="discussion">
-        @pulls.html.discussion(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
      </div>
-      <div class="tab-pane" id="commits">
-        @pulls.html.commits(dayByDayCommits, repository)
+      <ul class="nav nav-tabs fill-width pull-left" id="pullreq-tab">
+        <li class="active"><a href="#discussion">Discussion</a></li>
+        <li><a href="#commits">Commits <span class="badge">@commits.size</span></a></li>
+        <li><a href="#files">Files Changed <span class="badge">@diffs.size</span></a></li>
+      </ul>
+      <div class="tab-content fill-width pull-left">
+        <div class="tab-pane active" id="discussion">
+          @pulls.html.discussion(issue, pullreq, comments, issueLabels, collaborators, milestones, labels, hasWritePermission, repository)
+        </div>
+        <div class="tab-pane" id="commits">
+          @pulls.html.commits(dayByDayCommits, repository)
+        </div>
+        <div class="tab-pane" id="files">
+          @helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true)
+        </div>
      </div>
-      <div class="tab-pane" id="files">
-        @helper.html.diff(diffs, repository, Some(commits.head.id), Some(commits.last.id), true)
-      </div>
-    </div>
+    }
  }
 }
 <script>
--- a/src/main/twirl/repo/blob.scala.html
+++ b/src/main/twirl/repo/blob.scala.html
@@ -2,55 +2,80 @@
  repository: service.RepositoryService.RepositoryInfo,
  pathList: List[String],
  content: util.JGitUtil.ContentInfo,
-  latestCommit: util.JGitUtil.CommitInfo)(implicit context: app.Context)
+  latestCommit: util.JGitUtil.CommitInfo,
+  hasWritePermission: Boolean)(implicit context: app.Context)
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.header("code", repository)
-  @tab(branch, repository, "files")
-  <div class="head">
-    <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
-    @pathList.zipWithIndex.map { case (section, i) =>
-      @if(i == pathList.length - 1){
-        @section
-      } else {
-        <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+  @html.menu("code", repository){
+    <div class="head">
+      @helper.html.dropdown(
+        value  = if(branch.length == 40) branch.substring(0, 10) else branch,
+        prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree",
+        mini   = true
+      ){
+        @repository.branchList.map { x =>
+          <li><a href="@url(repository)/blob/@encodeRefName(x)/@pathList.mkString("/")">@helper.html.checkicon(x == branch) @x</a></li>
+        }
      }
-    }
-  </div>
+      <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+      @pathList.zipWithIndex.map { case (section, i) =>
+        @if(i == pathList.length - 1){
+          @section
+        } else {
+          <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+        }
+      }
+    </div>

-  <table class="table table-bordered">
-    <tr>
-      <th style="font-weight: normal;">
-        <div class="pull-left">
-          @avatar(latestCommit, 20)
-          @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
-          <span class="muted">@datetime(latestCommit.time)</span>
-          <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
-        </div>
-        <div class="btn-group pull-right">
-          <a class="btn btn-mini" href="?raw=true">Raw</a>
-          <a class="btn btn-mini" href="@url(repository)/commits/@encodeRefName(branch)/@pathList.mkString("/")">History</a>
-        </div>  
-      </th>
-    </tr>
-    <tr>
-      <td>
-        @if(content.viewType == "text"){
-        <pre class="prettyprint linenums blob">@content.content.get</pre>
-        }
-        @if(content.viewType == "image"){
-        <img src="?raw=true"/>
-        }
-        @if(content.viewType == "large" || content.viewType == "binary"){
-        <div style="text-align: center">
-          <a href="?raw=true">View Raw</a><br>
-          (Sorry about that, but we can't show files that are this big right now)
-        </div>
-        }
-      </td>
-    </tr>
-  </table>
+    <table class="table table-bordered">
+      <tr>
+        <th style="font-weight: normal;">
+          <div class="pull-left">
+            @avatar(latestCommit, 20)
+            @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
+            <span class="muted">@datetime(latestCommit.time)</span>
+            <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
+          </div>
+          <div class="btn-group pull-right">
+            @if(hasWritePermission && content.viewType == "text" && repository.branchList.contains(branch)){
+              <a class="btn btn-mini" href="@url(repository)/edit/@encodeRefName(branch)/@pathList.mkString("/")">Edit</a>
+            }
+            <a class="btn btn-mini" href="?raw=true">Raw</a>
+            <a class="btn btn-mini" href="@url(repository)/commits/@encodeRefName(branch)/@pathList.mkString("/")">History</a>
+            @if(hasWritePermission){
+              <a class="btn btn-mini btn-danger" href="@url(repository)/remove/@encodeRefName(branch)/@pathList.mkString("/")">Delete</a>
+            }
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td>
+          @if(content.viewType == "text"){
+            @defining(pathList.reverse.head) { file =>
+              @if(renderableSuffixes.find(suffix => file.toLowerCase.endsWith(suffix))) {
+                <div class="box-content markdown-body" style="border: none; padding-left: 16px; padding-right: 16px;">
+                  @renderMarkup(pathList, content.content.get, branch, repository, false, false)
+                </div>
+              } else {
+                <pre class="prettyprint linenums blob">@content.content.get</pre>
+              }
+            }
+          }
+          @if(content.viewType == "image"){
+            <img src="?raw=true"/>
+          }
+          @if(content.viewType == "large" || content.viewType == "binary"){
+            <div style="text-align: center; padding-top: 20px; padding-bottom: 20px;">
+              <a href="?raw=true">View Raw</a><br>
+              <br>
+              (Sorry about that, but we can't show files that are this big right now)
+            </div>
+          }
+        </td>
+      </tr>
+    </table>
+  }
 }
 <script src="@assets/common/js/jquery.ba-hashchange.js"></script>
 <script>
@@ -58,6 +83,31 @@ $(window).load(function(){
  $(window).hashchange(function(){
    updateHighlighting();
  }).hashchange();
+
+  $('pre.prettyprint ol.linenums li').each(function(i, e){
+    var pre = $('pre.prettyprint');
+    pre.append($('<div class="source-line-num">')
+       .data('line', (i + 1))
+       .css({
+      cursor  : 'pointer',
+      position: 'absolute',
+      top     : $(e).position().top + 'px',
+      left    : pre.position().left + 'px',
+      width   : ($(e).position().left - pre.position().left) + 'px',
+      height  : '16px'
+    }));
+  });
+
+  $('div.source-line-num').click(function(e){
+    var line = $(e.target).data('line');
+    var hash = location.hash;
+    if(e.shiftKey == true && hash.match(/#L\d+(-L\d+)?/)){
+      var lines = hash.split('-');
+      location.hash = lines[0] + '-L' + line;
+    } else {
+      location.hash = '#L' + line;
+    }
+  });
 });

 /**
--- a/src/main/twirl/repo/branches.scala.html
+++ b/src/main/twirl/repo/branches.scala.html
@@ -4,38 +4,38 @@
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.header("code", repository)
-  @tab(repository.repository.defaultBranch, repository, "branches", true)
-  <h1>Branches</h1>
-  <table class="table table-bordered">
-    <tr>
-      <th width="40%">Branch</th>
-      <th width="20%">Last update</th>
-      <th width="20%">Compare</th>
-      <th width="20%">Download</th>
-    </tr>
-    @branchInfo.map { case (branchName, latestUpdateDate) =>
+  @html.menu("code", repository){
+    <h1>Branches</h1>
+    <table class="table table-bordered">
      <tr>
-        <td>
-          <a href="@url(repository)/tree/@encodeRefName(branchName)">@branchName</a>
-          @if(hasWritePermission && repository.repository.defaultBranch != branchName){
-            <a href="@url(repository)/delete/@encodeRefName(branchName)" class="btn btn-danger btn-mini pull-right delete-branch" data-name="@branchName">Delete branch</a>
-          }
-        </td>
-        <td>
-          @datetime(latestUpdateDate)
-        </td>
-        <td>
-          @if(repository.repository.defaultBranch == branchName){
-            Base branch
-          } else {
-            <a href="@url(repository)/compare/@{encodeRefName(repository.repository.defaultBranch)}...@{encodeRefName(branchName)}">to @{repository.repository.defaultBranch}</a>
-          }
-        </td>
-        <td><a href="@url(repository)/archive/@{encodeRefName(branchName)}.zip">ZIP</a></td>
+        <th width="40%">Branch</th>
+        <th width="20%">Last update</th>
+        <th width="20%">Compare</th>
+        <th width="20%">Download</th>
      </tr>
-    }
-  </table>
+      @branchInfo.map { case (branchName, latestUpdateDate) =>
+        <tr>
+          <td>
+            <a href="@url(repository)/tree/@encodeRefName(branchName)">@branchName</a>
+            @if(hasWritePermission && repository.repository.defaultBranch != branchName){
+              <a href="@url(repository)/delete/@encodeRefName(branchName)" class="btn btn-danger btn-mini pull-right delete-branch" data-name="@branchName">Delete branch</a>
+            }
+          </td>
+          <td>
+            @datetime(latestUpdateDate)
+          </td>
+          <td>
+            @if(repository.repository.defaultBranch == branchName){
+              Base branch
+            } else {
+              <a href="@url(repository)/compare/@{encodeRefName(repository.repository.defaultBranch)}...@{encodeRefName(branchName)}">to @{repository.repository.defaultBranch}</a>
+            }
+          </td>
+          <td><a href="@url(repository)/archive/@{encodeRefName(branchName)}.zip">ZIP</a></td>
+        </tr>
+      }
+    </table>
+  }
 }
 <script>
 $(function(){
--- a/src/main/twirl/repo/commit.scala.html
+++ b/src/main/twirl/repo/commit.scala.html
@@ -9,68 +9,68 @@
@import view.helpers._
@import util.Implicits._
@html.main(commit.shortMessage, Some(repository)){
-  @html.header("code", repository)
-  @tab(commitId, repository, "commits")
-  <table class="table table-bordered">
-    <tr>
-      <th>
-        <div class="pull-right align-right">
-          <a href="@url(repository)/tree/@commit.id" class="btn btn-small">Browse code</a>
-        </div>
-        <div class="commit-log">@link(commit.summary, repository)</div>
-        @if(commit.description.isDefined){
-          <pre class="commit-description">@link(commit.description.get, repository)</pre>
-        }
-        <div class="small" style="font-weight: normal;">
-          @if(branches.nonEmpty){
-            <span class="muted">
-              <img src="@assets/common/images/branch.png"/>
-              @branches.zipWithIndex.map { case (branch, i) =>
-                <a href="@url(repository)/tree/@encodeRefName(branch)" class="branch" id="branch-@i">@branch</a>
-              }
-            </span>
-          }
-          @if(tags.nonEmpty){
-            <span class="muted">
-              <img src="@assets/common/images/tag.png"/>
-              @tags.zipWithIndex.map { case (tag, i) =>
-                <a href="@url(repository)/tree/@tag" class="tag" id="tag-@i">@tag</a>
-              }
-            </span>
-          }
-        </div>
-      </th>
-    </tr>
-    <tr>
-      <td>
-        @avatar(commit, 20)
-        @user(commit.committer, commit.mailAddress, "username strong")
-        <span class="muted">@datetime(commit.time)</span>
-        <div class="pull-right monospace small" style="text-align: right;">
-          <div>
-            @if(commit.parents.size == 0){
-              <span class="muted">0 parent</span>
-            }
-            @if(commit.parents.size == 1){
-              <span class="muted">1 parent</span>
-              <a href="@url(repository)/commit/@commit.parents(0)" class="commit-id">@commit.parents(0).substring(0, 7)</a>
-            }
-            <span class="muted">commit</span> @commit.id
+  @html.menu("code", repository){
+    <table class="table table-bordered">
+      <tr>
+        <th>
+          <div class="pull-right align-right">
+            <a href="@url(repository)/tree/@commit.id" class="btn btn-small">Browse code</a>
          </div>
-          @if(commit.parents.size > 1){
-            <div>
-              <span class="muted">@commit.parents.size parents
-              @commit.parents.map { parent =>
-                <a href="@url(repository)/commit/@parent" class="commit-id">@parent.substring(0, 7)</a>
-              }.mkHtml(" + ")
-              </span>
-            </div>
+          <div class="commit-log">@link(commit.summary, repository)</div>
+          @if(commit.description.isDefined){
+            <pre class="commit-description">@link(commit.description.get, repository)</pre>
          }
-        </div>
-      </td>
-    </tr>
-  </table>
-  @helper.html.diff(diffs, repository, Some(commit.id), oldCommitId, true)
+          <div class="small" style="font-weight: normal;">
+            @if(branches.nonEmpty){
+              <span class="muted">
+                <img src="@assets/common/images/branch.png"/>
+                @branches.zipWithIndex.map { case (branch, i) =>
+                  <a href="@url(repository)/tree/@encodeRefName(branch)" class="branch" id="branch-@i">@branch</a>
+                }
+              </span>
+            }
+            @if(tags.nonEmpty){
+              <span class="muted">
+                <img src="@assets/common/images/tag.png"/>
+                @tags.zipWithIndex.map { case (tag, i) =>
+                  <a href="@url(repository)/tree/@tag" class="tag" id="tag-@i">@tag</a>
+                }
+              </span>
+            }
+          </div>
+        </th>
+      </tr>
+      <tr>
+        <td>
+          @avatar(commit, 20)
+          @user(commit.committer, commit.mailAddress, "username strong")
+          <span class="muted">@datetime(commit.time)</span>
+          <div class="pull-right monospace small" style="text-align: right;">
+            <div>
+              @if(commit.parents.size == 0){
+                <span class="muted">0 parent</span>
+              }
+              @if(commit.parents.size == 1){
+                <span class="muted">1 parent</span>
+                <a href="@url(repository)/commit/@commit.parents(0)" class="commit-id">@commit.parents(0).substring(0, 7)</a>
+              }
+              <span class="muted">commit</span> @commit.id
+            </div>
+            @if(commit.parents.size > 1){
+              <div>
+                <span class="muted">@commit.parents.size parents
+                @commit.parents.map { parent =>
+                  <a href="@url(repository)/commit/@parent" class="commit-id">@parent.substring(0, 7)</a>
+                }.mkHtml(" + ")
+                </span>
+              </div>
+            }
+          </div>
+        </td>
+      </tr>
+    </table>
+    @helper.html.diff(diffs, repository, Some(commit.id), oldCommitId, true)
+  }
 }
 <script>
 $(function(){
--- a/src/main/twirl/repo/commits.scala.html
+++ b/src/main/twirl/repo/commits.scala.html
@@ -7,60 +7,69 @@
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.header("code", repository)
-  @tab(branch, repository, if(pathList.isEmpty) "commits" else "files")
-  <div class="head">
-    @if(pathList.isEmpty){
-      <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> / Commit History
-    }
-    @if(pathList.nonEmpty){
-      <span class="muted">History for</span>
-      <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
-      @pathList.zipWithIndex.map { case (section, i) =>
-        @if(i == pathList.length - 1){
-          @section
-        } else {
-          <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+  @html.menu("code", repository){
+    <div class="head">
+      @helper.html.dropdown(
+        value  = if(branch.length == 40) branch.substring(0, 10) else branch,
+        prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree",
+        mini   = true
+      ){
+        @repository.branchList.map { x =>
+          <li><a href="@url(repository)/commits/@encodeRefName(x)">@helper.html.checkicon(x == branch) @x</a></li>
        }
      }
-    }
-  </div>
-  @commits.map { day =>
-    <table class="table table-bordered">
-      <tr>
-        <th>@date(day.head.time)</th>
-      </tr>
-      @day.map { commit =>
-      <tr>
-        <td>
-          <div class="pull-right align-right">
-            <a href="@url(repository)/commit/@commit.id" class="btn btn-small monospace">@commit.id.substring(0, 10)</a><br>
-            <a href="@url(repository)/tree/@commit.id" class="small">Browse code</a>
-          </div>
-          <div>
-            <div class="commit-avatar-image">@avatar(commit, 40)</div>
-            <div class="commit-message-box">
-              <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
-              @if(commit.description.isDefined){
-                <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
-              }
-              <br>
-              @if(commit.description.isDefined){
-                <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
-              }
-              <div class="small">
-                @user(commit.committer, commit.mailAddress, "username")
-                <span class="muted">@datetime(commit.time)</span>
+      @if(pathList.isEmpty){
+        <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> / Commit History
+      }
+      @if(pathList.nonEmpty){
+        <span class="muted">History for</span>
+        <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+        @pathList.zipWithIndex.map { case (section, i) =>
+          @if(i == pathList.length - 1){
+            @section
+          } else {
+            <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+          }
+        }
+      }
+    </div>
+    @commits.map { day =>
+      <table class="table table-bordered">
+        <tr>
+          <th>@date(day.head.time)</th>
+        </tr>
+        @day.map { commit =>
+        <tr>
+          <td>
+            <div class="pull-right align-right">
+              <a href="@url(repository)/commit/@commit.id" class="btn btn-small monospace">@commit.id.substring(0, 10)</a><br>
+              <a href="@url(repository)/tree/@commit.id" class="small">Browse code</a>
+            </div>
+            <div>
+              <div class="commit-avatar-image">@avatar(commit, 40)</div>
+              <div class="commit-message-box">
+                <a href="@url(repository)/commit/@commit.id" class="commit-message" style="font-weight: bold;">@link(commit.summary, repository)</a>
+                @if(commit.description.isDefined){
+                  <a href="javascript:void(0)" onclick="$('#description-@commit.id').toggle();" class="omit">...</a>
+                }
+                <br>
+                @if(commit.description.isDefined){
+                  <pre id="description-@commit.id" style="display: none;" class="commit-description">@link(commit.description.get, repository)</pre>
+                }
+                <div class="small">
+                  @user(commit.committer, commit.mailAddress, "username")
+                  <span class="muted">@datetime(commit.time)</span>
+                </div>
              </div>
            </div>
-          </div>
-        </td>
-      </tr>
-      }
-    </table>
+          </td>
+        </tr>
+        }
+      </table>
+    }
+    <div class="btn-group">
+      <button class="btn" onclick="location.href='?page=@{page - 1}'"@if(page <= 1){ disabled="true"}>&lt; Newer</button>
+      <button class="btn" onclick="location.href='?page=@{page + 1}'"@if(!hasNext){ disabled="true"}>Older &gt;</button>
+    </div>
  }
-  <div class="btn-group">
-    <button class="btn" onclick="location.href='?page=@{page - 1}'"@if(page <= 1){ disabled="true"}>&lt; Newer</button>
-    <button class="btn" onclick="location.href='?page=@{page + 1}'"@if(!hasNext){ disabled="true"}>Older &gt;</button>
-  </div>   
 }
--- a/src/main/twirl/repo/delete.scala.html
+++ b/src/main/twirl/repo/delete.scala.html
@@ -0,0 +1,61 @@
+@(branch: String,
+  repository: service.RepositoryService.RepositoryInfo,
+  pathList: List[String],
+  fileName: String,
+  content: util.JGitUtil.ContentInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(s"Deleting ${path} at ${fileName} - ${repository.owner}/${repository.name}", Some(repository)) {
+  @html.menu("code", repository){
+    <form method="POST" action="@url(repository)/remove" validate="true">
+      <div class="head">
+        <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+        @pathList.zipWithIndex.map { case (section, i) =>
+          <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+        }
+        @fileName
+        <input type="hidden" name="fileName" id="fileName" value="@fileName"/>
+        <input type="hidden" name="branch" id="branch" value="@branch"/>
+        <input type="hidden" name="path" id="path" value="@pathList.mkString("/")"/>
+      </div>
+      <table class="table table-bordered">
+        <th style="font-weight: normal;" class="box-header">
+          @fileName
+          <div class="pull-right align-right">
+            <a href="@url(repository)/blob/@branch/@{(pathList ::: List(fileName)).mkString("/")}" class="btn btn-small">View</a>
+          </div>
+        </th>
+        <tr>
+          <td>
+            <div id="diffText"></div>
+            <textarea id="newText" style="display: none;"></textarea>
+            <textarea id="oldText" style="display: none;">@content.content</textarea>
+          </td>
+        </tr>
+      </table>
+      <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
+        <div class="box issue-comment-box">
+        <div class="box-content">
+          <div>
+            <strong>Commit changes</strong>
+          </div>
+          <div>
+            <input type="text" name="message" style="width: 98%;"/>
+          </div>
+          <div style="text-align: right;">
+            <a href="@url(repository)/blob/@encodeRefName(branch)/@pathList.mkString("/")" class="btn btn-danger">Cancel</a>
+            <input type="submit" id="commit" class="btn btn-success" value="Commit changes"/>
+          </div>
+        </div>
+      </div>
+    </form>
+  }
+}
+<script type="text/javascript" src="@assets/jsdifflib/difflib.js"></script>
+<script type="text/javascript" src="@assets/jsdifflib/diffview.js"></script>
+<link href="@assets/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
+<script>
+$(function(){
+  diffUsingJS('oldText', 'newText', 'diffText');
+});
+</script>
--- a/src/main/twirl/repo/editor.scala.html
+++ b/src/main/twirl/repo/editor.scala.html
@@ -0,0 +1,145 @@
+@(branch: String,
+  repository: service.RepositoryService.RepositoryInfo,
+  pathList: List[String],
+  fileName: Option[String],
+  content: util.JGitUtil.ContentInfo)(implicit context: app.Context)
+@import context._
+@import view.helpers._
+@html.main(if(fileName.isEmpty) "New File" else s"Editing ${fileName.get} at ${branch} - ${repository.owner}/${repository.name}", Some(repository)) {
+  @html.menu("code", repository){
+    <form method="POST" action="@url(repository)/@if(fileName.isEmpty){create}else{update}" validate="true">
+      <span class="error" id="error-newFileName"></span>
+      <div class="head">
+        <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+        @pathList.zipWithIndex.map { case (section, i) =>
+          <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+        }
+        <input type="text" name="newFileName" id="newFileName" placeholder="Name your file..." value="@fileName"/>
+        <input type="hidden" name="oldFileName" id="oldFileName" value="@fileName"/>
+        <input type="hidden" name="branch" id="branch" value="@branch"/>
+        <input type="hidden" name="path" id="path" value="@pathList.mkString("/")"/>
+      </div>
+      <table class="table table-bordered">
+        <tr>
+          <th>
+            <div class="pull-right">
+              <select id="wrap" class="input-medium" style="margin-bottom: 0px; height: 26px; padding: 0px;">
+                <optgroup label="Line Wrap Mode">
+                  <option value="false">No wrap</option>
+                  <option value="true">Soft wrap</option>
+                </optgroup>
+              </select>
+            </div>
+            <div class="btn-group" data-toggle="buttons-radio">
+              <input type="button" id="btn-code" class="btn btn-default btn-small active" value="Code">
+              <input type="button" id="btn-preview" class="btn btn-default btn-small" value="Preview">
+            </div>
+          </th>
+        </tr>
+        <tr>
+          <td>
+            <div id="editor" style="width: 100%; height: 600px;"></div>
+            <div id="preview" style="width: 100%; display: none;"></div>
+          </td>
+        </tr>
+      </table>
+      <div class="issue-avatar-image">@avatar(loginAccount.get.userName, 48)</div>
+        <div class="box issue-comment-box">
+        <div class="box-content">
+          <div>
+            <strong>Commit changes</strong>
+          </div>
+          <div>
+            <input type="text" name="message" style="width: 98%;"/>
+          </div>
+          <div style="text-align: right;">
+            @if(fileName.isEmpty){
+              <a href="@url(repository)/tree/@encodeRefName(branch)/@{pathList.mkString("/")}" class="btn btn-danger">Cancel</a>
+            } else {
+              <a href="@url(repository)/blob/@encodeRefName(branch)/@{(pathList ++ Seq(fileName.get)).mkString("/")}" class="btn btn-danger">Cancel</a>
+            }
+            <input type="submit" id="commit" class="btn btn-success" value="Commit changes" disabled="true"/>
+            <input type="hidden" id="charset" name="charset" value="@content.charset"/>
+            <input type="hidden" id="content" name="content" value=""/>
+            <input type="hidden" id="initial" value="@content.content"/>
+          </div>
+        </div>
+      </div>
+    </form>
+  }
+}
+<script src="@assets/ace/ace.js" type="text/javascript" charset="utf-8"></script>
+<script type="text/javascript" src="@assets/jsdifflib/difflib.js"></script>
+<script type="text/javascript" src="@assets/jsdifflib/diffview.js"></script>
+<link href="@assets/jsdifflib/diffview.css" type="text/css" rel="stylesheet" />
+<script>
+$(function(){
+  $('#editor').text($('#initial').val());
+  var editor = ace.edit("editor");
+  editor.setTheme("ace/theme/monokai");
+  //editor.getSession().setUseWrapMode(false);
+
+  @if(fileName.isDefined){
+    editor.getSession().setMode("ace/mode/@editorType(fileName.get)");
+  }
+
+  editor.on('change', function(){
+    updateCommitButtonStatus();
+  });
+
+  function updateCommitButtonStatus(){
+    if(editor.getValue() == $('#initial').val() && $('#newFileName').val() == $('#oldFileName').val()){
+      $('#commit').attr('disabled', true);
+    } else {
+      $('#commit').attr('disabled', false);
+    }
+  }
+
+  $('#wrap').change(function(){
+    if($('#wrap option:selected').val() == 'true'){
+      editor.getSession().setUseWrapMode(true);
+    } else {
+      editor.getSession().setUseWrapMode(false);
+    }
+  });
+
+  $('#newFileName').watch(function(){
+    updateCommitButtonStatus();
+  });
+
+  $('#commit').click(function(){
+    $('#content').val(editor.getValue());
+  });
+
+  $('#btn-code').click(function(){
+    $('#editor').show();
+    $('#preview').hide();
+  });
+
+  $('#btn-preview').click(function(){
+    $('#editor').hide();
+    $('#preview').show()
+
+    @if(renderableSuffixes.find(suffix => fileName.map(_.toLowerCase.endsWith(suffix)).getOrElse(false))) {
+      // update preview
+      $('#preview').html('<img src="@assets/common/images/indicator.gif"> Previewing...');
+      $.post('@url(repository)/_preview', {
+        content        : editor.getValue(),
+        enableWikiLink : false,
+        enableRefsLink : false
+      }, function(data){
+        $('#preview').empty().append(
+          $('<div class="markdown-body" style="padding-left: 16px; padding-right: 16px;">').html(data));
+        prettyPrint();
+      });
+    } else {
+      // Show diff
+      $('#preview').empty()
+        .append($('<div id="diffText">'))
+        .append($('<textarea id="newText" style="display: none;">').html(editor.getValue()))
+        .append($('<textarea id="oldText" style="display: none;">').html($('#initial').val()));
+      diffUsingJS('oldText', 'newText', 'diffText');
+    }
+  });
+});
+</script>
--- a/src/main/twirl/repo/files.scala.html
+++ b/src/main/twirl/repo/files.scala.html
@@ -3,25 +3,31 @@
  pathList: List[String],
  latestCommit: util.JGitUtil.CommitInfo,
  files: List[util.JGitUtil.FileInfo],
-  readme: Option[(util.JGitUtil.FileInfo, String)])(implicit context: app.Context)
+  readme: Option[(List[String], String)],
+  hasWritePermission: Boolean)(implicit context: app.Context)
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.header("code", repository)
-  @tab(branch, repository, "files")
-  <div class="head">
-    <div class="pull-right">
-      @defining(repository.commitCount){ commitCount =>
-        <a href="@url(repository)/commits/@encodeRefName(branch)">@if(commitCount > 10000){ @commitCount+ } else { @commitCount } @plural(commitCount, "commit")</a>&nbsp;
+  @html.menu("code", repository, Some(branch), pathList.isEmpty){
+    <div class="head">
+      @helper.html.dropdown(
+        value  = if(branch.length == 40) branch.substring(0, 10) else branch,
+        prefix = if(branch.length == 40) "tree" else if(repository.branchList.contains(branch)) "branch" else "tree",
+        mini   = true
+      ){
+        @repository.branchList.map { x =>
+          <li><a href="@url(repository)/tree/@encodeRefName(x)">@helper.html.checkicon(x == branch) @x</a></li>
+        }
+      }
+      <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
+      @pathList.zipWithIndex.map { case (section, i) =>
+        <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
+      }
+      @if(hasWritePermission){
+        <a href="@url(repository)/new/@encodeRefName(branch)/@pathList.mkString("/")"><img src="@assets/common/images/newfile.png"/></a>
      }
    </div>
-    <a href="@url(repository)/tree/@encodeRefName(branch)">@repository.name</a> /
-    @pathList.zipWithIndex.map { case (section, i) =>
-      <a href="@url(repository)/tree/@encodeRefName(branch)/@pathList.take(i + 1).mkString("/")">@section</a> /
-    }
-  </div>
-  <div class="box">
-    <table class="table table-file-list" style="border: 1px solid silver;">
+    <table class="table table-file-list">
      <tr>
        <th colspan="4" style="font-weight: normal;">
          <a href="@url(repository)/commit/@latestCommit.id" class="commit-message">@link(latestCommit.summary, repository)</a>
@@ -37,7 +43,7 @@
            @avatar(latestCommit, 20)
            @user(latestCommit.committer, latestCommit.mailAddress, "username strong")
            <span class="muted">@datetime(latestCommit.time)</span>
-            <div class="pull-right align-right monospace">
+            <div class="pull-right align-right monospace" style="line-height: 18px;">
              <a href="@url(repository)/commit/@latestCommit.id" class="commit-id"><span class="muted">latest commit</span> @latestCommit.id.substring(0, 10)</a>
            </div>
          </div>
@@ -75,20 +81,19 @@
          <a href="@url(repository)/blob@{(encodeRefName(branch) :: pathList).mkString("/", "/", "/")}@file.name">@file.name</a>
        }
        </td>
-        <td>@datetime(file.time)</td>
-        <td>
+        <td class="mute">
          <a href="@url(repository)/commit/@file.commitId" class="commit-message">@link(file.message, repository)</a>
          [@user(file.committer, file.mailAddress)]
        </td>
+        <td style="text-align: right;">@datetime(file.time)</td>
      </tr>
      }
    </table>
-  </div>
-  
-  @readme.map { case(file, content) =>
-  <div id="readme" class="box">
-    <div class="box-header">@file.name</div>
-    <div class="box-content markdown-body">@markdown(content, repository, false, false)</div>
-  </div>
+    @readme.map { case(filePath, content) =>
+      <div id="readme">
+        <div class="box-header">@filePath.reverse.head</div>
+        <div class="box-content markdown-body">@renderMarkup(filePath, content, branch, repository, false, false)</div>
+      </div>
+    }
  }
 }
--- a/src/main/twirl/repo/forked.scala.html
+++ b/src/main/twirl/repo/forked.scala.html
@@ -4,31 +4,32 @@
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.header("network", repository)
-  <ul class="nav nav-tabs">
-    <li class="active"><a href="@url(repository)/network/members">Members</a></li>
-  </ul>
-  <h3>Members of the @repository.name Network</h3>
-  <div class="block">
-    @if(originRepository.isDefined){
-      @avatar(originRepository.get.owner, 20)
-      <span@if(repository.owner == originRepository.get.owner){ class="highlight"}>
-        <a href="@url(originRepository.get)">@originRepository.get.owner</a> / <a href="@path/@originRepository.get.owner/@originRepository.get.name">@originRepository.get.name</a>
-      </span>
-    } else {
-      @avatar(repository.repository.originUserName.get, 20)
-      <span class="highlight">
-        @repository.repository.originUserName / @repository.repository.originRepositoryName
-      </span>
-    }
-    (origin)
-  </div>
-  @members.map { case (owner, name) =>
+  @html.menu("network", repository){
+    <ul class="nav nav-tabs">
+      <li class="active"><a href="@url(repository)/network/members">Members</a></li>
+    </ul>
+    <h3>Members of the @repository.name Network</h3>
    <div class="block">
-      @avatar(owner, 20)
-      <span@if(repository.owner == owner){ class="highlight"}>
-        <a href="@url(owner)">@owner</a> / <a href="@path/@owner/@name">@name</a>
-      </span>
+      @if(originRepository.isDefined){
+        @avatar(originRepository.get.owner, 20)
+        <span@if(repository.owner == originRepository.get.owner){ class="highlight"}>
+          <a href="@url(originRepository.get)">@originRepository.get.owner</a> / <a href="@path/@originRepository.get.owner/@originRepository.get.name">@originRepository.get.name</a>
+        </span>
+      } else {
+        @avatar(repository.repository.originUserName.get, 20)
+        <span class="highlight">
+          @repository.repository.originUserName / @repository.repository.originRepositoryName
+        </span>
+      }
+      (origin)
    </div>
+    @members.map { case (owner, name) =>
+      <div class="block">
+        @avatar(owner, 20)
+        <span@if(repository.owner == owner){ class="highlight"}>
+          <a href="@url(owner)">@owner</a> / <a href="@path/@owner/@name">@name</a>
+        </span>
+      </div>
+    }
  }
 }
--- a/src/main/twirl/repo/guide.scala.html
+++ b/src/main/twirl/repo/guide.scala.html
@@ -1,21 +1,27 @@
-@(repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
+@(repository: service.RepositoryService.RepositoryInfo,
+  hasWritePermission: Boolean)(implicit context: app.Context)
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-@html.header("code", repository)
-<h3 style="margin-top: 30px;">Create a new repository on the command line</h3>
-<pre>
-touch README.md
-git init
-git add README.md
-git commit -m "first commit"
-git remote add origin @repository.httpUrl
-git push -u origin master
-</pre>
+  @html.menu("code", repository){
+    @if(!hasWritePermission){
+      <h3>This is an empty repository</h3>
+    } else {
+      <h3 style="margin-top: 30px;">Create a new repository on the command line</h3>
+      <pre>
+      touch README.md
+      git init
+      git add README.md
+      git commit -m "first commit"
+      git remote add origin @repository.httpUrl
+      git push -u origin master
+      </pre>

-<h3 style="margin-top: 30px;">Push an existing repository from the command line</h3>
-<pre>
-git remote add origin @repository.httpUrl
-git push -u origin master
-</pre>
-}
+      <h3 style="margin-top: 30px;">Push an existing repository from the command line</h3>
+      <pre>
+      git remote add origin @repository.httpUrl
+      git push -u origin master
+      </pre>
+    }
+  }
+}
--- a/src/main/twirl/repo/tab.scala.html
+++ b/src/main/twirl/repo/tab.scala.html
@@ -1,55 +0,0 @@
-@(id: String, repository: service.RepositoryService.RepositoryInfo, active: String,
-  hideBranchPulldown: Boolean = false)(implicit context: app.Context)
-@import context._
-@import view.helpers._
-<ul class="nav nav-tabs">
-  @if(!hideBranchPulldown){
-  <li>
-    @helper.html.dropdown(
-      value  = if(id.length == 40) id.substring(0, 10) else id,
-      prefix = if(id.length == 40) "tree" else if(repository.branchList.contains(id)) "branch" else "tree",
-      mini   = false,
-      style  = "margin-right: 20px;"
-    ){
-      @repository.branchList.map { branch =>
-        <li><a href="@url(repository)/@if(active=="commits"){commits} else {tree}/@encodeRefName(branch)">@helper.html.checkicon(id == branch) @branch</a></li>
-      }
-    }
-  </li>
-  }
-  <li@if(active=="files"   ){ class="active"}><a href="@url(repository)/tree/@encodeRefName(id)">Files</a></li>
-  <li@if(active=="commits" ){ class="active"}><a href="@url(repository)/commits/@encodeRefName(id)">Commits</a></li>
-  <li@if(active=="branches"){ class="active"}><a href="@url(repository)/branches">Branches@if(repository.branchList.length > 0){ <span class="badge">@repository.branchList.length</span>}</a></li>
-  <li@if(active=="tags"    ){ class="active"}><a href="@url(repository)/tags">Tags@if(repository.tags.length > 0){ <span class="badge">@repository.tags.length</span>}</a></li>
-  <li class="pull-right">
-    @helper.html.copy("repository-url-copy", repository.httpUrl, true){
-      @if(settings.ssh && loginAccount.isDefined){
-        <div class="btn-group add-on" data-toggle="buttons-radio" style="padding: 0px; border-width: 0px;">
-          <button type="button" class="btn active" id="repository-url-http">HTTP</button><button type="button" class="btn" id="repository-url-ssh">SSH</button>
-        </div>
-      } else {
-        <span class="add-on">HTTP</span>
-      }
-      <input type="text" value="@repository.httpUrl" id="repository-url" style="width: 150px;" readonly>
-    }
-  </li>
-  <li class="pull-right" style="margin-right: 8px;">
-    <div class="pull-right">
-      <a href="@{url(repository)}/archive/@{encodeRefName(id)}.zip" class="btn"><i class="icon-download-alt"></i>ZIP</a>
-    </div>
-  </li>
-</ul>
-@if(settings.ssh && loginAccount.isDefined){
-<script>
-$(function(){
-  $('#repository-url-http').click(function(){
-    $('#repository-url').val('@repository.httpUrl');
-    $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
-  });
-  $('#repository-url-ssh').click(function(){
-    $('#repository-url').val('@repository.sshUrl(settings.sshPort.getOrElse(service.SystemSettingsService.DefaultSshPort), loginAccount.get.userName)');
-    $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
-  });
-});
-</script>
-}
--- a/src/main/twirl/repo/tags.scala.html
+++ b/src/main/twirl/repo/tags.scala.html
@@ -2,23 +2,23 @@
@import context._
@import view.helpers._
@html.main(s"${repository.owner}/${repository.name}", Some(repository)) {
-  @html.header("code", repository)
-  @tab(repository.repository.defaultBranch, repository, "tags", true)
-  <h1>Tags</h1>
-  <table class="table table-bordered">
-    <tr>
-      <th width="40%">Tag</th>
-      <th width="20%">Date</th>
-      <th width="20%">Commit</th>
-      <th width="20%">Download</th>
-    </tr>
-    @repository.tags.map { tag =>
+  @html.menu("code", repository){
+    <h1>Tags</h1>
+    <table class="table table-bordered">
      <tr>
-        <td><a href="@url(repository)/tree/@encodeRefName(tag.name)">@tag.name</a></td>
-        <td>@datetime(tag.time)</td>
-        <td class="monospace"><a href="@url(repository)/commit/@tag.id">@tag.id.substring(0, 10)</a></td>
-        <td><a href="@url(repository)/archive/@{encodeRefName(tag.name)}.zip">ZIP</a></td>
+        <th width="40%">Tag</th>
+        <th width="20%">Date</th>
+        <th width="20%">Commit</th>
+        <th width="20%">Download</th>
      </tr>
-    }
-  </table>
+      @repository.tags.map { tag =>
+        <tr>
+          <td><a href="@url(repository)/tree/@encodeRefName(tag.name)">@tag.name</a></td>
+          <td>@datetime(tag.time)</td>
+          <td class="monospace"><a href="@url(repository)/commit/@tag.id">@tag.id.substring(0, 10)</a></td>
+          <td><a href="@url(repository)/archive/@{encodeRefName(tag.name)}.zip">ZIP</a></td>
+        </tr>
+      }
+    </table>
+  }
 }
--- a/src/main/twirl/search/menu.scala.html
+++ b/src/main/twirl/search/menu.scala.html
@@ -2,36 +2,37 @@
  repository: service.RepositoryService.RepositoryInfo)(body: Html)(implicit context: app.Context)
@import context._
@import view.helpers._
-@html.header("", repository)
-<div class="row-fluid">
-  <div class="span3">
-    <div class="box">
-      <ul class="nav nav-tabs nav-stacked side-menu">
-        <li@if(active=="code"){ class="active"}>
-          <a href="@url(repository)/search?q=@urlEncode(query)&type=code">
-            @if(fileCount != 0){
-              <span class="badge pull-right">@fileCount</span>
-            }
-            Code
-          </a>
-        </li>
-        <li@if(active=="issue"){ class="active"}>
-          <a href="@url(repository)/search?q=@urlEncode(query)&type=issue">
-            @if(issueCount != 0){
-              <span class="badge pull-right">@issueCount</span>
-            }
-            Issue
-          </a>
-        </li>
-      </ul>
+@html.menu("", repository){
+  <div class="row-fluid">
+    <div class="span3">
+      <div class="box">
+        <ul class="nav nav-tabs nav-stacked side-menu">
+          <li@if(active=="code"){ class="active"}>
+            <a href="@url(repository)/search?q=@urlEncode(query)&type=code">
+              @if(fileCount != 0){
+                <span class="badge pull-right">@fileCount</span>
+              }
+              Code
+            </a>
+          </li>
+          <li@if(active=="issue"){ class="active"}>
+            <a href="@url(repository)/search?q=@urlEncode(query)&type=issue">
+              @if(issueCount != 0){
+                <span class="badge pull-right">@issueCount</span>
+              }
+              Issue
+            </a>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <div class="span9">
+      <form action="@url(repository)/search" method="GET">
+        <input type="text" name="q" value="@query" style="width: 80%; margin-bottom: 0px;"/>
+        <input type="submit" value="Search" class="btn" style="width: 15%;"/>
+        <input type="hidden" name="type" value="@active"/>
+      </form>
+      @body
    </div>
  </div>
-  <div class="span9">
-    <form action="@url(repository)/search" method="GET">
-      <input type="text" name="q" value="@query" style="width: 80%; margin-bottom: 0px;"/>
-      <input type="submit" value="Search" class="btn" style="width: 15%;"/>
-      <input type="hidden" name="type" value="@active"/>
-    </form>
-    @body
-  </div>
-</div>
+}
--- a/src/main/twirl/settings/collaborators.scala.html
+++ b/src/main/twirl/settings/collaborators.scala.html
@@ -4,31 +4,32 @@
@import context._
@import view.helpers._
@html.main("Settings", Some(repository)){
-  @html.header("settings", repository)
-  @menu("collaborators", repository){
-    <h3>Manage Collaborators</h3>
-    <ul class="collaborator">
-      @collaborators.map { collaboratorName =>
-        <li>
-          <a href="@url(collaboratorName)">@collaboratorName</a>
-          @if(!isGroupRepository){
-            <a href="@url(repository)/settings/collaborators/remove?name=@collaboratorName" class="remove">(remove)</a>
-          } else {
-            @if(repository.managers.contains(collaboratorName)){
-              (Manager)
+  @html.menu("settings", repository){
+    @menu("collaborators", repository){
+      <h3>Manage Collaborators</h3>
+      <ul class="collaborator">
+        @collaborators.map { collaboratorName =>
+          <li>
+            <a href="@url(collaboratorName)">@collaboratorName</a>
+            @if(!isGroupRepository){
+              <a href="@url(repository)/settings/collaborators/remove?name=@collaboratorName" class="remove">(remove)</a>
+            } else {
+              @if(repository.managers.contains(collaboratorName)){
+                (Manager)
+              }
            }
-          }
-        </li>
+          </li>
+        }
+      </ul>
+      @if(!isGroupRepository){
+        <form method="POST" action="@url(repository)/settings/collaborators/add" validate="true" autocomplete="off">
+          <div>
+            <span class="error" id="error-userName"></span>
+          </div>
+          @helper.html.account("userName", 300)
+          <input type="submit" class="btn" value="Add"/>
+        </form>
      }
-    </ul>
-    @if(!isGroupRepository){
-      <form method="POST" action="@url(repository)/settings/collaborators/add" validate="true" autocomplete="off">
-        <div>
-          <span class="error" id="error-userName"></span>
-        </div>
-        @helper.html.account("userName", 300)
-        <input type="submit" class="btn" value="Add"/>
-      </form>
    }
  }
 }
--- a/src/main/twirl/settings/danger.scala.html
+++ b/src/main/twirl/settings/danger.scala.html
@@ -2,37 +2,38 @@
@import context._
@import view.helpers._
@html.main("Danger Zone", Some(repository)){
-  @html.header("settings", repository)
-  @menu("danger", repository){
-    <div class="box">
-      <div class="box-header">Danger Zone</div>
-      <div class="box-content">
-        <form id="transfer-form" method="post" action="@url(repository)/settings/transfer" validate="true" autocomplete="off">
-          <fieldset>
-            <label class="strong">Transfer Ownership</label>
-            <div>
-              Transfer this repo to another user or to group.
-              <div class="pull-right">
-                @helper.html.account("newOwner", 150)
-                <input type="submit" class="btn btn-danger" value="Transfer"/>
-                <div>
-                  <span id="error-newOwner" class="error"></span>
+  @html.menu("settings", repository){
+    @menu("danger", repository){
+      <div class="box">
+        <div class="box-header">Danger Zone</div>
+        <div class="box-content">
+          <form id="transfer-form" method="post" action="@url(repository)/settings/transfer" validate="true" autocomplete="off">
+            <fieldset>
+              <label class="strong">Transfer Ownership</label>
+              <div>
+                Transfer this repo to another user or to group.
+                <div class="pull-right">
+                  @helper.html.account("newOwner", 150)
+                  <input type="submit" class="btn btn-danger" value="Transfer"/>
+                  <div>
+                    <span id="error-newOwner" class="error"></span>
+                  </div>
                </div>
              </div>
-            </div>
-          </fieldset>
-        </form>
-        <form id="delete-form" method="post" action="@url(repository)/settings/delete">
-          <fieldset class="margin">
-            <label class="strong">Delete repository</label>
-            <div>
-              Once you delete a repository, there is no going back.
-              <input type="submit" class="btn btn-danger pull-right" value="Delete this repository"/>
-            </div>
-          </fieldset>
-        </form>
+            </fieldset>
+          </form>
+          <form id="delete-form" method="post" action="@url(repository)/settings/delete">
+            <fieldset class="margin">
+              <label class="strong">Delete repository</label>
+              <div>
+                Once you delete a repository, there is no going back.
+                <input type="submit" class="btn btn-danger pull-right" value="Delete this repository"/>
+              </div>
+            </fieldset>
+          </form>
+        </div>
      </div>
-    </div>
+    }
  }
 }
 <script>
--- a/src/main/twirl/settings/hooks.scala.html
+++ b/src/main/twirl/settings/hooks.scala.html
@@ -2,22 +2,23 @@
@import context._
@import view.helpers._
@html.main("Settings", Some(repository)){
-  @html.header("settings", repository)
-  @menu("hooks", repository){
-    @helper.html.information(info)
-    <h3>WebHook URLs</h3>
-    <ul>
-      @webHooks.map { webHook =>
-        <li>@webHook.url <a href="@url(repository)/settings/hooks/delete?url=@urlEncode(webHook.url)" class="remove">(remove)</a></li>
-      }
-    </ul>
-    <form method="POST" action="@url(repository)/settings/hooks/add" validate="true">
-      <div>
-        <span class="error" id="error-url"></span>
-      </div>
-      <input type="text" name="url" id="url" style="width: 300px; margin-bottom: 0px;"/>
-      <input type="submit" class="btn" value="Add"/>
-      <a href="@url(repository)/settings/hooks/test" class="btn">Test Hook</a>
-    </form>
+  @html.menu("settings", repository){
+    @menu("hooks", repository){
+      @helper.html.information(info)
+      <h3>WebHook URLs</h3>
+      <ul>
+        @webHooks.map { webHook =>
+          <li>@webHook.url <a href="@url(repository)/settings/hooks/delete?url=@urlEncode(webHook.url)" class="remove">(remove)</a></li>
+        }
+      </ul>
+      <form method="POST" action="@url(repository)/settings/hooks/add" validate="true">
+        <div>
+          <span class="error" id="error-url"></span>
+        </div>
+        <input type="text" name="url" id="url" style="width: 300px; margin-bottom: 0px;"/>
+        <input type="submit" class="btn" value="Add"/>
+        <a href="@url(repository)/settings/hooks/test" class="btn">Test Hook</a>
+      </form>
+    }
  }
 }
--- a/src/main/twirl/settings/options.scala.html
+++ b/src/main/twirl/settings/options.scala.html
@@ -2,91 +2,99 @@
@import context._
@import view.helpers._
@html.main("Settings", Some(repository)){
-  @html.header("settings", repository)
-  @menu("options", repository){
-    @helper.html.information(info)
-    <form id="form" method="post" action="@url(repository)/settings/options" validate="true">
-      <div class="box">
-        <div class="box-header">Settings</div>
-        <div class="box-content">
-          <fieldset>
-            <label for="repositoryName" class="strong">Repository Name:</label>
-            <input type="text" name="repositoryName" id="repositoryName" value="@repository.name"/>
-            <span id="error-repositoryName" class="error"></span>
-          </fieldset>
-          <fieldset class="margin">
-            <label for="description" class="strong">Description:</label>
-            <input type="text" name="description" id="description" style="width: 600px;" value="@repository.repository.description"/>
-          </fieldset>
-          <fieldset class="margin">
-            <label for="defaultBranch" class="strong">Default Branch:</label>
-            <select name="defaultBranch" id="defaultBranch">
-              @repository.branchList.map { branch =>
-                <option value="@branch"@if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
+  @html.menu("settings", repository){
+    @menu("options", repository){
+      @helper.html.information(info)
+      <form id="form" method="post" action="@url(repository)/settings/options" validate="true">
+        <div class="box">
+          <div class="box-header">Settings</div>
+          <div class="box-content">
+            <fieldset>
+              <label for="repositoryName" class="strong">Repository Name:</label>
+              <input type="text" name="repositoryName" id="repositoryName" value="@repository.name"/>
+              <span id="error-repositoryName" class="error"></span>
+            </fieldset>
+            <fieldset class="margin">
+              <label for="description" class="strong">Description:</label>
+              <input type="text" name="description" id="description" style="width: 600px;" value="@repository.repository.description"/>
+            </fieldset>
+            <fieldset class="margin">
+              <label for="defaultBranch" class="strong">Default Branch:</label>
+              <select name="defaultBranch" id="defaultBranch"@if(repository.branchList.isEmpty){ disabled}>
+                @if(repository.branchList.isEmpty){
+                  <option value="none" selected>No Branch</option>
+                } else {
+                  @repository.branchList.map { branch =>
+                    <option@if(branch==repository.repository.defaultBranch){ selected}>@branch</option>
+                  }
+                }
+              </select>
+              @if(repository.branchList.isEmpty){
+                <input type="hidden" name="defaultBranch" value="none"/>
              }
-            </select>
-            <span class="error" id="error-defaultBranch"></span>
-          </fieldset>
-          <fieldset class="margin">
-            <label class="radio">
-              <input type="radio" name="isPrivate" value="false"
-                @if(!repository.repository.isPrivate              ){ checked  }
-                @if(repository.repository.parentUserName.isDefined){ disabled }
-              >
-              <span class="strong">Public</span><br>
-              <div>
-                <span>All users and guests can read this repository.</span>
-              </div>
-            </label>
-          </fieldset>
-          <fieldset>
-            <label class="radio">
-              <input type="radio" name="isPrivate" value="true"
-                @if(repository.repository.isPrivate               ){ checked  }
-                @if(repository.repository.parentUserName.isDefined){ disabled }
-              >
-              <span class="strong">Private</span><br>
-              <div>
-                <span>Only collaborators can read this repository.</span>
-              </div>
-            </label>
-          </fieldset>
-        </div>
-      </div>
-      @*
-      <div class="box">
-        <div class="box-header">Features:</div>
-        <div class="box-content">
-          <dl>
-            <dt>
-              <label class="checkbox strong">
-                <input type="checkbox" name="wiki" id="wiki"/> Wiki
+              <span class="error" id="error-defaultBranch"></span>
+            </fieldset>
+            <fieldset class="margin">
+              <label class="radio">
+                <input type="radio" name="isPrivate" value="false"
+                  @if(!repository.repository.isPrivate              ){ checked  }
+                  @if(repository.repository.parentUserName.isDefined){ disabled }
+                >
+                <span class="strong">Public</span><br>
+                <div>
+                  <span>All users and guests can read this repository.</span>
+                </div>
              </label>
-            </dt>
-            <dd>
-              Adds lightweight Wiki system to this repository.
-              This is the simplest way to provide documentation or examples.
-              Only collaborators can edit Wiki pages.
-            </dd>
-          </dl>
-          <hr>
-          <dl>
-            <dt>
-              <label class="checkbox strong">
-                <input type="checkbox" name="issue" id="issue"/> Issue
+            </fieldset>
+            <fieldset>
+              <label class="radio">
+                <input type="radio" name="isPrivate" value="true"
+                  @if(repository.repository.isPrivate               ){ checked  }
+                  @if(repository.repository.parentUserName.isDefined){ disabled }
+                >
+                <span class="strong">Private</span><br>
+                <div>
+                  <span>Only collaborators can read this repository.</span>
+                </div>
              </label>
-            </dt>
-            <dd>
-              Adds lightweight issue tracking integrated with this repository.
-              All users who have signed in and can access this repository can register an issue.
-            </dd>
-          </dl>
+            </fieldset>
+          </div>
        </div>
-      </div>
-      *@
-      <fieldset>
-        <input type="submit" class="btn btn-success" value="Apply changes"/>
-      </fieldset>
-    </form>
+        @*
+        <div class="box">
+          <div class="box-header">Features:</div>
+          <div class="box-content">
+            <dl>
+              <dt>
+                <label class="checkbox strong">
+                  <input type="checkbox" name="wiki" id="wiki"/> Wiki
+                </label>
+              </dt>
+              <dd>
+                Adds lightweight Wiki system to this repository.
+                This is the simplest way to provide documentation or examples.
+                Only collaborators can edit Wiki pages.
+              </dd>
+            </dl>
+            <hr>
+            <dl>
+              <dt>
+                <label class="checkbox strong">
+                  <input type="checkbox" name="issue" id="issue"/> Issue
+                </label>
+              </dt>
+              <dd>
+                Adds lightweight issue tracking integrated with this repository.
+                All users who have signed in and can access this repository can register an issue.
+              </dd>
+            </dl>
+          </div>
+        </div>
+        *@
+        <fieldset>
+          <input type="submit" class="btn btn-success" value="Apply changes"/>
+        </fieldset>
+      </form>
+    }
  }
 }
--- a/src/main/twirl/wiki/compare.scala.html
+++ b/src/main/twirl/wiki/compare.scala.html
@@ -10,31 +10,31 @@
@import org.eclipse.jgit.diff.DiffEntry.ChangeType
@html.main(s"Compare Revisions - ${repository.owner}/${repository.name}", Some(repository)){
  @helper.html.information(info)
-  @html.header("wiki", repository)
-  @tab("history", repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title"><span class="muted">Compare Revisions</span></h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-      @if(pageName.isDefined){
-        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
-        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Back to Page History</a>
-      } else {
-        <a class="btn" href="@url(repository)/wiki/_history">Back to Wiki History</a>
-      }
+  @html.menu("wiki", repository){
+    <ul class="nav nav-tabs fill-width pull-left">
+      <li>
+        <h1 class="wiki-title"><span class="muted">Compare Revisions</span></h1>
+      </li>
+      <li class="pull-right">
+        <div class="btn-group">
+        @if(pageName.isDefined){
+          <a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
+          <a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Back to Page History</a>
+        } else {
+          <a class="btn btn-small" href="@url(repository)/wiki/_history">Back to Wiki History</a>
+        }
+        </div>
+      </li>
+    </ul>
+    @helper.html.diff(diffs, repository, None, None, false)
+    @if(hasWritePermission){
+      <div>
+        @if(pageName.isDefined){
+          <a href="@url(repository)/wiki/@urlEncode(pageName)/_revert/@from...@to" class="btn">Revert Changes</a>
+        } else {
+          <a href="@url(repository)/wiki/_revert/@from...@to" class="btn">Revert Changes</a>
+        }
      </div>
-    </li>
-  </ul>
-  @helper.html.diff(diffs, repository, None, None, false)
-  @if(hasWritePermission){
-    <div>
-      @if(pageName.isDefined){
-        <a href="@url(repository)/wiki/@urlEncode(pageName)/_revert/@from...@to" class="btn">Revert Changes</a>
-      } else {
-        <a href="@url(repository)/wiki/_revert/@from...@to" class="btn">Revert Changes</a>
-      }
-    </div>
+    }
  }
 }
--- a/src/main/twirl/wiki/edit.scala.html
+++ b/src/main/twirl/wiki/edit.scala.html
@@ -4,31 +4,31 @@
@import context._
@import view.helpers._
@html.main(s"${if(pageName.isEmpty) "New Page" else pageName} - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("wiki", repository)
-  @tab("", repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-      @if(page.isDefined){
-        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
-        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
-        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
-      }
-      </div>
-    </li>
-  </ul>
-  <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
-    <span id="error-pageName" class="error"></span>
-    <input type="text" name="pageName" value="@pageName" style="width: 900px; font-weight: bold;" placeholder="Input a page name."/>
-    @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, "width: 900px; height: 400px;", "")
-    <input type="text" name="message" value="" style="width: 900px;" placeholder="Write a small message here explaining this change. (Optional)"/>
-    <input type="hidden" name="currentPageName" value="@pageName"/>
-    <input type="hidden" name="id" value="@page.map(_.id)"/>
-    <input type="submit" value="Save" class="btn btn-success">
-  </form>
+  @html.menu("wiki", repository){
+    <ul class="nav nav-tabs fill-width pull-left">
+      <li>
+        <h1 class="wiki-title"><span class="muted">Editing</span> @if(pageName.isEmpty){New Page} else {@pageName}</h1>
+      </li>
+      <li class="pull-right">
+        <div class="btn-group">
+        @if(page.isDefined){
+          <a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
+          <a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_delete" id="delete">Delete Page</a>
+          <a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
+        }
+        </div>
+      </li>
+    </ul>
+    <form action="@url(repository)/wiki/@if(page.isEmpty){_new} else {_edit}" method="POST" validate="true">
+      <span id="error-pageName" class="error"></span>
+      <input type="text" name="pageName" value="@pageName" style="width: 850px; font-weight: bold;" placeholder="Input a page name."/>
+      @helper.html.preview(repository, page.map(_.content).getOrElse(""), true, false, "width: 850px; height: 400px;", "")
+      <input type="text" name="message" value="" style="width: 850px;" placeholder="Write a small message here explaining this change. (Optional)"/>
+      <input type="hidden" name="currentPageName" value="@pageName"/>
+      <input type="hidden" name="id" value="@page.map(_.id)"/>
+      <input type="submit" value="Save" class="btn btn-success">
+    </form>
+  }
 }
 <script>
 $(function(){
--- a/src/main/twirl/wiki/history.scala.html
+++ b/src/main/twirl/wiki/history.scala.html
@@ -4,68 +4,68 @@
@import context._
@import view.helpers._
@html.main(s"History - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("wiki", repository)
-  @tab(if(pageName.isEmpty) "history" else "", repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title">
-        @if(pageName.isEmpty){
-          <span class="muted">History</span>
-        } else {
-          <span class="muted">History for</span> @pageName.get
-        }
-      </h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-        @if(pageName.isEmpty){
-          @if(loginAccount.isDefined){
-            <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
+  @html.menu("wiki", repository){
+    <ul class="nav nav-tabs fill-width pull-left">
+      <li>
+        <h1 class="wiki-title">
+          @if(pageName.isEmpty){
+            <span class="muted">History</span>
+          } else {
+            <span class="muted">History for</span> @pageName.get
          }
-        } else {
-          <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
-          @if(loginAccount.isDefined){
-            <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
+        </h1>
+      </li>
+      <li class="pull-right">
+        <div class="btn-group">
+          @if(pageName.isEmpty){
+            @if(loginAccount.isDefined){
+              <a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
+            }
+          } else {
+            <a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)">View Page</a>
+            @if(loginAccount.isDefined){
+              <a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
+            }
          }
-        }
-      </div>
-    </li>
-  </ul>
-  <table class="table table-bordered">
-    @commits.map { commit =>
-      <tr>
-        <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
-        <td>@avatar(commit, 20)&nbsp;@user(commit.committer, commit.mailAddress)</td>
-        <td width="80%">
-          <span class="muted">@datetime(commit.time):</span>&nbsp;@commit.shortMessage
-        </td>
-      </tr>
-    }
-  </table>
-  <input type="button" id="compare" value="Compare Revisions" class="btn"/>
-  <input type="button" id="top" value="Back to Top" class="btn"/>
-  <script>
-  $(function(){
-    $('input[name=commitId]').click(function(){
-      return !($('input[name=commitId]:checked').length == 3);
-    });
-    
-    $('#compare').click(function(){
-      var e = $('input[name=commitId]:checked');
-      if(e.length == 2){
-        @if(pageName.isEmpty){
-          location.href = '@url(repository)/wiki/_compare/' +
-            $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
-        } else {
-          location.href = '@url(repository)/wiki/@urlEncode(pageName.get)/_compare/' +
-            $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
-        }
+        </div>
+      </li>
+    </ul>
+    <table class="table table-bordered fill-width pull-left">
+      @commits.map { commit =>
+        <tr>
+          <td width="0%"><input type="checkbox" name="commitId" value="@commit.id"></td>
+          <td>@avatar(commit, 20)&nbsp;@user(commit.committer, commit.mailAddress)</td>
+          <td width="80%">
+            <span class="muted">@datetime(commit.time):</span>&nbsp;@commit.shortMessage
+          </td>
+        </tr>
      }
+    </table>
+    <input type="button" id="compare" value="Compare Revisions" class="btn"/>
+    <input type="button" id="top" value="Back to Top" class="btn"/>
+    <script>
+    $(function(){
+      $('input[name=commitId]').click(function(){
+        return !($('input[name=commitId]:checked').length == 3);
+      });
+
+      $('#compare').click(function(){
+        var e = $('input[name=commitId]:checked');
+        if(e.length == 2){
+          @if(pageName.isEmpty){
+            location.href = '@url(repository)/wiki/_compare/' +
+              $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
+          } else {
+            location.href = '@url(repository)/wiki/@urlEncode(pageName.get)/_compare/' +
+              $(e.get(1)).attr('value') + '...' + $(e.get(0)).attr('value');
+          }
+        }
+      });
+
+      $('#top').click(function(){
+        $('html,body').animate({ scrollTop: 0 }, 'fast');
+      });
    });
-    
-    $('#top').click(function(){
-      $('html,body').animate({ scrollTop: 0 }, 'fast');
-    });
-  });
-  </script>
+    </script>
+  }
 }
--- a/src/main/twirl/wiki/page.scala.html
+++ b/src/main/twirl/wiki/page.scala.html
@@ -1,30 +1,75 @@
@(pageName: String,
  page: service.WikiService.WikiPageInfo,
+  pages: List[String],
  repository: service.RepositoryService.RepositoryInfo,
  hasWritePermission: Boolean)(implicit context: app.Context)
@import context._
+@import service.WikiService._
@import view.helpers._
@html.main(s"${pageName} - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("wiki", repository)
-  @tab((if(pageName == "Home") "home" else ""), repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title">@pageName</h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-        @if(hasWritePermission){
-          <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
-          <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
-        }
-        <a class="btn" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
+  @html.menu("wiki", repository){
+    <ul class="nav nav-tabs fill-width pull-left">
+      <li>
+        <h1 class="wiki-title">@pageName</h1>
+        <div class="small">
+          <span class="muted"><strong>@page.committer</strong> edited this page at @datetime(page.time)</span>
+        </div>
+      </li>
+      <li class="pull-right">
+        <div class="btn-group">
+          @if(hasWritePermission){
+            <a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
+            <a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_edit">Edit Page</a>
+          }
+          <a class="btn btn-small" href="@url(repository)/wiki/@urlEncode(pageName)/_history">Page History</a>
+        </div>
+      </li>
+    </ul>
+    <div style="width: 200px;" class="pull-right">
+      <table class="table table-bordered">
+        <tr>
+          <th class="metal">Pages</th>
+        </tr>
+        <tr>
+          <td>
+            <ul style="margin-left: 0px; margin-bottom: 0px;">
+            @pages.map { page =>
+              <li style="margin-left:0px; list-style-type: none;"><a href="@url(repository)/wiki/@urlEncode(page)">@page</a></li>
+            }
+            </ul>
+          </td>
+        </tr>
+      </table>
+      <div class="small">
+        <strong>Clone this wiki locally</strong>
      </div>
-    </li>
-  </ul>
-  <div class="markdown-body">
-    @markdown(page.content, repository, true, false)
-  </div>
-  <div class="small">
-    <span class="muted">Last edited by @page.committer at @datetime(page.time)</span>
-  </div>
+      @helper.html.copy("repository-url-copy", repository.httpUrl){
+        <input type="text" value="@httpUrl(repository)" id="repository-url" style="width: 160px;" readonly>
+      }
+      @if(settings.ssh && loginAccount.isDefined){
+        <div class="small">
+          <span class="mute">You can clone <a href="javascript:void(0);" id="repository-url-http">HTTP</a> or <a href="javascript:void(0);" id="repository-url-ssh">SSH</a>.</span>
+        </div>
+      }
+    </div>
+    <div style="margin-right: 220px;">
+      <div class="markdown-body">
+        @markdown(page.content, repository, true, false)
+      </div>
+    </div>
+  }
 }
+@if(settings.ssh && loginAccount.isDefined){
+  <script>
+  $(function(){
+    $('#repository-url-http').click(function(){
+      $('#repository-url').val('@httpUrl(repository)');
+      $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
+    });
+    $('#repository-url-ssh').click(function(){
+      $('#repository-url').val('@sshUrl(repository, settings, loginAccount.get.userName)');
+      $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
+    });
+  });
+  </script>
+}
--- a/src/main/twirl/wiki/pages.scala.html
+++ b/src/main/twirl/wiki/pages.scala.html
@@ -4,24 +4,23 @@
@import context._
@import view.helpers._
@html.main(s"Pages - ${repository.owner}/${repository.name}", Some(repository)){
-  @html.header("wiki", repository)
-  @tab("pages", repository)
-  <ul class="nav nav-tabs">
-    <li>
-      <h1 class="wiki-title"><span class="muted">Pages</span></h1>
-    </li>
-    <li class="pull-right">
-      <div class="btn-group">
-        @if(hasWritePermission){
-          <a class="btn" href="@url(repository)/wiki/_new">New Page</a>
-        }
-      </div>
-    </li>
-  </ul>
-  <ul>
-    @pages.map { page =>
-      <li><a href="@url(repository)/wiki/@urlEncode(page)">@page</a></li>
-    }
-  </ul>
-
+  @html.menu("wiki", repository){
+    <ul class="nav nav-tabs fill-width pull-left">
+      <li>
+        <h1 class="wiki-title"><span class="muted">Pages</span></h1>
+      </li>
+      <li class="pull-right">
+        <div class="btn-group">
+          @if(hasWritePermission){
+            <a class="btn btn-small" href="@url(repository)/wiki/_new">New Page</a>
+          }
+        </div>
+      </li>
+    </ul>
+    <ul class="pull-left">
+      @pages.map { page =>
+        <li><a href="@url(repository)/wiki/@urlEncode(page)">@page</a></li>
+      }
+    </ul>
+  }
 }
--- a/src/main/twirl/wiki/tab.scala.html
+++ b/src/main/twirl/wiki/tab.scala.html
@@ -1,36 +0,0 @@
-@(active: String,
-  repository: service.RepositoryService.RepositoryInfo)(implicit context: app.Context)
-@import context._
-@import service.WikiService._
-@import view.helpers._
-<ul class="nav nav-tabs">
-  <li@if(active == "home"   ){ class="active"}><a href="@url(repository)/wiki">Home</a></li>
-  <li@if(active == "pages"  ){ class="active"}><a href="@url(repository)/wiki/_pages">Pages</a></li>
-  <li@if(active == "history"){ class="active"}><a href="@url(repository)/wiki/_history">Wiki History</a></li>
-  <li class="pull-right">
-    @helper.html.copy("repository-url-copy", httpUrl(repository), true){
-      @if(settings.ssh && loginAccount.isDefined){
-        <div class="btn-group add-on" data-toggle="buttons-radio" style="padding: 0px; border-width: 0px;">
-          <button type="button" class="btn active" id="repository-url-http">HTTP</button><button type="button" class="btn" id="repository-url-ssh">SSH</button>
-        </div>
-      } else {
-        <span class="add-on">HTTP</span>
-      }
-      <input type="text" value="@httpUrl(repository)" readonly id="repository-url">
-    }
-  </li>
-</ul>
-@if(settings.ssh && loginAccount.isDefined){
-<script>
-$(function(){
-  $('#repository-url-http').click(function(){
-    $('#repository-url').val('@httpUrl(repository)');
-    $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
-  });
-  $('#repository-url-ssh').click(function(){
-    $('#repository-url').val('@sshUrl(repository, settings, loginAccount.get.userName)');
-    $('#repository-url-copy').attr('data-clipboard-text', $('#repository-url').val());
-  });
-});
-</script>
-}
--- a/src/main/webapp/assets/ace/ace.js
+++ b/src/main/webapp/assets/ace/ace.js
--- a/src/main/webapp/assets/ace/ext-beautify.js
+++ b/src/main/webapp/assets/ace/ext-beautify.js
@@ -0,0 +1,360 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Distributed under the BSD license:
+ *
+ * Copyright (c) 2012, Ajax.org B.V.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Ajax.org B.V. nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+ace.define('ace/ext/beautify', ['require', 'exports', 'module' , 'ace/token_iterator', 'ace/ext/beautify/php_rules'], function(require, exports, module) {
+
+var TokenIterator = require("ace/token_iterator").TokenIterator;
+
+var phpTransform = require("./beautify/php_rules").transform;
+
+exports.beautify = function(session) {
+    var iterator = new TokenIterator(session, 0, 0);
+    var token = iterator.getCurrentToken();
+
+    var context = session.$modeId.split("/").pop();
+
+    var code = phpTransform(iterator, context);
+    session.doc.setValue(code);
+};
+
+exports.commands = [{
+    name: "beautify",
+    exec: function(editor) {
+        exports.beautify(editor.session);
+    },
+    bindKey: "Ctrl-Shift-B"
+}]
+
+});
+
+ace.define('ace/ext/beautify/php_rules', ['require', 'exports', 'module' , 'ace/token_iterator'], function(require, exports, module) {
+
+var TokenIterator = require("ace/token_iterator").TokenIterator;
+exports.newLines = [{
+    type: 'support.php_tag',
+    value: '<?php'
+}, {
+    type: 'support.php_tag',
+    value: '<?'
+}, {
+    type: 'support.php_tag',
+    value: '?>'
+}, {
+    type: 'paren.lparen',
+    value: '{',
+    indent: true
+}, {
+    type: 'paren.rparen',
+    breakBefore: true,
+    value: '}',
+    indent: false
+}, {
+    type: 'paren.rparen',
+    breakBefore: true,
+    value: '})',
+    indent: false,
+    dontBreak: true
+}, {
+    type: 'comment'
+}, {
+    type: 'text',
+    value: ';'
+}, {
+    type: 'text',
+    value: ':',
+    context: 'php'
+}, {
+    type: 'keyword',
+    value: 'case',
+    indent: true,
+    dontBreak: true
+}, {
+    type: 'keyword',
+    value: 'default',
+    indent: true,
+    dontBreak: true
+}, {
+    type: 'keyword',
+    value: 'break',
+    indent: false,
+    dontBreak: true
+}, {
+    type: 'punctuation.doctype.end',
+    value: '>'
+}, {
+    type: 'meta.tag.punctuation.end',
+    value: '>'
+}, {
+    type: 'meta.tag.punctuation.begin',
+    value: '<',
+    blockTag: true,
+    indent: true,
+    dontBreak: true
+}, {
+    type: 'meta.tag.punctuation.begin',
+    value: '</',
+    indent: false,
+    breakBefore: true,
+    dontBreak: true
+}, {
+    type: 'punctuation.operator',
+    value: ';'
+}];
+
+exports.spaces = [{
+    type: 'xml-pe',
+    prepend: true
+},{
+    type: 'entity.other.attribute-name',
+    prepend: true
+}, {
+    type: 'storage.type',
+    value: 'var',
+    append: true
+}, {
+    type: 'storage.type',
+    value: 'function',
+    append: true
+}, {
+    type: 'keyword.operator',
+    value: '='
+}, {
+    type: 'keyword',
+    value: 'as',
+    prepend: true,
+    append: true
+}, {
+    type: 'keyword',
+    value: 'function',
+    append: true
+}, {
+    type: 'support.function',
+    next: /[^\(]/,
+    append: true
+}, {
+    type: 'keyword',
+    value: 'or',
+    append: true,
+    prepend: true
+}, {
+    type: 'keyword',
+    value: 'and',
+    append: true,
+    prepend: true
+}, {
+    type: 'keyword',
+    value: 'case',
+    append: true
+}, {
+    type: 'keyword.operator',
+    value: '||',
+    append: true,
+    prepend: true
+}, {
+    type: 'keyword.operator',
+    value: '&&',
+    append: true,
+    prepend: true
+}];
+exports.singleTags = ['!doctype','area','base','br','hr','input','img','link','meta'];
+
+exports.transform = function(iterator, maxPos, context) {
+    var token = iterator.getCurrentToken();
+    
+    var newLines = exports.newLines;
+    var spaces = exports.spaces;
+    var singleTags = exports.singleTags;
+
+    var code = '';
+    
+    var indentation = 0;
+    var dontBreak = false;
+    var tag;
+    var lastTag;
+    var lastToken = {};
+    var nextTag;
+    var nextToken = {};
+    var breakAdded = false;
+    var value = '';
+
+    while (token!==null) {
+        console.log(token);
+
+        if( !token ){
+            token = iterator.stepForward();
+            continue;
+        }
+        if( token.type == 'support.php_tag' && token.value != '?>' ){
+            context = 'php';
+        }
+        else if( token.type == 'support.php_tag' && token.value == '?>' ){
+            context = 'html';
+        }
+        else if( token.type == 'meta.tag.name.style' && context != 'css' ){
+            context = 'css';
+        }
+        else if( token.type == 'meta.tag.name.style' && context == 'css' ){
+            context = 'html';
+        }
+        else if( token.type == 'meta.tag.name.script' && context != 'js' ){
+            context = 'js';
+        }
+        else if( token.type == 'meta.tag.name.script' && context == 'js' ){
+            context = 'html';
+        }
+
+        nextToken = iterator.stepForward();
+        if (nextToken && nextToken.type.indexOf('meta.tag.name') == 0) {
+            nextTag = nextToken.value;
+        }
+        if ( lastToken.type == 'support.php_tag' && lastToken.value == '<?=') {
+            dontBreak = true;
+        }
+        if (token.type == 'meta.tag.name') {
+            token.value = token.value.toLowerCase();
+        }
+        if (token.type == 'text') {
+            token.value = token.value.trim();
+        }
+        if (!token.value) {
+            token = nextToken;
+            continue;
+        }
+        value = token.value;
+        for (var i in spaces) {
+            if (
+                token.type == spaces[i].type &&
+                (!spaces[i].value || token.value == spaces[i].value) &&
+                (
+                    nextToken &&
+                    (!spaces[i].next || spaces[i].next.test(nextToken.value))
+                )
+            ) {
+                if (spaces[i].prepend) {
+                    value = ' ' + token.value;
+                }
+
+                if (spaces[i].append) {
+                    value += ' ';
+                }
+            }
+        }
+        if (token.type.indexOf('meta.tag.name') == 0) {
+            tag = token.value;
+        }
+        breakAdded = false;
+        for (i in newLines) {
+            if (
+                token.type == newLines[i].type &&
+                (
+                    !newLines[i].value ||
+                    token.value == newLines[i].value
+                ) &&
+                (
+                    !newLines[i].blockTag ||
+                    singleTags.indexOf(nextTag) === -1
+                ) &&
+                (
+                    !newLines[i].context ||
+                    newLines[i].context === context
+                )
+            ) {
+                if (newLines[i].indent === false) {
+                    indentation--;
+                }
+
+                if (
+                    newLines[i].breakBefore &&
+                    ( !newLines[i].prev || newLines[i].prev.test(lastToken.value) )
+                ) {
+                    code += "\n";
+                    breakAdded = true;
+                    for (i = 0; i < indentation; i++) {
+                        code += "\t";
+                    }
+                }
+
+                break;
+            }
+        }
+
+        if (dontBreak===false) {
+            for (i in newLines) {
+                if (
+                    lastToken.type == newLines[i].type &&
+                    (
+                        !newLines[i].value || lastToken.value == newLines[i].value
+                    ) &&
+                    (
+                        !newLines[i].blockTag ||
+                        singleTags.indexOf(tag) === -1
+                    ) &&
+                    (
+                        !newLines[i].context ||
+                        newLines[i].context === context
+                    )
+                ) {
+                    if (newLines[i].indent === true) {
+                        indentation++;
+                    }
+
+                    if (!newLines[i].dontBreak  && !breakAdded) {
+                        code += "\n";
+                        for (i = 0; i < indentation; i++) {
+                            code += "\t";
+                        }
+                    }
+
+                    break;
+                }
+            }
+        }
+
+        code += value;
+        if ( lastToken.type == 'support.php_tag' && lastToken.value == '?>' ) {
+            dontBreak = false;
+        }
+        lastTag = tag;
+
+        lastToken = token;
+
+        token = nextToken;
+
+        if (token===null) {
+            break;
+        }
+    }
+    
+    return code;
+};
+
+
+
+});
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Naoki Takezoe	db5395ddbc	Update version number to 2.0.	2014-05-31 10:38:31 +09:00
Naoki Takezoe	1e8224536b	(refs #383 )Disable "New Issue" button in the new issue creation page.	2014-05-29 01:55:10 +09:00
Naoki Takezoe	a846c77c7e	(refs #346 )Add group members as collaborator when transfer repository to the group.	2014-05-25 18:14:53 +09:00
Tomofumi Tanaka	29812f4a82	(refs #375 )Show merge commit diffs correctly	2014-05-20 21:26:51 +09:00
takezoe	a863951d97	Show diff for files other than markdown by "Preview" button	2014-05-19 00:29:29 +09:00
takezoe	146be677ba	Hide "Edit" button if target is not head of the branch.	2014-05-19 00:03:24 +09:00
takezoe	03b5f7feb8	Fix title in file editing.	2014-05-18 23:36:13 +09:00
Tomofumi Tanaka	6d54361a6d	Fix style broken in Firefox	2014-05-18 23:28:28 +09:00
Tomofumi Tanaka	f440421ed1	Repository url protocol label should be change Like repository url.	2014-05-18 23:05:48 +09:00
takezoe	e57464fc5e	Merge branch 'master' of https://github.com/takezoe/gitbucket	2014-05-18 23:03:37 +09:00
takezoe	2a4b0f5ddb	(refs #372 )Use shift key instead if ctrl key to select region	2014-05-18 22:58:16 +09:00
Tomofumi Tanaka	bb66e2201f	Fix width styles * issue updation title and content * issue new comment * pull request new comment	2014-05-18 21:44:25 +09:00
takezoe	4dc60e887f	(refs #373 )Preview markdown in the text file editor.	2014-05-18 21:05:51 +09:00
takezoe	f6eb2e2dc8	(refs #230 )Fix markdown preview styles	2014-05-18 16:04:38 +09:00
takezoe	9ecc10ab21	(refs #372 )Select lines by clicking line number in blob view	2014-05-18 15:35:50 +09:00
Naoki Takezoe	d7037a43c6	bugfix	2014-05-16 17:06:57 +09:00
Naoki Takezoe	2471b8dfe0	bugfix	2014-05-16 14:31:00 +09:00
Tomofumi Tanaka	0430cb49f9	Fix typo	2014-05-13 23:53:23 +09:00
takezoe	7811926779	(refs #367 )Redirect if forked repository already exists	2014-05-12 23:56:42 +09:00
takezoe	9bb66a4297	Fix broken layout in pull request detail page	2014-05-12 23:39:32 +09:00
takezoe	70772f0d74	(refs #364 )Keep links which start with '#'	2014-05-11 13:13:16 +09:00
takezoe	728b00e4c3	Fix readme styles	2014-05-11 13:08:32 +09:00
takezoe	97008ef984	Merge branch 'ui-refreshing' Conflicts: src/main/twirl/index.scala.html	2014-05-11 03:04:31 +09:00
takezoe	6b86406e94	Add hover icons for header links	2014-05-11 02:58:29 +09:00
takezoe	4252c364a4	Fix commit id style in file list	2014-05-11 02:57:49 +09:00
takezoe	4f4bc0321b	Fix file list style in repository viewer	2014-05-11 02:55:43 +09:00
takezoe	6ecabe4588	Fix header style	2014-05-11 02:42:03 +09:00
takezoe	93fa8484c5	Fix header button size	2014-05-11 02:23:51 +09:00
takezoe	ff2e55e82c	Fix h1-h6 styles	2014-05-11 02:01:46 +09:00
takezoe	259637ce3c	Fix wiki styles	2014-05-11 01:38:12 +09:00
takezoe	743b9b759a	Fix button style in blob page	2014-05-10 23:17:16 +09:00
takezoe	73ba0b348b	Add branch switcher	2014-05-10 23:10:36 +09:00
takezoe	e93769cc81	Fix header and side-menu styles	2014-05-10 22:51:14 +09:00
Naoki Takezoe	68f9739eed	Merge pull request #365 from selesy/announce_ssh Update the features list in README.md	2014-05-10 21:54:22 +09:00
Steve Moyer	c3d25b7a71	Update the features list in README.md The version 1.12 announces the addition of the SSH protocol for repository access, but the feature list still states "Public / Private Git repository (http access only)".	2014-05-10 08:06:57 -04:00
takezoe	aaa582ff1a	Fix header style in wiki pages	2014-05-10 20:35:49 +09:00
takezoe	debc798aec	Side-menu is completed!	2014-05-10 14:44:19 +09:00
takezoe	6042f0e1e0	Add active icons for side-menu	2014-05-08 07:46:32 +09:00
takezoe	e10d02f45c	Apply mouse hover style	2014-05-08 07:30:35 +09:00
takezoe	aebf4ff728	Remove invalid char	2014-05-08 02:15:30 +09:00
Naoki Takezoe	1a2e89c9ed	Disable bootstrap tooltip because icon link blinks.	2014-05-07 10:52:31 +09:00
Naoki Takezoe	e10e2748b9	Fix issue and pull request creation form styles	2014-05-07 10:37:51 +09:00
takezoe	f422936e34	Add <div class="container"> to pages outside of repository.	2014-05-06 21:32:40 +09:00
takezoe	4e87f21405	Revert style for fork count	2014-05-06 12:41:45 +09:00
takezoe	dc2d79b16c	Remove unnecessary parts and styles.	2014-05-06 03:21:31 +09:00
takezoe	88a3100563	Fix tab style	2014-05-06 02:28:33 +09:00
takezoe	8d3433a0e7	Add icon for repository resttings	2014-05-06 02:17:41 +09:00
takezoe	0fe30e5629	Rename header.scala.html to menu.scala.html	2014-05-06 02:17:11 +09:00
takezoe	ea1e9037c4	Folding side-menu	2014-05-06 01:01:43 +09:00
takezoe	24feeb17be	Add icons for new UI	2014-05-05 22:06:18 +09:00
takezoe	6a7fc55572	Global navigation moves to side menu.	2014-05-05 22:05:41 +09:00
takezoe	cf047a8cee	Migrate: add extension to files which are attached to issue	2014-05-04 18:45:58 +09:00
takezoe	896420f8dc	Disable AceEditor for non text files	2014-05-04 17:58:47 +09:00
Tomofumi Tanaka	619f72d929	Add link for image file * Render image tag with link tag on issue and wiki * Correct response content-type of attached image on issue	2014-05-03 00:56:36 +09:00
Tomofumi Tanaka	dc21e8388e	Improve update pull request query commitIdFrom and commitIdTo columns update by one query.	2014-05-02 19:55:49 +09:00
takezoe	642e8bbb7c	Fix #358	2014-05-01 01:39:19 +09:00
Naoki Takezoe	3ee4143235	Move duplicated JavaScript and CSS for diff to common files	2014-04-30 10:55:42 +09:00
Naoki Takezoe	c136823170	Fix comment	2014-04-30 10:45:23 +09:00
Naoki Takezoe	92631fbfcf	Fix JavaScript and CSS for attachment area	2014-04-30 10:28:46 +09:00
Naoki Takezoe	5a1b1a4485	Update README.md	2014-04-29 18:27:51 +09:00
Naoki Takezoe	3e82534c78	Update README.md	2014-04-29 17:40:53 +09:00
Tomofumi Tanaka	dd694d27b5	(refs #324 )Update commitIdFrom when pullrequest branch is updated	2014-04-29 17:24:51 +09:00
takezoe	1900aefe32	Modify message in avatar uploader	2014-04-29 17:24:16 +09:00
takezoe	2fe6b8c1e7	Fix TestCase	2014-04-29 17:02:16 +09:00
takezoe	ecfaa0247a	(refs #12 )Fix styles	2014-04-29 16:42:40 +09:00
takezoe	9a0cc9e043	Fix baseURL to baseUrl	2014-04-29 15:52:24 +09:00
takezoe	b0360db105	Merge branch 'master' of https://github.com/takezoe/gitbucket	2014-04-29 15:44:58 +09:00
takezoe	0f9c95c15a	baseUrl calculation is concentrated to SystemSettings	2014-04-29 15:43:41 +09:00
shimamoto	8efd1da7e6	Merge branch 'fileupload'	2014-04-29 14:42:25 +09:00
shimamoto	52ebba43d5	(refs #12 ) Modified the response status when the file does not exist.	2014-04-29 13:54:06 +09:00
shimamoto	790eee7443	(refs #12 ) Add acceptedFiles options.	2014-04-29 13:41:50 +09:00
shimamoto	9f325290e8	(refs #12 ) Modified from path to baseURL.	2014-04-29 11:53:13 +09:00
shimamoto	93bf0a9a47	(refs #12 ) Modified to use the helper of the attachment.	2014-04-29 04:21:48 +09:00
shimamoto	bdd0af21a9	(refs #12 ) Created the helper of the attachment function.	2014-04-29 04:19:40 +09:00
Naoki Takezoe	aae5fe387b	Update README.md	2014-04-29 02:52:02 +09:00
takezoe	257c5aef51	Merge branch 'ace-editor'	2014-04-29 02:43:01 +09:00
takezoe	3cae337487	(refs #13 )New file icon	2014-04-29 02:41:19 +09:00
takezoe	779df30ec8	Fix #355	2014-04-29 02:03:28 +09:00
Naoki Takezoe	5609507991	(refs #13 )Fix link target of cancel button	2014-04-28 10:45:13 +09:00
Naoki Takezoe	1c24090c14	(refs #13 )Fix real-time validation for filename and Add line wrap mode switcher	2014-04-28 10:39:32 +09:00
takezoe	7da2c650d2	(refs #13 )Bug fix	2014-04-28 01:33:13 +09:00
shimamoto	27fa9df2ee	(refs #12 ) Implemented the process of saving image.	2014-04-27 21:08:31 +09:00
shimamoto	63c4e12259	(refs #12 ) Change the Markdown notation of images.	2014-04-27 19:11:14 +09:00
shimamoto	1f66670819	(refs #12 ) Implemented the upload area in preview.hrml.	2014-04-27 16:59:54 +09:00
shimamoto	a7b4f8de8d	(refs #12 ) Replaced the latest version of the dropzone.	2014-04-27 16:55:48 +09:00
takezoe	ad0d57fbf9	Merge remote-tracking branch 'origin/master'	2014-04-27 02:11:39 +09:00
takezoe	cfc594805b	(refs #348 )Upgrade MINA to 0.11.0	2014-04-27 02:11:10 +09:00
Naoki Takezoe	52461e673c	Merge pull request #351 from ysuganuma/Fix308 Fix #308	2014-04-27 02:06:27 +09:00
takezoe	a97edb7ef5	(refs #13 )File editing (add, edit and delete) in repository viewer is available.	2014-04-27 02:02:36 +09:00
Yasuhito Suganuma	7a1c872861	Fix #308	2014-04-25 23:49:17 +09:00
Naoki Takezoe	0e5591017a	Refactoring	2014-04-25 10:38:34 +09:00
takezoe	a104157c9a	(refs #13 )Disable commit button if content is not modified.	2014-04-25 00:09:34 +09:00
Naoki Takezoe	ad244adbfa	(refs #13 )Commit from AceEditor is available.	2014-04-24 21:49:30 +09:00
takezoe	3721b328a6	(refs #13 )Implementing file editing on the repository viewer	2014-04-24 07:42:00 +09:00
takezoe	dd688f48b7	(refs #13 )Implementing file editing on the repository viewer	2014-04-24 02:19:29 +09:00
shimamoto	296a0b2124	Removed FileUploadControllerBase(in the middle of improving file upload).	2014-04-23 02:02:19 +09:00
takezoe	b9cc46e5ef	(refs #13 )Trying to embed ace editor into repository viewer.	2014-04-22 07:24:50 +09:00
Naoki Takezoe	375211fc30	Remove unused code	2014-04-21 16:04:25 +09:00
Naoki Takezoe	b8b59f9dcd	Fix TestCase	2014-04-18 11:10:12 +09:00
Naoki Takezoe	6760ff34ef	Adjust avatar icon style	2014-04-18 10:49:48 +09:00
Naoki Takezoe	c5de7811c4	Display large icons at the user repository list page	2014-04-18 10:33:45 +09:00
takezoe	82ef5457b0	Merge branch 'master' of https://github.com/takezoe/gitbucket	2014-04-18 07:54:10 +09:00
takezoe	d558476cd2	(refs #327 )Fix baseURL and host in Context	2014-04-18 07:53:09 +09:00
takezoe	644701d995	(refs #327 )Add atom feed of the specified user	2014-04-18 07:23:52 +09:00
takezoe	1382d59206	(refs #327 )Fix icon position for global recent activities feed	2014-04-18 07:11:49 +09:00
takezoe	b60e2c07c7	(refs #327 )Move feed.scala.xml to helper package because it breaks compilation by overriding xml package	2014-04-18 07:04:31 +09:00
takezoe	86f0307633	Merge branch 'feedactivities' of https://github.com/kaakaa/gitbucket into kaakaa-feedactivities	2014-04-18 06:44:27 +09:00
Naoki Takezoe	1db891a771	(refs #345 )Fix an error for users who are authenticated with mail address through LDAP in push over HTTP.	2014-04-15 19:26:09 +09:00
Naoki Takezoe	c9fa3291f5	Fix TestCase	2014-04-11 13:23:36 +09:00
Naoki Takezoe	e0f1658120	Use retro as default Gravator image	2014-04-11 12:12:24 +09:00
Naoki Takezoe	da105b7180	Merge remote-tracking branch 'origin/master'	2014-04-11 11:58:51 +09:00
Naoki Takezoe	9c4f7cc530	Fix message for empty repository	2014-04-11 11:57:16 +09:00
takezoe	d7eef8bd25	(refs #343 )Add drop COMMIT_LOG table statement in migration for 1.13	2014-04-11 07:40:07 +09:00
Tomofumi Tanaka	7b7c0e1eee	Fix getAllcommitIds bug in empty repository	2014-04-11 01:35:31 +09:00
Naoki Takezoe	2ae7798591	(refs #343 )Apply fix to ssh pushing also	2014-04-10 17:55:58 +09:00
Naoki Takezoe	3f76453f34	(refs #343 )Retrieve all commit id from Git repository in pre commit hook instead of COMMIT_LOG table	2014-04-10 17:42:25 +09:00
Naoki Takezoe	8fbbe7f31e	(refs #337 )Fix JavaScript not found problem in JBoss/WildFly	2014-04-10 11:25:39 +09:00
takezoe	92a43b4f99	Merge branch 'remove-asciidoc'	2014-04-10 07:44:02 +09:00
Naoki Takezoe	c128086778	(refs #335 )Revert account updating in LDAP authentication	2014-04-08 16:34:01 +09:00
Naoki Takezoe	cc4fb8bf79	(refs #335 )Add Scaladoc	2014-04-08 16:24:53 +09:00
Naoki Takezoe	c3ac0f3d9f	(refs #335 )Fix account updating in LDAP authentication	2014-04-08 16:21:10 +09:00
Naoki Takezoe	dfa4816633	(refs #288 )Once remove AsciiDoc support	2014-04-08 10:13:07 +09:00
Tomofumi Tanaka	06978a4fc4	(refs #340 )Add public key validation	2014-04-07 22:56:13 +09:00
Tomofumi Tanaka	3a2ecf6896	Fix bug #340	2014-04-07 22:53:31 +09:00
Naoki Takezoe	b357d52ec5	(refs #335 )Fix LDAP authentication	2014-04-07 21:08:13 +09:00
Naoki Takezoe	f8b6b1ebf8	Merge pull request #288 from lefou/asciidoctorj Support AsciiDoc markup for all files + Plain text Readme's	2014-04-04 13:09:45 +09:00
takezoe	91bd9d1111	(refs #335 )Oops, fix substring condition	2014-04-03 08:55:50 +09:00
takezoe	1ec825050d	(refs #335 )Use string before '@' of mail address if user name is mail address in LDAP authentication.	2014-04-03 08:47:42 +09:00
takezoe	a6a08d13e9	(refs #335 )Use string before '@' of mail address if user name is mail address in LDAP authentication.	2014-04-03 06:54:56 +09:00
takezoe	9a47c4a990	Fix #334	2014-04-03 00:32:39 +09:00
Naoki Takezoe	5063294177	Merge pull request #332 from mslinn/patch-1 Update README.md	2014-04-02 09:36:00 +09:00
Mike Slinn	b14917e2c6	Update README.md	2014-03-31 22:43:29 -07:00
takezoe	c1bbec2a1c	Use logger instead of println	2014-04-01 04:53:32 +09:00
takezoe	6227a4643a	Fix #331	2014-04-01 04:47:08 +09:00
takezoe	5d3365a944	Fix #328	2014-03-31 00:39:30 +09:00
takezoe	84ac2974fb	Skip issue id extraction if the repository has no issues	2014-03-30 20:52:39 +09:00
Tobias Roeser	c9a1515d1f	Merge branch 'master' into asciidoctorj Conflicts: src/main/scala/app/RepositoryViewerController.scala	2014-03-29 13:53:23 +01:00
kaakaa	3bff6a1949	Implement atom feeds	2014-03-24 23:06:37 +09:00
Tobias Roeser	10a40bfcaf	Removed commented out code.	2014-03-05 09:28:13 +01:00
Tobias Roeser	af397ba150	Fix page-relative links, e.g. in TOC.	2014-03-05 09:12:03 +01:00
Tobias Roeser	4276c8f23e	Support relative links in asciidoc files.	2014-03-04 16:43:56 +01:00
Tobias Roeser	9e1352c8b1	Enabled rendering of renderable files in blob view.	2014-03-04 16:43:50 +01:00
Tobias Roeser	3db3bf1b74	Rewrite relative links to reflect the base url of the repo.	2014-03-04 11:38:56 +01:00
Tobias Roeser	0311359922	Merge branch 'master' into asciidoctorj	2014-03-02 09:15:57 +01:00
Tobias Roeser	89601305f6	Merge branch 'master' into asciidoctorj Conflicts: src/main/twirl/repo/files.scala.html	2014-02-28 09:42:50 +01:00
Tobias Roeser	4600b5a3bf	Enabled rendering of page document title.	2014-02-28 09:36:04 +01:00
Tobias Roeser	cbf615d699	Support plain text readme files (with .txt or no extension).	2014-02-26 16:13:39 +01:00
Tobias Roeser	97b1a0090d	Initial support for rendering asciidoc files.	2014-02-26 15:14:39 +01:00
Tobias Roeser	9078aa6d08	Added asciidoctorj dependency.	2014-02-26 13:53:50 +01:00
Tobias Roeser	8677146a8d	Show the correct name of the readme file (instead of showing always README.md).	2014-02-26 12:12:49 +01:00