This reverts commit c226e92284c7b4b405352814155dd5da3458e029, reversing
changes made to 80b23854bc
.
master
@@ -24,7 +24,6 @@ captcha = Captcha | |||||
repository = Repository | repository = Repository | ||||
organization = Organization | organization = Organization | ||||
mirror = Mirror | mirror = Mirror | ||||
new = New | |||||
new_repo = New Repository | new_repo = New Repository | ||||
new_migrate = New Migration | new_migrate = New Migration | ||||
new_fork = New Fork Repository | new_fork = New Fork Repository | ||||
@@ -39,7 +38,6 @@ pull_requests = Pull Requests | |||||
issues = Issues | issues = Issues | ||||
cancel = Cancel | cancel = Cancel | ||||
more = More | |||||
[install] | [install] | ||||
install = Installation | install = Installation | ||||
@@ -415,8 +413,6 @@ release.save_draft = Save Draft | |||||
release.edit_release = Edit Release | release.edit_release = Edit Release | ||||
release.tag_name_already_exist = Release with this tag name has already existed. | release.tag_name_already_exist = Release with this tag name has already existed. | ||||
download = Download | |||||
[org] | [org] | ||||
org_name_holder = Organization Name | org_name_holder = Organization Name | ||||
org_name_helper = Great organization names are short and memorable. | org_name_helper = Great organization names are short and memorable. | ||||
@@ -728,10 +724,3 @@ months = %d months %s | |||||
years = %d years %s | years = %d years %s | ||||
raw_seconds = seconds | raw_seconds = seconds | ||||
raw_minutes = minutes | raw_minutes = minutes | ||||
[footer] | |||||
github = GitHub | |||||
twitter = Twitter | |||||
gplus = Google+ | |||||
weibo = Weibo |
@@ -22,16 +22,16 @@ | |||||
</div> | </div> | ||||
</form> --> | </form> --> | ||||
{{end}} | {{end}} | ||||
<a id="nav-out" class="nav-item navbar-right navbar-btn btn btn-danger" href="{{AppSubUrl}}/user/logout/"><i class="fa fa-power-off fa-lg"></i><span class="sr-only">Sign Out</span></a> | |||||
<a id="nav-out" class="nav-item navbar-right navbar-btn btn btn-danger" href="{{AppSubUrl}}/user/logout/"><i class="fa fa-power-off fa-lg"></i></a> | |||||
<a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}"> | <a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}"> | ||||
<img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/> | <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/> | ||||
</a> | </a> | ||||
<a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="{{AppSubUrl}}/user/settings" data-toggle="tooltip" data-placement="bottom" title="Settings"><i class="fa fa-cogs fa-lg"></i><span class="sr-only">Settings</span></a> | |||||
<a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="{{AppSubUrl}}/user/settings" data-toggle="tooltip" data-placement="bottom" title="Settings"><i class="fa fa-cogs fa-lg"></i></a> | |||||
{{if .IsAdmin}} | {{if .IsAdmin}} | ||||
<a class="navbar-right nav-item{{if .PageIsAdmin}} active{{end}}" href="{{AppSubUrl}}/admin" data-toggle="tooltip" data-placement="bottom" title="Admin"><i class="fa fa-gear fa-lg"></i><span class="sr-only">Admin</span></a> | |||||
<a class="navbar-right nav-item{{if .PageIsAdmin}} active{{end}}" href="{{AppSubUrl}}/admin" data-toggle="tooltip" data-placement="bottom" title="Admin"><i class="fa fa-gear fa-lg"></i></a> | |||||
{{end}} | {{end}} | ||||
<div class="navbar-right nav-item pull-right{{if .PageIsNewRepo}} active{{end}}" id="nav-repo-new" data-toggle="tooltip" data-placement="bottom" title="New Repo"> | <div class="navbar-right nav-item pull-right{{if .PageIsNewRepo}} active{{end}}" id="nav-repo-new" data-toggle="tooltip" data-placement="bottom" title="New Repo"> | ||||
<button type="button" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square fa-lg"></i><span class="sr-only">New</span></button> | |||||
<button type="button" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square fa-lg"></i></button> | |||||
<div class="dropdown-menu"> | <div class="dropdown-menu"> | ||||
<ul class="list-unstyled"> | <ul class="list-unstyled"> | ||||
<li><a href="{{AppSubUrl}}/repo/create"><i class="fa fa-book"></i>Repository</a></li> | <li><a href="{{AppSubUrl}}/repo/create"><i class="fa fa-book"></i>Repository</a></li> | ||||
@@ -5,10 +5,10 @@ | |||||
{{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong></p> | {{.i18n.Tr "template"}}: <strong>{{call .TmplLoadTimes}}</strong></p> | ||||
<div class="right" id="footer-links"> | <div class="right" id="footer-links"> | ||||
<a target="_blank" href="https://github.com/gogits/gogs"><i class="fa fa-github-square"></i><span class="sr-only">{{.i18n.Tr "github"}}</span></a> | |||||
<a target="_blank" href="https://twitter.com/gogitservice"><i class="fa fa-twitter"></i><span class="sr-only">{{.i18n.Tr "twitter"}}</span></a> | |||||
<a target="_blank" href="https://plus.google.com/communities/115599856376145964459"><i class="fa fa-google-plus"></i><span class="sr-only">{{.i18n.Tr "gplus"}}</span></a> | |||||
<a target="_blank" href="http://weibo.com/gogschina"><i class="fa fa-weibo"></i><span class="sr-only">{{.i18n.Tr "Weibo"}}</span></a> | |||||
<a target="_blank" href="https://github.com/gogits/gogs"><i class="fa fa-github-square"></i></a> | |||||
<a target="_blank" href="https://twitter.com/gogitservice"><i class="fa fa-twitter"></i></a> | |||||
<a target="_blank" href="https://plus.google.com/communities/115599856376145964459"><i class="fa fa-google-plus"></i></a> | |||||
<a target="_blank" href="http://weibo.com/gogschina"><i class="fa fa-weibo"></i></a> | |||||
<div id="footer-lang" class="inline drop drop-top">{{.i18n.Tr "language"}} | <div id="footer-lang" class="inline drop drop-top">{{.i18n.Tr "language"}} | ||||
<div class="drop-down"> | <div class="drop-down"> | ||||
<ul class="menu menu-vertical switching-list"> | <ul class="menu menu-vertical switching-list"> | ||||
@@ -13,18 +13,18 @@ | |||||
{{if .IsSigned}} | {{if .IsSigned}} | ||||
<li class="right" id="header-nav-sign-out"> | <li class="right" id="header-nav-sign-out"> | ||||
<a href="{{AppSubUrl}}/user/logout" title="{{.i18n.Tr "sign_out"}}"><i class="octicon octicon-sign-out"></i><span class="sr-only">{{.i18n.Tr "sign_out"}}</span></a> | |||||
<a href="{{AppSubUrl}}/user/logout" title="{{.i18n.Tr "sign_out"}}"><i class="octicon octicon-sign-out"></i></a> | |||||
</li> | </li> | ||||
<li class="right {{if .PageIsUserSettings}}current{{end}}"> | <li class="right {{if .PageIsUserSettings}}current{{end}}"> | ||||
<a href="{{AppSubUrl}}/user/settings" title="{{.i18n.Tr "account_settings"}}"><i class="octicon octicon-settings"></i><span class="sr-only">{{.i18n.Tr "account_settings"}}</span></a> | |||||
<a href="{{AppSubUrl}}/user/settings" title="{{.i18n.Tr "account_settings"}}"><i class="octicon octicon-settings"></i></a> | |||||
</li> | </li> | ||||
{{if .IsAdmin}} | {{if .IsAdmin}} | ||||
<li class="right {{if .PageIsAdmin}}current{{end}}"> | <li class="right {{if .PageIsAdmin}}current{{end}}"> | ||||
<a href="{{AppSubUrl}}/admin" title="{{.i18n.Tr "admin_panel"}}"><i class="octicon octicon-circuit-board"><span class="sr-only">{{.i18n.Tr "admin_panel"}}</span></i></a> | |||||
<a href="{{AppSubUrl}}/admin" title="{{.i18n.Tr "admin_panel"}}"><i class="octicon octicon-circuit-board"></i></a> | |||||
</li> | </li> | ||||
{{end}} | {{end}} | ||||
<li class="right down"> | <li class="right down"> | ||||
<a href="#"><i class="octicon octicon-plus"></i><span class="sr-only">{{.i18n.Tr "more"}}</span></a> | |||||
<a href="#"><i class="octicon octicon-plus"></i></a> | |||||
<ul class="menu menu-down" id="header-new-repo-menu"> | <ul class="menu menu-down" id="header-new-repo-menu"> | ||||
<li><a href="{{AppSubUrl}}/repo/create"><i class="octicon octicon-repo-create"></i>{{.i18n.Tr "new_repo"}}</a></li> | <li><a href="{{AppSubUrl}}/repo/create"><i class="octicon octicon-repo-create"></i>{{.i18n.Tr "new_repo"}}</a></li> | ||||
<li><a href="{{AppSubUrl}}/repo/migrate"><i class="octicon octicon-repo-clone"></i>{{.i18n.Tr "new_migrate"}}</a></li> | <li><a href="{{AppSubUrl}}/repo/migrate"><i class="octicon octicon-repo-clone"></i>{{.i18n.Tr "new_migrate"}}</a></li> | ||||
@@ -8,10 +8,9 @@ | |||||
<div class="col-md-5 actions text-right clone-group-btn"> | <div class="col-md-5 actions text-right clone-group-btn"> | ||||
{{if not .IsBareRepo}} | {{if not .IsBareRepo}} | ||||
<div class="btn-group" id="repo-clone"> | <div class="btn-group" id="repo-clone"> | ||||
<a class="btn btn-default" href="{{.RepoLink}}/archive/{{.BranchName}}/{{.Repository.Name}}.zip"><i class="fa fa-download fa-lg fa-m"><span class="sr-only">{{.i18n.Tr "download"}}</span></i></a> | |||||
<a class="btn btn-default" href="{{.RepoLink}}/archive/{{.BranchName}}/{{.Repository.Name}}.zip"><i class="fa fa-download fa-lg fa-m"></i></a> | |||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> | <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> | ||||
<span class="caret"></span> | <span class="caret"></span> | ||||
<span class="sr-only">{{.i18n.Tr "more"}}</span> | |||||
</button> | </button> | ||||
<div class="dropdown-menu clone-group-btn dropdown-menu-right no-propagation"> | <div class="dropdown-menu clone-group-btn dropdown-menu-right no-propagation"> | ||||
<div class="input-group"> | <div class="input-group"> | ||||
@@ -21,7 +20,7 @@ | |||||
</span> | </span> | ||||
<input type="text" class="form-control clone-group-url" value="" readonly id="repo-clone-ipt"/> | <input type="text" class="form-control clone-group-url" value="" readonly id="repo-clone-ipt"/> | ||||
<span class="input-group-btn"> | <span class="input-group-btn"> | ||||
<button class="btn btn-default" type="button" data-toggle="tooltip" title="copy to clipboard" data-placement="top" data-init="copy" data-copy-val="val" data-copy-from="#repo-clone-ipt"><i class="fa fa-copy"></i><span class="sr-only">copy to clipboard</span></button> | |||||
<button class="btn btn-default" type="button" data-toggle="tooltip" title="copy to clipboard" data-placement="top" data-init="copy" data-copy-val="val" data-copy-from="#repo-clone-ipt"><i class="fa fa-copy"></i></button> | |||||
</span> | </span> | ||||
</div> | </div> | ||||
<p class="help-block text-center">Need help cloning? Visit <a target="_blank" href="https://help.github.com/articles/fork-a-repo">Help</a>!</p> | <p class="help-block text-center">Need help cloning? Visit <a target="_blank" href="https://help.github.com/articles/fork-a-repo">Help</a>!</p> | ||||
@@ -35,13 +34,12 @@ | |||||
{{if .IsSigned}} | {{if .IsSigned}} | ||||
<div class="btn-group {{if .IsRepositoryWatching}}watching{{else}}no-watching{{end}}" id="repo-watching" data-watch="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/watch" data-unwatch="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/unwatch"> | <div class="btn-group {{if .IsRepositoryWatching}}watching{{else}}no-watching{{end}}" id="repo-watching" data-watch="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/watch" data-unwatch="{{AppSubUrl}}/{{.Owner.Name}}/{{.Repository.Name}}/action/unwatch"> | ||||
{{if .IsRepositoryWatching}} | {{if .IsRepositoryWatching}} | ||||
<button type="button" class="btn btn-default"><i class="fa fa-eye fa-lg fa-m"></i><span class="sr-only">{{.i18n.Tr "unwatch"}}</span></button> | |||||
<button type="button" class="btn btn-default"><i class="fa fa-eye fa-lg fa-m"></i></button> | |||||
{{else}} | {{else}} | ||||
<button type="button" class="btn btn-default"><i class="fa fa-eye-slash fa-lg fa-m"></i><span class="sr-only">{{.i18n.Tr "watch"}}</span></button> | |||||
<button type="button" class="btn btn-default"><i class="fa fa-eye-slash fa-lg fa-m"></i></button> | |||||
{{end}} | {{end}} | ||||
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> | <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown"> | ||||
<span class="caret"></span> | <span class="caret"></span> | ||||
<span class="sr-only">{{.i18n.Tr "more"}}</span> | |||||
</button> | </button> | ||||
<div class="dropdown-menu dropdown-menu-right"> | <div class="dropdown-menu dropdown-menu-right"> | ||||
<div class="dropdown-item text-left to-unwatch"> | <div class="dropdown-item text-left to-unwatch"> | ||||
@@ -57,11 +55,11 @@ | |||||
</div> | </div> | ||||
{{end}} | {{end}} | ||||
<!-- <div class="btn-group"> | <!-- <div class="btn-group"> | ||||
<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Star"><i class="fa fa-star"></i> {{.Repository.NumStars}}<span class="sr-only"> {{.i18n.Tr "star"}}</span></button> | |||||
<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Star"><i class="fa fa-star"></i> {{.Repository.NumStars}}</button> | |||||
</div> --> | </div> --> | ||||
{{end}} | {{end}} | ||||
<!-- <div class="btn-group"> | <!-- <div class="btn-group"> | ||||
<a type="button" {{if not .IsRepositoryOwner}}href="{{AppSubUrl}}/{{.Username}}/{{.Reponame}}/fork"{{end}} class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Fork"><i class="fa fa-code-fork fa-lg"></i> {{.Repository.NumForks}}<span class="sr-only"> Fork</span></a> | |||||
<a type="button" {{if not .IsRepositoryOwner}}href="{{AppSubUrl}}/{{.Username}}/{{.Reponame}}/fork"{{end}} class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Fork"><i class="fa fa-code-fork fa-lg"></i> {{.Repository.NumForks}}</a> | |||||
</div> --> | </div> --> | ||||
</div> | </div> | ||||
</div> | </div> | ||||
@@ -17,7 +17,6 @@ | |||||
<li class="drop right"> | <li class="drop right"> | ||||
<button class="btn btn-green text-bold" id="dashboard-new-repo"> | <button class="btn btn-green text-bold" id="dashboard-new-repo"> | ||||
<i class="octicon octicon-plus"></i> | <i class="octicon octicon-plus"></i> | ||||
<span class="sr-only">{{.i18n.Tr "new"}}</span> | |||||
</button> | </button> | ||||
<ul class="menu menu-vertical drop-down" id="dashboard-new-repo-menu"> | <ul class="menu menu-vertical drop-down" id="dashboard-new-repo-menu"> | ||||
<li><a href="{{AppSubUrl}}/repo/create"><i class="octicon octicon-repo-create"></i>{{.i18n.Tr "new_repo"}}</a></li> | <li><a href="{{AppSubUrl}}/repo/create"><i class="octicon octicon-repo-create"></i>{{.i18n.Tr "new_repo"}}</a></li> | ||||