Skip to content

Commit

Permalink
Merge pull request #4 from elinw/davidsbranch
Browse files Browse the repository at this point in the history 
Pull from Elin
  • Loading branch information
David Hurley committed Apr 7, 2013
2 parents 5d7554d + 7aca338 commit 47e804e
Show file tree
Hide file tree
Showing 15 changed files with 107 additions and 472 deletions.
52 changes: 27 additions & 25 deletions administrator/components/com_categories/models/forms/category.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,30 +226,32 @@
</fields>

<fields name="metadata">

<field
name="author"
type="text"
label="JAUTHOR"
description="JFIELD_METADATA_AUTHOR_DESC"
size="30"/>

<field name="tags" type="tag"
label="JTAG" description="JTAG_DESC"
class="inputbox" multiple="true"
>
</field>

<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
</field>
<fieldset name="jmetadata"
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<field
name="author"
type="text"
label="JAUTHOR"
description="JFIELD_METADATA_AUTHOR_DESC"
size="30"/>

<field name="tags" type="tag"
label="JTAG" description="JTAG_DESC"
class="inputbox" multiple="true"
>
</field>

<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
</field>
</fieldset>
</fields>
</form>
54 changes: 7 additions & 47 deletions administrator/components/com_categories/views/category/tmpl/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,13 @@
</fieldset>
<?php echo JHtml::_('bootstrap.endPanel'); ?>

<?php echo JHtml::_('bootstrap.addPanel', 'myTab', 'metadata', JText::_('JGLOBAL_FIELDSET_METADATA_OPTIONS', true)); ?>
<fieldset>
<?php $fieldSets = $this->form->getFieldsets('metadata'); ?>
<?php foreach ($fieldSets as $name => $fieldSet) : ?>
<?php $metadatatabs = 'metadata-' . $name; ?>
<?php echo JHtml::_('bootstrap.addPanel', 'myTab', $metadatatabs, JText::_($fieldSet->label, true)); ?>
<?php echo $this->loadTemplate('metadata'); ?>
</fieldset>
<?php echo JHtml::_('bootstrap.endPanel'); ?>
<?php echo JHtml::_('bootstrap.endPanel'); ?>
<?php endforeach; ?>

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

Expand All @@ -167,49 +169,7 @@
</div>
<!-- End Content -->
<!-- Begin Sidebar -->
<div class="span2">
<h4><?php echo JText::_('JDETAILS');?></h4>
<hr />
<fieldset class="form-vertical">
<div class="control-group">
<div class="controls">
<?php echo $this->form->getValue('title'); ?>
</div>
</div>
<div class="control-group">
<?php echo $this->form->getLabel('parent_id'); ?>
<div class="controls">
<?php echo $this->form->getInput('parent_id'); ?>
</div>
</div>
<div class="control-group">
<?php echo $this->form->getLabel('published'); ?>
<div class="controls">
<?php echo $this->form->getInput('published'); ?>
</div>
</div>
<div class="control-group">
<?php echo $this->form->getLabel('access'); ?>
<div class="controls">
<?php echo $this->form->getInput('access'); ?>
</div>
</div>
<div class="control-group">
<?php echo $this->form->getLabel('language'); ?>
<div class="controls">
<?php echo $this->form->getInput('language'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('tags'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('tags'); ?>
</div>
</div>
</fieldset>
</div>
<?php echo JLayoutHelper::render('joomla.edit.details', $this); ?>
<!-- End Sidebar -->
</div>
</form>
30 changes: 2 additions & 28 deletions administrator/components/com_categories/views/category/tmpl/edit_metadata.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,6 @@
*/

defined('_JEXEC') or die;

echo JLayoutHelper::render('joomla.edit.metadata', $this);
?>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('metadesc'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('metadesc'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('metakey'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('metakey'); ?>
</div>
</div>
<?php foreach ($this->form->getGroup('metadata') as $field) : ?>
<div class="control-group">
<div class="control-label">
<?php if (!$field->hidden) : ?>
<?php echo $field->label; ?>
<?php endif; ?>
</div>
<div class="controls">
<?php echo $field->input; ?>
</div>
</div>
<?php endforeach; ?>
46 changes: 22 additions & 24 deletions administrator/components/com_contact/models/forms/contact.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,30 +692,28 @@
<fields name="metadata">
<fieldset name="jmetadata"
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">

<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
</field>

<field name="rights" type="text"
label="JFIELD_METADATA_RIGHTS_LABEL"
description="JFIELD_METADATA_RIGHTS_DESC"
size="20" />
<field name="tags" type="tag"
label="JTAG" description="JTAG_DESC"
class="inputbox" multiple="true"
>
</field>



<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
</field>

<field name="rights" type="text"
label="JFIELD_METADATA_RIGHTS_LABEL"
description="JFIELD_METADATA_RIGHTS_DESC"
size="20" />
<field name="tags" type="tag"
label="JTAG" description="JTAG_DESC"
class="inputbox" multiple="true"
>
</field>
</fieldset>
</fields>
<field name="hits"
Expand Down
53 changes: 1 addition & 52 deletions administrator/components/com_contact/views/contact/tmpl/edit.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,57 +205,6 @@
</div>
<!-- End content -->
<!-- Begin Sidebar -->
<div class="span2">
<h4><?php echo JText::_('JDETAILS');?></h4>
<hr />
<fieldset class="form-vertical">
<div class="control-group">
<div class="control-group">
<div class="controls">
<?php echo $this->form->getValue('name'); ?>
</div>
</div>
<div class="control-label">
<?php echo $this->form->getLabel('published'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('published'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('access'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('access'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('featured'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('featured'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php echo $this->form->getLabel('language'); ?>
</div>
<div class="controls">
<?php echo $this->form->getInput('language'); ?>
</div>
</div>
<div class="control-group">
<div class="control-label">
<?php // echo $this->form->getLabel('tags'); ?>
</div>
<div class="controls">
<?php // echo $this->form->getInput('tags'); ?>
</div>
</div>

</fieldset>
</div>
<?php echo JLayoutHelper::render('joomla.edit.details', $this); ?>
<!-- End Sidebar -->
</form>
34 changes: 2 additions & 32 deletions administrator/components/com_contact/views/contact/tmpl/edit_metadata.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,5 @@

defined('_JEXEC') or die;

$fieldSets = $this->form->getFieldsets('metadata');
foreach ($fieldSets as $name => $fieldSet) :
$metadatatabs = 'metadata-' . $name;
echo JHtml::_('bootstrap.addPanel', 'myTab', $metadatatabs, JText::_($fieldSet->label, true));

if (isset($fieldSet->description) && trim($fieldSet->description)) :
echo '<p class="alert alert-info">'.$this->escape(JText::_($fieldSet->description)).'</p>';
endif;
?>
<?php if ($name == 'jmetadata') : // Include the real fields in this panel.
?>
<div class="control-group">
<div class="control-label"><?php echo $this->form->getLabel('metadesc'); ?></div>
<div class="controls"><?php echo $this->form->getInput('metadesc'); ?></div>
</div>
<div class="control-group">
<div class="control-label"><?php echo $this->form->getLabel('metakey'); ?></div>
<div class="controls"><?php echo $this->form->getInput('metakey'); ?></div>
</div>
<div class="control-group">
<div class="control-label"><?php echo $this->form->getLabel('xreference'); ?></div>
<div class="controls"><?php echo $this->form->getInput('xreference'); ?></div>
</div>
<?php endif; ?>
<?php foreach ($this->form->getFieldset($name) as $field) : ?>
<div class="control-group">
<div class="control-label"><?php echo $field->label; ?></div>
<div class="controls"><?php echo $field->input; ?></div>
</div>
<?php endforeach; ?>
<?php echo JHtml::_('bootstrap.endPanel'); ?>
<?php endforeach; ?>
echo JLayoutHelper::render('joomla.edit.metadata', $this);
?>
66 changes: 35 additions & 31 deletions administrator/components/com_content/models/forms/article.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -794,37 +794,41 @@
</field>

</fields>
<fields name="metadata">
<field name="tags" type="tag"
label="JTAG" description="JTAG_DESC"
class="inputbox span12 small" multiple="true"
>
</field>

<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
labelclass="control-label"
<fields name="metadata">
<fieldset name="jmetadata"
label="JGLOBAL_FIELDSET_METADATA_OPTIONS">
<field name="tags" type="tag"
label="JTAG" description="JTAG_DESC"
class="inputbox span12 small" multiple="true"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
</field>

<field name="author" type="text"
label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"
size="20" labelclass="control-label" />

<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"
description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"
cols="30" rows="2" labelclass="control-label" />
<field name="xreference" type="text"
label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
description="COM_CONTENT_FIELD_XREFERENCE_DESC"
class="inputbox" size="20" labelclass="control-label" />
</fields>
</field>

<field name="robots"
type="list"
label="JFIELD_METADATA_ROBOTS_LABEL"
description="JFIELD_METADATA_ROBOTS_DESC"
labelclass="control-label"
>
<option value="">JGLOBAL_USE_GLOBAL</option>
<option value="index, follow">JGLOBAL_INDEX_FOLLOW</option>
<option value="noindex, follow">JGLOBAL_NOINDEX_FOLLOW</option>
<option value="index, nofollow">JGLOBAL_INDEX_NOFOLLOW</option>
<option value="noindex, nofollow">JGLOBAL_NOINDEX_NOFOLLOW</option>
</field>

<field name="author" type="text"
label="JAUTHOR" description="JFIELD_METADATA_AUTHOR_DESC"
size="20" labelclass="control-label" />

<field name="rights" type="textarea" label="JFIELD_META_RIGHTS_LABEL"
description="JFIELD_META_RIGHTS_DESC" required="false" filter="string"
cols="30" rows="2" labelclass="control-label" />
<field name="xreference" type="text"
label="COM_CONTENT_FIELD_XREFERENCE_LABEL"
description="COM_CONTENT_FIELD_XREFERENCE_DESC"
class="inputbox" size="20" labelclass="control-label" />

</fieldset>
</fields>

</form>
Loading

0 comments on commit 47e804e

Please sign in to comment.