Browse Source

Merge pull request '修复组织成员标签在移动端不能显示的问题' (#1862) from web into V20220415

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/1862
Reviewed-by: lewis <747342561@qq.com>
tags/v1.22.4.1^2
lewis 4 years ago
parent
commit
672be45879
3 changed files with 14 additions and 10 deletions
  1. +2
    -2
      templates/base/head_notice.tmpl
  2. +11
    -7
      templates/org/member/members.tmpl
  3. +1
    -1
      web_src/less/openi.less

+ 2
- 2
templates/base/head_notice.tmpl View File

@@ -1,7 +1,7 @@
{{if not .IsCourse}}
{{ if .notices}}
<div class="notic_content" id ="notic_content" style="display: block; position: relative">
<diV class="ui container">
<div class="ui container">
<marquee behavior="scroll" direction="left">
{{ $firstTag := true }}
{{range .notices.Notices}}
@@ -25,7 +25,7 @@
<div class="item right" style="position:absolute;right: 1px;top:0px;">
<i class="ri-close-fill x_icon" onclick="closeNoice()"></i>
</div>
</diV>
</div>
</div>
{{end}}

+ 11
- 7
templates/org/member/members.tmpl View File

@@ -4,18 +4,19 @@
<div class="ui container">
{{template "base/alert" .}}
{{template "org/navber" .}}
<div class="ui stackable grid">
<div class="ui stackable grid">
<div class="ui sixteen wide computer column list">
{{ range .Members}}
<div class="item ui grid">
<div class="ui two wide column">
<img class="ui avatar" src="{{.SizedRelAvatarLink 48}}">
</div><div class="ui three wide column">
</div>
<div class="ui three wide column">
<div class="meta"><a href="{{.HomeLink}}">{{.Name}}</a></div>
<div class="meta">{{.FullName}}</div>
</div><div class="ui four wide column center">
</div>
<div class="ui four wide column center">
<div class="meta">
{{$.i18n.Tr "org.members.membership_visibility"}}
</div>
@@ -29,14 +30,16 @@
{{if or (eq $.SignedUser.ID .ID) $.IsOrganizationOwner}}(<a class="link-action" href data-url="{{$.OrgLink}}/members/action/public?uid={{.ID}}">{{$.i18n.Tr "org.members.private_helper"}}</a>){{end}}
{{end}}
</div>
</div><div class="ui three wide column center">
</div>
<div class="ui three wide column center">
<div class="meta">
{{$.i18n.Tr "org.members.member_role"}}
</div>
<div class="meta">
<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock" 16}} {{$.i18n.Tr "org.members.owner"}}{{else}}{{$.i18n.Tr "org.members.member"}}{{end}}</strong>
</div>
</div><div class="ui one wide column center">
</div>
<div class="ui one wide column center">
<div class="meta">
2FA
</div>
@@ -49,7 +52,8 @@
{{end}}
</strong>
</div>
</div><div class="ui three wide column">
</div>
<div class="ui three wide column">
<div class="text right">
{{if eq $.SignedUser.ID .ID}}
<form method="post" action="{{$.OrgLink}}/members/action/leave">


+ 1
- 1
web_src/less/openi.less View File

@@ -717,7 +717,7 @@ display: block;
#repo-files-table .age,
#repo-files-table .ui.sha.label,
#repo-files-table .commit-button,
.members
.repository .members
{
display: none !important;
}


Loading…
Cancel
Save