← All changes | admin/views/shortcode/tmpl/default.php +58 -47 1.6.5 → 1.8.16 View file →

		@@ -7,76 +7,84 @@
7	7	$views = $this->views;
8	8
9	9	$vik = VikApplication::getInstance();
10	10
	11	+// load select2
	12	+VikBooking::getVboApplication()->loadSelect2();
	13	+
11	14	?>
12	15
13		-<form action="admin.php" method="post" name="adminForm" id="adminForm">
	16	+<form action="admin.php?option=com_vikbooking" method="post" name="adminForm" id="adminForm">
14	17
15		- <div id="poststuff">
	18	+ <div class="vbo-admin-container">
16	19
17		- <?php echo $vik->openFieldset(JText::translate('JSHORTCODE')); ?>
	20	+ <div class="vbo-config-maintab-left">
18	21
19		- <?php echo $vik->openControl(JText::translate('JNAME').'*', '', array('id' => 'vik-name')); ?>
20		- <input type="text" id="vik-name" name="name" class="required" value="<?php echo $sel['name']; ?>" size="40" />
21		- <?php echo $vik->closeControl(); ?>
	22	+ <?php echo $vik->openFieldset(JText::translate('JSHORTCODE')); ?>
22	23
23		- <?php echo $vik->openControl(JText::translate('JTYPE').'*', '', array('id' => 'vik-type')); ?>
24		- <select name="type" id="vik-type" class="required" onchange="shortcodeTypeValueChanged(this);">
25		- <option data-desc="" value="">--</option>
26		- <?php foreach ($this->views as $k => $v) { ?>
27		- <option data-desc="<?php echo htmlspecialchars(JText::translate($v['desc'])); ?>" value="<?php echo $k; ?>" <?php echo $k == $sel['type'] ? 'selected="selected"' : ''; ?>><?php echo JText::translate($v['name']); ?></option>
28		- <?php } ?>
29		- </select>
30		- <?php echo $vik->closeControl(); ?>
	24	+ <?php echo $vik->openControl(JText::translate('JNAME').'*', '', array('id' => 'vik-name')); ?>
	25	+ <input type="text" id="vik-name" name="name" class="required" value="<?php echo JHtml::fetch('esc_attr', $sel['name']); ?>" size="40" />
	26	+ <?php echo $vik->closeControl(); ?>
31	27
32		- <?php echo $vik->openControl(JText::translate('JLANGUAGE')); ?>
33		- <select name="lang">
34		- <option value="*"><?php echo JText::translate('JALL'); ?></option>
35		- <?php foreach (JLanguage::getKnownLanguages() as $tag => $lang) { ?>
36		- <option value="<?php echo $tag; ?>" <?php echo $tag == $sel['lang'] ? 'selected="selected"' : ''; ?>><?php echo $lang['nativeName']; ?></option>
37		- <?php } ?>
38		- </select>
39		- <?php echo $vik->closeControl(); ?>
	28	+ <?php echo $vik->openControl(JText::translate('JTYPE').'*', '', array('id' => 'vik-type')); ?>
	29	+ <select name="type" id="vik-type" class="required" onchange="shortcodeTypeValueChanged(this);">
	30	+ <option data-desc="" value="">--</option>
	31	+ <?php foreach ($this->views as $k => $v) { ?>
	32	+ <option data-desc="<?php echo htmlspecialchars(JText::translate($v['desc'])); ?>" value="<?php echo JHtml::fetch('esc_attr', $k); ?>" <?php echo $k == $sel['type'] ? 'selected="selected"' : ''; ?>><?php echo JHtml::fetch('esc_html', JText::translate($v['name'])); ?></option>
	33	+ <?php } ?>
	34	+ </select>
	35	+ <?php echo $vik->closeControl(); ?>
40	36
41		- <?php echo $vik->openControl(JText::translate('VBO_SHORTCODE_PARENT_FIELD'), '', array('id' => 'vik-parent')); ?>
42		- <select name="parent_id" id="vik-parent">
43		- <option value="">--</option>
	37	+ <?php echo $vik->openControl(JText::translate('JLANGUAGE')); ?>
	38	+ <select name="lang">
	39	+ <option value="*"><?php echo JText::translate('JALL'); ?></option>
	40	+ <?php foreach (JLanguage::getKnownLanguages() as $tag => $lang) { ?>
	41	+ <option value="<?php echo JHtml::fetch('esc_attr', $tag); ?>" <?php echo $tag == $sel['lang'] ? 'selected="selected"' : ''; ?>><?php echo JHtml::fetch('esc_html', $lang['nativeName']); ?></option>
	42	+ <?php } ?>
	43	+ </select>
	44	+ <?php echo $vik->closeControl(); ?>
44	45
45		- <?php
46		- foreach ($this->shortcodesList as $item)
47		- {
48		- if ($item->id === $sel['id'])
	46	+ <?php echo $vik->openControl(JText::translate('VBO_SHORTCODE_PARENT_FIELD'), '', array('id' => 'vik-parent')); ?>
	47	+ <select name="parent_id" id="vik-parent">
	48	+ <option value="">--</option>
	49	+
	50	+ <?php
	51	+ foreach ($this->shortcodesList as $item)
49	52	{
50		- // exclude self
51		- continue;
	53	+ if ($item->id === $sel['id'])
	54	+ {
	55	+ // exclude self
	56	+ continue;
	57	+ }
	58	+
	59	+ ?>
	60	+ <option value="<?php echo $this->escape($item->id); ?>" <?php echo $item->id == $sel['parent_id'] ? 'selected="selected"' : ''; ?>>
	61	+ <?php echo $item->name; ?>
	62	+ </option>
	63	+ <?php
52	64	}
53		-
54	65	?>
55		- <option value="<?php echo $this->escape($item->id); ?>" <?php echo $item->id == $sel['parent_id'] ? 'selected="selected"' : ''; ?>>
56		- <?php echo $item->name; ?>
57		- </option>
58		- <?php
59		- }
60		- ?>
61		- </select>
62		- <?php echo $vik->closeControl(); ?>
	66	+ </select>
	67	+ <?php echo $vik->closeControl(); ?>
63	68
	69	+ <?php echo $vik->openControl(''); ?>
	70	+ <span id="vik-type-desc"></span>
	71	+ <?php echo $vik->closeControl(); ?>
64	72
65		- <div class="control">
66		- <span id="vik-type-desc"></span>
67		- </div>
	73	+ <?php echo $vik->closeFieldset(); ?>
68	74
69		- <?php echo $vik->closeFieldset(); ?>
	75	+ </div>
70	76
71		- <div class="shortcode-params"></div>
	77	+ <div class="vbo-config-maintab-right shortcode-params"></div>
72	78
73	79	</div>
74	80
	81	+ <?php echo JHtml::fetch('form.token'); ?>
	82	+
75	83	<input type="hidden" name="id" value="<?php echo (int)$sel['id']; ?>" />
76	84	<input type="hidden" name="option" value="com_vikbooking" />
77	85	<input type="hidden" name="task" value="" />
78		- <input type="hidden" name="return" value="<?php echo $this->returnLink; ?>" />
	86	+ <input type="hidden" name="return" value="<?php echo JHtml::fetch('esc_attr', $this->returnLink); ?>" />
79	87
80	88	</form>
81	89
82	90	<script>
		@@ -82,9 +90,9 @@
82	90	<script>
83	91
84	92	var validator = null;
85	93
86		- jQuery(document).ready(function() {
	94	+ jQuery(function() {
87	95
88	96	validator = new JFormValidator('#adminForm');
89	97
90	98	var typeSelect = jQuery('select[name="type"]');
		@@ -114,8 +122,11 @@
114	122
115	123	validator.registerFields('.shortcode-params .required');
116	124
117	125	jQuery('#vik-type-desc').html(jQuery(select).find('option:selected').attr('data-desc'));
	126	+
	127	+ // render select2 on multiple select tags
	128	+ jQuery('.shortcode-params').find('select[multiple]').select2();
118	129
119	130	});
120	131
121	132	}