Added improvement

YetiForceCompany · Sep 8, 2023 · ecf14ad · ecf14ad
1 parent d250028
commit ecf14ad
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/modules/Vtiger/uitypes/Email.php b/modules/Vtiger/uitypes/Email.php
@@ -47,8 +47,7 @@ public function getDisplayValue($value, $record = false, $recordModel = false, $
 			if ('Base' !== \App\Mail::getMailComposer()) {
 				$icon = '<span class="fa-solid fa-envelope" aria-hidden="true"></span> ';
 				$moduleName = $recordModel->getModuleName();
-				$url = "index.php?module={$moduleName}&action=Fields&mode=getCopyValue&fieldName={$this->getFieldModel()->getName()}&record={$recordModel->getId()}";
-				$button = "<button type=\"button\" class=\"btn btn-primary btn-xs ml-1 js-copy-clipboard-url\" data-url=\"$url\" title=\"" . \App\Language::translate('BTN_COPY_TO_CLIPBOARD', $moduleName) . '"><span class="fa-regular fa-copy"></span></button>';
+				$button = "<button type=\"button\" class=\"btn btn-primary btn-xs ml-1 clipboard\" data-copy-attribute=\"clipboard-text\" data-clipboard-text=\"{$value}\" title=\"" . \App\Language::translate('BTN_COPY_TO_CLIPBOARD', $moduleName) . '"><span class="fa-regular fa-copy"></span></button>';
 			}
 			return "<a class=\"u-cursor-pointer js-email-compose \" {$data} data-js=\"click|container\">{$icon}{$value}</a>$button";
 		}

diff --git a/modules/Vtiger/uitypes/Phone.php b/modules/Vtiger/uitypes/Phone.php
@@ -88,8 +88,7 @@ public function getDisplayValue($value, $record = false, $recordModel = false, $
 			return '<a href="' . $href . '" class="js-popover-tooltip" title="' . $label . ' ' . trim($title) . '">' . $international . '</a>' . $extra;
 		}
 		$moduleName = $recordModel->getModuleName();
-		$url = "index.php?module={$moduleName}&action=Fields&mode=getCopyValue&fieldName={$fieldName}&record={$recordModel->getId()}";
-		$button = "<button type=\"button\" class=\"btn btn-primary btn-xs ml-1 js-copy-clipboard-url\" data-url=\"$url\" title=\"" . \App\Language::translate('BTN_COPY_TO_CLIPBOARD', $moduleName) . '"><span class="fa-regular fa-copy"></span></button>';
+		$button = "<button type=\"button\" class=\"btn btn-primary btn-xs ml-1 clipboard\" data-copy-attribute=\"clipboard-text\" data-clipboard-text=\"{$international}\" title=\"" . \App\Language::translate('BTN_COPY_TO_CLIPBOARD', $moduleName) . '"><span class="fa-regular fa-copy"></span></button>';
 		$data = 'data-phone="' . preg_replace('/(?<!^)\+|[^\d+]+/', '', $international) . '"';
 		if ($record) {
 			$data .= ' data-record="' . $record . '"';

diff --git a/public_html/layouts/basic/modules/Vtiger/resources/Detail.js b/public_html/layouts/basic/modules/Vtiger/resources/Detail.js
@@ -1044,7 +1044,7 @@ jQuery.Class(
 					fieldElement.inputmask();
 				}
 				detailViewValue.addClass('d-none');
-				actionElement.addClass('d-none');
+				// actionElement.addClass('d-none');
 				editElement
 					.removeClass('d-none')
 					.children()
@@ -2836,6 +2836,7 @@ jQuery.Class(
 				// Not detail view page
 				return;
 			}
+			App.Fields.Text.registerCopyClipboard(detailViewContainer);
 			this.registerWidgetProductAndServices();
 			this.registerSetReadRecord(detailViewContainer);
 			this.getForm().validationEngine(app.validationEngineOptionsForRecord);

diff --git a/public_html/layouts/basic/modules/Vtiger/resources/List.js b/public_html/layouts/basic/modules/Vtiger/resources/List.js
@@ -2112,6 +2112,7 @@ $.Class(
 			if (typeof CustomView !== 'undefined') {
 				CustomView.registerCustomViewAdvCondEvents(this.getListViewContainer());
 			}
+			App.Fields.Text.registerCopyClipboard(this.getListViewContainer());
 			this.registerMassActionsBtnEvents();
 			Vtiger_Helper_Js.showHorizontalTopScrollBar();
 			this.registerUrlFieldClickEvent();

diff --git a/public_html/layouts/basic/styles/_Style.scss b/public_html/layouts/basic/styles/_Style.scss
@@ -1569,7 +1569,16 @@ td.listViewEntryValue .row input {
 	padding: 0;
 	margin-bottom: 0;
 }
-
+@media only screen and (min-width: 1200px) {
+	.listViewEntries .listViewEntryValue .clipboard,
+	.detailViewTable .fieldValue .clipboard {
+		display: none;
+	}
+	.listViewEntries .listViewEntryValue:hover .clipboard,
+	.detailViewTable .fieldValue:hover .clipboard {
+		display: inline-block;
+	}
+}
 .listViewContentDiv {
 	position: relative;
 }
@@ -3401,7 +3410,8 @@ select {
 	min-width: 400px;
 }
 
-.table tr.inventoryRow td,.table tr.inventoryRowGroup td {
+.table tr.inventoryRow td,
+.table tr.inventoryRowGroup td {
 	padding: 4px;
 }