diff options
author | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
---|---|---|
committer | Unknwon <u@gogs.io> | 2015-08-10 23:01:41 +0800 |
commit | 887bc1b594ef5c279c28c90009e67b068978482f (patch) | |
tree | d4390bf5b8a6b4f581fc322a3290e69315060b78 /templates | |
parent | 884bc4ffd81f5b952df172d43ba7b16e1844ff19 (diff) | |
parent | 2aea247208d4429d111fb9725c16a8e9ea24860f (diff) | |
download | gitea-887bc1b594ef5c279c28c90009e67b068978482f.tar.gz gitea-887bc1b594ef5c279c28c90009e67b068978482f.zip |
Merge branch 'develop' of github.com:gogits/gogs into feature/pull_request2
# Conflicts:
# modules/bindata/bindata.go
# public/css/gogs.min.css
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base/head.tmpl | 114 | ||||
-rw-r--r-- | templates/repo/settings/navbar.tmpl | 4 |
2 files changed, 86 insertions, 32 deletions
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 161e0132cf..2c41782681 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -44,15 +44,23 @@ <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 secondary menu"> - <img class="img-15 ui image brand" src="{{AppSubUrl}}/img/favicon.png"> - <a class="view-ui item {{if .PageIsHome}}active{{end}}" href="{{AppSubUrl}}/">{{if .IsSigned}}{{.i18n.Tr "dashboard"}}{{else}}{{.i18n.Tr "home"}}{{end}}</a> - <a class="view-ui item {{if .PageIsExplore}}active{{end}}" href="{{AppSubUrl}}/explore">{{.i18n.Tr "explore"}}</a> - <a class="view-ui item" target="_blank" href="http://gogs.io/docs">{{.i18n.Tr "help"}}</a> + <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"}}"> @@ -61,38 +69,84 @@ </div> --> {{if .IsSigned}} + <a class="item{{if .PageIsIssues}} active{{end}}" href="{{AppSubUrl}}/issues">{{.i18n.Tr "issues"}}</a> <div class="right menu"> - <a class="view-ui item user avatar poping up" href="{{AppSubUrl}}/{{.SignedUser.Name}}" data-content="{{.SignedUser.Name}}" data-variation="inverted"> - <img class="img-15" src="{{.SignedUser.AvatarLink}}"/> - <span class="sr-only">{{.SignedUser.Name}}</span> - </a> - <div class="ui dropdown head link jump item"> + <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="dropdown icon"></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> - </div> - {{if .IsAdmin}} - <a class="view-ui item poping up {{if .PageIsAdmin}}active{{end}}" href="{{AppSubUrl}}/admin" data-content="{{.i18n.Tr "admin_panel"}}" data-variation="inverted"><i class="octicon icon settings"></i><span class="sr-only">{{.i18n.Tr "admin_panel"}}</span></a> - {{end}} - <a class="view-ui item poping up {{if .PageIsSettings}}active{{end}}" href="{{AppSubUrl}}/user/settings" data-content="{{.i18n.Tr "account_settings"}}" data-variation="inverted"><i class="octicon octicon-settings"></i><span class="sr-only">{{.i18n.Tr "account_settings"}}</span></a> - <a class="view-ui item poping up" href="{{AppSubUrl}}/user/logout" data-content="{{.i18n.Tr "sign_out"}}" data-variation="inverted"><i class="octicon octicon-sign-out"></i><span class="sr-only">{{.i18n.Tr "sign_out"}}</span></a> - </div> + <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="{{.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"> + {{.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> + + <a class="item" href="{{AppSubUrl}}/admin"> + <i class="icon settings"></i> + {{.i18n.Tr "admin_panel"}}<!-- Admin Panel --> + </a> + {{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}} - <div class="ui right floated secondary menu"> + + <a class="item" target="_blank" href="http://gogs.io/docs" rel="noreferrer">{{.i18n.Tr "help"}}</a> + <div class="right menu"> {{if .ShowRegistrationButton}} - <a class="view-ui item {{if .PageIsSignUp}}active{{end}}" href="{{AppSubUrl}}/user/sign_up"><i class="octicon octicon-person-add"></i> {{.i18n.Tr "register"}}</a> + <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="view-ui item {{if .PageIsSignIn}}active{{end}}" href="{{AppSubUrl}}/user/login"><i class="octicon octicon-sign-in"></i> {{.i18n.Tr "sign_in"}}</a> - </div> + <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> - </div> - </div> - </div> + </div><!-- end top menu --> + </div><!-- end column --> + </div><!-- end container --> + </div><!-- end bar --> {{end}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 1001c3a250..a92f891e6a 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -4,7 +4,7 @@ <a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.RepoLink}}/settings"> {{.i18n.Tr "repo.settings.options"}} </a> - <a class="{{if .PageIsSettingsCollaboration}}active{{end}} item" href="{.RepoLink}}/settings/collaboration"> + <a class="{{if .PageIsSettingsCollaboration}}active{{end}} item" href="{{.RepoLink}}/settings/collaboration"> {{.i18n.Tr "repo.settings.collaboration"}} </a> <a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks"> @@ -17,4 +17,4 @@ {{.i18n.Tr "repo.settings.deploy_keys"}} </a> </div> -</div>
\ No newline at end of file +</div> |