Finish update password and profile

5 files changed, 53 insertions, 16 deletions

diff --git a/templates/user/delete.tmpl b/templates/user/delete.tmpl
index 37259f61e5..904201772e 100644
--- a/templates/user/delete.tmpl
+++ b/templates/user/delete.tmpl
@@ -5,7 +5,7 @@
         <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/email_password">Emails and Password</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>
diff --git a/templates/user/email_password.tmpl b/templates/user/password.tmpl
index 364bcf398e..a8b1e21e04 100644
--- a/templates/user/email_password.tmpl
+++ b/templates/user/password.tmpl
@@ -5,7 +5,7 @@
         <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 list-group-item-success"><a href="/user/setting/email_password">Emails and Password</a></li>
+            <li class="list-group-item list-group-item-success"><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>
@@ -13,37 +13,35 @@
         </ul>
     </div>
     <div id="gogs-user-setting-container" class="col-md-9">
-        <div id="gogs-setting-email">
-            <h4>Email</h4>
-            <p><strong>Your Primary Email</strong> will be used for Account related notifications as well as any web based operations, such as edits and merges made via the web.</p>
-            <p>// TODO</p><br/>
-        </div>
         <div id="gogs-setting-pwd">
             <h4>Password</h4>
-            <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting/update_passwd">{{if .IsPwdSuccess}}
-                <p class="alert alert-success">Password is changed successfully. You can sign in via new password.</p>{{end}}
+            <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting/password">{{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}}
                 <div class="form-group">
                     <label class="col-md-2 control-label">Old Password<strong class="text-danger">*</strong></label>
                     <div class="col-md-8">
                         <input type="password" name="oldpasswd" class="form-control" placeholder="Type your current password" required="required">
                     </div>
                 </div>
+
                 <div class="form-group">
                     <label class="col-md-2 control-label">New Password<strong class="text-danger">*</strong></label>
                     <div class="col-md-8">
                         <input type="password" name="newpasswd" class="form-control" placeholder="Type your new password" required="required">
                     </div>
                 </div>
+
                 <div class="form-group">
                     <label class="col-md-2 control-label">Re-Type<strong class="text-danger">*</strong></label>
                     <div class="col-md-8">
-                        <input type="password" name="re-type" class="form-control" placeholder="Re-type your new password" required="required">
+                        <input type="password" name="retypepasswd" class="form-control" placeholder="Re-type your new password" required="required">
                     </div>
                 </div>
+
                 <div class="form-group">
                     <div class="col-md-offset-2 col-md-8">
                         <button type="submit" class="btn btn-primary">Change Password</button>&nbsp;&nbsp;
-                        <a href="/forget-password/">Forget Password ?</a>
+                        <a href="/forget-password/">Forgot your password?</a>
                     </div>
                 </div>
             </form>
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 94ec33b696..c10bfcb0f3 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -11,8 +11,8 @@
         <div class="profile-info">
             <ul class="list-group">
                 <li class="list-group-item"><i class="fa fa-thumb-tack"></i>{{.Owner.Location}}</li>
-                <li class="list-group-item"><i class="fa fa-envelope"></i><a href="#">{{.Owner.Email}}</a></li>
-                <li class="list-group-item"><i class="fa fa-link"></i><a href="#">{{.Owner.Website}}</a></li>
+                <li class="list-group-item"><i class="fa fa-envelope"></i><a href="mailto:{{.Owner.Email}}">{{.Owner.Email}}</a></li>
+                <li class="list-group-item"><i class="fa fa-link"></i><a target="_blank" href="{{.Owner.Website}}">{{.Owner.Website}}</a></li>
                 <li class="list-group-item"><i class="fa fa-clock-o"></i>{{.Owner.Created}}</li>
             </ul>
         </div>
diff --git a/templates/user/publickey.tmpl b/templates/user/publickey.tmpl
index 195af75887..60d2c2464a 100644
--- a/templates/user/publickey.tmpl
+++ b/templates/user/publickey.tmpl
@@ -5,7 +5,7 @@
         <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/email_password">Emails and Password</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 list-group-item-success"><a href="/user/setting/ssh/">SSH Keys</a></li>
             <li class="list-group-item"><a href="/user/setting/security">Security</a></li>
diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index 380ac88a62..edbeeb22a9 100644
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -5,7 +5,7 @@
         <h4>Account Setting</h4>
         <ul class="list-group">
             <li class="list-group-item list-group-item-success"><a href="/user/setting">Account Profile</a></li>
-            <li class="list-group-item"><a href="/user/setting/email_password">Emails and Password</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>
@@ -13,7 +13,46 @@
         </ul>
     </div>
     <div id="gogs-user-setting-container" class="col-md-9">
-        setting container
+        <div id="gogs-setting-pwd">
+            <h4>Account Profile</h4>
+            <form class="form-horizontal" id="gogs-password-form" method="post" action="/user/setting">{{if .IsSuccess}}
+                <p class="alert alert-success">Your profile has been successfully updated.</p>{{else if .HasError}}<p class="alert alert-danger form-error">{{.ErrorMsg}}</p>{{end}}
+                <p>Your Email will be public and used for Account related notifications and any web based operations made via the web.</p>
+                <div class="form-group">
+                    <label class="col-md-2 control-label">Email</label>
+                    <div class="col-md-8">
+                        <input type="text" name="email" class="form-control" placeholder="Type your e-mail address" value="{{.Owner.Email}}">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">Website</label>
+                    <div class="col-md-8">
+                        <input type="text" name="website" class="form-control" placeholder="Type your website URL" value="{{.Owner.Website}}">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">Location</label>
+                    <div class="col-md-8">
+                        <input type="text" name="location" class="form-control" placeholder="Type your current location" value="{{.Owner.Location}}">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <label class="col-md-2 control-label">Gravatar Email<strong class="text-danger">*</strong></label>
+                    <div class="col-md-8">
+                        <input type="text" name="avatar" class="form-control" placeholder="Type your Gravatar e-mail address" required="required" value="{{.Owner.AvatarEmail}}">
+                    </div>
+                </div>
+
+                <div class="form-group">
+                    <div class="col-md-offset-2 col-md-8">
+                        <button type="submit" class="btn btn-primary">Update Profile</button>
+                    </div>
+                </div>
+            </form>
+        </div>
     </div>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file