summaryrefslogtreecommitdiffstats
path: root/templates/user
diff options
context:
space:
mode:
authorFuXiaoHei <fuxiaohei@hexiaz.com>2014-05-01 20:57:11 +0800
committerFuXiaoHei <fuxiaohei@hexiaz.com>2014-05-01 20:57:11 +0800
commitcc1eb5643e3d28b6e23d3642bdf93670c33fa9c5 (patch)
tree7adfbed18647baf9d3e281b7f23c0dcd0828cc7d /templates/user
parent52fbb9788aa80adb56c96389f73c878cc0fe8b42 (diff)
parenta2333d95d594a6aa4e77e78c2efe32991d3cf1ef (diff)
downloadgitea-cc1eb5643e3d28b6e23d3642bdf93670c33fa9c5.tar.gz
gitea-cc1eb5643e3d28b6e23d3642bdf93670c33fa9c5.zip
Merge branch 'dev' of https://github.com/gogits/gogs into dev
Diffstat (limited to 'templates/user')
-rw-r--r--templates/user/profile.tmpl1
-rw-r--r--templates/user/setting.tmpl7
2 files changed, 8 insertions, 0 deletions
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 15d2a0bd5a..43ecabfa16 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -6,6 +6,7 @@
<a href="http://gravatar.com/emails/" class="center-block" data-toggle="tooltip" data-placement="bottom" title="Change your avatar at gravatar.com">
<img id="user-avatar" src="{{.Owner.AvatarLink}}?s=200" alt="user-avatar" title="{{.Owner.Name}}"/>
</a>
+ {{if .Owner.FullName}}<span id="user-name" class="center-block">{{.Owner.FullName}}</span>{{end}}
<span id="user-name" class="center-block">{{.Owner.Name}}</span>
</div>
<div class="profile-info">
diff --git a/templates/user/setting.tmpl b/templates/user/setting.tmpl
index 56d859fe41..bdcf9ce3b7 100644
--- a/templates/user/setting.tmpl
+++ b/templates/user/setting.tmpl
@@ -18,6 +18,13 @@
</div>
<div class="form-group">
+ <label class="col-md-2 control-label">Full Name</label>
+ <div class="col-md-8">
+ <input name="fullname" class="form-control" placeholder="Type your full name" value="{{.SignedUser.FullName}}">
+ </div>
+ </div>
+
+ <div class="form-group">
<label class="col-md-2 control-label">Email<strong class="text-danger">*</strong></label>
<div class="col-md-8">
<input name="email" class="form-control" placeholder="Type your e-mail address" required="required" value="{{.SignedUser.Email}}">