joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-28 16:13:42 +00:00
Code Packages Releases Activity

Changed most of the calls to JHtmlSelect::genericlist to use the new argument order

Browse Source 
git-svn-id: http://joomlacode.org/svn/joomla/development/trunk@11773 6f6e1ebd-4c2b-0410-823f-f34bde69bce9
This commit is contained in:
Ercan Ozkaya 2009-04-16 18:25:39 +00:00
parent 3bbcb6545e
commit 3b28b3556f
25 changed files with 182 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
administrator/components/com_contact/elements/contact.php
View File

@ -37,6 +37,14 @@ class JElementContact extends JElement
$db->setQuery($query);
$options = $db->loadObjectList();
return JHtml::_('select.genericlist', $options, ''.$control_name.'['.$name.']', 'class="inputbox"', 'id', 'text', $value, $control_name.$name);
return JHtml::_('select.genericlist', $options, $control_name.'['.$name.']',
array(
'id' => $control_name.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value,
'option.key' => 'id',
'option.text' => 'text'
)
);
}
}

10
administrator/components/com_content/helpers/html/contentgrid.php
View File

@ -30,7 +30,15 @@ class JHtmlContentGrid
$authors[] = JHtml::_('select.option', '0', '- '.JText::_('Select Author').' -', 'created_by', 'name');
$db->setQuery($query);
$authors = array_merge($authors, $db->loadObjectList());
return JHtml::_('select.genericlist', $authors, $name, 'class="inputbox" size="1" onchange="document.adminForm.submit();"', 'created_by', 'name', $filter_authorid);
return JHtml::_('select.genericlist', $authors, $name,
array(
'list.attr' => 'class="inputbox" size="1" onchange="document.adminForm.submit();"',
'list.select' => $filter_authorid,
'option.key' => 'created_by',
'option.text' => 'name'
)
);
}
function category($name, $filter_catid)

7
administrator/components/com_installer/views/modules/view.php
View File

@ -46,7 +46,12 @@ class InstallerViewModules extends InstallerViewDefault
$select[] = JHtml::_('select.option', '-1', JText::_('All'));
$select[] = JHtml::_('select.option', '0', JText::_('Site Modules'));
$select[] = JHtml::_('select.option', '1', JText::_('Admin Modules'));
$lists->client = JHtml::_('select.genericlist', $select, 'client', 'class="inputbox" size="1" onchange="document.adminForm.submit();"', 'value', 'text', $state->get('filter.client'));
$lists->client = JHtml::_('select.genericlist', $select, 'client',
array(
'list.attr' => 'class="inputbox" size="1" onchange="document.adminForm.submit();"',
'list.select' => $state->get('filter.client')
)
);
$this->assignRef('items', $items);
$this->assignRef('pagination', $pagination);

7
administrator/components/com_installer/views/plugins/view.php
View File

@ -42,7 +42,12 @@ class InstallerViewPlugins extends InstallerViewDefault
$groups = &$this->get('Groups');
$fields = new stdClass();
$fields->groups = JHtml::_('select.genericlist', $groups, 'group', 'class="inputbox" size="1" onchange="document.adminForm.submit( );"', 'value', 'text', $state->get('filter.group') );
$fields->groups = JHtml::_('select.genericlist', $groups, 'group',
array(
'list.attr' => 'class="inputbox" size="1" onchange="document.adminForm.submit();"',
'list.select' => $state->get('filter.group')
)
);
$this->assignRef('items', $items);
$this->assignRef('pagination', $pagination);

7
administrator/components/com_installer/views/templates/view.php
View File

@ -43,7 +43,12 @@ class InstallerViewTemplates extends InstallerViewDefault
$select[] = JHtml::_('select.option', '-1', JText::_('All'));
$select[] = JHtml::_('select.option', '0', JText::_('Site Templates'));
$select[] = JHtml::_('select.option', '1', JText::_('Admin Templates'));
$lists->client = JHtml::_('select.genericlist', $select, 'client', 'class="inputbox" size="1" onchange="document.adminForm.submit();"', 'value', 'text', $state->get('filter.client'));
$lists->client = JHtml::_('select.genericlist', $select, 'client',
array(
'list.attr' => 'class="inputbox" size="1" onchange="document.adminForm.submit();"',
'list.select' => $state->get('filter.client')
)
);
$this->assignRef('items', $items);
$this->assignRef('pagination', $pagination);

7
administrator/components/com_members/helpers/html/acladmin.php
View File

@ -132,7 +132,12 @@ class JHtmlAclAdmin
$options[$i]->text = sprintf('%s (%d)', $option->text, $option->rule_count);
}
}
return JHTML::_('select.genericlist', $options, $name, $attribs, 'value', 'text', $selected);
return JHTML::_('select.genericlist', $options, $name,
array(
'list.attr' => $attribs,
'list.select' => $selected
)
);
}
/**

7
administrator/components/com_members/helpers/html/members.php
View File

@ -41,7 +41,12 @@ class JHTMLMembers
array_unshift($options, JHtml::_('select.option', 0, 'Select Group'));
return JHtml::_('select.genericlist', $options, $name, 'class="inputbox" '.$attribs, 'value', 'text', $selected, $name);
return JHtml::_('select.genericlist', $options, $name,
array(
'list.attr' => 'class="inputbox" '.$attribs,
'list.select' => $selected
)
);
}
public static function addLevel($section = null)

2
administrator/components/com_modules/views/module/tmpl/default.php
View File

@ -116,7 +116,7 @@ foreach ($this->orders2 as $k=>$items) {
<td>
<?php
if ($this->row->client_id == 0) :
echo JHtml::_('acl.assetgroups', $this->row->access);
echo JHtml::_('access.assetgroups', 'access', $this->row->access);
else :
echo JText::_('N/A');
endif;

2
administrator/components/com_templates/helpers/template.php
View File

@ -114,8 +114,8 @@ class TemplatesHelper
$options,
'selections[]',
array(
'id' => 'selections',
'list.attr' => 'class="inputbox" size="15" multiple="multiple"',
'list.id' =>'selections',
'list.select' => $lookup,
)
);

10
administrator/components/com_weblinks/elements/snapshotsource.php
View File

@ -27,6 +27,14 @@ class JElementSnapshotSource extends JElement
JModel::addIncludePath(JPATH_ADMINISTRATOR.DS.'components'.DS.'com_weblinks'.DS.'models');
$model =& JModel::getInstance('snapshotsources','WeblinksModel');
$sites = $model->getData();
return JHtml::_('select.genericlist', $sites, ''.$control_name.'['.$name.']', 'class="inputbox"', 'name', 'name', $value, $control_name.$name);
return JHtml::_('select.genericlist', $sites, $control_name.'['.$name.']',
array(
'id' => $control_name.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value,
'option.key' => 'name',
'option.text' => 'name'
)
);
}
}

7
administrator/components/com_weblinks/helpers/html/weblink.php
View File

@ -52,6 +52,11 @@ class JHtmlWeblink
$options[] = JHtml::_('select.option', '-1', JText::_('Weblinks_Reported'));
$options[] = JHtml::_('select.option', '-2', JText::_('JState_Trashed'));
return JHTML::_('select.genericlist', $options, 'filter_state', 'class="inputbox" onchange="this.form.submit();"', 'value', 'text', $selected);
return JHTML::_('select.genericlist', $options, 'filter_state',
array(
'list.attr' => 'class="inputbox" onchange="this.form.submit();"',
'list.select' => $selected
)
);
}
}

18
components/com_content/views/article/view.html.php
View File

@ -292,7 +292,14 @@ class ContentViewArticle extends ContentView
$sections[] = JHtml::_('select.option', '-1', '- '.JText::_('Select Section').' -', 'id', 'title');
$sections[] = JHtml::_('select.option', '0', JText::_('Uncategorized'), 'id', 'title');
$sections = array_merge($sections, $db->loadObjectList());
$lists['sectionid'] = JHtml::_('select.genericlist', $sections, 'sectionid', 'class="inputbox" size="1" '.$javascript, 'id', 'title', intval($article->sectionid));
$lists['sectionid'] = JHtml::_('select.genericlist', $sections, 'sectionid',
array(
'list.attr' => 'class="inputbox" size="1" '.$javascript,
'list.select' => (int) $article->sectionid,
'option.key' => 'id',
'option.text' => 'title'
)
);
foreach ($sections as $section)
{
@ -350,7 +357,14 @@ class ContentViewArticle extends ContentView
$categories[] = JHtml::_('select.option', '-1', JText::_( 'Select Category' ), 'id', 'title');
$lists['sectioncategories'] = $sectioncategories;
$lists['catid'] = JHtml::_('select.genericlist', $categories, 'catid', 'class="inputbox" size="1"', 'id', 'title', intval($article->catid));
$lists['catid'] = JHtml::_('select.genericlist', $categories, 'catid',
array(
'list.attr' => 'class="inputbox" size="1"',
'list.select' => (int) $article->catid,
'option.key' => 'id',
'option.text' => 'title'
)
);
// Select List: Category Ordering
$query = 'SELECT ordering AS value, title AS text FROM #__content WHERE catid = '.(int) $article->catid.' ORDER BY ordering';

16
libraries/joomla/html/html/access.php
View File

@ -49,7 +49,12 @@ abstract class JHtmlAccess
array_unshift($options, JHtml::_('select.option', '', JText::_('JOption_Access_Show_All_Sections')));
}
return JHTML::_('select.genericlist', $options, $name, $attribs, 'value', 'text', $selected);
return JHtml::_('select.genericlist', $options, $name,
array(
'list.attr' => $attribs,
'list.select' => $selected
)
);
}
/**
@ -89,7 +94,12 @@ abstract class JHtmlAccess
array_unshift($options, JHtml::_('select.option', '', JText::_('JOption_Access_Show_All_Groups')));
}
return JHTML::_('select.genericlist', $options, $name, $attribs, 'value', 'text', $selected);
return JHtml::_('select.genericlist', $options, $name,
array(
'list.attr' => $attribs,
'list.select' => $selected
)
);
}
/**
@ -238,7 +248,7 @@ abstract class JHtmlAccess
$cache,
$name,
array(
'list.id' => 'assetgroups_'.$count,
'id' => 'assetgroups_'.$count,
'list.attr' => (is_null($attribs) ? 'class="inputbox" size="3"' : $attribs),
'list.select' => (int) $selected,
'list.translate' => true

10
libraries/joomla/html/html/list.php
View File

@ -297,8 +297,14 @@ abstract class JHtmlList
{
$categories[] = JHtml::_('select.option', $category->id, str_repeat('-', $category->depth).$category->title, 'id', 'title');
}
$category = JHtml::_('select.genericlist', $categories, $name, 'class="inputbox" size="'. $size .'" '. $javascript, 'id', 'title', $active);
$category = JHtml::_('select.genericlist', $categories, $name,
array(
'list.attr' => 'class="inputbox" size="'. $size .'" '. $javascript,
'list.select' => $active,
'option.key' => 'id',
'option.text' => 'title'
)
);
return $category;
}
}

8
libraries/joomla/html/parameter/element/editors.php
View File

@ -55,6 +55,12 @@ class JElementEditors extends JElement
array_unshift($editors, JHtml::_('select.option', '', '- '. JText::_('Select Editor') .' -'));
return JHtml::_('select.genericlist', $editors, ''. $control_name .'['. $name .']', 'class="inputbox"', 'value', 'text', $value, $control_name.$name);
return JHtml::_('select.genericlist', $editors, $control_name .'['. $name .']',
array(
'id' => $control_name.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value
)
);
}
}

8
libraries/joomla/html/parameter/element/filelist.php
View File

@ -71,6 +71,12 @@ class JElementFilelist extends JElement
}
}
return JHtml::_('select.genericlist', $options, ''.$control_name.'['.$name.']', 'class="inputbox"', 'value', 'text', $value, "param$name");
return JHtml::_('select.genericlist', $options, $control_name .'['. $name .']',
array(
'id' => 'param'.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value
)
);
}
}

8
libraries/joomla/html/parameter/element/folderlist.php
View File

@ -58,6 +58,12 @@ class JElementFolderlist extends JElement
array_unshift($options, JHtml::_('select.option', '', '- '.JText::_('Use default').' -'));
}
return JHtml::_('select.genericlist', $options, ''.$control_name.'['.$name.']', 'class="inputbox"', 'value', 'text', $value, "param$name");
return JHtml::_('select.genericlist', $options, $control_name .'['. $name .']',
array(
'id' => 'param'.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value
)
);
}
}

8
libraries/joomla/html/parameter/element/helpsites.php
View File

@ -35,6 +35,12 @@ class JElementHelpsites extends JElement
$helpsites = JHelp::createSiteList(JPATH_ADMINISTRATOR.DS.'help'.DS.'helpsites-15.xml', $value);
array_unshift($helpsites, JHtml::_('select.option', '', JText::_('local')));
return JHtml::_('select.genericlist', $helpsites, ''.$control_name.'['.$name.']', ' class="inputbox"', 'value', 'text', $value, $control_name.$name);
return JHtml::_('select.genericlist', $helpsites, $control_name .'['. $name .']',
array(
'id' => $control_name.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value
)
);
}
}

8
libraries/joomla/html/parameter/element/languages.php
View File

@ -46,6 +46,12 @@ class JElementLanguages extends JElement
$languages = JLanguageHelper::createLanguageList($value, constant('JPATH_'.strtoupper($client)), true);
array_unshift($languages, JHtml::_('select.option', '', '- '.JText::_('Select Language').' -'));
return JHtml::_('select.genericlist', $languages, ''.$control_name.'['.$name.']', 'class="inputbox"', 'value', 'text', $value, $control_name.$name);
return JHtml::_('select.genericlist', $languages, $control_name .'['. $name .']',
array(
'id' => $control_name.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value
)
);
}
}

8
libraries/joomla/html/parameter/element/list.php
View File

@ -51,6 +51,12 @@ class JElementList extends JElement
{
$attribs = ($node->attributes('class') ? 'class="'.$node->attributes('class').'"' : 'class="inputbox"');
return JHtml::_('select.genericlist', $this->_getOptions($node), ''.$control_name.'['.$name.']', $attribs, 'value', 'text', $value, $control_name.$name);
return JHtml::_('select.genericlist', $this->_getOptions($node), $control_name .'['. $name .']',
array(
'id' => $control_name.$name,
'list.attr' => $attribs,
'list.select' => $value
)
);
}
}

8
libraries/joomla/html/parameter/element/menu.php
View File

@ -39,6 +39,12 @@ class JElementMenu extends JElement
}
array_unshift($options, JHtml::_('select.option', '', '- '.JText::_('Select Menu').' -'));
return JHtml::_('select.genericlist', $options, ''.$control_name.'['.$name.']', 'class="inputbox"', 'value', 'text', $value, $control_name.$name);
return JHtml::_('select.genericlist', $options, $control_name.'['.$name.']',
array(
'id' => $control_name.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value
)
);
}
}

8
libraries/joomla/html/parameter/element/menuitem.php
View File

@ -120,6 +120,12 @@ class JElementMenuItem extends JElement
}
}
return JHtml::_('select.genericlist', $options, ''.$control_name.'['.$name.']', 'class="inputbox"', 'value', 'text', $value, $control_name.$name);
return JHtml::_('select.genericlist', $options, $control_name.'['.$name.']',
array(
'id' => $control_name.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value
)
);
}
}

11
libraries/joomla/html/parameter/element/sql.php
View File

@ -39,6 +39,15 @@ class JElementSQL extends JElement
} catch(JException $e) {
$options = array();
}
return JHtml::_('select.genericlist', $options, ''.$control_name.'['.$name.']', 'class="inputbox"', $key, $val, $value, $control_name.$name);
return JHtml::_('select.genericlist', $options, $control_name.'['.$name.']',
array(
'id' => $control_name.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value,
'option.key' => $key,
'option.text' => $val
)
);
}
}

8
libraries/joomla/html/parameter/element/timezones.php
View File

@ -78,6 +78,12 @@ class JElementTimezones extends JElement
JHtml::_('select.option', 13, JText::_('(UTC +13:00) Tonga')),
JHtml::_('select.option', 14, JText::_('(UTC +14:00) Kiribati')),);
return JHtml::_('select.genericlist', $timezones, ''.$control_name.'['.$name.']', ' class="inputbox"', 'value', 'text', $value, $control_name.$name);
return JHtml::_('select.genericlist', $timezones, $control_name.'['.$name.']',
array(
'id' => $control_name.$name,
'list.attr' => 'class="inputbox"',
'list.select' => $value
)
);
}
}

8
libraries/joomla/html/parameter/element/usergroup.php
View File

@ -51,6 +51,12 @@ class JElementUserGroup extends JElement
}
//array_unshift($editors, JHtml::_('select.option', '', '- '. JText::_('Select Editor') .' -'));
return JHtml::_('select.genericlist', $gtree, $ctrl, $attribs, 'value', 'text', $value, $control_name.$name);
return JHtml::_('select.genericlist', $gtree, $ctr,
array(
'id' => $control_name.$name,
'list.attr' => $attribs,
'list.select' => $value
)
);
}
}