Improved copying values from the phone and email fields.

YetiForceCompany · Sep 12, 2023 · 712f855 · 712f855
1 parent 3e21356
commit 712f855
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 6 deletions.
diff --git a/layouts/basic/modules/Vtiger/RelatedListContents.tpl b/layouts/basic/modules/Vtiger/RelatedListContents.tpl
@@ -145,7 +145,7 @@
 							{/if}
 							{assign var=COUNT value=$COUNT+1}
 							{assign var=RELATED_HEADERNAME value=$HEADER_FIELD->getFieldName()}
-							<td class="{$WIDTHTYPE}" data-field-type="{$HEADER_FIELD->getFieldDataType()}" nowrap
+							<td class="listViewEntryValue {$WIDTHTYPE}" data-field-type="{$HEADER_FIELD->getFieldDataType()}" nowrap
 								{if $smarty.foreach.listHeaderForeach.iteration eq $RELATED_HEADER_COUNT} colspan="2" {/if}>
 								{if empty($HEADER_FIELD->get('source_field_name')) && ($HEADER_FIELD->isNameField() eq true or $HEADER_FIELD->getUIType() eq '4') &&  $RELATED_MODULE->isListViewNameFieldNavigationEnabled() && $RELATED_RECORD->isViewable()}
 									<a class="modCT_{$RELATED_MODULE_NAME} js-list__field js-popover-tooltip--record" data-js="width" title="" href="{$RELATED_RECORD->getDetailViewUrl()}">

diff --git a/layouts/basic/modules/Vtiger/SummaryWidgetsContent.tpl b/layouts/basic/modules/Vtiger/SummaryWidgetsContent.tpl
@@ -39,7 +39,7 @@
 						{foreach item=HEADER_FIELD from=$RELATED_HEADERS}
 							{$COUNT = $COUNT+1}
 							{assign var=RELATED_HEADERNAME value=$HEADER_FIELD->getFieldName()}
-							<td class="text-left {$WIDTHTYPE}
+							<td class="listViewEntryValue text-left {$WIDTHTYPE}
 							{if $RELATED_HEADERNAME && $HEADER_FIELD->getFieldDataType() eq 'documentsFileUpload' && $HEADER_FIELD->isEditable() && $RELATED_RECORD->isEditable() && 'I' === $RELATED_RECORD->getValueByField('filelocationtype') } js-drop-container{/if}"
 								data-id="{$RELATED_RECORD->getId()}"
 								data-module="{$RELATED_MODULE->getName()}"

diff --git a/modules/Vtiger/uitypes/Email.php b/modules/Vtiger/uitypes/Email.php
@@ -46,7 +46,7 @@ public function getDisplayValue($value, $record = false, $recordModel = false, $
 			$icon = $button = '';
 			if ('Base' !== \App\Mail::getMailComposer()) {
 				$icon = '<span class="fa-solid fa-envelope" aria-hidden="true"></span> ';
-				$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', $recordModel->getModuleName()) . '"><span class="fa-regular fa-copy"></span></button>';
+				$button = "<button type=\"button\" class=\"btn btn-primary btn-xs float-right clipboard\"  data-copy-attribute=\"clipboard-text\" data-clipboard-text=\"{$value}\" title=\"" . \App\Language::translate('BTN_COPY_TO_CLIPBOARD', $recordModel->getModuleName()) . '"><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
@@ -86,7 +86,7 @@ public function getDisplayValue($value, $record = false, $recordModel = false, $
 		if (!\App\Integrations\Pbx::isActive()) {
 			return '<a href="' . $href . '" class="js-popover-tooltip" title="' . $label . ' ' . trim($title) . '">' . $international . '</a>' . $extra;
 		}
-		$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', $recordModel->getModuleName()) . '"><span class="fa-regular fa-copy"></span></button>';
+		$button = "<button type=\"button\" class=\"btn btn-primary btn-xs float-right clipboard\" data-copy-attribute=\"clipboard-text\" data-clipboard-text=\"{$international}\" title=\"" . \App\Language::translate('BTN_COPY_TO_CLIPBOARD', $recordModel->getModuleName()) . '"><span class="fa-regular fa-copy"></span></button>';
 		$data = 'data-phone="' . preg_replace('/(?<!^)\+|[^\d+]+/', '', $international) . '"';
 		if ($record) {
 			$data .= ' data-record="' . $record . '"';
@@ -109,7 +109,7 @@ public function getTextParserDisplayValue($value, Vtiger_Record_Model $recordMod
 				$international = $phoneUtil->format($swissNumberProto, \libphonenumber\PhoneNumberFormat::INTERNATIONAL);
 				$href = $phoneUtil->format($swissNumberProto, $format);
 			} catch (\libphonenumber\NumberParseException $e) {
-				\App\Log::info($e->__toString(), __CLASS__);
+  				\App\Log::info($e->__toString(), __CLASS__);
 			}
 			if (\libphonenumber\PhoneNumberFormat::RFC3966 !== $format) {
 				$href = 'tel:' . $href;

diff --git a/public_html/layouts/basic/modules/Vtiger/resources/Detail.js b/public_html/layouts/basic/modules/Vtiger/resources/Detail.js
@@ -2836,7 +2836,7 @@ jQuery.Class(
 				// Not detail view page
 				return;
 			}
-			App.Fields.Text.registerCopyClipboard(detailViewContainer);
+			App.Fields.Text.registerCopyClipboard(detailViewContainer.find('.detailViewTable:not(.js-widget-general-info)'));
 			this.registerWidgetProductAndServices();
 			this.registerSetReadRecord(detailViewContainer);
 			this.getForm().validationEngine(app.validationEngineOptionsForRecord);

diff --git a/public_html/layouts/basic/modules/Vtiger/resources/RelatedList.js b/public_html/layouts/basic/modules/Vtiger/resources/RelatedList.js
@@ -990,6 +990,12 @@ jQuery.Class(
 		},
 		registerListEvents: function () {
 			let thisInstance = this;
+			let listRow = this.content.find('.listViewEntries.js-list__row');
+			if (listRow.length > 0) {
+				listRow.find('.clipboard').on('click', function (e) {
+					App.Fields.Text.registerCopyClipboard($(e.currentTarget));
+				});
+			}
 			this.content.find('a.favorites').on('click', function () {
 				let progressInstance = jQuery.progressIndicator({
 					position: 'html',

diff --git a/public_html/layouts/basic/styles/_Style.scss b/public_html/layouts/basic/styles/_Style.scss
@@ -1578,6 +1578,16 @@ td.listViewEntryValue .row input {
 	.detailViewTable .fieldValue:hover .clipboard {
 		display: inline-block;
 	}
+	.c-detail-widget .fieldValue:hover .clipboard,
+	.listViewEntries .listViewEntryValue:hover .clipboard {
+		position: absolute;
+	}
+	.listViewEntries .listViewEntryValue:hover .clipboard {
+		right: 0;
+	}
+	.c-detail-widget .fieldValue:hover .clipboard {
+		right: 36px;
+	}
 }
 .listViewContentDiv {
 	position: relative;