diff options
Diffstat (limited to 'templates/base')
-rw-r--r-- | templates/base/alert.tmpl | 17 | ||||
-rw-r--r-- | templates/base/alert_old.tmpl | 2 | ||||
-rw-r--r-- | templates/base/footer.tmpl | 2 | ||||
-rw-r--r-- | templates/base/head.tmpl | 49 | ||||
-rw-r--r-- | templates/base/head_old.tmpl | 5 |
5 files changed, 64 insertions, 11 deletions
diff --git a/templates/base/alert.tmpl b/templates/base/alert.tmpl index bb1eb6aa..e71be803 100644 --- a/templates/base/alert.tmpl +++ b/templates/base/alert.tmpl @@ -1,2 +1,15 @@ -{{if .Flash.ErrorMsg}}<div class="alert alert-danger form-error">{{.Flash.ErrorMsg}}</div>{{end}} -{{if .Flash.SuccessMsg}}<div class="alert alert-success">{{.Flash.SuccessMsg}}</div>{{end}}
\ No newline at end of file +{{if .Flash.ErrorMsg}} +<div class="ui negative message"> + <p>{{.Flash.ErrorMsg}}</p> +</div> +{{end}} +{{if .Flash.SuccessMsg}} +<div class="ui positive message"> + <p>{{.Flash.SuccessMsg}}</p> +</div> +{{end}} +{{if .Flash.InfoMsg}} +<div class="ui info message"> + <p>{{.Flash.InfoMsg}}</p> +</div> +{{end}}
\ No newline at end of file diff --git a/templates/base/alert_old.tmpl b/templates/base/alert_old.tmpl new file mode 100644 index 00000000..bb1eb6aa --- /dev/null +++ b/templates/base/alert_old.tmpl @@ -0,0 +1,2 @@ +{{if .Flash.ErrorMsg}}<div class="alert alert-danger form-error">{{.Flash.ErrorMsg}}</div>{{end}} +{{if .Flash.SuccessMsg}}<div class="alert alert-success">{{.Flash.SuccessMsg}}</div>{{end}}
\ No newline at end of file diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index ad629816..0f0f8442 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -11,7 +11,7 @@ <a target="_blank" href="https://plus.google.com/communities/115599856376145964459"><i class="fa fa-google-plus"></i><span class="sr-only">Google Plus</span></a> <a target="_blank" href="http://weibo.com/gogschina"><i class="fa fa-weibo"></i><span class="sr-only">Sina Weibo</span></a> {{end}} - <div class="ui language bottom pointing dropdown link item"> + <div class="ui language bottom pointing slide up dropdown link item"> <i class="world icon"></i> <div class="text">{{.LangName}}</div> <div class="menu"> diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index ef6ad56a..c5813f73 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -6,6 +6,7 @@ <meta name="author" content="Gogs - Go Git Service" /> <meta name="description" content="Gogs(Go Git Service) a painless self-hosted Git Service written in Go" /> <meta name="keywords" content="go, git, self-hosted, gogs"> + <meta name="referrer" content="no-referrer" /> <meta name="_csrf" content="{{.CsrfToken}}" /> {{if .GoGetImport}} <meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}"> @@ -14,35 +15,70 @@ <link rel="shortcut icon" href="{{AppSubUrl}}/img/favicon.png" /> {{if CdnMode}} - <script src="//code.jquery.com/jquery-1.11.2.min.js"></script> + <script src="//code.jquery.com/jquery-1.11.3.min.js"></script> <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css"> {{else}} - <script src="{{AppSubUrl}}/js/jquery-1.11.2.min.js"></script> + <script src="{{AppSubUrl}}/js/jquery-1.11.3.min.js"></script> <link rel="stylesheet" href="{{AppSubUrl}}/css/font-awesome.min.css"> {{end}} <!-- Stylesheet --> - <link rel="stylesheet" href="{{AppSubUrl}}/css/semantic.min.css"> - <link rel="stylesheet" href="{{AppSubUrl}}/css/gogs.min.css"> + <link rel="stylesheet" href="{{AppSubUrl}}/css/semantic.min.css?v={{AppVer}}"> + <link rel="stylesheet" href="{{AppSubUrl}}/css/gogs.min.css?v={{AppVer}}"> <!-- JavaScript --> - <script src="{{AppSubUrl}}/js/semantic.min.js"></script> - <script src="{{AppSubUrl}}/js/gogs.js"></script> + <script src="{{AppSubUrl}}/js/semantic.min.js?v={{AppVer}}"></script> + <script src="{{AppSubUrl}}/js/gogs.js?v={{AppVer}}"></script> + + <!-- Third-party libraries --> + {{if .PageIsLabels}} + <link rel="stylesheet" href="{{AppSubUrl}}/css/jquery.minicolors.css?v={{AppVer}}"> + <script src="{{AppSubUrl}}/js/libs/jquery.minicolors.min.js?v={{AppVer}}"></script> + {{else if .PageIsMilestones}} + <link rel="stylesheet" href="{{AppSubUrl}}/css/jquery.datetimepicker.css?v={{AppVer}}"> + <script src="{{AppSubUrl}}/js/libs/jquery.datetimepicker.js?v={{AppVer}}"></script> + {{end}} <title>{{if .Title}}{{.Title}} - {{end}}{{AppName}}</title> </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 page grid"> <div class="column"> + {{if .IsSigned}} + <div class="ui right floated secondary 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 pointing dropdown head link jump item"> + <span class="text"> + <i class="octicon octicon-plus"></i> + <i class="dropdown icon"></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> + {{else}} <div class="ui right floated secondary 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> {{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> + {{end}} <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> @@ -58,3 +94,4 @@ </div> </div> </div> + {{end}} diff --git a/templates/base/head_old.tmpl b/templates/base/head_old.tmpl index cb3951ea..fc2a8678 100644 --- a/templates/base/head_old.tmpl +++ b/templates/base/head_old.tmpl @@ -8,6 +8,7 @@ <meta name="author" content="Gogs - Go Git Service" /> <meta name="description" content="Gogs(Go Git Service) is a GitHub-like clone in the Go Programming Language" /> <meta name="keywords" content="go, git"> + <meta name="referrer" content="no-referrer" /> <meta name="_csrf" content="{{.CsrfToken}}" /> {{if .GoGetImport}}<meta name="go-import" content="{{.GoGetImport}} git {{.CloneLink.HTTPS}}">{{end}} @@ -16,13 +17,13 @@ <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"> <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet"> - <script src="//code.jquery.com/jquery-1.11.0.min.js"></script> + <script src="//code.jquery.com/jquery-1.11.3.min.js"></script> <script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script> {{else}} <link href="{{AppSubUrl}}/css/bootstrap.min.css" rel="stylesheet" /> <link href="{{AppSubUrl}}/css/font-awesome.min.css" rel="stylesheet" /> - <script src="{{AppSubUrl}}/js/jquery-1.10.1.min.js"></script> + <script src="{{AppSubUrl}}/js/jquery-1.11.3.min.js"></script> <script src="{{AppSubUrl}}/js/bootstrap.min.js"></script> {{end}} |