From fc406a927c586683b8cfb1c824ea6f320dde24d4 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Mon, 15 Apr 2024 00:43:01 +0900
Subject: [PATCH] Support style in extravar value definition

---
 modules/extravar/models/Value.php              |  1 +
 .../default/form_types/checkbox.blade.php      |  1 +
 .../default/form_types/datetime.blade.php      |  2 ++
 .../skins/default/form_types/locale.blade.php  |  3 +++
 .../default/form_types/password.blade.php      |  1 +
 .../skins/default/form_types/select.blade.php  |  1 +
 .../skins/default/form_types/tel.blade.php     | 18 +++++++++---------
 .../skins/default/form_types/text.blade.php    |  3 +++
 .../default/form_types/textarea.blade.php      |  1 +
 9 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/modules/extravar/models/Value.php b/modules/extravar/models/Value.php
index 8df933909..84c2b1fd1 100644
--- a/modules/extravar/models/Value.php
+++ b/modules/extravar/models/Value.php
@@ -29,6 +29,7 @@ class Value
 	public $is_disabled = 'N';
 	public $is_readonly = 'N';
 	public $search = 'N';
+	public $style = null;
 
 	/**
 	 * Skin path cache.
diff --git a/modules/extravar/skins/default/form_types/checkbox.blade.php b/modules/extravar/skins/default/form_types/checkbox.blade.php
index 4806ae871..be516f021 100644
--- a/modules/extravar/skins/default/form_types/checkbox.blade.php
+++ b/modules/extravar/skins/default/form_types/checkbox.blade.php
@@ -8,6 +8,7 @@
 		<li>
 			<input type="{{ $type }}" name="{{ $input_name . $column_suffix }}"
 				id="{{ $tempid }}" class="{{ $type }}" value="{{ $v }}"
+				style="{{ $definition->style }}"|if="$definition->style"
 				@checked($is_checked)
 				@required(toBool($definition->is_required))
 				@disabled(toBool($definition->is_disabled))
diff --git a/modules/extravar/skins/default/form_types/datetime.blade.php b/modules/extravar/skins/default/form_types/datetime.blade.php
index 029501c47..dfa97f589 100644
--- a/modules/extravar/skins/default/form_types/datetime.blade.php
+++ b/modules/extravar/skins/default/form_types/datetime.blade.php
@@ -8,6 +8,7 @@
 	/>
 	<input type="date" class="date" value="{{ $formatted_value }}"
 		pattern="\d{4}-\d{2}-\d{2}" placeholder="YYYY-MM-DD"
+		style="{{ $definition->style }}"|if="$definition->style"
 		onchange="jQuery(this).prev('.rx_ev_date').val(this.value.replace(/-/g, ''));"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))
@@ -21,6 +22,7 @@
 	<input type="time" name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="rx_ev_time"
 		value="{{ $value }}" pattern="\d{2}:\d{2}"
+		style="{{ $definition->style }}"|if="$definition->style"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))
 		@readonly(toBool($definition->is_readonly))
diff --git a/modules/extravar/skins/default/form_types/locale.blade.php b/modules/extravar/skins/default/form_types/locale.blade.php
index 9a9238b40..108930048 100644
--- a/modules/extravar/skins/default/form_types/locale.blade.php
+++ b/modules/extravar/skins/default/form_types/locale.blade.php
@@ -6,6 +6,7 @@
 	@endphp
 	<select name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="select rx_ev_select rx_ev_select_country"
+		style="{{ $definition->style }}"|if="$definition->style"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))
 		@readonly(toBool($definition->is_readonly))>
@@ -24,6 +25,7 @@
 	@endphp
 	<select name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="select rx_ev_select rx_ev_select_language"
+		style="{{ $definition->style }}"|if="$definition->style"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))
 		@readonly(toBool($definition->is_readonly))>
@@ -40,6 +42,7 @@
 	@endphp
 	<select name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="select rx_ev_select rx_ev_select_timezone"
+		style="{{ $definition->style }}"|if="$definition->style"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))
 		@readonly(toBool($definition->is_readonly))>
diff --git a/modules/extravar/skins/default/form_types/password.blade.php b/modules/extravar/skins/default/form_types/password.blade.php
index 907b13b6d..cbc3a1cbe 100644
--- a/modules/extravar/skins/default/form_types/password.blade.php
+++ b/modules/extravar/skins/default/form_types/password.blade.php
@@ -1,5 +1,6 @@
 <input type="password" name="{{ $input_name }}"
 	id="{{ $input_id }}"|if="$input_id" class="password rx_ev_password"
+	style="{{ $definition->style }}"|if="$definition->style"
 	value="{{ strval($value) !== '' ? $value : $default }}"
 	@required(toBool($definition->is_required))
 	@disabled(toBool($definition->is_disabled))
diff --git a/modules/extravar/skins/default/form_types/select.blade.php b/modules/extravar/skins/default/form_types/select.blade.php
index a8eaccc13..38677093a 100644
--- a/modules/extravar/skins/default/form_types/select.blade.php
+++ b/modules/extravar/skins/default/form_types/select.blade.php
@@ -1,5 +1,6 @@
 <select name="{{ $input_name }}"
 	id="{{ $input_id }}"|if="$input_id" class="select rx_ev_select"
+	style="{{ $definition->style }}"|if="$definition->style"
 	@required(toBool($definition->is_required))
 	@disabled(toBool($definition->is_disabled))
 	@readonly(toBool($definition->is_readonly))>
diff --git a/modules/extravar/skins/default/form_types/tel.blade.php b/modules/extravar/skins/default/form_types/tel.blade.php
index ceb18c701..3806d878e 100644
--- a/modules/extravar/skins/default/form_types/tel.blade.php
+++ b/modules/extravar/skins/default/form_types/tel.blade.php
@@ -1,16 +1,16 @@
 @if ($type === 'tel')
-	<input type="tel" name="{{ $input_name }}[]" value="{{ $value[0] }}" size="4" maxlength="4" class="tel rx_ev_tel1" />
-	<input type="tel" name="{{ $input_name }}[]" value="{{ $value[1] }}" size="4" maxlength="4" class="tel rx_ev_tel2" />
-	<input type="tel" name="{{ $input_name }}[]" value="{{ $value[2] }}" size="4" maxlength="4" class="tel rx_ev_tel3" />
+	<input type="tel" name="{{ $input_name }}[]" value="{{ $value[0] }}" size="4" maxlength="4" class="tel rx_ev_tel1" style="{{ $definition->style }}"|if="$definition->style" />
+	<input type="tel" name="{{ $input_name }}[]" value="{{ $value[1] }}" size="4" maxlength="4" class="tel rx_ev_tel2" style="{{ $definition->style }}"|if="$definition->style" />
+	<input type="tel" name="{{ $input_name }}[]" value="{{ $value[2] }}" size="4" maxlength="4" class="tel rx_ev_tel3" style="{{ $definition->style }}"|if="$definition->style" />
 @elseif ($type === 'tel_v2')
-	<input type="tel" name="{{ $input_name }}[]" value="{{ $value[0] }}" size="16" maxlength="16" class="rx_ev_tel_v2" />
+	<input type="tel" name="{{ $input_name }}[]" value="{{ $value[0] }}" size="16" maxlength="16" class="rx_ev_tel_v2" style="{{ $definition->style }}"|if="$definition->style" />
 @elseif ($type === 'tel_intl' || $type === 'tel_intl_v2')
 	@php
 		$lang_type = Context::getLangType();
 		$lang_sort = $lang_type === 'ko' ? Rhymix\Framework\i18n::SORT_NAME_KOREAN : Rhymix\Framework\i18n::SORT_NAME_ENGLISH;
 		$countries = Rhymix\Framework\i18n::listCountries($lang_sort);
 	@endphp
-	<select name="{{ $input_name }}[]" class="select rx_ev_select rx_ev_select_country">
+	<select name="{{ $input_name }}[]" class="select rx_ev_select rx_ev_select_country" style="{{ $definition->style }}"|if="$definition->style">
   		<option value=""></option>
 		@foreach ($countries as $country)
 			@php
@@ -21,10 +21,10 @@
 		@endforeach
 	</select>
 	@if ($type === 'tel_intl')
-		<input type="tel" name="{{ $input_name }}[]" value="{{ $value[1] }}" size="4" maxlength="4" class="tel rx_ev_tel1" />
-		<input type="tel" name="{{ $input_name }}[]" value="{{ $value[2] }}" size="4" maxlength="4" class="tel rx_ev_tel2" />
-		<input type="tel" name="{{ $input_name }}[]" value="{{ $value[3] }}" size="4" maxlength="4" class="tel rx_ev_tel3" />
+		<input type="tel" name="{{ $input_name }}[]" value="{{ $value[1] }}" size="4" maxlength="4" class="tel rx_ev_tel1" style="{{ $definition->style }}"|if="$definition->style" />
+		<input type="tel" name="{{ $input_name }}[]" value="{{ $value[2] }}" size="4" maxlength="4" class="tel rx_ev_tel2" style="{{ $definition->style }}"|if="$definition->style" />
+		<input type="tel" name="{{ $input_name }}[]" value="{{ $value[3] }}" size="4" maxlength="4" class="tel rx_ev_tel3" style="{{ $definition->style }}"|if="$definition->style" />
 	@else
-		<input type="tel" name="{{ $input_name }}[]" value="{{ $value[1] }}" size="16" maxlength="16" class="rx_ev_tel_v2" />
+		<input type="tel" name="{{ $input_name }}[]" value="{{ $value[1] }}" size="16" maxlength="16" class="rx_ev_tel_v2" style="{{ $definition->style }}"|if="$definition->style" />
 	@endif
 @endif
diff --git a/modules/extravar/skins/default/form_types/text.blade.php b/modules/extravar/skins/default/form_types/text.blade.php
index 33bbe1338..3b8338e98 100644
--- a/modules/extravar/skins/default/form_types/text.blade.php
+++ b/modules/extravar/skins/default/form_types/text.blade.php
@@ -1,6 +1,7 @@
 @if ($type === 'homepage' || $type === 'url')
 	<input type="url" name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="homepage rx_ev_url"
+		style="{{ $definition->style }}"|if="$definition->style"
 		value="{{ $value }}"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))
@@ -9,6 +10,7 @@
 @elseif ($type === 'email_address' || $type === 'email')
 	<input type="email" name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="email_address rx_ev_email"
+		style="{{ $definition->style }}"|if="$definition->style"
 		value="{{ $value }}"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))
@@ -17,6 +19,7 @@
 @else
 	<input type="text" name="{{ $input_name }}"
 		id="{{ $input_id }}"|if="$input_id" class="text rx_ev_text"
+		style="{{ $definition->style }}"|if="$definition->style"
 		value="{{ strval($value) !== '' ? $value : $default }}"
 		@required(toBool($definition->is_required))
 		@disabled(toBool($definition->is_disabled))
diff --git a/modules/extravar/skins/default/form_types/textarea.blade.php b/modules/extravar/skins/default/form_types/textarea.blade.php
index c94924d24..779bc7b67 100644
--- a/modules/extravar/skins/default/form_types/textarea.blade.php
+++ b/modules/extravar/skins/default/form_types/textarea.blade.php
@@ -1,5 +1,6 @@
 <textarea name="{{ $input_name }}"
 	id="{{ $input_id }}"|if="$input_id" class="rx_ev_textarea"
+	style="{{ $definition->style }}"|if="$definition->style"
 	@required(toBool($definition->is_required))
 	@disabled(toBool($definition->is_disabled))
 	@readonly(toBool($definition->is_readonly))