Skip to content

Commit 497e7db

Browse files
cyrezcyrez
committed
Fix hidden field (no html) + Code Style Review
1 parent e69dd81 commit 497e7db

1 file changed

Lines changed: 44 additions & 42 deletions

File tree

  • administrator/components/com_config/view/component/tmpl

‎administrator/components/com_config/view/component/tmpl/default.php‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,16 @@
3737

3838
<form action="<?php echo JRoute::_('index.php?option=com_config'); ?>" id="component-form" method="post" name="adminForm" autocomplete="off" class="form-validate form-horizontal">
3939
<div class="row-fluid">
40+
4041
<!-- Begin Sidebar -->
41-
<div id="sidebar" class="span2">
42+
<div class="span2" id="sidebar">
4243
<div class="sidebar-nav">
4344
<?php echo $this->loadTemplate('navigation'); ?>
4445
</div>
45-
</div>
46-
<!-- End Sidebar -->
47-
<div class="span10">
46+
</div><!-- End Sidebar -->
47+
48+
<div class="span10" id="config">
49+
4850
<ul class="nav nav-tabs" id="configTabs">
4951
<?php foreach ($this->fieldsets as $name => $fieldSet) : ?>
5052
<?php $rel = ''; ?>
@@ -53,7 +55,7 @@
5355
<?php JHtml::_('script', 'jui/cms.js', false, true); ?>
5456
<?php $showonarr = array(); ?>
5557
<?php foreach (preg_split('%\[AND\]|\[OR\]%', $fieldSet->showon) as $showonfield) : ?>
56-
<?php $showon = explode(':', $showonfield, 2); ?>
58+
<?php $showon = explode(':', $showonfield, 2); ?>
5759
<?php $showonarr[] = array(
5860
'field' => $this->form->getFormControl() . '[' . $showon[0] . ']',
5961
'values' => explode(',', $showon[1]),
@@ -63,55 +65,55 @@
6365
<?php $rel = ' data-showon=\'' . json_encode($showonarr) . '\''; ?>
6466
<?php endif; ?>
6567
<?php $label = empty($fieldSet->label) ? 'COM_CONFIG_' . $name . '_FIELDSET_LABEL' : $fieldSet->label; ?>
66-
<li<?php echo $rel; ?>><a href="#<?php echo $name; ?>" data-toggle="tab"><?php echo JText::_($label); ?></a></li>
68+
<li<?php echo $rel; ?>><a data-toggle="tab" href="#<?php echo $name; ?>"><?php echo JText::_($label); ?></a></li>
6769
<?php endforeach; ?>
68-
</ul>
69-
<div class="tab-content">
70+
</ul><!-- /configTabs -->
71+
72+
<div class="tab-content" id="configContent">
7073
<?php foreach ($this->fieldsets as $name => $fieldSet) : ?>
7174
<div class="tab-pane" id="<?php echo $name; ?>">
72-
<?php
73-
if (isset($fieldSet->description) && !empty($fieldSet->description))
74-
{
75-
echo '<p class="tab-description alert alert-info"><span class="icon-info"></span> ' . JText::_($fieldSet->description) . '</p>';
76-
}
77-
?>
75+
<?php if (isset($fieldSet->description) && !empty($fieldSet->description)) : ?>
76+
<div class="tab-description alert alert-info">
77+
<span class="icon-info"></span> <?php echo JText::_($fieldSet->description); ?>
78+
</div>
79+
<?php endif; ?>
7880
<?php foreach ($this->form->getFieldset($name) as $field) : ?>
79-
<?php
80-
$datashowon = '';
81-
if ($showonstring = $field->getAttribute('showon')) {
82-
JHtml::_('jquery.framework');
83-
JHtml::_('script', 'jui/cms.js', false, true);
84-
$showonarr = array();
85-
86-
foreach (preg_split('%\[AND\]|\[OR\]%', $showonstring) as $showonfield)
87-
{
88-
$showon = explode(':', $showonfield, 2);
89-
$showonarr[] = array(
81+
<?php $datashowon = ''; ?>
82+
<?php if ($showonstring = $field->getAttribute('showon')) : ?>
83+
<?php JHtml::_('jquery.framework'); ?>
84+
<?php JHtml::_('script', 'jui/cms.js', false, true); ?>
85+
<?php $showonarr = array(); ?>
86+
<?php foreach (preg_split('%\[AND\]|\[OR\]%', $showonstring) as $showonfield) : ?>
87+
<?php $showon = explode(':', $showonfield, 2); ?>
88+
<?php $showonarr[] = array(
9089
'field' => $this->form->getFormControl() . '[' . $this->form->getFieldAttribute($showon[0], 'name') . ']',
9190
'values' => explode(',', $showon[1]),
9291
'op' => (preg_match('%\[(AND|OR)\]' . $showonfield . '%', $showonstring, $matches)) ? $matches[1] : ''
93-
);
94-
}
95-
$datashowon = ' data-showon=\'' . json_encode($showonarr) . '\'';
96-
}
97-
?>
98-
<div class="control-group"<?php echo $datashowon; ?>>
99-
<?php if (!$field->hidden && $name != "permissions") : ?>
100-
<div class="control-label">
101-
<?php echo $field->label; ?>
92+
); ?>
93+
<?php endforeach; ?>
94+
<?php $datashowon = ' data-showon=\'' . json_encode($showonarr) . '\''; ?>
95+
<?php endif; ?>
96+
<?php if ($field->hidden) : ?>
97+
<?php echo $field->input; ?>
98+
<?php else : ?>
99+
<div class="control-group"<?php echo $datashowon; ?>>
100+
<?php if ($name != "permissions") : ?>
101+
<div class="control-label">
102+
<?php echo $field->label; ?>
103+
</div>
104+
<?php endif; ?>
105+
<div class="<?php if ($name != "permissions") : ?>controls<?php endif; ?>">
106+
<?php echo $field->input; ?>
102107
</div>
103-
<?php endif; ?>
104-
<div class="<?php if ($name != "permissions") : ?>controls<?php endif; ?>">
105-
<?php echo $field->input; ?>
106108
</div>
107-
</div>
109+
<?php endif; ?>
108110
<?php endforeach; ?>
109111
</div>
110112
<?php endforeach; ?>
111-
</div>
112-
</div>
113-
</div>
114-
<div>
113+
</div><!-- /configContent -->
114+
115+
</div><!-- /config -->
116+
115117
<input type="hidden" name="id" value="<?php echo $this->component->id; ?>" />
116118
<input type="hidden" name="component" value="<?php echo $this->component->option; ?>" />
117119
<input type="hidden" name="return" value="<?php echo $this->return; ?>" />

0 commit comments

Comments
 (0)