Merge branch 'main' into 18883_bulk_selected_issues

cmd/admin.go

@@ -632,9 +632,10 @@ func runListUsers(c *cli.Context) error {
 			}
 		}
 	} else {
-		fmt.Fprintf(w, "ID\tUsername\tEmail\tIsActive\tIsAdmin\n")
+		twofa := user_model.UserList(users).GetTwoFaStatus()
+		fmt.Fprintf(w, "ID\tUsername\tEmail\tIsActive\tIsAdmin\t2FA\n")
 		for _, u := range users {
-			fmt.Fprintf(w, "%d\t%s\t%s\t%t\t%t\n", u.ID, u.Name, u.Email, u.IsActive, u.IsAdmin)
+			fmt.Fprintf(w, "%d\t%s\t%s\t%t\t%t\t%t\n", u.ID, u.Name, u.Email, u.IsActive, u.IsAdmin, twofa[u.ID])
 		}
 
 	}

package.json

@@ -29,6 +29,7 @@
     "pretty-ms": "7.0.1",
     "sortablejs": "1.15.0",
     "swagger-ui-dist": "4.11.1",
+    "tippy.js": "6.3.7",
     "tributejs": "5.1.3",
     "uint8-to-base64": "0.2.0",
     "vue": "2.6.14",

routers/web/org/members.go

@@ -45,6 +45,7 @@ func Members(ctx *context.Context) {
 		}
 		opts.PublicOnly = !isMember && !ctx.Doer.IsAdmin
 	}
+	ctx.Data["PublicOnly"] = opts.PublicOnly
 
 	total, err := organization.CountOrgMembers(opts)
 	if err != nil {

templates/org/member/members.tmpl

@@ -29,28 +29,30 @@
 							{{end}}
 						</div>
 					</div>
-					<div class="ui three wide column center">
-						<div class="meta">
-							{{$.locale.Tr "org.members.member_role"}}
-						</div>
-						<div class="meta">
-							<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.locale.Tr "org.members.owner"}}{{else}}{{$.locale.Tr "org.members.member"}}{{end}}</strong>
-						</div>
-					</div>
-					<div class="ui two wide column center">
-						<div class="meta">
-							{{$.locale.Tr "admin.users.2fa"}}
+					{{if not .PublicOnly}}
+						<div class="ui three wide column center">
+							<div class="meta">
+								{{$.locale.Tr "org.members.member_role"}}
+							</div>
+							<div class="meta">
+								<strong>{{if index $.MembersIsUserOrgOwner .ID}}{{svg "octicon-shield-lock"}} {{$.locale.Tr "org.members.owner"}}{{else}}{{$.locale.Tr "org.members.member"}}{{end}}</strong>
+							</div>
 						</div>
-						<div class="meta">
-							<strong>
-								{{if index $.MembersTwoFaStatus .ID}}
-									<span class="text green">{{svg "octicon-check"}}</span>
-								{{else}}
-									{{svg "octicon-x"}}
-								{{end}}
-							</strong>
+						<div class="ui two wide column center">
+							<div class="meta">
+								{{$.locale.Tr "admin.users.2fa"}}
+							</div>
+							<div class="meta">
+								<strong>
+									{{if index $.MembersTwoFaStatus .ID}}
+										<span class="text green">{{svg "octicon-check"}}</span>
+									{{else}}
+										{{svg "octicon-x"}}
+									{{end}}
+								</strong>
+							</div>
 						</div>
-					</div>
+					{{end}}
 					<div class="ui three wide column">
 						<div class="text right">
 							{{if eq $.SignedUser.ID .ID}}

web_src/js/features/contextpopup.js

@@ -2,6 +2,7 @@ import $ from 'jquery';
 import Vue from 'vue';
 import ContextPopup from '../components/ContextPopup.vue';
 import {parseIssueHref} from '../utils.js';
+import {createTippy} from '../modules/tippy.js';
 
 export default function initContextPopups() {
   const refIssues = $('.ref-issue');
@@ -16,7 +17,6 @@ export default function initContextPopups() {
     if (!owner) return;
 
     const el = document.createElement('div');
-    el.className = 'ui custom popup hidden';
     el.innerHTML = '<div></div>';
     this.parentNode.insertBefore(el, this.nextSibling);
 
@@ -33,17 +33,12 @@ export default function initContextPopups() {
       el.textContent = 'ContextPopup failed to load';
     }
 
-    $(this).popup({
-      variation: 'wide',
-      delay: {
-        show: 250
-      },
+    createTippy(this, {
+      content: el,
+      interactive: true,
       onShow: () => {
-        view.$emit('load-context-popup', {owner, repo, index}, () => {
-          $(this).popup('reposition');
-        });
-      },
-      popup: $(el),
+        view.$emit('load-context-popup', {owner, repo, index});
+      }
     });
   });
 }

web_src/js/modules/tippy.js

@@ -0,0 +1,12 @@
+import tippy from 'tippy.js';
+
+export function createTippy(target, opts) {
+  return tippy(target, {
+    appendTo: document.body,
+    placement: 'top-start',
+    animation: false,
+    allowHTML: true,
+    arrow: `<svg width="16" height="7"><path d="m0 7 8-7 8 7Z" class="tippy-svg-arrow-outer"/><path d="m0 8 8-7 8 7Z" class="tippy-svg-arrow-inner"/></svg>`,
+    ...opts,
+  });
+}

web_src/less/index.less

@@ -9,6 +9,7 @@
 @import "./features/imagediff.less";
 @import "./features/codeeditor.less";
 @import "./features/projects.less";
+@import "./modules/tippy.less";
 @import "./markup/content.less";
 @import "./markup/codecopy.less";
 @import "./code/linebutton.less";

web_src/less/modules/tippy.less

@@ -0,0 +1,84 @@
+/* styles are based on node_modules/tippy.js/dist/tippy.css */
+
+.tippy-box[data-animation="fade"][data-state="hidden"] {
+  opacity: 0;
+}
+
+[data-tippy-root] {
+  max-width: calc(100vw - 10px);
+}
+
+.tippy-box {
+  position: relative;
+  background-color: var(--color-body);
+  color: var(--color-secondary-dark-6);
+  border: 1px solid var(--color-secondary);
+  border-radius: var(--border-radius);
+  font-size: 1rem;
+  transition-property: transform, visibility, opacity;
+}
+
+.tippy-content {
+  position: relative;
+  padding: 1rem;
+  z-index: 1;
+}
+
+.tippy-box[data-placement^="top"] > .tippy-svg-arrow {
+  bottom: 0;
+}
+
+.tippy-box[data-placement^="top"] > .tippy-svg-arrow::after,
+.tippy-box[data-placement^="top"] > .tippy-svg-arrow > svg {
+  top: 16px;
+  transform: rotate(180deg);
+}
+
+.tippy-box[data-placement^="bottom"] > .tippy-svg-arrow {
+  top: 0;
+}
+
+.tippy-box[data-placement^="bottom"] > .tippy-svg-arrow > svg {
+  bottom: 16px;
+}
+
+.tippy-box[data-placement^="left"] > .tippy-svg-arrow {
+  right: 0;
+}
+
+.tippy-box[data-placement^="left"] > .tippy-svg-arrow::after,
+.tippy-box[data-placement^="left"] > .tippy-svg-arrow > svg {
+  transform: rotate(90deg);
+  top: calc(50% - 3px);
+  left: 11px;
+}
+
+.tippy-box[data-placement^="right"] > .tippy-svg-arrow {
+  left: 0;
+}
+
+.tippy-box[data-placement^="right"] > .tippy-svg-arrow::after,
+.tippy-box[data-placement^="right"] > .tippy-svg-arrow > svg {
+  transform: rotate(-90deg);
+  top: calc(50% - 3px);
+  right: 11px;
+}
+
+.tippy-svg-arrow {
+  width: 16px;
+  height: 16px;
+  text-align: initial;
+}
+
+.tippy-svg-arrow,
+.tippy-svg-arrow > svg {
+  position: absolute;
+}
+
+.tippy-svg-arrow-outer {
+  fill: var(--color-secondary);
+}
+
+.tippy-svg-arrow-inner {
+  fill: var(--color-body);
+}