← All changes | includes/Frontend/Form/View/FormViewHelper.php +61 -132 3.1.2 → 2.15.3 View file →

		@@ -39,36 +39,27 @@
39	39	{
40	40	if (empty($source)) {
41	41	return '';
42	42	}
43		- return sprintf(
44		- '<img
45		- class="%1$s _frm-b-stp-icn"
46		- src="%2$s"
47		- alt=""
48		- aria-hidden="true"
49		- />
50		- ',
51		- $this->_form->getAtomicCls($classElement),
52		- $source
53		- );
	43	+ return <<<ICON
	44	+<img
	45	+ class="{$this->_form->getAtomicCls($classElement)}"
	46	+ src="{$source}"
	47	+ alt=""
	48	+/>
	49	+ICON;
54	50	}
55	51
56	52	private function getHeaderLabelMarkup($lbl, $preIcn, $sufIcn, $uniqClass)
57	53	{
58	54	$formID = $this->getFormId();
59		- return sprintf(
60		- '<span class="%1$s _frm-b-stp-hdr-%2$s">
61		- %3$s
62		- %4$s
63		- %5$s
64		- </span>',
65		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-{$uniqClass}"),
66		- $uniqClass,
67		- $this->getIconMarkup($preIcn, "_frm-b{$formID}-stp-{$uniqClass}-pre-i"),
68		- $this->filterHtml($lbl),
69		- $this->getIconMarkup($sufIcn, "_frm-b{$formID}-stp-{$uniqClass}-suf-i")
70		- );
	55	+ return <<<HEADERLABEL
	56	+ <span class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-{$uniqClass}")}'>
	57	+ {$this->getIconMarkup($preIcn, "_frm-b{$formID}-stp-{$uniqClass}-pre-i")}
	58	+ {$this->filterHtml($lbl)}
	59	+ {$this->getIconMarkup($sufIcn, "_frm-b{$formID}-stp-{$uniqClass}-suf-i")}
	60	+ </span>
	61	+HEADERLABEL;
71	62	}
72	63
73	64	private function getStepButton($btnSettings)
74	65	{
		@@ -80,27 +71,19 @@
80	71	$sufIcn = isset($btnSettings->sufIcn) ? $btnSettings->sufIcn : null;
81	72	$preIcnMrkp = $this->getIconMarkup($preIcn, "_frm-b{$formID}-{$key}-pre-i");
82	73	$sufIcnMrkp = $this->getIconMarkup($sufIcn, "_frm-b{$formID}-{$key}-suf-i");
83	74	$btnSpinner = '<span class="bf-spinner d-none"></span>';
84		- return sprintf(
85		- '<button
86		- class="%1$s %2$s"
87		- name="%2$s"
88		- type="%3$s"
	75	+ return <<<BUTTON
	76	+ <button
	77	+ class="{$this->_form->getAtomicCls("_frm-b{$formID}-{$key}")} {$key}"
	78	+ type="{$btnTyp}"
89	79	>
90		- %4$s
91		- %5$s
92		- %6$s
93		- %7$s
94		- </button>',
95		- $this->_form->getAtomicCls("_frm-b{$formID}-{$key}"),
96		- $key,
97		- $btnTyp,
98		- $preIcnMrkp,
99		- $this->filterHtml($txt),
100		- $sufIcnMrkp,
101		- $btnSpinner
102		- );
	80	+ {$preIcnMrkp}
	81	+ {$this->filterHtml($txt)}
	82	+ {$sufIcnMrkp}
	83	+ {$btnSpinner}
	84	+ </button>
	85	+BUTTON;
103	86	}
104	87
105	88	public function getStepHeaderHtml()
106	89	{
		@@ -111,19 +94,12 @@
111	94	}
112	95
113	96	$formID = $this->_form->getFormID();
114	97	$layout = $this->_layout;
115		- $totalSteps = is_array($layout) ? count($layout) : 1;
116		- $stepHeaderHtml = sprintf(
117		- '<div class="%1$s _frm-b-stp-hdr-cntnr">
118		- <div
119		- class="%2$s _frm-b-stp-hdr-wrpr"
120		- role="tablist"
121		- aria-label="Form steps navigation"
122		- >',
123		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-cntnr"),
124		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-wrpr")
125		- );
	98	+ $stepHeaderHtml = <<<HEADERHTML
	99	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-cntnr")}'>
	100	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-wrpr")}'>
	101	+HEADERHTML;
126	102
127	103	$showHeadarIcon = isset($multiStepSettings->headerIcon->show) ? $multiStepSettings->headerIcon->show : false;
128	104	$showLbl = isset($multiStepSettings->showLbl) ? $multiStepSettings->showLbl : false;
129	105	$showSubtitle = isset($multiStepSettings->showSubtitle) ? $multiStepSettings->showSubtitle : false;
		@@ -146,18 +122,15 @@
146	122	} else {
147	123	$stepIcon = "<span class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-num")}'>{$step}</span>";
148	124	}
149	125	if ($showHeadarIcon) {
150		- $iconWrapper = sprintf(
151		- '<div class="%1$s _frm-b-stp-hdr-icn-wrp">
152		- <div class="%2$s _frm-b-stp-icn-cntn">
153		- %3$s
	126	+ $iconWrapper = <<<ICONWRPR
	127	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-icn-wrp")}'>
	128	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-icn-cntn")}'>
	129	+ {$stepIcon}
154	130	</div>
155		- </div>',
156		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-icn-wrp"),
157		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-icn-cntn"),
158		- $stepIcon
159		- );
	131	+ </div>
	132	+ICONWRPR;
160	133	}
161	134	$showStepLbl = $showLbl && isset($settings->showLbl) ? $settings->showLbl : false;
162	135	$showStepSubtitle = $showSubtitle && isset($settings->showSubtitle) ? $settings->showSubtitle : false;
163	136	$lblPreIcn = isset($settings->lblPreIcn) ? $settings->lblPreIcn : null;
		@@ -168,49 +141,24 @@
168	141	$stepSubtitleMarkup = $showStepSubtitle ? $this->getHeaderLabelMarkup($settings->subtitle, $subTlePreIcn, $subTleSufIcn, 'sub-titl') : '';
169	142
170	143	$activeClass = 0 === $key ? 'active' : '';
171	144	$disableClass = (0 !== $key && $stepValidation) ? 'disabled' : '';
172		- $ariaSelected = 0 === $key ? 'true' : 'false';
173		- $ariaDisabled = (0 !== $key && $stepValidation) ? 'aria-disabled="true"' : '';
174		- $tabIndex = 0 === $key ? '0' : '-1';
175		- $stepHeaderHtml .= sprintf(
176		- '
177		- <div
178		- class="%1$s _frm-b-stp-hdr %2$s %3$s"
179		- data-step="%4$s"
180		- role="tab"
181		- aria-selected="%5$s"
182		- aria-controls="step-%6$s-%4$s-panel"
183		- id="step-%6$s-%4$s-tab"
184		- tabindex="%7$s"
185		- %8$s
186		- >
187		- <div class="%9$s _frm-b-stp-hdr-cntnt">
188		- %10$s
189		- <span class="%11$s _frm-b-stp-hdr-titl-wrpr">
190		- %12$s
191		- %13$s
	145	+ $stepHeaderHtml .= <<<HEADERHTML
	146	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr")} {$activeClass} {$disableClass}' data-step='{$step}'>
	147	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-cntnt")}'>
	148	+ {$iconWrapper}
	149	+ <span class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-titl-wrpr")}'>
	150	+ {$stepLabelMarkup}
	151	+ {$stepSubtitleMarkup}
192	152	</span>
193	153	</div>
194		- </div>',
195		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr"), // 1
196		- $activeClass, // 2
197		- $disableClass, // 3
198		- $step, // 4
199		- $ariaSelected, // 5
200		- $formID, // 6
201		- $tabIndex, // 7
202		- $ariaDisabled, // 8
203		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-cntnt"), // 9
204		- $iconWrapper, // 10
205		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-hdr-titl-wrpr"), // 11
206		- $stepLabelMarkup, // 12
207		- $stepSubtitleMarkup // 13
208		- );
	154	+ </div>
	155	+HEADERHTML;
209	156	}
210		- $stepHeaderHtml .= '
	157	+ $stepHeaderHtml .= <<<HEADERHTML
211	158	</div>
212		- </div>';
	159	+ </div>
	160	+HEADERHTML;
213	161	return $stepHeaderHtml;
214	162	}
215	163
216	164	public function getProgressBarMarkup()
		@@ -221,34 +169,19 @@
221	169	return '';
222	170	}
223	171	$precentage = (isset($progressBarSettings->showPercentage) && $progressBarSettings->showPercentage) ? '0%' : '';
224	172	$formID = $this->getFormId();
225		- $totalSteps = is_array($this->_layout) ? count($this->_layout) : 1;
226		- return sprintf(
227		- '
228		- <div class="%1$s">
229		- <div class="%2$s">
230		- <div
231		- class="%3$s"
232		- role="progressbar"
233		- aria-valuenow="0"
234		- aria-valuemin="0"
235		- aria-valuemax="100"
236		- aria-label="Form completion progress: Step 1 of %4$s"
237		- >
238		- <div class="%5$s" style="width: 0%%;">
239		- %6$s
	173	+ return <<<PROGRESSHTML
	174	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-progress-wrpr")}'>
	175	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-progress")}'>
	176	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-progress-bar")}'>
	177	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-progress-fill")}' style="width: 0%;">
	178	+ {$precentage}
240	179	</div>
241	180	</div>
242	181	</div>
243		- </div>',
244		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-progress-wrpr"),
245		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-progress"),
246		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-progress-bar"),
247		- $totalSteps,
248		- $this->_form->getAtomicCls("_frm-b{$formID}-progress-fill"),
249		- $precentage
250		- );
	182	+ </div>
	183	+ PROGRESSHTML;
251	184	}
252	185
253	186	public function getStepButtonMarkup()
254	187	{
		@@ -257,18 +190,14 @@
257	190	if (is_null($btnSettings) || (empty($btnSettings->show))) {
258	191	return '';
259	192	}
260	193	$formID = $this->getFormId();
261		- return sprintf(
262		- '<div class="%1$s">
263		- <div class="%2$s">
264		- %3$s
265		- %4$s
	194	+ return <<<BUTTONWRPR
	195	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-btn-wrpr")}'>
	196	+ <div class='{$this->_form->getAtomicCls("_frm-b{$formID}-stp-btn-cntnt")}'>
	197	+ {$this->getStepButton($btnSettings->prevBtn)}
	198	+ {$this->getStepButton($btnSettings->nextBtn)}
266	199	</div>
267		- </div>',
268		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-btn-wrpr"),
269		- $this->_form->getAtomicCls("_frm-b{$formID}-stp-btn-cntnt"),
270		- $this->getStepButton($btnSettings->prevBtn),
271		- $this->getStepButton($btnSettings->nextBtn)
272		- );
	200	+ </div>
	201	+BUTTONWRPR;
273	202	}
274	203	}