Skip to content

Commit

Permalink
Revert "Issue #112961 chore: Merge upstream/master"
Browse files Browse the repository at this point in the history 
This reverts commit dd5c93d
  • Loading branch information
@manojLondhe
manojLondhe committed Nov 8, 2017
1 parent dd5c93d commit 23c73d6
Show file tree
Hide file tree
Showing 19 changed files with 411 additions and 466 deletions.
195 changes: 109 additions & 86 deletions administrator/config.xml
View file
Original file line number Diff line number Diff line change
@@ -1,86 +1,109 @@
<?xml version="1.0" encoding="utf-8"?>
<config>
<fieldset name="component" label="COM_TJFIELDS_COMPONENT_LABEL" description="COM_TJFIELDS_COMPONENT_DESC">
<field name="test" type="radio" default="1" label="COM_TJFIELDS_TEST_LABEL" description="COM_TJFIELDS_TEST_DESC">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>
</fieldset>
<fieldset name="permissions" description="JCONFIG_PERMISSIONS_DESC" label="JCONFIG_PERMISSIONS_LABEL">
<field name="rules" type="rules" component="com_tjfields" class="inputbox" filter="rules" validate="rules" label="JCONFIG_PERMISSIONS_LABEL" section="component" />
</fieldset>
</config>
<!--
########################################################################################
The following are a list of all the different types of fields you can add to this file
They are here for copy pasting - neat eh?
########################################################################################
http://docs.joomla.org/Calendar_parameter_type
<field name="mycalendar" type="calendar" default="5-10-2008" label="Select a date" description="" format="%d-%m-%Y" />
http://docs.joomla.org/Category_parameter_type
<field name="mycategory" type="category" label="Select a category" description="" section="3" />
http://docs.joomla.org/Editors_parameter_type
<field name="myeditor" type="editors" default="none" label="Select an editor" />
http://docs.joomla.org/Filelist_parameter_type
<field name="myfile" type="filelist" default="" label="Select a file" description="" directory="administrator" filter="" exclude="" stripext="" />
http://docs.joomla.org/Folderlist_parameter_type
<field name="myfolder" type="folderlist" default="" label="Select a folder" directory="administrator" filter="" exclude="" stripext="" />
http://docs.joomla.org/Helpsites_parameter_type
<field name="myhelpsite" type="helpsites" default="" label="Select a help site" description="" />
http://docs.joomla.org/Hidden_parameter_type
<field name="mysecretvariable" type="hidden" default="" />
http://docs.joomla.org/Imagelist_parameter_type
<field name="myimage" type="imagelist" default="" label="Select an image" description="" directory="" exclude="" stripext="" />
http://docs.joomla.org/Languages_parameter_type
<field name="mylanguage" type="languages" client="site" default="en-GB" label="Select a language" description="" />
http://docs.joomla.org/List_parameter_type
<field name="mylistvalue" type="list" default="" label="Select an option" description="">
<option value="0">Option 1</option>
<option value="1">Option 2</option>
</field>
http://docs.joomla.org/Menu_parameter_type
<field name="mymenu" type="menu" default="mainmenu" label="Select a menu" description="Select a menu" />
http://docs.joomla.org/Menuitem_parameter_type
<field name="mymenuitem" type="menuitem" default="45" label="Select a menu item" description="Select a menu item" />
http://docs.joomla.org/Password_parameter_type
<field name="mypassword" type="password" default="secret" label="Enter a password" description="" size="5" />
http://docs.joomla.org/Radio_parameter_type
<field name="myradiovalue" type="radio" default="0" label="Select an option" description="">
<option value="0">1</option>
<option value="1">2</option>
</field>
http://docs.joomla.org/Spacer_parameter_type
<field type="spacer" default="&lt;b&gt;Advanced parameters&lt;/b&gt;" />
http://docs.joomla.org/Sql_parameter_type
<field name="myfield" type="sql" default="10" label="Select an article" query="SELECT id, title FROM #__content" key_field=”id” value_field=”title” />
http://docs.joomla.org/Text_parameter_type
<field name="mytextvalue" type="text" default="Some text" label="Enter some text" description="" size="10" />
http://docs.joomla.org/Textarea_parameter_type
<field name="mytextarea" type="textarea" default="default" label="Enter some text" description="" rows="10" cols="5" />
http://docs.joomla.org/Timezones_parameter_type
<field name="mytimezone" type="timezones" default="-10" label="Select a timezone" description="" />
http://docs.joomla.org/Usergroup_parameter_type
<field name="myusergroups" type="usergroup" default="" label="Select a user group" description="" />
-->
<?xml version="1.0" encoding="utf-8"?>
<config>
<fieldset name="component"
label="COM_TJFIELDS_COMPONENT_LABEL"
description="COM_TJFIELDS_COMPONENT_DESC"
>

<field name="test"
type="radio"
default="1"
label="COM_TJFIELDS_TEST_LABEL"
description="COM_TJFIELDS_TEST_DESC">
<option value="0">JHIDE</option>
<option value="1">JSHOW</option>
</field>

</fieldset>

<fieldset name="permissions"
description="JCONFIG_PERMISSIONS_DESC"
label="JCONFIG_PERMISSIONS_LABEL"
>

<field
name="rules"
type="rules"
component="com_tjfields"
class="inputbox"
filter="rules"
validate="rules"
label="JCONFIG_PERMISSIONS_LABEL"
section="component" />
</fieldset>

</config>
<!--
########################################################################################
The following are a list of all the different types of fields you can add to this file
They are here for copy pasting - neat eh?
########################################################################################
http://docs.joomla.org/Calendar_parameter_type
<field name="mycalendar" type="calendar" default="5-10-2008" label="Select a date" description="" format="%d-%m-%Y" />
http://docs.joomla.org/Category_parameter_type
<field name="mycategory" type="category" label="Select a category" description="" section="3" />
http://docs.joomla.org/Editors_parameter_type
<field name="myeditor" type="editors" default="none" label="Select an editor" />
http://docs.joomla.org/Filelist_parameter_type
<field name="myfile" type="filelist" default="" label="Select a file" description="" directory="administrator" filter="" exclude="" stripext="" />
http://docs.joomla.org/Folderlist_parameter_type
<field name="myfolder" type="folderlist" default="" label="Select a folder" directory="administrator" filter="" exclude="" stripext="" />
http://docs.joomla.org/Helpsites_parameter_type
<field name="myhelpsite" type="helpsites" default="" label="Select a help site" description="" />
http://docs.joomla.org/Hidden_parameter_type
<field name="mysecretvariable" type="hidden" default="" />
http://docs.joomla.org/Imagelist_parameter_type
<field name="myimage" type="imagelist" default="" label="Select an image" description="" directory="" exclude="" stripext="" />
http://docs.joomla.org/Languages_parameter_type
<field name="mylanguage" type="languages" client="site" default="en-GB" label="Select a language" description="" />
http://docs.joomla.org/List_parameter_type
<field name="mylistvalue" type="list" default="" label="Select an option" description="">
<option value="0">Option 1</option>
<option value="1">Option 2</option>
</field>
http://docs.joomla.org/Menu_parameter_type
<field name="mymenu" type="menu" default="mainmenu" label="Select a menu" description="Select a menu" />
http://docs.joomla.org/Menuitem_parameter_type
<field name="mymenuitem" type="menuitem" default="45" label="Select a menu item" description="Select a menu item" />
http://docs.joomla.org/Password_parameter_type
<field name="mypassword" type="password" default="secret" label="Enter a password" description="" size="5" />
http://docs.joomla.org/Radio_parameter_type
<field name="myradiovalue" type="radio" default="0" label="Select an option" description="">
<option value="0">1</option>
<option value="1">2</option>
</field>
http://docs.joomla.org/Spacer_parameter_type
<field type="spacer" default="&lt;b&gt;Advanced parameters&lt;/b&gt;" />
http://docs.joomla.org/Sql_parameter_type
<field name="myfield" type="sql" default="10" label="Select an article" query="SELECT id, title FROM #__content" key_field=”id” value_field=”title” />
http://docs.joomla.org/Text_parameter_type
<field name="mytextvalue" type="text" default="Some text" label="Enter some text" description="" size="10" />
http://docs.joomla.org/Textarea_parameter_type
<field name="mytextarea" type="textarea" default="default" label="Enter some text" description="" rows="10" cols="5" />
http://docs.joomla.org/Timezones_parameter_type
<field name="mytimezone" type="timezones" default="-10" label="Select a timezone" description="" />
http://docs.joomla.org/Usergroup_parameter_type
<field name="myusergroups" type="usergroup" default="" label="Select a user group" description="" />
-->
49 changes: 36 additions & 13 deletions administrator/models/forms/city.xml
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<field name="id" type="hidden" size="40" class="inputbox" label="COM_TJFIELDS_FORM_LBL_CITY_CITY_ID" description="COM_TJFIELDS_FORM_DESC_CITY_CITY_ID" filter="safehtml" />
<field name="city" type="text" size="40" class="inputbox" label="COM_TJFIELDS_FORM_LBL_CITY_CITY" description="COM_TJFIELDS_FORM_DESC_CITY_CITY" required="true" filter="safehtml" />
<field name="country_id" type="countries" label="COM_TJFIELDS_FORM_LBL_CITY_SELECT_COUNTRY" description="COM_TJFIELDS_FORM_DESC_CITY_SELECT_COUNTRY" required="true" filter="safehtml" onchange="generateRegions();">
<option value="">COM_TJFIELDS_FILTER_SELECT_COUNTRY</option>
</field>
<field name="region_id" type="list" label="COM_TJFIELDS_FORM_LBL_CITY_SELECT_REGION" description="COM_TJFIELDS_FORM_DESC_CITY_SELECT_REGION" filter="safehtml" class="chzn-done" data-chosen="com_tjfields">
<option value="">COM_TJFIELDS_FILTER_SELECT_REGION</option>
</field>
<field name="city_jtext" type="text" size="40" class="inputbox" label="COM_TJFIELDS_FORM_LBL_CITY_CITY_JTEXT" description="COM_TJFIELDS_FORM_DESC_CITY_CITY_JTEXT" filter="safehtml" />
</fieldset>
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<field name="id" type="hidden" size="40" class="inputbox"
label="COM_TJFIELDS_FORM_LBL_CITY_CITY_ID"
description="COM_TJFIELDS_FORM_DESC_CITY_CITY_ID"
filter="safehtml" />

<field name="city" type="text" size="40" class="inputbox"
label="COM_TJFIELDS_FORM_LBL_CITY_CITY"
description="COM_TJFIELDS_FORM_DESC_CITY_CITY"
required="true" filter="safehtml" />

<field name="country_id" type="countries"
label="COM_TJFIELDS_FORM_LBL_CITY_SELECT_COUNTRY"
description="COM_TJFIELDS_FORM_DESC_CITY_SELECT_COUNTRY"
required="true" filter="safehtml"
onchange="generateRegions();">
<option value="">COM_TJFIELDS_FILTER_SELECT_COUNTRY</option>
</field>

<field name="region_id" type="list"
label="COM_TJFIELDS_FORM_LBL_CITY_SELECT_REGION"
description="COM_TJFIELDS_FORM_DESC_CITY_SELECT_REGION"
filter="safehtml"
class="chzn-done"
data-chosen="com_tjfields"
>
<option value="">COM_TJFIELDS_FILTER_SELECT_REGION</option>
</field>

<field name="city_jtext" type="text" size="40" class="inputbox"
label="COM_TJFIELDS_FORM_LBL_CITY_CITY_JTEXT"
description="COM_TJFIELDS_FORM_DESC_CITY_CITY_JTEXT"
filter="safehtml" />
</fieldset>
</form>
37 changes: 28 additions & 9 deletions administrator/models/forms/country.xml
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<field name="id" type="hidden" size="40" class="inputbox" label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY_ID" description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY_ID" filter="safehtml" />
<field name="country" type="text" size="40" class="inputbox" label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY" description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY" required="true" filter="safehtml" />
<field name="country_3_code" type="text" size="40" class="inputbox" label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY_3_CODE" description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY_3_CODE" required="true" filter="safehtml" />
<field name="country_code" type="text" size="40" class="inputbox" label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY_CODE" description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY_CODE" required="true" filter="safehtml" />
<field name="country_jtext" type="text" size="40" class="inputbox" label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY_JTEXT" description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY_JTEXT" filter="safehtml" />
</fieldset>
<?xml version="1.0" encoding="utf-8"?>
<form>
<fieldset>
<field name="id" type="hidden" size="40" class="inputbox"
label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY_ID"
description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY_ID"
filter="safehtml" />

<field name="country" type="text" size="40" class="inputbox"
label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY"
description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY"
required="true" filter="safehtml" />

<field name="country_3_code" type="text" size="40" class="inputbox"
label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY_3_CODE"
description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY_3_CODE"
required="true" filter="safehtml" />

<field name="country_code" type="text" size="40" class="inputbox"
label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY_CODE"
description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY_CODE"
required="true" filter="safehtml" />

<field name="country_jtext" type="text" size="40" class="inputbox"
label="COM_TJFIELDS_FORM_LBL_COUNTRY_COUNTRY_JTEXT"
description="COM_TJFIELDS_FORM_DESC_COUNTRY_COUNTRY_JTEXT"
filter="safehtml" />
</fieldset>
</form>
Loading

0 comments on commit 23c73d6

Please sign in to comment.