Skip to content

Commit 47e804e

Browse files
author
David Hurley
committed
Merge pull request #4 from elinw/davidsbranch
Pull from Elin
2 parents 5d7554d + 7aca338 commit 47e804e

File tree

15 files changed

+107
-472
lines changed

15 files changed

+107
-472
lines changed

‎administrator/components/com_categories/models/forms/category.xml‎

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -226,30 +226,32 @@
226226
</fields>
227227

228228
<fields name="metadata">
229-
230-
<field
231-
name="author"
232-
type="text"
233-
label="JAUTHOR"
234-
description="JFIELD_METADATA_AUTHOR_DESC"
235-
size="30"/>
236-
237-
<field name="tags" type="tag"
238-
label="JTAG" description="JTAG_DESC"
239-
class="inputbox" multiple="true"
240-
>
241-
</field>
242-
243-
<field name="robots"
244-
type="list"
245-
label="JFIELD_METADATA_ROBOTS_LABEL"
246-
description="JFIELD_METADATA_ROBOTS_DESC"
247-
>
248-
<option value="">JGLOBAL_USE_GLOBAL</option>
249-
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
250-
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
251-
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
252-
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
253-
</field>
229+
<fieldset name="jmetadata"
230+
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
231+
<field
232+
name="author"
233+
type="text"
234+
label="JAUTHOR"
235+
description="JFIELD_METADATA_AUTHOR_DESC"
236+
size="30"/>
237+
238+
<field name="tags" type="tag"
239+
label="JTAG" description="JTAG_DESC"
240+
class="inputbox" multiple="true"
241+
>
242+
</field>
243+
244+
<field name="robots"
245+
type="list"
246+
label="JFIELD_METADATA_ROBOTS_LABEL"
247+
description="JFIELD_METADATA_ROBOTS_DESC"
248+
>
249+
<option value="">JGLOBAL_USE_GLOBAL</option>
250+
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
251+
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
252+
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
253+
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
254+
</field>
255+
</fieldset>
254256
</fields>
255257
</form>

‎administrator/components/com_categories/views/category/tmpl/edit.php‎

Lines changed: 7 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -136,11 +136,13 @@
136136
</fieldset>
137137
<?php echo JHtml::_('bootstrap.endPanel'); ?>
138138

139-
<?php echo JHtml::_('bootstrap.addPanel', 'myTab', 'metadata', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS', true)); ?>
140-
<fieldset>
139+
<?php $fieldSets = $this->form->getFieldsets('metadata'); ?>
140+
<?php foreach ($fieldSets as $name => $fieldSet) : ?>
141+
<?php $metadatatabs = 'metadata-' . $name; ?>
142+
<?php echo JHtml::_('bootstrap.addPanel', 'myTab', $metadatatabs, JText::_($fieldSet->label, true)); ?>
141143
<?php echo $this->loadTemplate('metadata'); ?>
142-
</fieldset>
143-
<?php echo JHtml::_('bootstrap.endPanel'); ?>
144+
<?php echo JHtml::_('bootstrap.endPanel'); ?>
145+
<?php endforeach; ?>
144146

145147
<?php echo $this->loadTemplate('extrafields'); ?>
146148

@@ -167,49 +169,7 @@
167169
</div>
168170
<!-- End Content -->
169171
<!-- Begin Sidebar -->
170-
<div class="span2">
171-
<h4><?php echo JText::_('JDETAILS');?></h4>
172-
<hr />
173-
<fieldset class="form-vertical">
174-
<div class="control-group">
175-
<div class="controls">
176-
<?php echo $this->form->getValue('title'); ?>
177-
</div>
178-
</div>
179-
<div class="control-group">
180-
<?php echo $this->form->getLabel('parent_id'); ?>
181-
<div class="controls">
182-
<?php echo $this->form->getInput('parent_id'); ?>
183-
</div>
184-
</div>
185-
<div class="control-group">
186-
<?php echo $this->form->getLabel('published'); ?>
187-
<div class="controls">
188-
<?php echo $this->form->getInput('published'); ?>
189-
</div>
190-
</div>
191-
<div class="control-group">
192-
<?php echo $this->form->getLabel('access'); ?>
193-
<div class="controls">
194-
<?php echo $this->form->getInput('access'); ?>
195-
</div>
196-
</div>
197-
<div class="control-group">
198-
<?php echo $this->form->getLabel('language'); ?>
199-
<div class="controls">
200-
<?php echo $this->form->getInput('language'); ?>
201-
</div>
202-
</div>
203-
<div class="control-group">
204-
<div class="control-label">
205-
<?php echo $this->form->getLabel('tags'); ?>
206-
</div>
207-
<div class="controls">
208-
<?php echo $this->form->getInput('tags'); ?>
209-
</div>
210-
</div>
211-
</fieldset>
212-
</div>
172+
<?php echo JLayoutHelper::render('joomla.edit.details', $this); ?>
213173
<!-- End Sidebar -->
214174
</div>
215175
</form>

‎administrator/components/com_categories/views/category/tmpl/edit_metadata.php‎

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,32 +8,6 @@
88
*/
99

1010
defined('_JEXEC') or die;
11+
12+
echo JLayoutHelper::render('joomla.edit.metadata', $this);
1113
?>
12-
<div class="control-group">
13-
<div class="control-label">
14-
<?php echo $this->form->getLabel('metadesc'); ?>
15-
</div>
16-
<div class="controls">
17-
<?php echo $this->form->getInput('metadesc'); ?>
18-
</div>
19-
</div>
20-
<div class="control-group">
21-
<div class="control-label">
22-
<?php echo $this->form->getLabel('metakey'); ?>
23-
</div>
24-
<div class="controls">
25-
<?php echo $this->form->getInput('metakey'); ?>
26-
</div>
27-
</div>
28-
<?php foreach ($this->form->getGroup('metadata') as $field) : ?>
29-
<div class="control-group">
30-
<div class="control-label">
31-
<?php if (!$field->hidden) : ?>
32-
<?php echo $field->label; ?>
33-
<?php endif; ?>
34-
</div>
35-
<div class="controls">
36-
<?php echo $field->input; ?>
37-
</div>
38-
</div>
39-
<?php endforeach; ?>

‎administrator/components/com_contact/models/forms/contact.xml‎

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -692,30 +692,28 @@
692692
<fields name="metadata">
693693
<fieldset name="jmetadata"
694694
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
695-
696-
<field name="robots"
697-
type="list"
698-
label="JFIELD_METADATA_ROBOTS_LABEL"
699-
description="JFIELD_METADATA_ROBOTS_DESC"
700-
>
701-
<option value="">JGLOBAL_USE_GLOBAL</option>
702-
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
703-
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
704-
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
705-
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
706-
</field>
707-
708-
<field name="rights" type="text"
709-
label="JFIELD_METADATA_RIGHTS_LABEL"
710-
description="JFIELD_METADATA_RIGHTS_DESC"
711-
size="20" />
712-
<field name="tags" type="tag"
713-
label="JTAG" description="JTAG_DESC"
714-
class="inputbox" multiple="true"
715-
>
716-
</field>
717-
718-
695+
696+
<field name="robots"
697+
type="list"
698+
label="JFIELD_METADATA_ROBOTS_LABEL"
699+
description="JFIELD_METADATA_ROBOTS_DESC"
700+
>
701+
<option value="">JGLOBAL_USE_GLOBAL</option>
702+
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
703+
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
704+
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
705+
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
706+
</field>
707+
708+
<field name="rights" type="text"
709+
label="JFIELD_METADATA_RIGHTS_LABEL"
710+
description="JFIELD_METADATA_RIGHTS_DESC"
711+
size="20" />
712+
<field name="tags" type="tag"
713+
label="JTAG" description="JTAG_DESC"
714+
class="inputbox" multiple="true"
715+
>
716+
</field>
719717
</fieldset>
720718
</fields>
721719
<field name="hits"

‎administrator/components/com_contact/views/contact/tmpl/edit.php‎

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -205,57 +205,6 @@
205205
</div>
206206
<!-- End content -->
207207
<!-- Begin Sidebar -->
208-
<div class="span2">
209-
<h4><?php echo JText::_('JDETAILS');?></h4>
210-
<hr />
211-
<fieldset class="form-vertical">
212-
<div class="control-group">
213-
<div class="control-group">
214-
<div class="controls">
215-
<?php echo $this->form->getValue('name'); ?>
216-
</div>
217-
</div>
218-
<div class="control-label">
219-
<?php echo $this->form->getLabel('published'); ?>
220-
</div>
221-
<div class="controls">
222-
<?php echo $this->form->getInput('published'); ?>
223-
</div>
224-
</div>
225-
<div class="control-group">
226-
<div class="control-label">
227-
<?php echo $this->form->getLabel('access'); ?>
228-
</div>
229-
<div class="controls">
230-
<?php echo $this->form->getInput('access'); ?>
231-
</div>
232-
</div>
233-
<div class="control-group">
234-
<div class="control-label">
235-
<?php echo $this->form->getLabel('featured'); ?>
236-
</div>
237-
<div class="controls">
238-
<?php echo $this->form->getInput('featured'); ?>
239-
</div>
240-
</div>
241-
<div class="control-group">
242-
<div class="control-label">
243-
<?php echo $this->form->getLabel('language'); ?>
244-
</div>
245-
<div class="controls">
246-
<?php echo $this->form->getInput('language'); ?>
247-
</div>
248-
</div>
249-
<div class="control-group">
250-
<div class="control-label">
251-
<?php // echo $this->form->getLabel('tags'); ?>
252-
</div>
253-
<div class="controls">
254-
<?php // echo $this->form->getInput('tags'); ?>
255-
</div>
256-
</div>
257-
258-
</fieldset>
259-
</div>
208+
<?php echo JLayoutHelper::render('joomla.edit.details', $this); ?>
260209
<!-- End Sidebar -->
261210
</form>

‎administrator/components/com_contact/views/contact/tmpl/edit_metadata.php‎

Lines changed: 2 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -9,35 +9,5 @@
99

1010
defined('_JEXEC') or die;
1111

12-
$fieldSets = $this->form->getFieldsets('metadata');
13-
foreach ($fieldSets as $name => $fieldSet) :
14-
$metadatatabs = 'metadata-' . $name;
15-
echo JHtml::_('bootstrap.addPanel', 'myTab', $metadatatabs, JText::_($fieldSet->label, true));
16-
17-
if (isset($fieldSet->description) && trim($fieldSet->description)) :
18-
echo '<p class="alert alert-info">'.$this->escape(JText::_($fieldSet->description)).'</p>';
19-
endif;
20-
?>
21-
<?php if ($name == 'jmetadata') : // Include the real fields in this panel.
22-
?>
23-
<div class="control-group">
24-
<div class="control-label"><?php echo $this->form->getLabel('metadesc'); ?></div>
25-
<div class="controls"><?php echo $this->form->getInput('metadesc'); ?></div>
26-
</div>
27-
<div class="control-group">
28-
<div class="control-label"><?php echo $this->form->getLabel('metakey'); ?></div>
29-
<div class="controls"><?php echo $this->form->getInput('metakey'); ?></div>
30-
</div>
31-
<div class="control-group">
32-
<div class="control-label"><?php echo $this->form->getLabel('xreference'); ?></div>
33-
<div class="controls"><?php echo $this->form->getInput('xreference'); ?></div>
34-
</div>
35-
<?php endif; ?>
36-
<?php foreach ($this->form->getFieldset($name) as $field) : ?>
37-
<div class="control-group">
38-
<div class="control-label"><?php echo $field->label; ?></div>
39-
<div class="controls"><?php echo $field->input; ?></div>
40-
</div>
41-
<?php endforeach; ?>
42-
<?php echo JHtml::_('bootstrap.endPanel'); ?>
43-
<?php endforeach; ?>
12+
echo JLayoutHelper::render('joomla.edit.metadata', $this);
13+
?>

‎administrator/components/com_content/models/forms/article.xml‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -794,37 +794,41 @@
794794
</field>
795795

796796
</fields>
797-
<fields name="metadata">
798-
<field name="tags" type="tag"
799-
label="JTAG" description="JTAG_DESC"
800-
class="inputbox span12 small" multiple="true"
801-
>
802-
</field>
803-
804-
<field name="robots"
805-
type="list"
806-
label="JFIELD_METADATA_ROBOTS_LABEL"
807-
description="JFIELD_METADATA_ROBOTS_DESC"
808-
labelclass="control-label"
797+
<fields name="metadata">
798+
<fieldset name="jmetadata"
799+
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
800+
<field name="tags" type="tag"
801+
label="JTAG" description="JTAG_DESC"
802+
class="inputbox span12 small" multiple="true"
809803
>
810-
<option value="">JGLOBAL_USE_GLOBAL</option>
811-
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
812-
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
813-
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
814-
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
815-
</field>
816-
817-
<field name="author" type="text"
818-
label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"
819-
size="20" labelclass="control-label" />
820-
821-
<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"
822-
description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"
823-
cols="30" rows="2" labelclass="control-label" />
824-
<field name="xreference" type="text"
825-
label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
826-
description="COM_CONTENT_FIELD_XREFERENCE_DESC"
827-
class="inputbox" size="20" labelclass="control-label" />
828-
</fields>
804+
</field>
805+
806+
<field name="robots"
807+
type="list"
808+
label="JFIELD_METADATA_ROBOTS_LABEL"
809+
description="JFIELD_METADATA_ROBOTS_DESC"
810+
labelclass="control-label"
811+
>
812+
<option value="">JGLOBAL_USE_GLOBAL</option>
813+
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
814+
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
815+
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
816+
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
817+
</field>
818+
819+
<field name="author" type="text"
820+
label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"
821+
size="20" labelclass="control-label" />
822+
823+
<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"
824+
description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"
825+
cols="30" rows="2" labelclass="control-label" />
826+
<field name="xreference" type="text"
827+
label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
828+
description="COM_CONTENT_FIELD_XREFERENCE_DESC"
829+
class="inputbox" size="20" labelclass="control-label" />
830+
831+
</fieldset>
832+
</fields>
829833

830834
</form>

0 commit comments

Comments
 (0)