Replace copy buttons with hover over copy buttons

This commit is contained in:
johnnyq
2026-10-14 17:27:27 -04:00
parent fb084ae504
commit 032e555f87
20 changed files with 71 additions and 49 deletions

View File

@@ -187,8 +187,8 @@ if (!empty($_SESSION['backup_master_key_reveal'])) {
<?php if ($backup_key !== '') { ?>
<div class="input-group">
<input type="text" class="form-control font-monospace" value="<?= escapeHtml($backup_key) ?>" readonly onclick="this.select();">
<button class="btn btn-secondary" title="Copy backup key" type="button" onclick="navigator.clipboard.writeText('<?= escapeHtml($backup_key) ?>');">
<i class="fas fa-fw fa-copy"></i>
<button class="btn btn-secondary clipboardjs" title="Copy backup key" type="button" data-clipboard-text="<?= escapeHtml($backup_key) ?>">
<i class="far fa-fw fa-copy"></i>
</button>
</div>
<?php } ?>

View File

@@ -74,7 +74,7 @@ ob_start();
<div class="input-group">
<span class="input-group-text"><i class="fa fa-fw fa-key"></i></span>
<input type="text" class="form-control" value="<?= $key ?>" required disabled>
<button class="btn btn-default clipboardjs" title="Copy API key" type="button" data-clipboard-text="<?= $key ?>"><i class="fa fa-fw fa-copy"></i></button>
<button class="btn btn-outline-secondary clipboardjs" title="Copy API key" type="button" data-clipboard-text="<?= $key ?>"><i class="far fa-fw fa-copy"></i></button>
</div>
</div>
@@ -83,7 +83,7 @@ ob_start();
<div class="input-group">
<span class="input-group-text"><i class="fa fa-fw fa-unlock-alt"></i></span>
<input type="text" class="form-control" value="<?= $decryptPW ?>" required disabled>
<button class="btn btn-default clipboardjs" title="Copy decryption password" type="button" data-clipboard-text="<?= $decryptPW ?>"><i class="fa fa-fw fa-copy"></i></button>
<button class="btn btn-outline-secondary clipboardjs" title="Copy decryption password" type="button" data-clipboard-text="<?= $decryptPW ?>"><i class="far fa-fw fa-copy"></i></button>
</div>
</div>
<br>

View File

@@ -432,7 +432,7 @@ if (mysqli_num_rows($sql) == 0) {
<div class="card-header">
<h3 class="card-title mb-0"><i class="fas fa-fw fa-network-wired text-secondary me-2"></i>Network</h3>
</div>
<div class="card-body itflow-copy-always">
<div class="card-body">
<dl class="itflow-asset-dl mb-0">
<?php if ($asset_ip) { ?>
<dt>IP</dt>
@@ -463,7 +463,7 @@ if (mysqli_num_rows($sql) == 0) {
<div class="card-header">
<h3 class="card-title mb-0"><i class="fas fa-fw fa-microchip text-secondary me-2"></i>Hardware</h3>
</div>
<div class="card-body itflow-copy-always">
<div class="card-body">
<dl class="itflow-asset-dl mb-0">
<?php if ($asset_make_model) { ?>
<dt>Model</dt><dd><?= $asset_make_model ?></dd>
@@ -537,7 +537,7 @@ if (mysqli_num_rows($sql) == 0) {
<span class="text-body-secondary">Nobody</span>
<?php } ?>
<!-- How to reach them - redrawn when the contact changes -->
<div class="itflow-copy-always" data-quick-related="asset-contact-<?= $asset_id ?>"><?= assetContactDetails($asset_row) ?></div>
<div data-quick-related="asset-contact-<?= $asset_id ?>"><?= assetContactDetails($asset_row) ?></div>
</dd>
</dl>
</div>
@@ -789,7 +789,7 @@ if (mysqli_num_rows($sql) == 0) {
</td>
<td class="text-nowrap">
<button class="btn btn-sm btn-light" aria-label="Show password" title="Show password" type="button" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-ellipsis-h"></i><i class="fas fa-ellipsis-h"></i></button>
<button class="btn btn-sm btn-link text-secondary" title="Copy password" type="button" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy"></i></button>
<button type="button" class="itflow-copy" title="Copy password" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy"></i></button>
</td>
<td class="text-nowrap">
<?php if ($credential_has_otp) { ?>

View File

@@ -198,7 +198,7 @@ $money_format = function ($amount) use ($currency_format, $client_currency_code,
<?php if ($person_email) { ?>
<div class="small d-flex align-items-center">
<a class="text-reset text-decoration-none text-truncate" href="mailto:<?= $person_email ?>"><i class="far fa-fw fa-envelope text-body-secondary me-1" aria-hidden="true"></i><?= $person_email ?></a>
<button class="btn btn-link btn-sm p-0 ms-1 text-body-secondary clipboardjs" type="button" title="Copy email" data-clipboard-text="<?= $person_email ?>"><i class="far fa-fw fa-copy" aria-hidden="true"></i></button>
<button type="button" class="itflow-copy clipboardjs" title="Copy email" data-clipboard-text="<?= $person_email ?>"><i class="far fa-copy"></i></button>
</div>
<?php } ?>
</div>
@@ -230,7 +230,7 @@ $money_format = function ($amount) use ($currency_format, $client_currency_code,
<span class="d-block small text-body-secondary text-truncate"><?= escapeHtml(trim($asset['asset_make'] . ' ' . $asset['asset_model'])) ?></span>
</span>
<?php if ($asset_ip) { ?>
<span class="small text-nowrap"><?= $asset_ip ?><button class="btn btn-link btn-sm p-0 ms-1 text-body-secondary clipboardjs" type="button" title="Copy IP" data-clipboard-text="<?= $asset_ip ?>"><i class="far fa-fw fa-copy" aria-hidden="true"></i></button></span>
<span class="small text-nowrap"><?= $asset_ip ?><button type="button" class="itflow-copy clipboardjs" title="Copy IP" data-clipboard-text="<?= $asset_ip ?>"><i class="far fa-copy"></i></button></span>
<?php } ?>
</div>
<?php } ?>
@@ -245,7 +245,7 @@ $money_format = function ($amount) use ($currency_format, $client_currency_code,
<?php if ($credential_username) { ?>
<span class="d-flex align-items-center small text-body-secondary">
<span class="text-truncate"><?= $credential_username ?></span>
<button class="btn btn-link btn-sm p-0 ms-1 text-body-secondary clipboardjs" type="button" title="Copy username" data-clipboard-text="<?= $credential_username ?>"><i class="far fa-fw fa-copy" aria-hidden="true"></i></button>
<button type="button" class="itflow-copy clipboardjs" title="Copy username" data-clipboard-text="<?= $credential_username ?>"><i class="far fa-copy"></i></button>
</span>
<?php } ?>
</span>
@@ -253,7 +253,7 @@ $money_format = function ($amount) use ($currency_format, $client_currency_code,
<span class="small text-body-secondary text-nowrap" onmouseenter="showOTPViaCredentialID(<?= $credential_id ?>)" title="Hover for the current code"><i class="far fa-clock me-1" aria-hidden="true"></i><span id="otp_<?= $credential_id ?>">OTP</span></span>
<?php } ?>
<span class="text-nowrap">
<button class="btn btn-sm btn-link text-body-secondary p-1" type="button" title="Show password" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-fw fa-eye" aria-hidden="true"></i></button><button class="btn btn-sm btn-link text-body-secondary p-1" type="button" title="Copy password" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-fw fa-copy" aria-hidden="true"></i></button>
<button class="btn btn-sm btn-link text-body-secondary p-1" type="button" title="Show password" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-fw fa-eye" aria-hidden="true"></i></button><button type="button" class="itflow-copy" title="Copy password" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy"></i></button>
</span>
</div>
<?php } ?>

View File

@@ -537,7 +537,7 @@ $total_leads = intval($row['leads']);
<?php } else { ?>
<a class="text-reset" href="mailto:<?= $contact_email ?>" title="Email <?= $contact_email ?>"><i class="far fa-fw fa-envelope" aria-hidden="true"></i><span class="visually-hidden">Email <?= $contact_email ?></span></a>
<?php } ?>
<button class="btn btn-link btn-sm p-0 text-reset clipboardjs" type="button" title="Copy <?= $contact_email ?>" data-clipboard-text="<?= $contact_email ?>"><i class="far fa-fw fa-copy" aria-hidden="true"></i><span class="visually-hidden">Copy email</span></button>
<button type="button" class="itflow-copy clipboardjs" title="Copy email" data-clipboard-text="<?= $contact_email ?>"><i class="far fa-copy"></i></button>
<?php } ?>
</div>
<?php } elseif ($can_edit) { ?>

View File

@@ -222,7 +222,7 @@ if (isset($_GET['contact_id'])) {
<div><i class="fa fa-fw fa-map-marker-alt text-secondary me-2"></i><?= $location_name ?></div>
<?php }
if ($contact_email) { ?>
<div class="mt-2"><i class="fa fa-fw fa-envelope text-secondary me-2"></i><a href='mailto:<?= $contact_email ?>'><?= $contact_email ?></a><button class='btn btn-sm btn-link clipboardjs' title='Copy email' data-clipboard-text='<?= $contact_email ?>'><i class='far fa-copy text-secondary'></i></button></div>
<div class="mt-2"><i class="fa fa-fw fa-envelope text-secondary me-2"></i><a href='mailto:<?= $contact_email ?>'><?= $contact_email ?></a><button type='button' class='itflow-copy clipboardjs' title='Copy email' data-clipboard-text='<?= $contact_email ?>'><i class='far fa-copy'></i></button></div>
<?php }
if ($contact_phone) { ?>
<div class="mt-2"><i class="fa fa-fw fa-phone text-secondary me-2"></i><a href="tel:<?= "$contact_phone" ?>"><?= $contact_phone ?></a></div>
@@ -395,7 +395,7 @@ if (isset($_GET['contact_id'])) {
if (empty($asset_ip)) {
$asset_ip_display = "-";
} else {
$asset_ip_display = "$asset_ip<button class='btn btn-sm btn-link clipboardjs' title='Copy IP' type='button' data-clipboard-text='$asset_ip'><i class='far fa-copy text-secondary'></i></button>";
$asset_ip_display = "$asset_ip<button type='button' class='itflow-copy clipboardjs' title='Copy IP' data-clipboard-text='$asset_ip'><i class='far fa-copy'></i></button>";
}
$asset_nat_ip = escapeHtml($row['interface_nat_ip']);
$asset_ipv6 = escapeHtml($row['interface_ipv6']);
@@ -533,14 +533,14 @@ if (isset($_GET['contact_id'])) {
if (empty($credential_uri)) {
$credential_uri_display = "-";
} else {
$credential_uri_display = "$credential_uri<button class='btn btn-sm btn-link clipboardjs' title='Copy URI' data-clipboard-text='$credential_uri'><i class='far fa-copy text-secondary'></i></button><a href='$credential_uri' target='_blank'><i class='fa fa-external-link-alt text-secondary'></i></a>";
$credential_uri_display = "$credential_uri<button type='button' class='itflow-copy clipboardjs' title='Copy URI' data-clipboard-text='$credential_uri'><i class='far fa-copy'></i></button><a href='$credential_uri' target='_blank'><i class='fa fa-external-link-alt text-secondary'></i></a>";
}
$credential_uri_2 = escapeHtml($row['credential_uri_2']);
$credential_username = escapeHtml(decryptCredentialEntry($row['credential_username']));
if (empty($credential_username)) {
$credential_username_display = "-";
} else {
$credential_username_display = "$credential_username<button class='btn btn-sm btn-link clipboardjs' title='Copy username' data-clipboard-text='$credential_username'><i class='far fa-copy text-secondary'></i></button>";
$credential_username_display = "$credential_username<button type='button' class='itflow-copy clipboardjs' title='Copy username' data-clipboard-text='$credential_username'><i class='far fa-copy'></i></button>";
}
$credential_otp_secret = escapeHtml($row['credential_otp_secret']);
if (empty($credential_otp_secret)) {
@@ -566,7 +566,7 @@ if (isset($_GET['contact_id'])) {
<td><?= $credential_description ?></td>
<td><?= $credential_username_display ?></td>
<td>
<button class="btn p-0" aria-label="Show password" type="button" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button><button class="btn btn-sm" title="Copy password" type="button" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy text-secondary"></i></button>
<button class="btn p-0" aria-label="Show password" type="button" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button><button type="button" class="itflow-copy" title="Copy password" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy"></i></button>
</td>
<td><?= $otp_display ?></td>
<td><?= $credential_uri_display ?></td>

View File

@@ -362,7 +362,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
if (empty($contact_email)) {
$contact_email_display = "";
} else {
$contact_email_display = "<div class='mt-1'><i class='fas fa-fw fa-envelope me-2'></i><a href='mailto:$contact_email'>$contact_email</a><button class='btn btn-sm btn-link clipboardjs' title='Copy email' type='button' data-clipboard-text='$contact_email'><i class='far fa-copy text-secondary'></i></button></div>";
$contact_email_display = "<div class='mt-1'><i class='fas fa-fw fa-envelope me-2'></i><a href='mailto:$contact_email'>$contact_email</a><button type='button' class='itflow-copy clipboardjs' title='Copy email' data-clipboard-text='$contact_email'><i class='far fa-copy'></i></button></div>";
}
$contact_info_display = "$contact_phone_display $contact_mobile_display $contact_email_display";
if (empty($contact_info_display)) {

View File

@@ -318,14 +318,14 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
if (empty($credential_uri)) {
$credential_uri_display = "-";
} else {
$credential_uri_display = "<a href='$credential_uri'>" . truncate($credential_uri,40) . "</a><button class='btn btn-sm btn-link clipboardjs' type='button' title='$credential_uri' data-clipboard-text='$credential_uri'><i class='far fa-copy text-secondary'></i></button>";
$credential_uri_display = "<a href='$credential_uri'>" . truncate($credential_uri,40) . "</a><button type='button' class='itflow-copy clipboardjs' title='Copy URI' data-clipboard-text='$credential_uri'><i class='far fa-copy'></i></button>";
}
$credential_uri_2 = escapeUrl($row['credential_uri_2']);
$credential_username = escapeHtml(decryptCredentialEntry($row['credential_username']));
if (empty($credential_username)) {
$credential_username_display = "-";
} else {
$credential_username_display = "$credential_username<button class='btn btn-sm btn-link clipboardjs' title='Copy username' type='button' data-clipboard-text='$credential_username'><i class='far fa-copy text-secondary'></i></button>";
$credential_username_display = "$credential_username<button type='button' class='itflow-copy clipboardjs' title='Copy username' data-clipboard-text='$credential_username'><i class='far fa-copy'></i></button>";
}
$credential_otp_secret = escapeHtml($row['credential_otp_secret']);
if (empty($credential_otp_secret)) {
@@ -415,7 +415,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
</td>
<td class="text-nowrap"><?= $credential_username_display ?></td>
<td class="text-nowrap">
<button class="btn p-0" aria-label="Show password" type="button" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button><button class="btn btn-sm" title="Copy password" type="button" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy text-secondary"></i></button>
<button class="btn p-0" aria-label="Show password" type="button" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i></button><button type="button" class="itflow-copy" title="Copy password" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy"></i></button>
</td>
<td class="text-nowrap"><?= $otp_display ?></td>
<td><?= $credential_uri_display ?></td>

View File

@@ -184,11 +184,11 @@ function searchResultBadge($badge) {
?>
<div class="text-nowrap d-none d-md-block">
<?php if ($credential_username !== '') { ?>
<span class="small"><?= $credential_username ?></span><button class="btn btn-sm btn-link clipboardjs" title="Copy username" type="button" data-clipboard-text="<?= $credential_username ?>"><i class="far fa-copy text-secondary"></i></button>
<span class="small"><?= $credential_username ?></span><button type="button" class="itflow-copy clipboardjs" title="Copy username" data-clipboard-text="<?= $credential_username ?>"><i class="far fa-copy"></i></button>
<?php } ?>
</div>
<div class="text-nowrap">
<button class="btn p-0" aria-label="Show password" type="button" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-ellipsis-h text-secondary"></i><i class="fas fa-ellipsis-h text-secondary"></i></button><button class="btn btn-sm" title="Copy password" type="button" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy text-secondary"></i></button>
<button class="btn p-0" aria-label="Show password" type="button" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-ellipsis-h text-secondary"></i><i class="fas fa-ellipsis-h text-secondary"></i></button><button type="button" class="itflow-copy" title="Copy password" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy"></i></button>
</div>
<?php } ?>

View File

@@ -27,7 +27,7 @@ $location_map_query = rawurlencode(html_entity_decode(trim("$location_address $l
<?php if ($contact_email) { ?>
<span class="d-flex align-items-center">
<a class="text-reset text-decoration-none text-truncate" href="mailto:<?= $contact_email ?>"><i class="far fa-fw fa-envelope text-body-secondary me-2" aria-hidden="true"></i><?= $contact_email ?></a>
<button class="btn btn-link btn-sm p-0 ms-1 text-body-secondary clipboardjs" type="button" title="Copy email" data-clipboard-text="<?= $contact_email ?>"><i class="far fa-fw fa-copy" aria-hidden="true"></i></button>
<button type="button" class="itflow-copy clipboardjs" title="Copy email" data-clipboard-text="<?= $contact_email ?>"><i class="far fa-copy"></i></button>
</span>
<?php } ?>
</div>

View File

@@ -43,8 +43,14 @@ function generateShareLink() {
document.getElementById("div_share_link_output").hidden = false;
document.getElementById("share_link").value = response;
// Copy link to clipboard
navigator.clipboard.writeText(response);
// Copy it straight away - itflowCopyText (js/app.js) also works
// on a plain-HTTP install, where navigator.clipboard is missing
// and this used to throw
const copyButton = document.getElementById("share_link_copy");
itflowCopyText(response, copyButton).then(
function () { flashTooltip(copyButton, 'Copied!'); },
function () {}
);
}
);
}

View File

@@ -264,7 +264,7 @@ ob_start();
<?php if ($has_left || $has_right) { ?>
<div class="row g-2 itflow-asset-glance">
<?php if ($has_left) { ?>
<div class="col-sm-6 itflow-copy-always">
<div class="col-sm-6">
<?php if ($asset_ip) { ?>
<div class="itflow-glance-item" title="IP address">
<i class="fas fa-fw fa-globe"></i>
@@ -401,7 +401,7 @@ ob_start();
<td class="text-nowrap"><?php if ($credential_username) { ?><?= $credential_username ?><button type="button" class="itflow-copy clipboardjs" title="Copy username" data-clipboard-text="<?= $credential_username ?>"><i class="far fa-copy"></i></button><?php } else { ?><span class="text-body-secondary">-</span><?php } ?></td>
<td class="text-nowrap">
<button class="btn btn-sm btn-light" aria-label="Show password" title="Show password" type="button" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="fas fa-ellipsis-h"></i><i class="fas fa-ellipsis-h"></i></button>
<button class="btn btn-sm btn-link text-secondary" title="Copy password" type="button" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy"></i></button>
<button type="button" class="itflow-copy" title="Copy password" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy"></i></button>
</td>
<td class="text-nowrap">
<?php if (!empty($row['credential_otp_secret'])) { ?>

View File

@@ -244,9 +244,7 @@ ob_start();
<div class="mt-1">
<i class="fas fa-fw fa-envelope text-secondary me-1"></i>
<a href="mailto:<?= $contact_email ?>"><?= $contact_email ?></a>
<button type="button" class="btn btn-sm btn-link p-0 ms-1 clipboardjs" title="Copy email" data-clipboard-text="<?= $contact_email ?>">
<i class="far fa-copy text-secondary"></i>
</button>
<button type="button" class="itflow-copy clipboardjs" title="Copy email" data-clipboard-text="<?= $contact_email ?>"><i class="far fa-copy"></i></button>
</div>
<?php } ?>
@@ -532,7 +530,7 @@ ob_start();
if (empty($credential_username)) {
$credential_username_display = "-";
} else {
$credential_username_display = "$credential_username <button type='button' class='btn btn-sm btn-link clipboardjs' title='Copy username' data-clipboard-text='$credential_username'><i class='far fa-copy text-secondary'></i></button>";
$credential_username_display = "$credential_username <button type='button' class='itflow-copy clipboardjs' title='Copy username' data-clipboard-text='$credential_username'><i class='far fa-copy'></i></button>";
}
$credential_otp_secret = escapeHtml($row['credential_otp_secret']);
@@ -550,9 +548,7 @@ ob_start();
<button class="btn p-0" aria-label="Show password" type="button" onclick="showPasswordViaCredentialID(this, <?= $credential_id ?>)">
<i class="fas fa-2x fa-ellipsis-h text-secondary"></i><i class="fas fa-2x fa-ellipsis-h text-secondary"></i>
</button>
<button class="btn btn-sm" title="Copy password" type="button" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)">
<i class="far fa-copy text-secondary"></i>
</button>
<button type="button" class="itflow-copy" title="Copy password" onclick="copyPasswordViaCredentialID(this, <?= $credential_id ?>)"><i class="far fa-copy"></i></button>
</td>
<td><?= $otp_display ?></td>
<td><?= $credential_uri_display ?></td>

View File

@@ -112,7 +112,7 @@ ob_start();
<span class="input-group-text"><i class="fa fa-fw fa-lock"></i></span>
<input type="password" class="form-control" data-toggle="password" name="password" placeholder="Password or Key" maxlength="350" value="<?= $credential_password ?>" required autocomplete="new-password">
<span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
<button class="btn btn-default clipboardjs" title="Copy password" type="button" data-clipboard-text="<?= $credential_password ?>"><i class="fa fa-fw fa-copy"></i></button>
<button class="input-group-text clipboardjs" title="Copy password" type="button" data-clipboard-target="input[name=password]"><i class="far fa-fw fa-copy"></i></button>
</div>
</div>
@@ -132,7 +132,7 @@ ob_start();
<input type="text" class="form-control" name="uri" placeholder="ex. http://192.168.1.1" maxlength="500" value="<?= $credential_uri ?>">
<a href="<?= $credential_uri_link ?>" target="_blank" class="input-group-text"><i class="fa fa-fw fa-link"></i></a>
<button class="input-group-text clipboardjs" title="Copy URI" type="button" data-clipboard-text="<?= $credential_uri ?>"><i class="fa fa-fw fa-copy"></i></button>
<button class="input-group-text clipboardjs" title="Copy URI" type="button" data-clipboard-target="input[name=uri]"><i class="far fa-fw fa-copy"></i></button>
</div>
</div>
@@ -142,7 +142,7 @@ ob_start();
<span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
<input type="text" class="form-control" name="uri_2" placeholder="ex. https://server.company.com:5001" maxlength="500" value="<?= $credential_uri_2 ?>">
<a href="<?= $credential_uri_2_link ?>" target="_blank" class="input-group-text"><i class="fa fa-fw fa-link"></i></a>
<button class="input-group-text clipboardjs" title="Copy URI" type="button" data-clipboard-text="<?= $credential_uri_2 ?>"><i class="fa fa-fw fa-copy"></i></button>
<button class="input-group-text clipboardjs" title="Copy URI 2" type="button" data-clipboard-target="input[name=uri_2]"><i class="far fa-fw fa-copy"></i></button>
</div>
</div>

View File

@@ -70,7 +70,10 @@
<div id="div_share_link_output" hidden>
<h3 id="share_link_header">Share URL</h3>
<input type="text" class="form-control" disabled id="share_link" value="">
<div class="input-group">
<input type="text" class="form-control" readonly id="share_link" value="" onclick="this.select();">
<button class="btn btn-outline-secondary clipboardjs" type="button" id="share_link_copy" title="Copy link" data-clipboard-target="#share_link"><i class="far fa-fw fa-copy"></i></button>
</div>
</div>
</div>

View File

@@ -72,9 +72,9 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
<img src='../../libs/barcode/barcode.php?f=png&s=qr&d=<?= $data ?>' data-bs-toggle="tooltip" title="Scan QR code into your MFA App">
<p>
<p class="itflow-copy-always">
<small data-bs-toggle="tooltip" title="Can't Scan? Copy and paste this code into your app"><?= $token ?></small>
<button type="button" class='btn btn-sm btn-link clipboardjs' title='Copy secret' data-clipboard-text='<?= $token ?>'><i class='far fa-copy text-secondary'></i></button>
<button type='button' class='itflow-copy clipboardjs' title='Copy secret' data-clipboard-text='<?= $token ?>'><i class='far fa-copy'></i></button>
</p>
<div class="input-group mb-3">

View File

@@ -26,8 +26,8 @@ $data = "otpauth://totp/ITFlow:$session_email?secret=$token";
<div class="text-center">
<img src='../../libs/barcode/barcode.php?f=png&s=qr&d=<?= $data ?>'>
<p><span class='text-secondary'>Secret:</span> <?= $token ?>
<button type="button" class='btn btn-sm btn-link clipboardjs' title='Copy secret' data-clipboard-text='<?= $token ?>'><i class='far fa-copy text-secondary'></i></button>
<p class="itflow-copy-always"><span class='text-secondary'>Secret:</span> <?= $token ?>
<button type='button' class='itflow-copy clipboardjs' title='Copy secret' data-clipboard-text='<?= $token ?>'><i class='far fa-copy'></i></button>
</p>
</div>

View File

@@ -178,7 +178,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$vendor_email = escapeHtml($row['vendor_email']);
$vendor_website = escapeHtml($row['vendor_website']);
if ($vendor_website) {
$vendor_website_display = "<a href='https://$vendor_website' target='_blank'>$vendor_website <i class='fa fa-external-link-alt'></i></a><button type='button' class='btn btn-sm btn-link clipboardjs' title='Copy website' data-clipboard-text='$vendor_website'><i class='far fa-copy text-secondary'></i></button>";
$vendor_website_display = "<a href='https://$vendor_website' target='_blank'>$vendor_website <i class='fa fa-external-link-alt'></i></a><button type='button' class='itflow-copy clipboardjs' title='Copy website' data-clipboard-text='$vendor_website'><i class='far fa-copy'></i></button>";
} else {
$vendor_website_display = "-";
}

View File

@@ -3638,7 +3638,13 @@ img.itflow-asset-icon {
line-height: 1.4;
}
/* Copy button beside an IP / MAC / serial - quiet until the row is pointed at */
/* Copy button beside a value - an IP, MAC, serial, email, username, URI or a
password. Quiet until the row or line it sits in is pointed at: a table row,
a list-group row, a quick-look line, or just its own parent element.
.itflow-copy-always keeps it showing where copying is the point (an MFA
secret). Markup:
<button type="button" class="itflow-copy clipboardjs" title="Copy IP" data-clipboard-text="..."><i class="far fa-copy"></i></button>
Copy buttons attached to an input stay input-group buttons. */
.itflow-copy {
margin-left: .3rem;
padding: 0 .15rem;
@@ -3650,6 +3656,9 @@ img.itflow-asset-icon {
transition: opacity .12s ease-in-out;
}
tr:hover .itflow-copy,
.list-group-item:hover .itflow-copy,
.itflow-glance-item:hover .itflow-copy,
:hover > .itflow-copy,
.itflow-copy-always .itflow-copy,
.itflow-copy:focus-visible {
opacity: 1;

View File

@@ -607,8 +607,11 @@ function itflowInit() {
});
// Copy buttons: any element with class="clipboardjs" and its text in
// data-clipboard-text. That is ClipboardJS's markup contract, kept so none of
// the call sites change - the library itself is no longer used here.
// data-clipboard-text, or the field to copy from in data-clipboard-target.
// That is ClipboardJS's markup contract, kept so none of the call sites
// change - the library itself is no longer used here. Beside a value they
// are the small .itflow-copy icon that shows when its row is pointed at
// (css/itflow_custom.css); beside an input, an input-group button.
//
// ClipboardJS copies by selecting a hidden textarea. Under Bootstrap 5 that
// textarea has to be inside the open modal or the focus trap pulls focus
@@ -632,7 +635,12 @@ function itflowInit() {
const trigger = this;
const target = itflowCopyFeedbackTarget(trigger);
const text = trigger.getAttribute('data-clipboard-text') || '';
// data-clipboard-target="input[name=uri]" copies what is in that
// field now - in its own input group first - rather than the value
// the page was drawn with, so an edited field copies the edit
const source = trigger.getAttribute('data-clipboard-target');
const field = source ? ((trigger.closest('.input-group') || document).querySelector(source) || document.querySelector(source)) : null;
const text = field ? (field.value || '') : (trigger.getAttribute('data-clipboard-text') || '');
// An empty field would otherwise wipe whatever is on the clipboard
if (text === '') {