finn/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

minor fix on #1460

Browse source
This commit is contained in:
Unknwon 2015-08-10 22:59:12 +08:00
parent 2cef9ef5e2
commit 2aea247208
6 changed files with 57 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conf/locale/locale_en-US.ini
View file

@ -14,6 +14,9 @@ version = Version
page = Page page = Page
template = Template template = Template
language = Language language = Language
create_new = Create new...
user_profile_and_more = User profile and more
signed_in_as = Signed in as
username = Username username = Username
email = E-mail email = E-mail

3
models/migrations/migrations.go
View file

@ -96,6 +96,9 @@ func Migrate(x *xorm.Engine) error {
} }
v := currentVersion.Version v := currentVersion.Version
if int(v) > len(migrations) {
return nil
}
for i, m := range migrations[v-_MIN_DB_VER:] { for i, m := range migrations[v-_MIN_DB_VER:] {
log.Info("Migration: %s", m.Description()) log.Info("Migration: %s", m.Description())
if err = m.Migrate(x); err != nil { if err = m.Migrate(x); err != nil {

94
modules/bindata/bindata.go
View file

File diff suppressed because one or more lines are too long

2
public/css/gogs.min.css vendored
View file

File diff suppressed because one or more lines are too long

1
public/less/_base.less
View file

@ -16,7 +16,6 @@ img {
z-index: 900; z-index: 900;
left: 0; left: 0;
width: 100%; width: 100%;
padding: 5px 0;
&.light { &.light {
background-color: white; background-color: white;
border-bottom: 1px solid #DDDDDD; border-bottom: 1px solid #DDDDDD;

47
templates/base/head.tmpl
View file

@ -43,34 +43,24 @@
</head> </head>
<body> <body>
<div class="full height"> <div class="full height">
<noscript>Please enable JavaScript in your browser!</noscript> <noscript>Please enable JavaScript in your browser!</noscript>
{{if not .PageIsInstall}} {{if not .PageIsInstall}}
<div class="following bar light"> <div class="following bar light">
<div class="ui container"> <div class="ui container">
<div class="column"> <div class="column">
<div class="ui top secondary menu"> <div class="ui top secondary menu">
<a class="item brand" href="{{AppSubUrl}}/"> <a class="item brand" href="{{AppSubUrl}}/">
<img class="ui mini image" src="{{AppSubUrl}}/img/favicon.png"> <img class="ui mini image" src="{{AppSubUrl}}/img/favicon.png">
</a> </a>
{{if .IsSigned}} {{if .IsSigned}}
<a class="item{{if .PageIsDashboard}} active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "dashboard"}}</a> <a class="item{{if .PageIsDashboard}} active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "dashboard"}}</a>
{{else}} {{else}}
<a class="item{{if .PageIsHome}} active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "home"}}</a> <a class="item{{if .PageIsHome}} active{{end}}" href="{{AppSubUrl}}/">{{.i18n.Tr "home"}}</a>
{{end}} {{end}}
<a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore">{{.i18n.Tr "explore"}}</a> <a class="item{{if .PageIsExplore}} active{{end}}" href="{{AppSubUrl}}/explore">{{.i18n.Tr "explore"}}</a>
<!-- <div class="item"> <!-- <div class="item">
<div class="ui icon input"> <div class="ui icon input">
<input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}"> <input class="searchbox" type="text" placeholder="{{.i18n.Tr "search_project"}}">
@ -79,66 +69,49 @@
</div> --> </div> -->
{{if .IsSigned}} {{if .IsSigned}}
<a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a> <a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a>
<div class="right menu"> <div class="right menu">
<div class="ui dropdown head link jump item poping up" data-content="{{.i18n.Tr "create_new"}}" data-variation="tiny inverted">
<div class="ui dropdown head link jump item poping up" data-content="Create new..." data-variation="tiny inverted">
<span class="text"> <span class="text">
<i class="octicon octicon-plus"></i> <i class="octicon octicon-plus"></i>
<i class="octicon octicon-triangle-down"></i> <i class="octicon octicon-triangle-down"></i>
</span> </span>
<div class="menu"> <div class="menu">
<a class="item" href="{{AppSubUrl}}/repo/create"> <a class="item" href="{{AppSubUrl}}/repo/create">
<i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}} <i class="octicon octicon-repo-create"></i> {{.i18n.Tr "new_repo"}}
</a> </a>
<a class="item" href="{{AppSubUrl}}/repo/migrate"> <a class="item" href="{{AppSubUrl}}/repo/migrate">
<i class="octicon octicon-repo-clone"></i> {{.i18n.Tr "new_migrate"}} <i class="octicon octicon-repo-clone"></i> {{.i18n.Tr "new_migrate"}}
</a> </a>
<a class="item" href="{{AppSubUrl}}/org/create"> <a class="item" href="{{AppSubUrl}}/org/create">
<i class="octicon octicon-organization"></i> {{.i18n.Tr "new_org"}} <i class="octicon octicon-organization"></i> {{.i18n.Tr "new_org"}}
</a> </a>
</div><!-- end content create new menu --> </div><!-- end content create new menu -->
</div><!-- end dropdown menu create new --> </div><!-- end dropdown menu create new -->
<div class="ui dropdown head link jump item poping up" tabindex="-1" data-content="User profile and more" data-variation="tiny inverted"> <div class="ui dropdown head link jump item poping up" tabindex="-1" data-content="{{.i18n.Tr "user_profile_and_more"}}" data-variation="tiny inverted">
<span class="text avatar"> <span class="text avatar">
<img class="ui small rounded image" src="{{.SignedUser.AvatarLink}}"> <img class="ui small rounded image" src="{{.SignedUser.AvatarLink}}">
<i class="octicon octicon-triangle-down" tabindex="-1"></i> <i class="octicon octicon-triangle-down" tabindex="-1"></i>
</span> </span>
<div class="menu" tabindex="-1"> <div class="menu" tabindex="-1">
<div class="ui header"> <div class="ui header">
Signed in as <strong>{{.SignedUser.Name}}</strong> {{.i18n.Tr "signed_in_as"}} <strong>{{.SignedUser.Name}}</strong>
</div> </div>
<div class="divider"></div> <div class="divider"></div>
<a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}"> <a class="item" href="{{AppSubUrl}}/{{.SignedUser.Name}}">
<i class="octicon icon octicon-person"></i> <i class="octicon icon octicon-person"></i>
{{.i18n.Tr "your_profile"}}<!-- Your profile --> {{.i18n.Tr "your_profile"}}<!-- Your profile -->
</a> </a>
<a class="item" href="{{AppSubUrl}}/user/settings"> <a class="item" href="{{AppSubUrl}}/user/settings">
<i class="octicon icon octicon-settings"></i> <i class="octicon icon octicon-settings"></i>
{{.i18n.Tr "your_settings"}}<!-- Your settings --> {{.i18n.Tr "your_settings"}}<!-- Your settings -->
</a> </a>
<a class="item" target="_blank" href="http://gogs.io/docs" rel="noreferrer"> <a class="item" target="_blank" href="http://gogs.io/docs" rel="noreferrer">
<i class="octicon icon octicon-question"></i> <i class="octicon icon octicon-question"></i>
{{.i18n.Tr "help"}}<!-- Help --> {{.i18n.Tr "help"}}<!-- Help -->
</a> </a>
{{if .IsAdmin}} {{if .IsAdmin}}
<div class="divider"></div> <div class="divider"></div>
@ -149,45 +122,31 @@
{{end}} {{end}}
<div class="divider"></div> <div class="divider"></div>
<a class="item" href="{{AppSubUrl}}/user/logout"> <a class="item" href="{{AppSubUrl}}/user/logout">
<i class="octicon icon octicon-sign-out"></i> <i class="octicon icon octicon-sign-out"></i>
{{.i18n.Tr "sign_out"}}<!-- Sign Out --> {{.i18n.Tr "sign_out"}}<!-- Sign Out -->
</a> </a>
</div><!-- end content avatar menu --> </div><!-- end content avatar menu -->
</div><!-- end dropdown avatar menu --> </div><!-- end dropdown avatar menu -->
</div><!-- end signed user right menu --> </div><!-- end signed user right menu -->
{{else}} {{else}}
<a class="item" target="_blank" href="http://gogs.io/docs" rel="noreferrer">{{.i18n.Tr "help"}}</a> <a class="item" target="_blank" href="http://gogs.io/docs" rel="noreferrer">{{.i18n.Tr "help"}}</a>
<div class="right menu"> <div class="right menu">
{{if .ShowRegistrationButton}} {{if .ShowRegistrationButton}}
<a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up"> <a class="item{{if .PageIsSignUp}} active{{end}}" href="{{AppSubUrl}}/user/sign_up">
<i class="octicon octicon-person-add"></i> {{.i18n.Tr "register"}} <i class="octicon octicon-person-add"></i> {{.i18n.Tr "register"}}
</a> </a>
{{end}} {{end}}
<a class="item{{if .PageIsSignIn}} active{{end}}" href="{{AppSubUrl}}/user/login"> <a class="item{{if .PageIsSignIn}} active{{end}}" href="{{AppSubUrl}}/user/login">
<i class="octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}} <i class="octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}}
</a> </a>
</div><!-- end anonymous right menu --> </div><!-- end anonymous right menu -->
{{end}} {{end}}
</div><!-- end top menu --> </div><!-- end top menu -->
</div><!-- end column --> </div><!-- end column -->
</div><!-- end container --> </div><!-- end container -->
</div><!-- end bar --> </div><!-- end bar -->
{{end}} {{end}}