Browse Source

fix issue

tags/v1.21.12.1
zhoupzh 4 years ago
parent
commit
0225e11724
6 changed files with 71 additions and 49 deletions
  1. +13
    -3
      templates/repo/activity.tmpl
  2. +6
    -44
      templates/repo/header.tmpl
  3. +5
    -1
      templates/repo/release/list.tmpl
  4. +7
    -0
      templates/repo/wiki/start.tmpl
  5. +9
    -1
      templates/repo/wiki/view.tmpl
  6. +31
    -0
      web_src/less/openi.less

+ 13
- 3
templates/repo/activity.tmpl View File

@@ -2,8 +2,18 @@
<div class="repository commits">
{{template "repo/header" .}}
<div class="ui container">
<h2 class="ui header">{{.DateFrom}} - {{.DateUntil}}
<div class="ui right">
<div class="ui three column stackable grid" style="align-items: center;">
<div class="column">
<div class="ui breadcrumb">
<a class="section" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">{{.i18n.Tr "repo.code"}}</a>
<div class="divider"> / </div>
<div class="active section" href="{{.RepoLink}}/activity">{{.i18n.Tr "repo.activity"}}</div>
</div>
</div>
<div class="column center aligned" style="font-weight: 800;">
{{.DateFrom}} - {{.DateUntil}}
</div>
<div class="column right aligned">
<!-- Period -->
<div class="ui floating dropdown jump filter">
<div class="ui basic compact button">
@@ -23,7 +33,7 @@
</div>
</div>
</div>
</h2>
</div>
<div class="ui divider"></div>

{{if (or (.Permission.CanRead $.UnitTypeIssues) (.Permission.CanRead $.UnitTypePullRequests))}}


+ 6
- 44
templates/repo/header.tmpl View File

@@ -88,63 +88,25 @@
</div><!-- end grid -->
</div><!-- end container -->
{{end}}
<style>
.dropdown-menu {
position: relative;
display: inline-block;
margin-top: 4px;
}
.dropdown-menu:hover .dropdown-content {
display: block;
}
.dropdown-content{
display: none;
position: absolute;
background-color: #ffffff;
min-width: 160px;
z-index: 999;
border: 1px solid transparent;
border-color: #d4d4d5;
border-top: none;

}
.dropdown-content a {
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
}
.dropdown-content a:hover {background-color: #f1f1f1}
.cloudbrain-question{
margin-left: 4px !important;
color: #3291F8;
}
</style>
<div class="ui tabs container">
{{if not .Repository.IsBeingCreated}}
<div class="ui tabular stackable menu navbar">
{{if .Permission.CanRead $.UnitTypeCode}}
<div class="dropdown-menu">
<a class="{{if .PageIsViewCode}}active{{end}} item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">
<a class="{{if or .PageIsViewCode .PageIsReleaseList .PageIsWiki .PageIsActivity}}active{{end}} item" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">
<span>{{svg "octicon-code" 16}} {{.i18n.Tr "repo.code"}} <i class="dropdown icon"></i></span>
</a>
<div class="dropdown-content">
{{if and (.Permission.CanRead $.UnitTypeReleases) (not .IsEmptyRepo) }}
<a class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
<a style="border: none;" class="{{if .PageIsReleaseList}}active{{end}} item" href="{{.RepoLink}}/releases">
{{svg "octicon-tag" 16}} {{.i18n.Tr "repo.releases"}} <span class="ui {{if not .NumReleases}}gray{{else}}blue{{end}} small label">{{.NumReleases}}</span>
</a>
{{end}}
{{if or (.Permission.CanRead $.UnitTypeWiki) (.Permission.CanRead $.UnitTypeExternalWiki)}}
<a class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Permission.CanRead $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}>
<a style="border: none;" class="{{if .PageIsWiki}}active{{end}} item" href="{{.RepoLink}}/wiki" {{if (.Permission.CanRead $.UnitTypeExternalWiki)}} target="_blank" rel="noopener noreferrer" {{end}}>
{{svg "octicon-book" 16}} {{.i18n.Tr "repo.wiki"}}
</a>
{{end}}
{{if and (.Permission.CanReadAny $.UnitTypePullRequests $.UnitTypeIssues $.UnitTypeReleases) (not .IsEmptyRepo)}}
<a class="{{if .PageIsActivity}}active{{end}} item" href="{{.RepoLink}}/activity">
<a style="border: none;" class="{{if .PageIsActivity}}active{{end}} item" href="{{.RepoLink}}/activity">
{{svg "octicon-pulse" 16}} {{.i18n.Tr "repo.activity"}}
</a>
{{end}}
</a>

</div>
</div>


+ 5
- 1
templates/repo/release/list.tmpl View File

@@ -4,7 +4,11 @@
<div class="ui container">
{{template "base/alert" .}}
<h2 class="ui header">
{{.i18n.Tr "repo.release.releases"}}
<div class="ui breadcrumb">
<a class="section" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">{{.i18n.Tr "repo.code"}}</a>
<div class="divider"> / </div>
<div class="active section" href="{{.RepoLink}}/releases">{{.i18n.Tr "repo.releases"}}</div>
</div>
{{if .CanCreateRelease}}
<div class="ui right">
<a class="ui small green button" href="{{$.RepoLink}}/releases/new">


+ 7
- 0
templates/repo/wiki/start.tmpl View File

@@ -2,6 +2,13 @@
<div class="repository wiki start">
{{template "repo/header" .}}
<div class="ui container">
<h2 class="ui header">
<div class="ui breadcrumb">
<a class="section" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">{{.i18n.Tr "repo.code"}}</a>
<div class="divider"> / </div>
<div class="active section" href="{{.RepoLink}}/wiki">{{.i18n.Tr "repo.wiki"}}</div>
</div>
</h2>
<div class="ui center segment">
{{svg "octicon-book" 32}}
<h2>{{.i18n.Tr "repo.wiki.welcome"}}</h2>


+ 9
- 1
templates/repo/wiki/view.tmpl View File

@@ -3,6 +3,14 @@
{{template "repo/header" .}}
{{ $title := .title}}
<div class="ui container">
<h2 class="ui header">
<div class="ui breadcrumb">
<a class="section" href="{{.RepoLink}}{{if (ne .BranchName .Repository.DefaultBranch)}}/src/{{.BranchNameSubURL | EscapePound}}{{end}}">{{.i18n.Tr "repo.code"}}</a>
<div class="divider"> / </div>
<div class="active section" href="{{.RepoLink}}/wiki">{{.i18n.Tr "repo.wiki"}}</div>
</div>
</h2>
<div class="ui divider"></div>
<div class="ui stackable grid">
<div class="ui ten wide column">
<div class="choose page">
@@ -28,7 +36,7 @@
</div>
</div>
</div>
<div class="ui six wide column">
<div class="ui six wide column right aligned">
<div class="ui action small input" id="clone-panel">
{{if not $.DisableHTTP}}
<button class="ui basic clone button" id="repo-clone-https" data-link="{{.WikiCloneLink.HTTPS}}">


+ 31
- 0
web_src/less/openi.less View File

@@ -244,3 +244,34 @@ footer .column{margin-bottom:0!important; padding-bottom:0!important;}
width: 100%;
}

.dropdown-menu {
position: relative;
display: inline-block;
margin-top: 4px;
}
.dropdown-menu:hover .dropdown-content {
display: block;
}
.dropdown-content{
display: none;
position: absolute;
background-color: #ffffff;
min-width: 160px;
z-index: 999;
border: 1px solid transparent;
border-color: #d4d4d5;
border-top: none;

}
.dropdown-content a {
color: black;
padding: 12px 16px;
text-decoration: none;
display: block;
}
.dropdown-content a:hover {background-color: #f1f1f1}
.cloudbrain-question{
margin-left: 4px !important;
color: #3291F8;
}

Loading…
Cancel
Save