Merged conflicts.

26 files changed, 237 insertions, 271 deletions

diff --git a/templates/.VERSION b/templates/.VERSION
index 355087e4b7..105769c650 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.6.9.0903 Beta
\ No newline at end of file
+0.6.9.0909 Beta
\ No newline at end of file
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index 5db717bfe1..874be79b01 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -25,12 +25,6 @@
                             <div class="panel-body admin-panel">
                                 <div class="admin-table">
                                     <table class="table">
-                                        <thead>
-                                            <tr>
-                                                <th>{{.i18n.Tr "admin.dashboard.operation_name"}}</th>
-                                                <th>{{.i18n.Tr "admin.dashboard.operation_switch"}}</th>
-                                            </tr>
-                                        </thead>
                                         <tbody>
                                             <tr>
                                                 <td>{{.i18n.Tr "admin.dashboard.clean_unbind_oauth"}}</td>
@@ -164,4 +158,4 @@
         </div>
     </div>
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "ng/base/footer" .}}
diff --git a/templates/base/delete_modal_actions.tmpl b/templates/base/delete_modal_actions.tmpl
new file mode 100644
index 0000000000..6e9e256cb9
--- /dev/null
+++ b/templates/base/delete_modal_actions.tmpl
@@ -0,0 +1,10 @@
+<div class="actions">
+  <div class="ui red basic inverted cancel button">
+    <i class="remove icon"></i>
+    {{.i18n.Tr "modal.no"}}
+  </div>
+  <div class="ui green basic inverted ok button">
+    <i class="checkmark icon"></i>
+    {{.i18n.Tr "modal.yes"}}
+  </div>
+</div>
\ No newline at end of file
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl
index a8176b50de..d4b1eb8852 100644
--- a/templates/base/footer.tmpl
+++ b/templates/base/footer.tmpl
@@ -2,13 +2,12 @@
 	<footer>
 		<div class="ui container">
 			<div class="ui left">
-				© 2015 Gogs · {{.i18n.Tr "version"}}: {{AppVer}} · {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> · {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong>
+				© 2015 Gogs {{.i18n.Tr "version"}}: {{AppVer}} {{.i18n.Tr "page"}}: <strong>{{LoadTimes .PageStartTime}}</strong> {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong>
 			</div>
 			<div class="ui right links">
 				{{if .ShowFooterBranding}}
 				<a target="_blank" href="https://github.com/gogits/gogs"><i class="fa fa-github-square"></i><span class="sr-only">GitHub</span></a>
 				<a target="_blank" href="https://twitter.com/gogitservice"><i class="fa fa-twitter"></i><span class="sr-only">Twitter</span></a>
-				<a target="_blank" href="https://plus.google.com/communities/115599856376145964459"><i class="fa fa-google-plus"></i><span class="sr-only">Google Plus</span></a>
 				<a target="_blank" href="http://weibo.com/gogschina"><i class="fa fa-weibo"></i><span class="sr-only">Sina Weibo</span></a>
 				{{end}}
 				<div class="ui language bottom pointing slide up dropdown link item">
@@ -44,4 +43,6 @@
 	<link rel="stylesheet" href="{{AppSubUrl}}/css/dropzone-4.0.1.css">
 	<script src="{{AppSubUrl}}/js/libs/dropzone-4.0.1.js"></script>
 	{{end}}
+	<script src="{{AppSubUrl}}/js/libs/emojify-1.1.0.min.js"></script>
+	
 </html>
\ No newline at end of file
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
index 17c26ea248..80f771ebc3 100644
--- a/templates/base/head.tmpl
+++ b/templates/base/head.tmpl
@@ -8,6 +8,7 @@
 	<meta name="keywords" content="go, git, self-hosted, gogs">
 	<meta name="referrer" content="no-referrer" />
 	<meta name="_csrf" content="{{.CsrfToken}}" />
+	<meta name="_suburl" content="{{AppSubUrl}}" />
 	{{if .GoGetImport}}
 	<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">
 	{{end}}
@@ -66,13 +67,13 @@
 									</span>
 									<div class="menu">
 										<a class="item" href="{{AppSubUrl}}/repo/create">
-											<i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}
+											<i class="icon octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}
 										</a>
 										<a class="item" href="{{AppSubUrl}}/repo/migrate">
-											<i class="octicon octicon-repo-clone"></i> {{.i18n.Tr "new_migrate"}}
+											<i class="icon octicon octicon-repo-clone"></i> {{.i18n.Tr "new_migrate"}}
 										</a>
 										<a class="item" href="{{AppSubUrl}}/org/create">
-											<i class="octicon octicon-organization"></i> {{.i18n.Tr "new_org"}}
+											<i class="icon octicon octicon-organization"></i> {{.i18n.Tr "new_org"}}
 										</a>
 									</div><!-- end content create new menu -->
 								</div><!-- end dropdown menu create new -->
@@ -89,15 +90,15 @@
 
 										<div class="divider"></div>
 										<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}">
-											<i class="octicon icon octicon-person"></i>
+											<i class="icon octicon octicon-person"></i>
 											{{.i18n.Tr "your_profile"}}<!-- Your profile -->
 										</a>
 										<a class="{{if .PageIsUserSettings}}active{{end}} item" href="{{AppSubUrl}}/user/settings">
-											<i class="octicon icon octicon-settings"></i>
+											<i class="icon octicon octicon-settings"></i>
 											{{.i18n.Tr "your_settings"}}<!-- Your settings -->
 										</a>
 										<a class="item" target="_blank" href="http://gogs.io/docs" rel="noreferrer">
-											<i class="octicon icon octicon-question"></i>
+											<i class="icon octicon octicon-question"></i>
 											{{.i18n.Tr "help"}}<!-- Help -->
 										</a>
 										{{if .IsAdmin}}
@@ -111,7 +112,7 @@
 
 										<div class="divider"></div>
 										<a class="item" href="{{AppSubUrl}}/user/logout">
-											<i class="octicon icon octicon-sign-out"></i>
+											<i class="icon octicon octicon-sign-out"></i>
 											{{.i18n.Tr "sign_out"}}<!-- Sign Out -->
 										</a>
 									</div><!-- end content avatar menu -->
diff --git a/templates/install.tmpl b/templates/install.tmpl
index 5bf741afb0..657247ce50 100644
--- a/templates/install.tmpl
+++ b/templates/install.tmpl
@@ -16,7 +16,7 @@
 	  	      <label>{{.i18n.Tr "install.db_type"}}</label>
 			      <div class="ui selection database type dropdown">
 			        <input type="hidden" id="db_type" name="db_type" value="{{.CurDbOption}}">
-			        <div class="default text">{{.CurDbOption}}</div>
+			        <div class="text">{{.CurDbOption}}</div>
 			        <i class="dropdown icon"></i>
 			        <div class="menu">
                 {{range .DbOptions}}
@@ -26,7 +26,7 @@
 			      </div>
 	  	    </div>
 
-          <div id="sql_settings" class="{{if eq .CurDbOption "SQLite3"}}hide{{end}}">
+          <div id="sql_settings" class="{{if or (eq .CurDbOption "SQLite3") (eq .CurDbOption "TiDB")}}hide{{end}}">
             <div class="inline required field {{if .Err_DbSetting}}error{{end}}">
               <label for="db_host">{{.i18n.Tr "install.host"}}</label>
               <input id="db_host" name="db_host" value="{{.db_host}}">
@@ -62,7 +62,7 @@
             </div>
           </div>
 
-          <div id="sqlite_settings" class="{{if not (eq .CurDbOption "SQLite3")}}hide{{end}}">
+          <div id="sqlite_settings" class="{{if not (or (eq .CurDbOption "SQLite3") (eq .CurDbOption "TiDB"))}}hide{{end}}">
             <div class="inline required field {{if or .Err_DbPath .Err_DbSetting}}error{{end}}">
               <label for="db_path">{{.i18n.Tr "install.path"}}</label>
               <input id="db_path" name="db_path" value="{{.db_path}}">
diff --git a/templates/ng/base/head.tmpl b/templates/ng/base/head.tmpl
index 061d602f2f..2a13036ec4 100644
--- a/templates/ng/base/head.tmpl
+++ b/templates/ng/base/head.tmpl
@@ -29,6 +29,7 @@
     	<script src="{{AppSubUrl}}/ng/js/lib/lib.js"></script>
     	<script src="{{AppSubUrl}}/ng/js/lib/jquery.tipsy.js"></script>
     	<script src="{{AppSubUrl}}/ng/js/lib/jquery.magnific-popup.min.js"></script>
+	<script src="{{AppSubUrl}}/js/libs/emojify-1.1.0.min.js"></script>
         <script src="{{AppSubUrl}}/ng/js/utils/tabs.js"></script>
         <script src="{{AppSubUrl}}/ng/js/utils/preview.js"></script>
 		<script src="{{AppSubUrl}}/ng/js/gogs/issue_label.js"></script>
diff --git a/templates/org/create.tmpl b/templates/org/create.tmpl
index 240fb21e37..debc1b6a93 100644
--- a/templates/org/create.tmpl
+++ b/templates/org/create.tmpl
@@ -1,31 +1,30 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="sign-wrapper">
-    <form class="form-align form panel sign-panel sign-form container panel-radius" id="sign-up-form" action="{{AppSubUrl}}/org/create" method="post">
+{{template "base/head" .}}
+<div class="organization new org">
+  <div class="ui middle very relaxed page grid">
+    <div class="column">
+      <form class="ui form" action="{{.Link}}" method="post">
         {{.CsrfTokenHtml}}
-        <div class="panel-header">
-            <h2>{{.i18n.Tr "new_org"}}</h2>
+        <h3 class="ui top attached header">
+          {{.i18n.Tr "new_org"}}
+        </h3>
+        <div class="ui attached segment">
+          {{template "base/alert" .}}
+          <div class="inline required field {{if .Err_OrgName}}error{{end}}">
+            <label for="org_name">{{.i18n.Tr "org.org_name_holder"}}</label>
+            <input id="org_name" name="org_name" value="{{.org_name}}" autofocus required>
+            <span class="help">{{.i18n.Tr "org.org_name_helper"}}</span>
+          </div>
+
+          <div class="inline field">
+            <label></label>
+            <button class="ui green button">
+              {{.i18n.Tr "org.create_org"}}
+            </button>
+            <a class="ui button" href="{{AppSubUrl}}/">{{.i18n.Tr "cancel"}}</a>
+          </div>
         </div>
-        <div class="panel-content">
-            {{template "ng/base/alert" .}}
-            <div class="field">
-                <label class="req" for="org_name">{{.i18n.Tr "org.org_name_holder"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_OrgName}}ipt-error{{end}}" id="org_name" name="org_name" type="text" value="{{.org_name}}" required/>
-                <label></label>
-                <span class="help">{{.i18n.Tr "org.org_name_helper"}}</span>
-            </div>
-            <div class="field">
-                <label class="req" for="email">{{.i18n.Tr "email"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.email}}" required/>
-                <label></label>
-                <span class="help">{{.i18n.Tr "org.org_email_helper"}}</span>
-            </div>
-            <div class="field">
-                <span class="form-label"></span>
-                <button class="btn btn-large btn-blue btn-radius">{{.i18n.Tr "org.create_org"}}</button>
-                <a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a>
-            </div>
-        </div>
-    </form>
+      </form>
+    </div>
+  </div>
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/org/header.tmpl b/templates/org/header.tmpl
index 7843441b6e..68c25a9865 100644
--- a/templates/org/header.tmpl
+++ b/templates/org/header.tmpl
@@ -8,14 +8,14 @@
 
 				<div class="ui right">
 			    <div class="ui menu">
-			      <a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
-			        <i class="octicon octicon-jersey"></i>&nbsp;{{$.i18n.Tr "org.teams"}}
-			        <div class="floating ui black label">{{.NumTeams}}</div>
-			      </a>
 			      <a class="{{if $.PageIsOrgMembers}}active{{end}} item" href="{{$.OrgLink}}/members">
 			        <i class="octicon octicon-organization"></i>&nbsp;{{$.i18n.Tr "org.people"}}
 			        <div class="floating ui black label">{{.NumMembers}}</div>
 			      </a>
+			      <a class="{{if $.PageIsOrgTeams}}active{{end}} item" href="{{$.OrgLink}}/teams">
+			        <i class="octicon octicon-jersey"></i>&nbsp;{{$.i18n.Tr "org.teams"}}
+			        <div class="floating ui black label">{{.NumTeams}}</div>
+			      </a>
 			    </div>
 				</div>
 			</div>
diff --git a/templates/org/settings/delete.tmpl b/templates/org/settings/delete.tmpl
index a929fabfe2..707d6f88b2 100644
--- a/templates/org/settings/delete.tmpl
+++ b/templates/org/settings/delete.tmpl
@@ -1,36 +1,43 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-{{template "org/base/header" .}}
-<div id="setting-wrapper" class="main-wrapper">
-    <div id="org-setting" class="container clear">
-        {{template "org/settings/nav" .}}
-        <div class="grid-4-5 left">
-            <div class="setting-content">
-                {{template "ng/base/alert" .}}
-                <div id="setting-content">
-                    <div id="user-profile-setting-content" class="panel panel-warning panel-radius">
-                        <p class="panel-header"><strong>{{.i18n.Tr "org.settings.delete_account"}}</strong></p>
-                        <div class="panel-body panel-content">
-                            <span class="alert alert-red alert-radius block"><i class="octicon octicon-alert"></i>{{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</span>
-                            <form id="delete-org-form" action="{{AppSubUrl}}/org/{{.Org.LowerName}}/settings/delete" method="post">
-                                {{.CsrfTokenHtml}}
-                                <p class="field">
-                                    <span class="form-label"></span>
-                                    <button class="btn btn-red btn-large btn-radius" id="delete-org-btn" href="#delete-org-modal">{{.i18n.Tr "org.settings.confirm_delete_account"}}</button>
-                                </p>
-                            </form>
-                            <div class="white-popup-block mfp-hide" id="delete-org-modal">
-                                <h1 class="text-red">{{.i18n.Tr "org.settings.delete_org_title"}}</h1>
-                                <p>{{.i18n.Tr "org.settings.delete_org_desc"}}</p>
-                                <br>
-                                <button class="btn btn-red btn-large btn-radius" id="delete-org-submit">{{.i18n.Tr "settings.continue"}}</button>
-                                <button class="btn btn-large btn-radius popup-modal-dismiss">{{.i18n.Tr "settings.cancel"}}</button>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+{{template "base/head" .}}
+<div class="organization settings delete">
+  {{template "org/header" .}}
+  <div class="ui container">
+    <div class="ui grid">
+      {{template "org/settings/navbar" .}}
+      <div class="twelve wide column content">
+        {{template "base/alert" .}}
+        <h4 class="ui top attached warning header">
+          {{.i18n.Tr "org.settings.delete_account"}}
+        </h4>
+        <div class="ui attached warning segment">
+          <div class="ui red message">
+            <p class="text left"><i class="octicon octicon-alert"></i> {{.i18n.Tr "org.settings.delete_prompt" | Str2html}}</p>
+          </div>
+          <form class="ui form" id="delete-form" action="{{.Link}}" method="post">
+            {{.CsrfTokenHtml}}
+            <input class="fake" type="password">
+            <div class="inline required field {{if .Err_Password}}error{{end}}">
+              <label for="password">{{.i18n.Tr "password"}}</label>
+              <input id="password" name="password" type="password" autofocus required>
             </div>
+            <div class="ui red button delete-button" data-type="form" data-form="#delete-form">
+              {{.i18n.Tr "org.settings.confirm_delete_account"}}
+            </div>
+          </form>
         </div>
+      </div>
     </div>
+  </div>
+</div>
+
+<div class="ui small basic delete modal">
+  <div class="ui icon header">
+    <i class="trash icon"></i>
+    {{.i18n.Tr "org.settings.delete_org_title"}}
+  </div>
+  <div class="content">
+    <p>{{.i18n.Tr "org.settings.delete_org_desc"}}</p>
+  </div>
+  {{template "base/delete_modal_actions" .}}
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/org/settings/nav.tmpl b/templates/org/settings/nav.tmpl
deleted file mode 100644
index 28af4d29a5..0000000000
--- a/templates/org/settings/nav.tmpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="setting-menu" class="grid-1-5 panel panel-radius left">
-  <div class="panel-header">
-  	<strong>{{.i18n.Tr "org.settings"}}</strong>
-  </div>
-  <div class="panel-body">
-    <ul class="menu menu-vertical switching-list grid-1-5 left">
-      <li {{if .PageIsSettingsOptions}}class="current"{{end}}><a href="{{.Org.HomeLink}}/settings">{{.i18n.Tr "org.settings.options"}}</a></li>
-      <li {{if .PageIsSettingsHooks}}class="current"{{end}}><a href="{{.Org.HomeLink}}/settings/hooks">{{.i18n.Tr "repo.settings.hooks"}}</a></li>
-      <li {{if .PageIsSettingsDelete}}class="current"{{end}}><a href="{{.Org.HomeLink}}/settings/delete">{{.i18n.Tr "org.settings.delete"}}</a></li>
-    </ul>
-  </div>
-</div>
diff --git a/templates/org/settings/options.tmpl b/templates/org/settings/options.tmpl
index 169067a79d..61db48b6f6 100644
--- a/templates/org/settings/options.tmpl
+++ b/templates/org/settings/options.tmpl
@@ -1,64 +1,59 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-{{template "org/base/header" .}}
-<div id="setting-wrapper" class="main-wrapper">
-  <div id="org-setting" class="container clear">
-    {{template "org/settings/nav" .}}
-    <div class="grid-4-5 left">
-      <div class="setting-content">
-        {{template "ng/base/alert" .}}
-        <div id="setting-content">
-          <div id="user-profile-setting-content" class="panel panel-radius">
-            <div class="panel-header">
-              <strong>{{.i18n.Tr "org.settings.options"}}</strong>
+{{template "base/head" .}}
+<div class="organization settings options">
+  {{template "org/header" .}}
+  <div class="ui container">
+    <div class="ui grid">
+      {{template "org/settings/navbar" .}}
+      <div class="twelve wide column content">
+        {{template "base/alert" .}}
+        <h4 class="ui top attached header">
+          {{.i18n.Tr "org.settings.options"}}
+        </h4>
+        <div class="ui attached segment">
+          <form class="ui form" action="{{.Link}}" method="post">
+            {{.CsrfTokenHtml}}
+            <div class="required field {{if .Err_Name}}error{{end}}">
+              <label for="org_name">{{.i18n.Tr "org.org_name_holder"}}<span class="text red hide" id="org-name-change-prompt"> {{.i18n.Tr "org.settings.change_orgname_prompt"}}</span></label>
+              <input id="org_name" name="name" value="{{.Org.Name}}" data-org-name="{{.Org.Name}}" autofocus required>
             </div>
-            <form class="form form-align panel-body" id="org-setting-form" action="{{AppSubUrl}}/org/{{.Org.LowerName}}/settings" method="post">
-              {{.CsrfTokenHtml}}
-              <input type="hidden" name="action" value="update">
-              <div class="field">
-                <label class="req" for="orgname">{{.i18n.Tr "org.org_name_holder"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="orgname" name="uname" value="{{.Org.Name}}" data-orgname="{{.Org.Name}}" required />
-              </div>
-              <div class="white-popup-block mfp-hide" id="change-orgname-modal">
-                <h1 class="text-red">{{.i18n.Tr "org.settings.change_orgname"}}</h1>
-                <p>{{.i18n.Tr "org.settings.change_orgname_desc"}}</p>
-                <br>
-                <button class="btn btn-red btn-large btn-radius" id="change-orgname-submit">{{.i18n.Tr "settings.continue"}}</button>
-                <button class="btn btn-large btn-radius popup-modal-dismiss">{{.i18n.Tr "settings.cancel"}}</button>
-              </div>
-              <div class="field">
-                <label for="full-name">{{.i18n.Tr "org.settings.full_name"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_FullName}}ipt-error{{end}}" id="full-name" name="fullname" value="{{.Org.FullName}}" />
-              </div>
-              <div class="field">
-                <label class="req" for="email">{{.i18n.Tr "email"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.Org.Email}}" required />
-              </div>
-              <div class="field clear">
-                <label class="left" for="desc">{{.i18n.Tr "org.org_desc"}}</label>
-                <textarea class="ipt ipt-large ipt-radius {{if .Err_Description}}ipt-error{{end}}" id="desc" name="desc">{{.Org.Description}}</textarea>
-              </div>
-              <div class="field">
-                <label for="website">{{.i18n.Tr "org.settings.website"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Website}}ipt-error{{end}}" id="website" name="website" type="url" value="{{.Org.Website}}" />
-              </div>
-              <div class="field">
-                <label for="location">{{.i18n.Tr "org.settings.location"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Location}}ipt-error{{end}}" id="location" name="location" type="text" value="{{.Org.Location}}" />
-              </div>
-              <div class="field {{if DisableGravatar}}hide{{end}}">
-                <label class="req" for="gravatar-email">Gravatar {{.i18n.Tr "email"}}</label>
-                <input class="ipt ipt-large ipt-radius {{if .Err_Avatar}}ipt-error{{end}}" id="gravatar-email" name="avatar" type="text" value="{{.Org.AvatarEmail}}" />
-              </div>
-              <div class="field">
-                <span class="form-label"></span>
-                <button class="btn btn-green btn-large btn-radius" id="change-orgname-btn" href="#change-orgname-modal">{{.i18n.Tr "org.settings.update_settings"}}</button>
-              </div>
-            </form>
-          </div>
+            <div class="field {{if .Err_FullName}}error{{end}}">
+              <label for="full_name">{{.i18n.Tr "org.org_name_holder"}}</label>
+              <input id="full_name" name="full_name" value="{{.Org.FullName}}">
+            </div>
+            <div class="field {{if .Err_Description}}error{{end}}">
+              <label for="description">{{$.i18n.Tr "org.org_desc"}}</label>
+              <textarea id="description" name="description" rows="2">{{.Org.Description}}</textarea>
+            </div>
+            <div class="field {{if .Err_Website}}error{{end}}">
+              <label for="website">{{.i18n.Tr "org.settings.website"}}</label>
+              <input id="website" name="website" type="url" value="{{.Org.Website}}">
+            </div>
+            <div class="field">
+              <label for="location">{{.i18n.Tr "org.settings.location"}}</label>
+              <input id="location" name="location"  value="{{.Org.Location}}">
+            </div>
+
+            <div class="field">
+               <button class="ui green button">{{$.i18n.Tr "org.settings.update_settings"}}</button>
+            </div>
+          </form>
+
+          <div class="ui divider"></div>
+
+          <form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
+            {{.CsrfTokenHtml}}
+            <div class="inline field">
+                <label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
+                <input name="avatar" type="file" >
+            </div>
+
+            <div class="field">
+               <button class="ui green button">{{$.i18n.Tr "settings.update_avatar"}}</button>
+            </div>
+          </form>
         </div>
       </div>
     </div>
   </div>
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index 084c99c200..c2d1c46014 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -24,13 +24,11 @@
                   {{.SignedUser.Name}}
                 </div>
                 {{range .Orgs}}
-                {{if .IsOwnedBy $.SignedUser.Id}}
                 <div class="item" data-value="{{.Id}}">
                   <img class="ui mini image" src="{{.AvatarLink}}">
                   {{.Name}}
                 </div>
                 {{end}}
-                {{end}}
               </div>
             </div>
           </div>
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index d95d9526e7..2f883cd704 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -29,7 +29,7 @@
 					    {{.NumStars}}
 					  </a>
 					</div>
-					{{if not .IsBare}}
+					{{if .CanBeForked}}
 					<div class="ui labeled button" tabindex="0">
 					  <a class="ui grey button {{if eq .OwnerID $.SignedUserID}}poping up{{end}}" {{if not (eq .OwnerID $.SignedUserID)}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{else}} data-content="{{$.i18n.Tr "repo.fork_from_self"}}" data-position="top center" data-variation="tiny"{{end}}>
 					    <i class="icon octicon octicon-repo-forked"></i>{{$.i18n.Tr "repo.fork"}}
diff --git a/templates/repo/header_old.tmpl b/templates/repo/header_old.tmpl
index 0537cc0244..23a3e0888d 100644
--- a/templates/repo/header_old.tmpl
+++ b/templates/repo/header_old.tmpl
@@ -48,7 +48,7 @@
                     </button>
                 </a>
             </li>
-            {{if not .IsBare}}
+            {{if .CanBeForked}}
             <li id="repo-header-fork">
                 <a id="repo-header-fork-btn" {{if or (not $.IsRepositoryAdmin) $.Owner.IsOrganization}}href="{{AppSubUrl}}/repo/fork/{{.ID}}"{{end}}>
                     <button class="btn btn-gray text-bold btn-radius">
diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl
index 2c12f28778..8199bb1d18 100644
--- a/templates/repo/issue/list.tmpl
+++ b/templates/repo/issue/list.tmpl
@@ -9,7 +9,7 @@
 			</div>
 		</div>
 		<div class="ui divider"></div>
-		<div class="ui tiny basic buttons">
+		<div class="ui tiny basic status buttons">
 		  <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{$.Link}}?type={{$.ViewType}}&sort={{$.SortType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}&assignee={{.AssigneeID}}">
 		  	<i class="octicon octicon-issue-opened"></i>
 		  	{{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}}
diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl
index c15b82a01a..d258d3d0a9 100644
--- a/templates/repo/issue/view_content.tmpl
+++ b/templates/repo/issue/view_content.tmpl
@@ -25,7 +25,7 @@
 					  </div>
 					</div>
 			    <div class="ui attached segment">
-			    	<div class="render-content markdown">
+			    	<div class="render-content markdown emojify">
 				    	{{if .Issue.RenderedContent}}
 							{{.Issue.RenderedContent|Str2html}}
 				    	{{else}}
@@ -77,7 +77,7 @@
 					  </div>
 					</div>
 			    <div class="ui attached segment">
-			    	<div class="render-content markdown">
+			    	<div class="render-content markdown emojify">
 				    	{{if .RenderedContent}}
 							{{.RenderedContent|Str2html}}
 				    	{{else}}
@@ -91,7 +91,7 @@
 					<div class="ui bottom attached segment">
 						<div class="ui small images">
 							{{range .Attachments}}
-						  <a target="_blank" href="/attachments/{{.UUID}}"><img class="ui image" src="/attachments/{{.UUID}}"></a>
+						  <a target="_blank" href="{{AppSubUrl}}/attachments/{{.UUID}}"><img class="ui image" src="{{AppSubUrl}}/attachments/{{.UUID}}"></a>
 						  {{end}}
 						</div>
 					</div>
@@ -317,7 +317,7 @@
 		<div class="ui bottom attached active write tab segment">
 		  <textarea id="content" name="content"></textarea>
 		</div>
-		<div class="ui bottom attached tab preview segment markdown">
+		<div class="ui bottom attached tab preview segment markdown emojify">
 		  {{$.i18n.Tr "repo.release.loading"}}
 		</div>
     <div class="text right edit buttons">
diff --git a/templates/repo/migrate.tmpl b/templates/repo/migrate.tmpl
index fa920e9fe3..5a76850d0d 100644
--- a/templates/repo/migrate.tmpl
+++ b/templates/repo/migrate.tmpl
@@ -49,13 +49,11 @@
 	            		{{.SignedUser.Name}}
 			        	</div>
 			        	{{range .Orgs}}
-			        	{{if .IsOwnedBy $.SignedUser.Id}}
 			        	<div class="item" data-value="{{.Id}}">
 				        	<img class="ui mini image" src="{{.AvatarLink}}">
 	            		{{.Name}}
 			        	</div>
 			        	{{end}}
-			        	{{end}}
 			        </div>
 			      </div>
 		      </div>
diff --git a/templates/repo/release/edit.tmpl b/templates/repo/release/edit.tmpl
index c1dfd0d98d..062884e2a1 100644
--- a/templates/repo/release/edit.tmpl
+++ b/templates/repo/release/edit.tmpl
@@ -27,7 +27,7 @@
                                 <li class="js-tab-nav js-tab-nav-show left" data-tab-target="#release-textarea">
                                     <button class="btn btn-medium btn-gray btn-left-radius">{{.i18n.Tr "repo.release.write"}}</button>
                                 </li>
-                                <li class="js-tab-nav left markdown-preview" id="release-preview-btn" data-tab-target="#release-preview" data-ajax="/api/v1/markdown" data-ajax-name="release-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#release-preview">
+                                <li class="js-tab-nav left markdown-preview" id="release-preview-btn" data-tab-target="#release-preview" data-ajax="{{AppSubUrl}}/api/v1/markdown" data-ajax-name="release-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#release-preview">
                                     <button class="btn btn-medium btn-gray btn-right-radius">{{.i18n.Tr "repo.release.preview"}}</button>
                                 </li>
                             </ul>
diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl
index 82cad3ca8b..d8909142f0 100644
--- a/templates/repo/release/new.tmpl
+++ b/templates/repo/release/new.tmpl
@@ -39,7 +39,7 @@
                                 <li class="js-tab-nav js-tab-nav-show left" data-tab-target="#release-textarea">
                                     <button class="btn btn-medium btn-gray btn-left-radius">{{.i18n.Tr "repo.release.write"}}</button>
                                 </li>
-                                <li class="js-tab-nav left markdown-preview" id="release-preview-btn" data-tab-target="#release-preview" data-ajax="/api/v1/markdown" data-ajax-name="release-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#release-preview">
+                                <li class="js-tab-nav left markdown-preview" id="release-preview-btn" data-tab-target="#release-preview" data-ajax="{{AppSubUrl}}/api/v1/markdown" data-ajax-name="release-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#release-preview">
                                     <button class="btn btn-medium btn-gray btn-right-radius">{{.i18n.Tr "repo.release.preview"}}</button>
                                 </li>
                             </ul>
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl
index 6218515537..474d719eb7 100644
--- a/templates/repo/settings/options.tmpl
+++ b/templates/repo/settings/options.tmpl
@@ -32,7 +32,7 @@
 					    <label>{{.i18n.Tr "repo.default_branch"}}</label>
 					    <div class="ui selection dropdown">
 					      <input type="hidden" id="branch" name="branch" value="{{.Repository.DefaultBranch}}">
-					      <div class="default text">{{.Repository.DefaultBranch}}</div>
+					      <div class="text">{{.Repository.DefaultBranch}}</div>
 					      <i class="dropdown icon"></i>
 					      <div class="menu">
                   {{range .Branches}}
diff --git a/templates/user/dashboard/dashboard.tmpl b/templates/user/dashboard/dashboard.tmpl
index 02c0102e42..e530b6f735 100644
--- a/templates/user/dashboard/dashboard.tmpl
+++ b/templates/user/dashboard/dashboard.tmpl
@@ -59,7 +59,7 @@
                     <ul class="list-no-style">
                         {{range .CollaborativeRepos}}
                         <li {{if .IsPrivate}}class="private"{{end}}>
-                            <a href="{{.Owner.Name}}/{{.Name}}">
+                            <a href="{{AppSubUrl}}/{{.Owner.Name}}/{{.Name}}">
                                 <i class="octicon octicon-{{if .IsPrivate}}lock{{else if .IsFork}}repo-forked{{else if .IsMirror}}repo-clone{{else}}repo{{end}}"></i>
                                 <span class="repo-name">
                                     <span class="repo-name-prefix">{{.Owner.Name}} / </span>
diff --git a/templates/user/dashboard/issues.tmpl b/templates/user/dashboard/issues.tmpl
index 37e7b9778f..092c2523c6 100644
--- a/templates/user/dashboard/issues.tmpl
+++ b/templates/user/dashboard/issues.tmpl
@@ -29,7 +29,7 @@
   			</div>
   		</div>
 			<div class="twelve wide column content">
-				<div class="ui tiny basic buttons">
+				<div class="ui tiny basic status buttons">
 				  <a class="ui {{if not .IsShowClosed}}green active{{end}} basic button" href="{{.Link}}?type={{$.ViewType}}&repo={{.RepoID}}&state=open">
 				  	<i class="octicon octicon-issue-opened"></i>
 				  	{{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}}
diff --git a/templates/user/settings/delete.tmpl b/templates/user/settings/delete.tmpl
index d9a0837b5e..6b490ad291 100644
--- a/templates/user/settings/delete.tmpl
+++ b/templates/user/settings/delete.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings">
+<div class="user settings delete">
   <div class="ui container">
     <div class="ui grid">
       {{template "user/settings/navbar" .}}
@@ -10,7 +10,7 @@
         </h4>
         <div class="ui attached warning segment">
           <div class="ui red message">
-            <p>{{.i18n.Tr "settings.delete_prompt" | Str2html}}</p>
+            <p class="text left"><i class="octicon octicon-alert"></i> {{.i18n.Tr "settings.delete_prompt" | Str2html}}</p>
           </div>
           <form class="ui form" id="delete-form" action="{{.Link}}" method="post">
             {{.CsrfTokenHtml}}
@@ -37,15 +37,6 @@
   <div class="content">
     <p>{{.i18n.Tr "settings.delete_account_desc"}}</p>
   </div>
-  <div class="actions">
-    <div class="ui red basic inverted cancel button">
-      <i class="remove icon"></i>
-      {{.i18n.Tr "modal.no"}}
-    </div>
-    <div class="ui green basic inverted ok button">
-      <i class="checkmark icon"></i>
-      {{.i18n.Tr "modal.yes"}}
-    </div>
-  </div>
+  {{template "base/delete_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/user/settings/profile.tmpl b/templates/user/settings/profile.tmpl
index 9ed92babcb..5438feae35 100644
--- a/templates/user/settings/profile.tmpl
+++ b/templates/user/settings/profile.tmpl
@@ -1,82 +1,74 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="setting-wrapper" class="main-wrapper">
-    <div id="user-profile-setting" class="container clear">
-        {{template "user/settings/nav" .}}
-        <div class="grid-4-5 left">
-            <div class="setting-content">
-                {{template "ng/base/alert" .}}
-                <div id="setting-content">
-                    <div id="user-profile-setting-content" class="panel panel-radius">
-                        <div class="panel-header">
-                            <strong>{{.i18n.Tr "settings.public_profile"}}</strong>
-                        </div>
-                        <div class="panel-body">
-                            <form class="form form-align" id="user-profile-form" action="{{AppSubUrl}}/user/settings" method="post">
-                                {{.CsrfTokenHtml}}
-                                <div class="text-center panel-desc">{{.i18n.Tr "settings.profile_desc"}}</div>
-                                <div class="field">
-                                    <label>{{.i18n.Tr "settings.uid"}}</label>
-                                    <label class="text-left">{{.SignedUser.Id}}</label>
-                                </div>
-                                <div class="field">
-                                    <label class="req" for="username">{{.i18n.Tr "username"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_UserName}}ipt-error{{end}}" id="username" name="uname" type="text" value="{{.SignedUser.Name}}" data-uname="{{.SignedUser.Name}}" required />
-                                </div>
-                                <div class="white-popup-block mfp-hide" id="change-username-modal">
-                                    <h1 class="text-red">{{.i18n.Tr "settings.change_username"}}</h1>
-                                    <p>{{.i18n.Tr "settings.change_username_desc"}}</p>
-                                    <br>
-                                    <button class="btn btn-red btn-large btn-radius" id="change-username-submit">{{.i18n.Tr "settings.continue"}}</button>
-                                    <button class="btn btn-large btn-radius popup-modal-dismiss">{{.i18n.Tr "settings.cancel"}}</button>
-                                </div>
-                                <div class="field">
-                                    <label for="full-name">{{.i18n.Tr "settings.full_name"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_FullName}}ipt-error{{end}}" id="full-name" name="fullname" type="text" value="{{.SignedUser.FullName}}" />
-                                </div>
-                                <div class="field">
-                                    <label class="req" for="email">{{.i18n.Tr "email"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.SignedUser.Email}}" required />
-                                </div>
-                                <div class="field">
-                                    <label for="website">{{.i18n.Tr "settings.website"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_Website}}ipt-error{{end}}" id="website" name="website" type="url" value="{{.SignedUser.Website}}" />
-                                </div>
-                                <div class="field">
-                                    <label for="location">{{.i18n.Tr "settings.location"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_Location}}ipt-error{{end}}" id="location" name="location" type="text" value="{{.SignedUser.Location}}" />
-                                </div>
-                                <div class="field {{if DisableGravatar}}hide{{end}}">
-                                    <label class="req" for="gravatar-email">Gravatar {{.i18n.Tr "email"}}</label>
-                                    <input class="ipt ipt-large ipt-radius {{if .Err_Avatar}}ipt-error{{end}}" id="gravatar-email" name="avatar" type="text" value="{{.SignedUser.AvatarEmail}}" />
-                                </div>
-                                <div class="field">
-                                    <label></label>
-                                    <button class="btn btn-green btn-large btn-radius" id="change-username-btn" href="#change-username-modal">{{.i18n.Tr "settings.update_profile"}}</button>
-                                </div>
-                            </form>
-                            <hr>
-                            <form class="form form-align" id="user-profile-form" action="{{AppSubUrl}}/user/settings/avatar" method="post" enctype="multipart/form-data">
-                                {{.CsrfTokenHtml}}
-                                <div class="field">
-                                    <label for="enable">{{.i18n.Tr "settings.enable_custom_avatar"}}</label>
-                                    <input class="ipt-chk" id="enable" name="enable" type="checkbox" {{if .SignedUser.UseCustomAvatar}}checked{{end}} />
-                                    <span>{{.i18n.Tr "settings.enable_custom_avatar_helper"}}</span>
-                                </div>
-                                <div class="field">
-                                    <label>{{.i18n.Tr "settings.choose_new_avatar"}}</label>
-                                    <input name="avatar" type="file" />
-                                </div>
-                                <div class="field">
-                                    <label></label>
-                                    <button class="btn btn-green btn-large btn-radius">{{.i18n.Tr "settings.update_avatar"}}</button>
-                                </div>
-                            </form>
-                        </div>
-                    </div>
-                </div>
+{{template "base/head" .}}
+<div class="user settings profile">
+  <div class="ui container">
+    <div class="ui grid">
+      {{template "user/settings/navbar" .}}
+      <div class="twelve wide column content">
+        {{template "base/alert" .}}
+        <h4 class="ui top attached header">
+          {{.i18n.Tr "settings.public_profile"}}
+        </h4>
+        <div class="ui attached segment">
+          <p>{{.i18n.Tr "settings.profile_desc"}}</p>
+          <form class="ui form" action="{{.Link}}" method="post">
+            {{.CsrfTokenHtml}}
+            <div class="inline field">
+              <label>{{.i18n.Tr "settings.uid"}}</label>
+              <span>{{.SignedUser.Id}}</span>
             </div>
+            <div class="required field {{if .Err_Name}}error{{end}}">
+              <label for="username">{{.i18n.Tr "username"}}<span class="text red hide" id="name-change-prompt"> {{.i18n.Tr "settings.change_username_prompt"}}</span></label>
+              <input id="username" name="name" value="{{.SignedUser.Name}}" data-name="{{.SignedUser.Name}}" autofocus required>
+            </div>
+            <div class="field {{if .Err_FullName}}error{{end}}">
+              <label for="full_name">{{.i18n.Tr "settings.full_name"}}</label>
+              <input id="full_name" name="full_name" value="{{.SignedUser.FullName}}">
+            </div>
+            <div class="required field {{if .Err_Email}}error{{end}}">
+              <label for="email">{{.i18n.Tr "email"}}</label>
+              <input id="email" name="email" value="{{.SignedUser.Email}}">
+            </div>
+            <div class="field {{if .Err_Website}}error{{end}}">
+              <label for="website">{{.i18n.Tr "settings.website"}}</label>
+              <input id="website" name="website" type="url" value="{{.SignedUser.Website}}">
+            </div>
+            <div class="field">
+              <label for="location">{{.i18n.Tr "settings.location"}}</label>
+              <input id="location" name="location"  value="{{.SignedUser.Location}}">
+            </div>
+            <div class="required field {{if or DisableGravatar .SignedUser.UseCustomAvatar}}hide{{end}} {{if .Err_Gravatar}}error{{end}}">
+                <label for="gravatar">Gravatar {{.i18n.Tr "email"}}</label>
+                <input id="gravatar" name="gravatar" value="{{.SignedUser.AvatarEmail}}" />
+            </div>
+
+            <div class="field">
+               <button class="ui green button">{{$.i18n.Tr "settings.update_profile"}}</button>
+            </div>
+          </form>
+
+          <div class="ui divider"></div>
+
+          <form class="ui form" action="{{.Link}}/avatar" method="post" enctype="multipart/form-data">
+            {{.CsrfTokenHtml}}
+            <div class="inline field">
+              <label>{{.i18n.Tr "settings.enable_custom_avatar"}}</label>
+              <div class="ui checkbox">
+                <input name="enable" type="checkbox" {{if .SignedUser.UseCustomAvatar}}checked{{end}}>
+                <label>{{.i18n.Tr "settings.enable_custom_avatar_helper"}}</label>
+              </div>
+            </div>
+            <div class="inline field">
+                <label for="avatar">{{.i18n.Tr "settings.choose_new_avatar"}}</label>
+                <input name="avatar" type="file" >
+            </div>
+
+            <div class="field">
+               <button class="ui green button">{{$.i18n.Tr "settings.update_avatar"}}</button>
+            </div>
+          </form>
         </div>
+      </div>
     </div>
+  </div>
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/user/settings/sshkeys.tmpl b/templates/user/settings/sshkeys.tmpl
index 5eb3bfb741..4c2177278b 100644
--- a/templates/user/settings/sshkeys.tmpl
+++ b/templates/user/settings/sshkeys.tmpl
@@ -1,5 +1,5 @@
 {{template "base/head" .}}
-<div class="user settings">
+<div class="user settings sshkeys">
   <div class="ui container">
     <div class="ui grid">
       {{template "user/settings/navbar" .}}
@@ -78,15 +78,6 @@
   <div class="content">
     <p>{{.i18n.Tr "settings.ssh_key_deletion_desc"}}</p>
   </div>
-  <div class="actions">
-    <div class="ui red basic inverted cancel button">
-      <i class="remove icon"></i>
-      {{.i18n.Tr "modal.no"}}
-    </div>
-    <div class="ui green basic inverted ok button">
-      <i class="checkmark icon"></i>
-      {{.i18n.Tr "modal.yes"}}
-    </div>
-  </div>
+  {{template "base/delete_modal_actions" .}}
 </div>
 {{template "base/footer" .}}
\ No newline at end of file