domi/forgejo-domi
1
0
Fork 0
forked from forgejo/forgejo
Code Pull requests Activity

Merge branch 'dev' of https://github.com/gogits/gogs into dev

Browse source
This commit is contained in:
FuXiaoHei 2014-05-01 20:57:11 +08:00
commit cc1eb5643e
24 changed files with 56 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

2
templates/base/footer.tmpl
View file

@ -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>

2
templates/base/navbar.tmpl
View file

@ -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">

1
templates/user/profile.tmpl
View file

@ -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">

7
templates/user/setting.tmpl
View file

@ -17,6 +17,13 @@
</div>
</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">