diff --git a/org/header.tmpl b/org/header.tmpl
new file mode 100644
index 0000000..b7cc9de
--- /dev/null
+++ b/org/header.tmpl
@@ -0,0 +1,18 @@
+<div class="ui container tw-flex">
+ {{ctx.AvatarUtils.Avatar .Org 100 "org-avatar"}}
+ <div id="org-info" class="tw-flex tw-flex-col">
+ <div class="ui header">
+ {{.Org.DisplayName}}
+ <span class="org-visibility">
+ {{if .Org.Visibility.IsLimited}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.limited_shortname"}}</span>{{end}}
+ {{if .Org.Visibility.IsPrivate}}<span class="ui large basic horizontal label">{{ctx.Locale.Tr "org.settings.visibility.private_shortname"}}</span>{{end}}
+ </span>
+ {{if .IsOrganizationOwner}}<a class="middle text grey" href="{{.OrgLink}}/settings">{{svg "octicon-gear" 16 "mb-3"}}</a>{{end}}
+ </div>
+ {{if .RenderedDescription}}<div class="render-content markup">{{.RenderedDescription}}</div>{{end}}
+ <div class="text light meta tw-mt-1">
+ {{if .Org.Location}}<div class="flex-text-block">{{svg "octicon-location"}} <span>{{.Org.Location}}</span></div>{{end}}
+ {{if .Org.Website}}<div class="flex-text-block">{{svg "octicon-link"}} <a class="muted" target="_blank" rel="noopener noreferrer me" href="{{.Org.Website}}">{{.Org.Website}}</a></div>{{end}}
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/org/home.tmpl b/org/home.tmpl
index 4851b69..e3cfda1 100644
--- a/org/home.tmpl
+++ b/org/home.tmpl
@@ -8,56 +8,54 @@
{{if .ProfileReadme}}
<div id="readme_profile" class="markup">{{.ProfileReadme}}</div>
{{end}}
- {{template "shared/repo_search" .}}
+ {{template "explore/repo_search" .}}
{{template "explore/repo_list" .}}
{{template "base/paginate" .}}
</div>
- {{if .ShowMemberAndTeamTab}}
- <div class="ui five wide column">
- {{if .CanCreateOrgRepo}}
- <div class="center aligned tw-mb-4">
- <a class="ui primary button" href="{{AppSubUrl}}/repo/create?org={{.Org.ID}}">{{ctx.Locale.Tr "new_repo"}}</a>
- {{if not .DisableNewPullMirrors}}
- <a class="ui primary button" href="{{AppSubUrl}}/repo/migrate?org={{.Org.ID}}&mirror=1">{{ctx.Locale.Tr "new_migrate"}}</a>
- {{end}}
- </div>
- <div class="divider"></div>
- {{end}}
- {{if .NumMembers}}
- <h4 class="ui top attached header tw-flex">
- <strong class="tw-flex-1">{{ctx.Locale.Tr "org.members"}}</strong>
- <a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/members"><span>{{.NumMembers}}</span> {{svg "octicon-chevron-right"}}</a>
- </h4>
- <div class="ui attached segment members">
- {{$isMember := .IsOrganizationMember}}
- {{range .Members}}
- {{if or $isMember (call $.IsPublicMember .ID)}}
- <a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">{{ctx.AvatarUtils.Avatar . 48}}</a>
+ {{ if .IsAdmin }}
+ <div class="ui five wide column">
+ <h4 class="ui top attached header df">
+ <strong class="f1">{{.i18n.Tr "org.people"}}</strong>
+ {{if .IsOrganizationMember}}
+ <div class="ui">
+ <a class="text grey dif ac"
+ href="{{.OrgLink}}/members"><span>{{.Org.NumMembers}}</span> {{svg "octicon-chevron-right"}}
+ </a>
+ </div>
{{end}}
- {{end}}
- </div>
- {{end}}
- {{if .IsOrganizationMember}}
- <div class="ui top attached header tw-flex">
- <strong class="tw-flex-1">{{ctx.Locale.Tr "org.teams"}}</strong>
- <a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
- </div>
- <div class="ui attached table segment teams">
- {{range .Teams}}
- <div class="item">
- <a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong class="team-name">{{.Name}}</strong></a>
- <p class="text grey">
- <a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}</a> ·
- <a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}</a>
- </p>
+ </h4>
+ <div class="ui attached segment members">
+ {{$isMember := .IsOrganizationMember}}
+ {{range .Members}}
+ {{if or $isMember (.IsPublicMember $.Org.ID)}}
+ <a href="{{.HomeLink}}" title="{{.Name}}{{if .FullName}} ({{.FullName}}){{end}}">
+ {{ctx.AvatarUtils .}}
+ </a>
+ {{end}}
+ {{end}}
+ </div>
+ {{if .IsOrganizationMember}}
+ <div class="ui top attached header tw-flex">
+ <strong class="tw-flex-1">{{ctx.Locale.Tr "org.teams"}}</strong>
+ <a class="text grey tw-flex tw-items-center" href="{{.OrgLink}}/teams"><span>{{.Org.NumTeams}}</span> {{svg "octicon-chevron-right"}}</a>
+ </div>
+ <div class="ui attached table segment teams">
+ {{range .Teams}}
+ <div class="item">
+ <a href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong class="team-name">{{.Name}}</strong></a>
+ <p class="text grey">
+ <a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}"><strong>{{.NumMembers}}</strong> {{ctx.Locale.Tr "org.lower_members"}}</a> ·
+ <a class="muted" href="{{$.OrgLink}}/teams/{{.LowerName | PathEscape}}/repositories"><strong>{{.NumRepos}}</strong> {{ctx.Locale.Tr "org.lower_repositories"}}</a>
+ </p>
+ </div>
+ {{end}}
+ </div>
+ {{if .IsOrganizationOwner}}
+ <div class="ui bottom attached segment">
+ <a class="ui primary small button" href="{{.OrgLink}}/teams/new">{{ctx.Locale.Tr "org.create_new_team"}}</a>
</div>
{{end}}
- </div>
- {{if .IsOrganizationOwner}}
- <div class="ui bottom attached segment">
- <a class="ui primary small button" href="{{.OrgLink}}/teams/new">{{ctx.Locale.Tr "org.create_new_team"}}</a>
- </div>
{{end}}
{{end}}
</div>
diff --git a/repo/clone_buttons.tmpl b/repo/clone_buttons.tmpl
index 91952c8..60ec0f2 100644
--- a/repo/clone_buttons.tmpl
+++ b/repo/clone_buttons.tmpl
@@ -1,15 +1,26 @@
<!-- there is always at least one button (by context/repo.go) -->
-{{if $.CloneButtonShowHTTPS}}
- <button class="ui small button" id="repo-clone-https" data-link="{{$.CloneButtonOriginLink.HTTPS}}">
- HTTPS
- </button>
-{{end}}
-{{if $.CloneButtonShowSSH}}
- <button class="ui small button" id="repo-clone-ssh" data-link="{{$.CloneButtonOriginLink.SSH}}">
- SSH
- </button>
-{{end}}
-<input id="repo-clone-url" size="10" class="js-clone-url" value="{{$.CloneButtonOriginLink.HTTPS}}" readonly>
-<button class="ui small icon button" id="clipboard-btn" data-tooltip-content="{{ctx.Locale.Tr "copy_url"}}" data-clipboard-target="#repo-clone-url" aria-label="{{ctx.Locale.Tr "copy_url"}}">
+<button class="ui small button" id="repo-clone-ssh" data-link="{{$.CloneButtonOriginLink.SSH}}">
+ SSH
+</button>
+
+<input id="repo-clone-url" size="10" class="js-clone-url" value="{{$.CloneButtonOriginLink.HTTPS}}"
+ readonly>
+
+<button class="ui small icon button" id="clipboard-btn"
+ data-tooltip-content="{{ctx.Locale.Tr "copy_url"}}"
+ data-clipboard-target="#repo-clone-url" aria-label="{{ctx.Locale.Tr "copy_url"}}">
{{svg "octicon-copy" 14}}
</button>
+
+{{if not (and $.DisableHTTP $.DisableSSH)}}
+ <script defer>
+ const isSSH = true
+ const sshButton = document.getElementById('repo-clone-ssh');
+ const input = document.getElementById('repo-clone-url');
+ if (input) input.value = sshButton.dataset.link;
+ if (sshButton) sshButton.classList['add']('primary');
+ setTimeout(() => {
+ if (sshButton) sshButton.classList.remove('no-transition');
+ }, 100);
+ </script>
+{{end}}
\ No newline at end of file