[codestyle] admin components xml files #15920

brianteeman · 2017-05-09T18:36:50Z

Review all the xml files in the administrator/components folder and make sure they are formatted according to the coding standards

(I had a long train journey)

C-Lodder · 2017-05-09T19:47:45Z

administrator/components/com_content/models/forms/filter_articles.xml

-                	>
-            		<option value="">JOPTION_SELECT_AUTHOR</option>
-        	</field>
+            name="author_id"


indentation isn't right here

C-Lodder · 2017-05-09T19:48:01Z

administrator/components/com_content/models/forms/filter_articles.xml

-        		<option value="">JOPTION_SELECT_MAX_LEVELS</option>
+
+	    <field
+        	name="level"


C-Lodder · 2017-05-09T19:48:12Z

administrator/components/com_content/models/forms/filter_featured.xml

-                	>
-        		<option value="">JOPTION_SELECT_AUTHOR</option>
-        	</field>
+            name="author_id"


C-Lodder · 2017-05-09T19:48:25Z

administrator/components/com_content/models/forms/filter_featured.xml

-        		<option value="">JOPTION_SELECT_MAX_LEVELS</option>
-        	</field>
+    	<field
+            name="level"


C-Lodder · 2017-05-09T19:49:03Z

administrator/components/com_finder/models/forms/filter.xml

+			name="title" 
+			type="text" 
+			label="JGLOBAL_TITLE"
+		    description="COM_FINDER_FILTER_TITLE_DESCRIPTION"


C-Lodder · 2017-05-09T19:50:38Z

administrator/components/com_menus/models/forms/item_url.xml

 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
 				default="1" filter="integer"


filter on a new line

C-Lodder · 2017-05-09T19:53:33Z

@wilsonge with the new switcher class and options switched round in the XML files, is this going to be a pita with conflicts when merging into J4?

wojsmol · 2017-05-10T00:18:51Z

administrator/components/com_config/model/form/application.xml

 			label="COM_CONFIG_FIELD_DEBUG_SYSTEM_LABEL"
 			description="COM_CONFIG_FIELD_DEBUG_SYSTEM_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
 		>


wojsmol · 2017-05-10T00:19:21Z

administrator/components/com_config/model/form/application.xml

 			label="COM_CONFIG_FIELD_DEBUG_LANG_LABEL"
 			description="COM_CONFIG_FIELD_DEBUG_LANG_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
 		>


wojsmol · 2017-05-10T00:21:50Z

administrator/components/com_config/model/form/application.xml

@@ -330,10 +330,10 @@
 		<field


fiedset to one line

wojsmol · 2017-05-10T00:22:39Z

administrator/components/com_config/model/form/application.xml

 			label="COM_CONFIG_FIELD_FTP_ENABLE_LABEL"
 			description="COM_CONFIG_FIELD_FTP_ENABLE_DESC"
+			class="btn-group btn-group-yesno"
+			default="0"
 			filter="integer"
 		>


laoneo · 2017-05-10T06:52:12Z

@wilsonge with the new switcher class and options switched round in the XML files, is this going to be a pita with conflicts when merging into J4?

Perhaps making the pr against the J4 branch then?

Bakual · 2017-05-10T06:59:30Z

Perhaps making the pr against the J4 branch then?

That will be the exact same pita 😄
Maybe better revert the stupid change with the switcher class and options switched around in J4 sigh

wilsonge · 2017-05-10T09:05:13Z

I can deal with the conflicts. Everyone can stop stressing - it's the result of having two versions being dev'd at the same time.

C-Lodder · 2017-05-10T09:37:43Z

I have tested this item ✅ successfully on 51cff1e

code review.

@wilsonge - Fair enough.

@Bakual - So you've said before. Submit a PR if you're not happy

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/15920.}

brianteeman · 2017-05-23T08:15:59Z

conflicts resolved

Quy · 2017-05-23T15:06:48Z

administrator/components/com_content/config.xml

 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>
+
 		<field name="show_category_title"


Move name="show_category_title" to next line.

Quy · 2017-05-23T15:07:35Z

administrator/components/com_content/config.xml

 			default="1"
-		>
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>

 		<field name="show_description"


Move to next line.

Quy · 2017-05-23T15:07:49Z

administrator/components/com_content/config.xml

 			class="btn-group btn-group-yesno"
 			default="1"
-			label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL"
-			description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC">
+			>
 			<option value="1">JSHOW</option>
 			<option value="0">JHIDE</option>
 		</field>

 		<field name="show_description_image"


Move to next line.

brianteeman · 2017-05-23T15:15:16Z

@Quy don't know how I missed those. Thanks I will update the pr tonight

Quy · 2017-05-23T15:18:33Z

administrator/components/com_content/config.xml

 			default="none"
 			label="JGLOBAL_CATEGORY_ORDER_LABEL"
-			description="JGLOBAL_CATEGORY_ORDER_DESC">
+			description="JGLOBAL_CATEGORY_ORDER_DESC"
+			type="list"


Move it under name.

brianteeman · 2017-05-27T22:06:40Z

@Quy thanks for everything on this - seems I didnt do a good job

Quy · 2017-05-28T14:34:22Z

I have tested this item ✅ successfully on 6cdfb9e

@brianteeman Thank you!

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/15920.}

andrepereiradasilva

hi @brianteeman !
just one or two errors detected and some minor improvements. all the rest seems fine.
ok when this corrected

andrepereiradasilva · 2017-05-31T13:04:05Z

administrator/components/com_content/config.xml

-		<field name="order_date" type="list"
-			default="published"
-			description="JGLOBAL_ORDERING_DATE_DESC"
+			description="JGLOBAL_ARTICLE_ORDER_DESC"


default="rdate" is missing

sorry i dont understand

thsi field is the name="orderby_sec" field
before:

<field name="orderby_sec" type="list" default="rdate" label="JGLOBAL_ARTICLE_ORDER_LABEL" description="JGLOBAL_ARTICLE_ORDER_DESC">

after

<field name="orderby_sec" type="list" label="JGLOBAL_ARTICLE_ORDER_LABEL" description="JGLOBAL_ARTICLE_ORDER_DESC" >

so default="rdate" is missing

andrepereiradasilva · 2017-05-31T13:09:04Z

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

 				label="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_LABEL"
 				description="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC"
+				default=""


not essencial but i think this can be removed.
there is no option with "" value and uses "useglobal", so the default is the global value.

this is used in quite a lot of places. i would prefer to leave changing that to another smaller pr where it would be easier to test.

andrepereiradasilva · 2017-05-31T13:14:31Z

administrator/components/com_finder/models/forms/filter.xml

+			name="filter_id"  
+			type="text" 
+			label="JGLOBAL_FIELD_ID_LABEL"
+			descriptio="JGLOBAL_FIELD_ID_DESC" 


"descriptio" should "description" (note the last "n")

andrepereiradasilva · 2017-05-31T13:19:26Z

administrator/components/com_menus/models/forms/item_component.xml

@@ -84,35 +96,47 @@

 		<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS"
 		>


could you check this one too?

andrepereiradasilva · 2017-05-31T13:19:41Z

administrator/components/com_menus/models/forms/item_component.xml

+				type="textarea"
+				label="JFIELD_META_DESCRIPTION_LABEL" 
+				description="JFIELD_META_DESCRIPTION_DESC"
+				rows="3" cols="40" 


cols in new line

andrepereiradasilva · 2017-05-31T13:31:16Z

administrator/components/com_menus/models/forms/item_separator.xml

 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
 				default="1" filter="integer"


filter in new line

andrepereiradasilva · 2017-05-31T13:31:57Z

administrator/components/com_menus/models/forms/itemadmin_alias.xml

 				label="COM_MENUS_ITEM_FIELD_MENU_TEXT_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_TEXT_DESC"
+				class="btn-group btn-group-yesno"
 				default="1" filter="integer"


filter in new line

brianteeman · 2017-05-31T14:44:42Z

@andrepereiradasilva made some of your changes and commented on two other requests

andrepereiradasilva · 2017-05-31T14:59:23Z

I have tested this item ✅ successfully on 6cdfb9e

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/15920.}

Quy · 2017-05-31T15:05:13Z

I have tested this item ✅ successfully on 6cdfb9e

Code review

_{This comment was created with the J!Tracker Application at issues.joomla.org/tracker/joomla-cms/15920.}

brianteeman · 2017-05-31T17:13:14Z

RTC please

ghost · 2017-05-31T17:16:09Z

RTC after two successful tests.

wilsonge · 2017-05-31T17:16:31Z

Thankyou very much!

brianteeman · 2017-05-31T17:21:07Z

Thanks everyone

brianteeman added 4 commits May 9, 2017 17:41

codestyle

ae8be7d

code style

5f2eacd

codestyle

36a632d

codestyle

55885fc

joomla-cms-bot added the PR-staging label May 9, 2017

C-Lodder reviewed May 9, 2017

View reviewed changes

codestyle

51cff1e

wojsmol reviewed May 10, 2017

View reviewed changes

administrator/components/com_config/model/form/application.xml

@@ -330,10 +330,10 @@

<field

Copy link

Contributor

wojsmol May 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fiedset to one line

wojsmol reviewed May 10, 2017

View reviewed changes

thanks @wojsmol

90f2776

brianteeman added 2 commits May 23, 2017 09:13

Merge branch 'staging' into xml-code-admin-components

eafd9e1

Merge branch 'staging' into xml-code-admin-components

46e479b

Quy reviewed May 23, 2017

View reviewed changes

Quy and others added 12 commits May 27, 2017 23:15

Update module.xml (#32)

1b3cbc0

Update plugin.xml (#33)

8d14345

Update config.xml (#34)

21bd709

Update link.xml (#35)

c143e23

Update config.xml (#36)

286a397

Update style.xml (#38)

01fe473

Update config.xml (#37)

9017db8

Update note.xml (#42)

be225fd

Update group.xml (#41)

2f94179

Update filter_debuggroup.xml (#40)

0697a2e

Update config.xml (#39)

50b07a9

Merge branch 'staging' into xml-code-admin-components

cfca241

andrepereiradasilva reviewed May 31, 2017

View reviewed changes

corrections for @andrepereiradasilva

b494f48

brianteeman added 2 commits May 31, 2017 15:45

Merge branch 'staging' into xml-code-admin-components

9a66594

gotya

857fd2a

joomla-cms-bot added the RTC This Pull Request is Ready To Commit label May 31, 2017

wilsonge merged commit 6c66636 into joomla:staging May 31, 2017

joomla-cms-bot removed the RTC This Pull Request is Ready To Commit label May 31, 2017

wilsonge added this to the Joomla 3.7.3 milestone May 31, 2017

brianteeman deleted the xml-code-admin-components branch May 31, 2017 17:21

		@@ -84,35 +96,47 @@

		<fieldset name="metadata" label="JGLOBAL_FIELDSET_METADATA_OPTIONS"
		>

[codestyle] admin components xml files #15920

[codestyle] admin components xml files #15920

Conversation

brianteeman commented May 9, 2017 • edited by joomla-cms-bot Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

C-Lodder commented May 9, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

laoneo commented May 10, 2017

Bakual commented May 10, 2017

wilsonge commented May 10, 2017

C-Lodder commented May 10, 2017 • edited Loading

brianteeman commented May 23, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brianteeman commented May 23, 2017

Choose a reason for hiding this comment

brianteeman commented May 27, 2017

Quy commented May 28, 2017

andrepereiradasilva left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrepereiradasilva May 31, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

brianteeman commented May 31, 2017

andrepereiradasilva commented May 31, 2017

Quy commented May 31, 2017

brianteeman commented May 31, 2017

ghost commented May 31, 2017

wilsonge commented May 31, 2017

brianteeman commented May 31, 2017

brianteeman commented May 9, 2017 •

edited by joomla-cms-bot

Loading

C-Lodder commented May 9, 2017 •

edited

Loading

C-Lodder commented May 10, 2017 •

edited

Loading

andrepereiradasilva May 31, 2017 •

edited

Loading