浏览代码

minor fix on #1460

Unknwon 9 年之前
父节点
当前提交
2aea247208

+ 3 - 0
conf/locale/locale_en-US.ini

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

+ 3 - 0
models/migrations/migrations.go

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

文件差异内容过多而无法显示
+ 0 - 0
modules/bindata/bindata.go


文件差异内容过多而无法显示
+ 0 - 0
public/css/gogs.min.css


+ 0 - 1
public/less/_base.less

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

+ 3 - 44
templates/base/head.tmpl

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

部分文件因为文件数量过多而无法显示