Fix #69

7 files changed, 9 insertions, 20 deletions

diff --git a/templates/admin/users/edit.tmpl b/templates/admin/users/edit.tmpl
index 5db2c7a95e..da9a67cfae 100644
--- a/templates/admin/users/edit.tmpl
+++ b/templates/admin/users/edit.tmpl
@@ -11,8 +11,8 @@
             <div class="panel-body">
             	<br/>
 				<form action="/admin/users/{{.User.Id}}" method="post" class="form-horizontal">
-				    {{if .IsSuccess}}<p class="alert alert-success">Account profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
 				    {{.CsrfTokenHtml}}
+				    {{template "base/alert" .}}
                 	<input type="hidden" value="{{.User.Id}}" name="userId"/>
 					<div class="form-group">
 						<label class="col-md-3 control-label">Username: </label>
diff --git a/templates/admin/users/new.tmpl b/templates/admin/users/new.tmpl
index 7f441f32b3..4c851e3144 100644
--- a/templates/admin/users/new.tmpl
+++ b/templates/admin/users/new.tmpl
@@ -12,7 +12,7 @@
             	<br/>
 				<form action="/admin/users/new" method="post" class="form-horizontal">
 					{{.CsrfTokenHtml}}
-				    <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+				    {{template "base/alert" .}}
 					<div class="form-group {{if .Err_UserName}}has-error has-feedback{{end}}">
 						<label class="col-md-3 control-label">Username: </label>
 						<div class="col-md-7">
diff --git a/templates/issue/create.tmpl b/templates/issue/create.tmpl
index 5375040b09..a75ee83617 100644
--- a/templates/issue/create.tmpl
+++ b/templates/issue/create.tmpl
@@ -6,6 +6,7 @@
     <div id="issue">
         <form class="form" action="{{.RepoLink}}/issues/new" method="post" id="issue-create-form">
             {{.CsrfTokenHtml}}
+            {{template "base/alert" .}}
             <div class="col-md-1">
                 <img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/>
             </div>
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index dc509fc1cc..97c7945616 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -4,7 +4,7 @@
     <form action="/repo/create" method="post" class="form-horizontal card" id="repo-create">
         {{.CsrfTokenHtml}}
         <h3>Create New Repository</h3>
-        <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+        {{template "base/alert" .}}
         <div class="form-group">
             <label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label>
             <div class="col-md-8">
diff --git a/templates/repo/mirror.tmpl b/templates/repo/mirror.tmpl
index 2ac21dd617..0f10d1f549 100644
--- a/templates/repo/mirror.tmpl
+++ b/templates/repo/mirror.tmpl
@@ -4,7 +4,7 @@
     <form action="/repo/create" method="post" class="form-horizontal card" id="repo-create">
         {{.CsrfTokenHtml}}
         <h3>Create Repository Mirror</h3>
-        <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
+        {{template "base/alert" .}}
         <div class="form-group">
             <label class="col-md-2 control-label">From<strong class="text-danger">*</strong></label>
             <div class="col-md-8">
diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl
index 39949ee2b6..6493bef38e 100644
--- a/templates/user/delete.tmpl
+++ b/templates/user/delete.tmpl
@@ -1,18 +1,7 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div id="body" class="container" data-page="user">
-    <div id="user-setting-nav" class="col-md-3">
-        <h4>Account Setting</h4>
-        <ul class="list-group">
-            <li class="list-group-item"><a href="/user/setting">Account Profile</a></li>
-            <li class="list-group-item"><a href="/user/setting/password">Password</a></li>
-            <!-- <li class="list-group-item"><a href="/user/setting/notification">Notifications</a></li> -->
-            <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
-            <!-- <li class="list-group-item"><a href="/user/setting/security">Security</a></li> -->
-            <li class="list-group-item list-group-item-success"><a href="/user/delete">Delete Account</a></li>
-        </ul>
-    </div>
-
+    {{template "user/setting_nav" .}}
     <div id="user-setting-container" class="col-md-9">
         <h4>Delete Account</h4>
         {{template "base/alert" .}}
diff --git a/templates/user/password.tmpl b/templates/user/password.tmpl
index b2cdc72d9e..cba9cce0c5 100644
--- a/templates/user/password.tmpl
+++ b/templates/user/password.tmpl
@@ -6,9 +6,8 @@
         <div id="setting-pwd">
             <h4>Password</h4>
             <form class="form-horizontal" id="password-form" method="post" action="/user/setting/password">
-            {{.CsrfTokenHtml}}
-            {{if .IsSuccess}}
-                <p class="alert alert-success">Password is changed successfully. You can now sign in via new password.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
+                {{.CsrfTokenHtml}}
+                {{template "base/alert" .}}
                 <div class="form-group">
                     <label class="col-md-3 control-label">Old Password<strong class="text-danger">*</strong></label>
                     <div class="col-md-7">
@@ -33,7 +32,7 @@
                 <div class="form-group">
                     <div class="col-md-offset-3 col-md-7">
                         <button type="submit" class="btn btn-primary">Change Password</button>&nbsp;&nbsp;
-                        <a href="/forget-password/">Forgot your password?</a>
+                        <a href="/user/forget_password/">Forgot your password?</a>
                     </div>
                 </div>
             </form>