diff options
| author | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-05-01 20:57:11 +0800 |
|---|---|---|
| committer | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-05-01 20:57:11 +0800 |
| commit | cc1eb5643e3d28b6e23d3642bdf93670c33fa9c5 (patch) | |
| tree | 7adfbed18647baf9d3e281b7f23c0dcd0828cc7d /templates | |
| parent | 52fbb9788aa80adb56c96389f73c878cc0fe8b42 (diff) | |
| parent | a2333d95d594a6aa4e77e78c2efe32991d3cf1ef (diff) | |
| download | gitea-cc1eb5643e3d28b6e23d3642bdf93670c33fa9c5.tar.gz gitea-cc1eb5643e3d28b6e23d3642bdf93670c33fa9c5.zip | |
Merge branch 'dev' of https://github.com/gogits/gogs into dev
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base/footer.tmpl | 2 | ||||
| -rw-r--r-- | templates/base/navbar.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/profile.tmpl | 1 | ||||
| -rw-r--r-- | templates/user/setting.tmpl | 7 |
4 files changed, 10 insertions, 2 deletions
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 23a1173f99..b3e3368b44 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -15,7 +15,7 @@ </div> <div class="col-md-4"> - <p class="desc"><a href="http://gogits.org">Official Website</a></p> + <p class="desc"><a href="http://gogs.io">Official Website</a></p> </div> </div> </div> diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl index da6865b8e8..80085d974a 100644 --- a/templates/base/navbar.tmpl +++ b/templates/base/navbar.tmpl @@ -3,7 +3,7 @@ <nav class="nav"> <a id="nav-logo" class="nav-item pull-left{{if .PageIsHome}} active{{end}}" href="/"><img src="/img/favicon.png" alt="Gogs Logo" id="logo"></a> <a class="nav-item pull-left{{if .PageIsUserDashboard}} active{{end}}" href="/">Dashboard</a> - <a class="nav-item pull-left{{if .PageIsHelp}} active{{end}}" target="_blank" href="https://github.com/gogits/gogs/wiki">Help</a>{{if .IsSigned}} + <a class="nav-item pull-left{{if .PageIsHelp}} active{{end}}" target="_blank" href="http://gogs.io/docs">Help</a>{{if .IsSigned}} {{if .HasAccess}}<form class="nav-item pull-left{{if .PageIsNewRepo}} active{{end}}" id="nav-search-form"> <div class="input-group"> <div class="input-group-btn"> 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}}"> |