diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml index c85e033b65b91..d593758964067 100644 --- a/administrator/components/com_content/models/forms/article.xml +++ b/administrator/components/com_content/models/forms/article.xml @@ -165,8 +165,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_TITLE_LABEL" - description="JGLOBAL_SHOW_TITLE_DESC"> - + description="JGLOBAL_SHOW_TITLE_DESC" + useglobal="true" + > @@ -176,8 +177,9 @@ type="list" class="chzn-color" label="JGLOBAL_LINKED_TITLES_LABEL" - description="JGLOBAL_LINKED_TITLES_DESC"> - + description="JGLOBAL_LINKED_TITLES_DESC" + useglobal="true" + > @@ -187,8 +189,8 @@ class="chzn-color" label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL" description="COM_CONTENT_FIELD_SHOW_TAGS_DESC" - > - + useglobal="true" + > @@ -198,8 +200,8 @@ class="chzn-color" description="JGLOBAL_SHOW_INTRO_DESC" label="JGLOBAL_SHOW_INTRO_LABEL" + useglobal="true" > - @@ -208,8 +210,9 @@ type="list" default="" label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL" - description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"> - + description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC" + useglobal="true" + > @@ -220,8 +223,9 @@ type="list" class="chzn-color" label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL" - description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"> - + description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC" + useglobal="true" + > @@ -231,8 +235,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_CATEGORY_LABEL" - description="JGLOBAL_SHOW_CATEGORY_DESC"> - + description="JGLOBAL_SHOW_CATEGORY_DESC" + useglobal="true" + > @@ -242,8 +247,9 @@ type="list" class="chzn-color" label="JGLOBAL_LINK_CATEGORY_LABEL" - description="JGLOBAL_LINK_CATEGORY_DESC"> - + description="JGLOBAL_LINK_CATEGORY_DESC" + useglobal="true" + > @@ -253,8 +259,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL" - description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"> - + description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC" + useglobal="true" + > @@ -264,8 +271,9 @@ type="list" class="chzn-color" label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL" - description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"> - + description="JGLOBAL_LINK_PARENT_CATEGORY_DESC" + useglobal="true" + > @@ -286,8 +294,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_AUTHOR_LABEL" - description="JGLOBAL_SHOW_AUTHOR_DESC"> - + description="JGLOBAL_SHOW_AUTHOR_DESC" + useglobal="true" + > @@ -297,8 +306,9 @@ type="list" class="chzn-color" label="JGLOBAL_LINK_AUTHOR_LABEL" - description="JGLOBAL_LINK_AUTHOR_DESC"> - + description="JGLOBAL_LINK_AUTHOR_DESC" + useglobal="true" + > @@ -308,8 +318,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_CREATE_DATE_LABEL" - description="JGLOBAL_SHOW_CREATE_DATE_DESC"> - + description="JGLOBAL_SHOW_CREATE_DATE_DESC" + useglobal="true" + > @@ -319,8 +330,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_MODIFY_DATE_LABEL" - description="JGLOBAL_SHOW_MODIFY_DATE_DESC"> - + description="JGLOBAL_SHOW_MODIFY_DATE_DESC" + useglobal="true" + > @@ -330,8 +342,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL" - description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"> - + description="JGLOBAL_SHOW_PUBLISH_DATE_DESC" + useglobal="true" + > @@ -341,8 +354,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_NAVIGATION_LABEL" - description="JGLOBAL_SHOW_NAVIGATION_DESC"> - + description="JGLOBAL_SHOW_NAVIGATION_DESC" + useglobal="true" + > @@ -352,8 +366,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_ICONS_LABEL" - description="JGLOBAL_SHOW_ICONS_DESC"> - + description="JGLOBAL_SHOW_ICONS_DESC" + useglobal="true" + > @@ -363,8 +378,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_PRINT_ICON_LABEL" - description="JGLOBAL_SHOW_PRINT_ICON_DESC"> - + description="JGLOBAL_SHOW_PRINT_ICON_DESC" + useglobal="true" + > @@ -374,8 +390,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_EMAIL_ICON_LABEL" - description="JGLOBAL_SHOW_EMAIL_ICON_DESC"> - + description="JGLOBAL_SHOW_EMAIL_ICON_DESC" + useglobal="true" + > @@ -386,8 +403,8 @@ class="chzn-color" label="JGLOBAL_SHOW_VOTE_LABEL" description="JGLOBAL_SHOW_VOTE_DESC" - > - + useglobal="true" + > @@ -397,8 +414,9 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_HITS_LABEL" - description="JGLOBAL_SHOW_HITS_DESC"> - + description="JGLOBAL_SHOW_HITS_DESC" + useglobal="true" + > @@ -408,10 +426,11 @@ type="list" class="chzn-color" label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL" - description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"> - - - + description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC" + useglobal="true" + > + + - + description="COM_CONTENT_FIELD_URLSPOSITION_DESC" + useglobal="true" + > @@ -457,11 +477,10 @@ default="" label="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_LABEL" description="COM_CONTENT_SHOW_PUBLISHING_OPTIONS_DESC" + useglobal="true" > - - - - + + - - - - + + - - - - + + - - - + + @@ -666,11 +683,12 @@ name="float_intro" type="list" label="COM_CONTENT_FLOAT_LABEL" - description="COM_CONTENT_FLOAT_DESC"> - - - - + description="COM_CONTENT_FLOAT_DESC" + useglobal="true" + > + + + - - - - + description="COM_CONTENT_FLOAT_DESC" + useglobal="true" + > + + + - @@ -766,12 +785,12 @@ description="COM_CONTENT_URL_FIELD_BROWSERNAV_DESC" default="" filter="options" + useglobal="true" > - - - - - + + + + - - - - - + + + + diff --git a/administrator/components/com_menus/models/forms/item_component.xml b/administrator/components/com_menus/models/forms/item_component.xml index 101b3e87704ba..43198e4d391b1 100644 --- a/administrator/components/com_menus/models/forms/item_component.xml +++ b/administrator/components/com_menus/models/forms/item_component.xml @@ -55,8 +55,8 @@ label="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_LABEL" description="COM_MENUS_ITEM_FIELD_SHOW_PAGE_HEADING_DESC" default="" - > - + useglobal="true" + > @@ -86,7 +86,7 @@ type="list" label="JFIELD_METADATA_ROBOTS_LABEL" description="JFIELD_METADATA_ROBOTS_DESC" - > + > diff --git a/administrator/language/en-GB/en-GB.ini b/administrator/language/en-GB/en-GB.ini index d88b552e3be8b..155caec8742c2 100644 --- a/administrator/language/en-GB/en-GB.ini +++ b/administrator/language/en-GB/en-GB.ini @@ -592,6 +592,8 @@ JGLOBAL_TPL_CPANEL_LINK_TEXT="Return to Control Panel" JGLOBAL_TYPE_OR_SELECT_CATEGORY="Type or Select a Category" JGLOBAL_TYPE_OR_SELECT_SOME_OPTIONS="Type or select some options" JGLOBAL_USE_GLOBAL="Use Global" +JGLOBAL_USE_GLOBAL_VALUE="Use Global (%s)" +JGLOBAL_USE_GLOBAL_VALUE_NOT_FOUND="Unfortunately there was no global value found for at least one field. Saving the options may help to remedy this issue." JGLOBAL_USERNAME="Username" JGLOBAL_VALIDATION_FORM_FAILED="Invalid form" JGLOBAL_VIEW_SITE="View Site" diff --git a/components/com_content/views/archive/tmpl/default.xml b/components/com_content/views/archive/tmpl/default.xml index b067559fbde59..a7be50a835d73 100644 --- a/components/com_content/views/archive/tmpl/default.xml +++ b/components/com_content/views/archive/tmpl/default.xml @@ -20,7 +20,7 @@ default="alpha" description="JGLOBAL_ARTICLE_ORDER_DESC" label="JGLOBAL_ARTICLE_ORDER_LABEL" - > + > @@ -68,8 +68,8 @@ default="" description="JGLOBAL_FILTER_FIELD_DESC" label="JGLOBAL_FILTER_FIELD_LABEL" - > - + useglobal="true" + > @@ -88,8 +88,8 @@ - + useglobal="true" + > @@ -99,8 +99,9 @@ type="list" default="" label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL" - description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"> - + description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC" + useglobal="true" + > @@ -112,8 +113,8 @@ type="list" label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL" description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC" - > - + useglobal="true" + > @@ -121,8 +122,8 @@ - + useglobal="true" + > @@ -130,8 +131,8 @@ - + useglobal="true" + > @@ -140,8 +141,9 @@ name="show_parent_category" type="list" label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL" - description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"> - + description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC" + useglobal="true" + > @@ -150,8 +152,9 @@ name="link_parent_category" type="list" label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL" - description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"> - + description="JGLOBAL_LINK_PARENT_CATEGORY_DESC" + useglobal="true" + > @@ -159,8 +162,8 @@ - + useglobal="true" + > @@ -168,19 +171,19 @@ - + useglobal="true" + > - + name="link_author" + type="list" + label="JGLOBAL_LINK_AUTHOR_LABEL" + description="JGLOBAL_LINK_AUTHOR_DESC" + useglobal="true" + > @@ -188,8 +191,8 @@ - + useglobal="true" + > @@ -197,8 +200,8 @@ - + useglobal="true" + > @@ -206,8 +209,8 @@ - + useglobal="true" + > @@ -216,8 +219,8 @@ - + useglobal="true" + > @@ -225,8 +228,8 @@ - + useglobal="true" + > diff --git a/components/com_content/views/article/tmpl/default.xml b/components/com_content/views/article/tmpl/default.xml index b0c4f791f0bd1..5b7c6190cae71 100644 --- a/components/com_content/views/article/tmpl/default.xml +++ b/components/com_content/views/article/tmpl/default.xml @@ -37,8 +37,9 @@ name="show_title" type="list" label="JGLOBAL_SHOW_TITLE_LABEL" - description="JGLOBAL_SHOW_TITLE_DESC"> - + description="JGLOBAL_SHOW_TITLE_DESC" + useglobal="true" + > @@ -47,8 +48,9 @@ name="link_titles" type="list" label="JGLOBAL_LINKED_TITLES_LABEL" - description="JGLOBAL_LINKED_TITLES_DESC"> - + description="JGLOBAL_LINKED_TITLES_DESC" + useglobal="true" + > @@ -57,8 +59,9 @@ name="show_intro" type="list" description="JGLOBAL_SHOW_INTRO_DESC" - label="JGLOBAL_SHOW_INTRO_LABEL"> - + label="JGLOBAL_SHOW_INTRO_LABEL" + useglobal="true" + > @@ -67,8 +70,9 @@ name="info_block_position" type="list" label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL" - description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"> - + description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC" + useglobal="true" + > @@ -78,8 +82,9 @@ name="info_block_show_title" type="list" label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL" - description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC"> - + description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC" + useglobal="true" + > @@ -88,8 +93,9 @@ name="show_category" type="list" label="JGLOBAL_SHOW_CATEGORY_LABEL" - description="JGLOBAL_SHOW_CATEGORY_DESC"> - + description="JGLOBAL_SHOW_CATEGORY_DESC" + useglobal="true" + > @@ -98,8 +104,9 @@ name="link_category" type="list" label="JGLOBAL_LINK_CATEGORY_LABEL" - description="JGLOBAL_LINK_CATEGORY_DESC"> - + description="JGLOBAL_LINK_CATEGORY_DESC" + useglobal="true" + > @@ -108,8 +115,9 @@ name="show_parent_category" type="list" label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL" - description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC"> - + description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC" + useglobal="true" + > @@ -118,19 +126,20 @@ name="link_parent_category" type="list" label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL" - description="JGLOBAL_LINK_PARENT_CATEGORY_DESC"> - + description="JGLOBAL_LINK_PARENT_CATEGORY_DESC" + useglobal="true" + > - + description="JGLOBAL_SHOW_ASSOCIATIONS_DESC" + useglobal="true" + > @@ -139,8 +148,9 @@ name="show_author" type="list" label="JGLOBAL_SHOW_AUTHOR_LABEL" - description="JGLOBAL_SHOW_AUTHOR_DESC"> - + description="JGLOBAL_SHOW_AUTHOR_DESC" + useglobal="true" + > @@ -149,8 +159,9 @@ name="link_author" type="list" label="JGLOBAL_LINK_AUTHOR_LABEL" - description="JGLOBAL_LINK_AUTHOR_DESC"> - + description="JGLOBAL_LINK_AUTHOR_DESC" + useglobal="true" + > @@ -159,8 +170,9 @@ name="show_create_date" type="list" label="JGLOBAL_SHOW_CREATE_DATE_LABEL" - description="JGLOBAL_SHOW_CREATE_DATE_DESC"> - + description="JGLOBAL_SHOW_CREATE_DATE_DESC" + useglobal="true" + > @@ -169,8 +181,9 @@ name="show_modify_date" type="list" label="JGLOBAL_SHOW_MODIFY_DATE_LABEL" - description="JGLOBAL_SHOW_MODIFY_DATE_DESC"> - + description="JGLOBAL_SHOW_MODIFY_DATE_DESC" + useglobal="true" + > @@ -179,8 +192,9 @@ name="show_publish_date" type="list" label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL" - description="JGLOBAL_SHOW_PUBLISH_DATE_DESC"> - + description="JGLOBAL_SHOW_PUBLISH_DATE_DESC" + useglobal="true" + > @@ -189,8 +203,9 @@ name="show_item_navigation" type="list" label="JGLOBAL_SHOW_NAVIGATION_LABEL" - description="JGLOBAL_SHOW_NAVIGATION_DESC"> - + description="JGLOBAL_SHOW_NAVIGATION_DESC" + useglobal="true" + > @@ -199,8 +214,9 @@ name="show_vote" type="list" label="JGLOBAL_SHOW_VOTE_LABEL" - description="JGLOBAL_SHOW_VOTE_DESC"> - + description="JGLOBAL_SHOW_VOTE_DESC" + useglobal="true" + > @@ -209,8 +225,9 @@ name="show_icons" type="list" label="JGLOBAL_SHOW_ICONS_LABEL" - description="JGLOBAL_SHOW_ICONS_DESC"> - + description="JGLOBAL_SHOW_ICONS_DESC" + useglobal="true" + > @@ -219,8 +236,9 @@ name="show_print_icon" type="list" label="JGLOBAL_SHOW_PRINT_ICON_LABEL" - description="JGLOBAL_SHOW_PRINT_ICON_DESC"> - + description="JGLOBAL_SHOW_PRINT_ICON_DESC" + useglobal="true" + > @@ -229,8 +247,9 @@ name="show_email_icon" type="list" label="JGLOBAL_SHOW_EMAIL_ICON_LABEL" - description="JGLOBAL_SHOW_EMAIL_ICON_DESC"> - + description="JGLOBAL_SHOW_EMAIL_ICON_DESC" + useglobal="true" + > @@ -239,8 +258,9 @@ name="show_hits" type="list" label="JGLOBAL_SHOW_HITS_LABEL" - description="JGLOBAL_SHOW_HITS_DESC"> - + description="JGLOBAL_SHOW_HITS_DESC" + useglobal="true" + > @@ -249,8 +269,9 @@ name="show_tags" type="list" label="JGLOBAL_SHOW_TAGS_LABEL" - description="JGLOBAL_SHOW_TAGS_DESC"> - + description="JGLOBAL_SHOW_TAGS_DESC" + useglobal="true" + > @@ -259,8 +280,9 @@ name="show_noauth" type="list" label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL" - description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC"> - + description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC" + useglobal="true" + > @@ -268,8 +290,9 @@ name="urls_position" type="list" label="COM_CONTENT_FIELD_URLSPOSITION_LABEL" - description="COM_CONTENT_FIELD_URLSPOSITION_DESC"> - + description="COM_CONTENT_FIELD_URLSPOSITION_DESC" + useglobal="true" + > diff --git a/components/com_content/views/categories/tmpl/default.xml b/components/com_content/views/categories/tmpl/default.xml index db882d72dcd14..3026f90a9cbd0 100644 --- a/components/com_content/views/categories/tmpl/default.xml +++ b/components/com_content/views/categories/tmpl/default.xml @@ -30,8 +30,8 @@ - + useglobal="true" + > @@ -45,8 +45,8 @@ - + useglobal="true" + > @@ -56,22 +56,19 @@ - + useglobal="true" + > - + label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL" + description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC" + useglobal="true" + > @@ -79,8 +76,8 @@ - + useglobal="true" + > @@ -95,8 +92,8 @@ - + useglobal="true" + > @@ -104,8 +101,8 @@ - + useglobal="true" + > @@ -113,8 +110,8 @@ - + useglobal="true" + > @@ -122,8 +119,8 @@ - + useglobal="true" + > @@ -136,8 +133,8 @@ - + useglobal="true" + > @@ -145,18 +142,18 @@ - - + type="list" + label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL" + description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC" + useglobal="true" + > @@ -164,16 +161,17 @@ - + useglobal="true" + >
- - + useglobal="true" + > - - - + useglobal="true" + > @@ -226,16 +222,16 @@ - + useglobal="true" + > @@ -245,8 +241,8 @@ - + useglobal="true" + > @@ -266,8 +262,8 @@ - + useglobal="true" + > @@ -283,8 +279,8 @@ - + useglobal="true" + > @@ -292,8 +288,8 @@ - + useglobal="true" + > @@ -303,8 +299,8 @@ - + useglobal="true" + > @@ -312,8 +308,8 @@ - + useglobal="true" + > @@ -329,8 +325,8 @@ - + useglobal="true" + > @@ -338,8 +334,8 @@ - + useglobal="true" + > @@ -366,8 +362,8 @@ - + useglobal="true" + > @@ -376,8 +372,8 @@ - + useglobal="true" + > @@ -387,8 +383,8 @@ - + useglobal="true" + > @@ -396,8 +392,8 @@ - + useglobal="true" + > @@ -405,8 +401,8 @@ - + useglobal="true" + > @@ -414,8 +410,8 @@ - + useglobal="true" + > @@ -423,8 +419,8 @@ - + useglobal="true" + > @@ -432,8 +428,8 @@ - + useglobal="true" + > @@ -441,8 +437,8 @@ - + useglobal="true" + > @@ -450,8 +446,8 @@ - + useglobal="true" + > @@ -459,8 +455,8 @@ - + useglobal="true" + > @@ -468,8 +464,8 @@ - + useglobal="true" + > @@ -477,8 +473,8 @@ - + useglobal="true" + > @@ -486,8 +482,8 @@ - + useglobal="true" + > @@ -495,30 +491,30 @@ - + useglobal="true" + > - - - - + name="show_vote" + type="list" + label="JGLOBAL_SHOW_VOTE_LABEL" + description="JGLOBAL_SHOW_VOTE_DESC" + useglobal="true" + > + + + - + useglobal="true" + > @@ -528,8 +524,8 @@ type="list" label="JGLOBAL_SHOW_READMORE_TITLE_LABEL" description="JGLOBAL_SHOW_READMORE_TITLE_DESC" - > - + useglobal="true" + > @@ -537,8 +533,8 @@ - + useglobal="true" + > @@ -546,8 +542,8 @@ - + useglobal="true" + > @@ -555,8 +551,8 @@ - + useglobal="true" + > @@ -564,30 +560,30 @@ - + useglobal="true" + > - + name="show_noauth" + type="list" + label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL" + description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC" + useglobal="true" + >
-
+
- + useglobal="true" + > @@ -595,8 +591,8 @@ - + useglobal="true" + > diff --git a/components/com_content/views/category/tmpl/blog.xml b/components/com_content/views/category/tmpl/blog.xml index 3b855900a3f5e..23593e16dc064 100644 --- a/components/com_content/views/category/tmpl/blog.xml +++ b/components/com_content/views/category/tmpl/blog.xml @@ -41,8 +41,8 @@ type="list" label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL" description="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC" - > - + useglobal="true" + > @@ -52,8 +52,8 @@ type="list" label="JGLOBAL_SHOW_CATEGORY_TITLE" description="JGLOBAL_SHOW_CATEGORY_TITLE_DESC" - > - + useglobal="true" + > @@ -63,8 +63,8 @@ type="list" description="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_DESC" label="JGLOBAL_SHOW_CATEGORY_DESCRIPTION_LABEL" - > - + useglobal="true" + > @@ -74,8 +74,8 @@ type="list" description="JGLOBAL_SHOW_CATEGORY_IMAGE_DESC" label="JGLOBAL_SHOW_CATEGORY_IMAGE_LABEL" - > - + useglobal="true" + > @@ -85,8 +85,8 @@ type="list" description="JGLOBAL_MAXLEVEL_DESC" label="JGLOBAL_MAXLEVEL_LABEL" - > - + useglobal="true" + > @@ -101,8 +101,8 @@ type="list" label="JGLOBAL_SHOW_EMPTY_CATEGORIES_LABEL" description="COM_CONTENT_SHOW_EMPTY_CATEGORIES_DESC" - > - + useglobal="true" + > @@ -112,8 +112,8 @@ type="list" label="COM_CONTENT_NO_ARTICLES_LABEL" description="COM_CONTENT_NO_ARTICLES_DESC" - > - + useglobal="true" + > @@ -123,8 +123,8 @@ type="list" label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL" description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC" - > - + useglobal="true" + > @@ -134,8 +134,8 @@ type="list" label="COM_CONTENT_NUMBER_CATEGORY_ITEMS_LABEL" description="COM_CONTENT_NUMBER_CATEGORY_ITEMS_DESC" - > - + useglobal="true" + > @@ -144,8 +144,8 @@ type="list" label="COM_CONTENT_FIELD_SHOW_CAT_TAGS_LABEL" description="COM_CONTENT_FIELD_SHOW_CAT_TAGS_DESC" - > - + useglobal="true" + > @@ -172,6 +172,7 @@ type="text" description="JGLOBAL_NUM_LEADING_ARTICLES_DESC" label="JGLOBAL_NUM_LEADING_ARTICLES_LABEL" + useglobal="true" size="3" /> @@ -180,6 +181,7 @@ type="text" description="JGLOBAL_NUM_INTRO_ARTICLES_DESC" label="JGLOBAL_NUM_INTRO_ARTICLES_LABEL" + useglobal="true" size="3" /> @@ -188,6 +190,7 @@ type="text" description="JGLOBAL_NUM_COLUMNS_DESC" label="JGLOBAL_NUM_COLUMNS_LABEL" + useglobal="true" size="3" /> @@ -196,6 +199,7 @@ type="text" description="JGLOBAL_NUM_LINKS_DESC" label="JGLOBAL_NUM_LINKS_LABEL" + useglobal="true" size="3" /> @@ -204,8 +208,8 @@ type="list" description="JGLOBAL_MULTI_COLUMN_ORDER_DESC" label="JGLOBAL_MULTI_COLUMN_ORDER_LABEL" - > - + useglobal="true" + > @@ -215,8 +219,8 @@ type="list" description="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_DESC" label="JGLOBAL_SHOW_SUBCATEGORY_CONTENT_LABEL" - > - + useglobal="true" + > @@ -237,8 +241,8 @@ type="list" description="JGLOBAL_CATEGORY_ORDER_DESC" label="JGLOBAL_CATEGORY_ORDER_LABEL" - > - + useglobal="true" + > @@ -250,8 +254,8 @@ type="list" description="JGLOBAL_ARTICLE_ORDER_DESC" label="JGLOBAL_ARTICLE_ORDER_LABEL" - > - + useglobal="true" + > @@ -274,8 +278,8 @@ type="list" description="JGLOBAL_ORDERING_DATE_DESC" label="JGLOBAL_ORDERING_DATE_LABEL" - > - + useglobal="true" + > @@ -286,8 +290,8 @@ type="list" description="JGLOBAL_PAGINATION_DESC" label="JGLOBAL_PAGINATION_LABEL" - > - + useglobal="true" + > @@ -298,8 +302,8 @@ type="list" label="JGLOBAL_PAGINATION_RESULTS_LABEL" description="JGLOBAL_PAGINATION_RESULTS_DESC" - > - + useglobal="true" + > @@ -310,8 +314,8 @@ default="" label="JGLOBAL_SHOW_FEATURED_ARTICLES_LABEL" description="JGLOBAL_SHOW_FEATURED_ARTICLES_DESC" - > - + useglobal="true" + > @@ -324,8 +328,8 @@ type="list" description="JGLOBAL_SHOW_TITLE_DESC" label="JGLOBAL_SHOW_TITLE_LABEL" - > - + useglobal="true" + > @@ -336,8 +340,8 @@ type="list" description="JGLOBAL_LINKED_TITLES_DESC" label="JGLOBAL_LINKED_TITLES_LABEL" - > - + useglobal="true" + > @@ -348,8 +352,8 @@ type="list" description="JGLOBAL_SHOW_INTRO_DESC" label="JGLOBAL_SHOW_INTRO_LABEL" - > - + useglobal="true" + > @@ -360,8 +364,9 @@ type="list" default="" label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL" - description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"> - + description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC" + useglobal="true" + > @@ -373,8 +378,8 @@ type="list" label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL" description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC" - > - + useglobal="true" + > @@ -385,8 +390,8 @@ type="list" description="JGLOBAL_SHOW_CATEGORY_DESC" label="JGLOBAL_SHOW_CATEGORY_LABEL" - > - + useglobal="true" + > @@ -397,8 +402,8 @@ type="list" description="JGLOBAL_LINK_CATEGORY_DESC" label="JGLOBAL_LINK_CATEGORY_LABEL" - > - + useglobal="true" + > @@ -409,8 +414,8 @@ type="list" description="JGLOBAL_SHOW_PARENT_CATEGORY_DESC" label="JGLOBAL_SHOW_PARENT_CATEGORY_LABEL" - > - + useglobal="true" + > @@ -421,8 +426,8 @@ type="list" description="JGLOBAL_LINK_PARENT_CATEGORY_DESC" label="JGLOBAL_LINK_PARENT_CATEGORY_LABEL" - > - + useglobal="true" + > @@ -433,8 +438,8 @@ type="list" label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL" description="JGLOBAL_SHOW_ASSOCIATIONS_DESC" - > - + useglobal="true" + > @@ -445,8 +450,8 @@ type="list" description="JGLOBAL_SHOW_AUTHOR_DESC" label="JGLOBAL_SHOW_AUTHOR_LABEL" - > - + useglobal="true" + > @@ -457,8 +462,8 @@ type="list" description="JGLOBAL_LINK_AUTHOR_DESC" label="JGLOBAL_LINK_AUTHOR_LABEL" - > - + useglobal="true" + > @@ -469,8 +474,8 @@ type="list" description="JGLOBAL_SHOW_CREATE_DATE_DESC" label="JGLOBAL_SHOW_CREATE_DATE_LABEL" - > - + useglobal="true" + > @@ -481,8 +486,8 @@ type="list" description="JGLOBAL_SHOW_MODIFY_DATE_DESC" label="JGLOBAL_SHOW_MODIFY_DATE_LABEL" - > - + useglobal="true" + > @@ -493,8 +498,8 @@ type="list" description="JGLOBAL_SHOW_PUBLISH_DATE_DESC" label="JGLOBAL_SHOW_PUBLISH_DATE_LABEL" - > - + useglobal="true" + > @@ -505,8 +510,8 @@ type="list" description="JGLOBAL_SHOW_NAVIGATION_DESC" label="JGLOBAL_SHOW_NAVIGATION_LABEL" - > - + useglobal="true" + > @@ -517,8 +522,8 @@ type="list" label="JGLOBAL_SHOW_VOTE_LABEL" description="JGLOBAL_SHOW_VOTE_DESC" - > - + useglobal="true" + > @@ -529,8 +534,8 @@ type="list" description="JGLOBAL_SHOW_READMORE_DESC" label="JGLOBAL_SHOW_READMORE_LABEL" - > - + useglobal="true" + > @@ -540,8 +545,8 @@ type="list" label="JGLOBAL_SHOW_READMORE_TITLE_LABEL" description="JGLOBAL_SHOW_READMORE_TITLE_DESC" - > - + useglobal="true" + > @@ -551,8 +556,8 @@ type="list" description="JGLOBAL_SHOW_ICONS_DESC" label="JGLOBAL_SHOW_ICONS_LABEL" - > - + useglobal="true" + > @@ -563,8 +568,8 @@ type="list" description="JGLOBAL_SHOW_PRINT_ICON_DESC" label="JGLOBAL_SHOW_PRINT_ICON_LABEL" - > - + useglobal="true" + > @@ -575,8 +580,8 @@ type="list" description="JGLOBAL_Show_Email_Icon_Desc" label="JGLOBAL_Show_Email_Icon_Label" - > - + useglobal="true" + > @@ -587,8 +592,8 @@ type="list" description="JGLOBAL_SHOW_HITS_DESC" label="JGLOBAL_SHOW_HITS_LABEL" - > - + useglobal="true" + > @@ -599,8 +604,8 @@ type="list" label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL" description="COM_CONTENT_FIELD_SHOW_TAGS_DESC" - > - + useglobal="true" + > @@ -611,8 +616,8 @@ type="list" description="JGLOBAL_SHOW_UNAUTH_LINKS_DESC" label="JGLOBAL_SHOW_UNAUTH_LINKS_LABEL" - > - + useglobal="true" + > @@ -625,8 +630,8 @@ type="list" description="JGLOBAL_SHOW_FEED_LINK_DESC" label="JGLOBAL_SHOW_FEED_LINK_LABEL" - > - + useglobal="true" + > @@ -636,8 +641,8 @@ type="list" description="JGLOBAL_FEED_SUMMARY_DESC" label="JGLOBAL_FEED_SUMMARY_LABEL" - > - + useglobal="true" + > diff --git a/components/com_content/views/category/tmpl/default.xml b/components/com_content/views/category/tmpl/default.xml index 9ade18a0ce8e4..b7b5569adf809 100644 --- a/components/com_content/views/category/tmpl/default.xml +++ b/components/com_content/views/category/tmpl/default.xml @@ -30,14 +30,14 @@ - -
+ +
- + useglobal="true" + > @@ -45,8 +45,8 @@ - + useglobal="true" + > @@ -54,8 +54,8 @@ - + useglobal="true" + > @@ -63,8 +63,8 @@ - + useglobal="true" + > @@ -77,8 +77,8 @@ - + useglobal="true" + > @@ -86,24 +86,25 @@ - - - - + type="list" + label="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_LABEL" + description="JGLOBAL_SHOW_CATEGORY_HEADING_TITLE_TEXT_DESC" + useglobal="true" + > + + - + label="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_LABEL" + description="JGLOBAL_SHOW_SUBCATEGORIES_DESCRIPTION_DESC" + useglobal="true" + > @@ -111,8 +112,8 @@ - + useglobal="true" + > @@ -120,8 +121,8 @@ - + useglobal="true" + > @@ -132,14 +133,14 @@ size="20" /> -
+
-
+
- + useglobal="true" + > @@ -147,20 +148,20 @@ - + useglobal="true" + > - + - + useglobal="true" + > @@ -168,8 +169,8 @@ - + useglobal="true" + > @@ -185,8 +186,8 @@ - + useglobal="true" + > @@ -194,8 +195,8 @@ - + useglobal="true" + > @@ -206,8 +207,8 @@ default="0" label="JGLOBAL_LIST_VOTES_LABEL" description="JGLOBAL_LIST_VOTES_DESC" + useglobal="true" > - @@ -218,23 +219,23 @@ default="0" label="JGLOBAL_LIST_RATINGS_LABEL" description="JGLOBAL_LIST_RATINGS_DESC" + useglobal="true" > - - + useglobal="true" + > @@ -244,8 +245,8 @@ - + useglobal="true" + > @@ -266,8 +267,8 @@ - + useglobal="true" + > @@ -276,8 +277,8 @@ - + useglobal="true" + > @@ -285,13 +286,13 @@ - - + description="JGLOBAL_PAGINATION_RESULTS_DESC" + useglobal="true" + > - - + @@ -304,25 +305,25 @@ - + - - - - - - -
+ + + + +
-
+
- + useglobal="true" + > @@ -330,8 +331,8 @@ - + useglobal="true" + > @@ -339,8 +340,8 @@ - + useglobal="true" + > @@ -348,8 +349,8 @@ - + useglobal="true" + > @@ -357,8 +358,8 @@ - + useglobal="true" + > @@ -366,8 +367,8 @@ - + useglobal="true" + > @@ -375,8 +376,8 @@ - + useglobal="true" + > @@ -386,8 +387,8 @@ type="list" label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL" description="JGLOBAL_SHOW_ASSOCIATIONS_DESC" + useglobal="true" > - @@ -395,8 +396,8 @@ - + useglobal="true" + > @@ -404,8 +405,8 @@ - + useglobal="true" + > @@ -413,8 +414,8 @@ - + useglobal="true" + > @@ -422,8 +423,8 @@ - + useglobal="true" + > @@ -431,8 +432,8 @@ - + useglobal="true" + > @@ -440,28 +441,28 @@ - + useglobal="true" + > - - - - + name="show_vote" type="list" + label="JGLOBAL_SHOW_VOTE_LABEL" + description="JGLOBAL_SHOW_VOTE_DESC" + useglobal="true" + > + + + - + useglobal="true" + > @@ -471,8 +472,8 @@ type="list" label="JGLOBAL_SHOW_READMORE_TITLE_LABEL" description="JGLOBAL_SHOW_READMORE_TITLE_DESC" - > - + useglobal="true" + > @@ -480,8 +481,8 @@ - + useglobal="true" + > @@ -489,8 +490,8 @@ - + useglobal="true" + > @@ -498,8 +499,8 @@ - + useglobal="true" + > @@ -507,8 +508,8 @@ - + useglobal="true" + > @@ -516,20 +517,19 @@ - + useglobal="true" + > -
-
+
+
- + useglobal="true" + > @@ -537,11 +537,11 @@ - + useglobal="true" + >
- + diff --git a/components/com_content/views/featured/tmpl/default.xml b/components/com_content/views/featured/tmpl/default.xml index 28e3d63937863..4657fcaf1a58a 100644 --- a/components/com_content/views/featured/tmpl/default.xml +++ b/components/com_content/views/featured/tmpl/default.xml @@ -35,32 +35,36 @@ - + useglobal="true" + > @@ -68,8 +72,8 @@ - + useglobal="true" + > @@ -79,8 +83,8 @@ - + useglobal="true" + > @@ -100,8 +104,8 @@ - + useglobal="true" + > @@ -110,8 +114,8 @@ - + useglobal="true" + > @@ -119,9 +123,9 @@ - - + description="JGLOBAL_PAGINATION_RESULTS_DESC" + useglobal="true" + > @@ -133,8 +137,8 @@ - + useglobal="true" + > @@ -143,8 +147,8 @@ - + useglobal="true" + > @@ -153,8 +157,8 @@ - + useglobal="true" + > @@ -165,8 +169,9 @@ type="list" default="" label="COM_CONTENT_FIELD_INFOBLOCK_POSITION_LABEL" - description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC"> - + description="COM_CONTENT_FIELD_INFOBLOCK_POSITION_DESC" + useglobal="true" + > @@ -178,8 +183,8 @@ type="list" label="COM_CONTENT_FIELD_INFOBLOCK_TITLE_LABEL" description="COM_CONTENT_FIELD_INFOBLOCK_TITLE_DESC" - > - + useglobal="true" + > @@ -188,8 +193,8 @@ - + useglobal="true" + > @@ -198,8 +203,8 @@ - + useglobal="true" + > @@ -208,8 +213,8 @@ - + useglobal="true" + > @@ -218,8 +223,8 @@ - + useglobal="true" + > @@ -230,8 +235,8 @@ type="list" label="JGLOBAL_SHOW_ASSOCIATIONS_LABEL" description="JGLOBAL_SHOW_ASSOCIATIONS_DESC" - > - + useglobal="true" + > @@ -239,8 +244,8 @@ - + useglobal="true" + > @@ -249,8 +254,8 @@ - + useglobal="true" + > @@ -259,8 +264,8 @@ - + useglobal="true" + > @@ -269,8 +274,8 @@ - + useglobal="true" + > @@ -279,8 +284,8 @@ - + useglobal="true" + > @@ -289,31 +294,31 @@ - + useglobal="true" + > - - - - - + name="show_vote" type="list" + label="JGLOBAL_SHOW_VOTE_LABEL" + description="JGLOBAL_SHOW_VOTE_DESC" + useglobal="true" + > + + + + - + useglobal="true" + > @@ -323,8 +328,8 @@ type="list" label="JGLOBAL_SHOW_READMORE_TITLE_LABEL" description="JGLOBAL_SHOW_READMORE_TITLE_DESC" - > - + useglobal="true" + > @@ -332,8 +337,8 @@ - + useglobal="true" + > @@ -342,8 +347,8 @@ - + useglobal="true" + > @@ -352,8 +357,8 @@ - + useglobal="true" + > @@ -362,8 +367,8 @@ - + useglobal="true" + > @@ -373,8 +378,8 @@ type="list" description="COM_CONTENT_FIELD_SHOW_TAGS_DESC" label="COM_CONTENT_FIELD_SHOW_TAGS_LABEL" - > - + useglobal="true" + > @@ -382,8 +387,8 @@ - + useglobal="true" + > @@ -395,8 +400,8 @@ - + useglobal="true" + > @@ -404,8 +409,8 @@ - + useglobal="true" + > diff --git a/language/en-GB/en-GB.ini b/language/en-GB/en-GB.ini index 1b629d44b1acc..678dc38627860 100644 --- a/language/en-GB/en-GB.ini +++ b/language/en-GB/en-GB.ini @@ -264,6 +264,8 @@ JGLOBAL_TITLE="Title" JGLOBAL_TYPE_OR_SELECT_CATEGORY="Type or Select a Category" JGLOBAL_TYPE_OR_SELECT_SOME_OPTIONS="Type or select some options" JGLOBAL_USE_GLOBAL="Use Global" +JGLOBAL_USE_GLOBAL_VALUE="Use Global (%s)" +JGLOBAL_USE_GLOBAL_VALUE_NOT_FOUND="Unfortunately there was no global value found for at least one field. Saving the options may help to remedy this issue." JGLOBAL_USERNAME="Username" JGLOBAL_VALIDATION_FORM_FAILED="Invalid form" JGLOBAL_YOU_MUST_LOGIN_FIRST="Please login first" diff --git a/libraries/joomla/form/abstractlist.php b/libraries/joomla/form/abstractlist.php index 4442a55b2c622..9a13e9c1423b2 100644 --- a/libraries/joomla/form/abstractlist.php +++ b/libraries/joomla/form/abstractlist.php @@ -148,6 +148,60 @@ protected function getOptions() $options[] = (object) $tmp; } + if ($this->element['useglobal']) + { + $tmp = new stdClass; + $tmp->value = ''; + $tmp->text = JText::_('JGLOBAL_USE_GLOBAL'); + $component = JFactory::getApplication()->input->getCmd('option'); + + // Get correct component for menu items + if ($component == 'com_menus') + { + $link = $this->form->getData()->get('link'); + $uri = new JUri($link); + $component = $uri->getVar('option', 'com_menus'); + } + + $params = JComponentHelper::getParams($component); + $value = $params->get($this->fieldname); + + // Try with global configuration + if (is_null($value)) + { + $value = JFactory::getConfig()->get($this->fieldname); + } + + // Try with menu configuration + if (is_null($value) && JFactory::getApplication()->input->getCmd('option') == 'com_menus') + { + $value = JComponentHelper::getParams('com_menus')->get($this->fieldname); + } + + if (!is_null($value)) + { + $value = (string) $value; + + foreach ($options as $option) + { + if ($option->value === $value) + { + $value = $option->text; + + break; + } + } + + $tmp->text = JText::sprintf('JGLOBAL_USE_GLOBAL_VALUE', $value); + } + else + { + JFactory::getApplication()->enqueueMessage(JText::_('JGLOBAL_USE_GLOBAL_VALUE_NOT_FOUND'), 'notice'); + } + + array_unshift($options, $tmp); + } + reset($options); return $options; diff --git a/libraries/joomla/form/fields/text.php b/libraries/joomla/form/fields/text.php index e50ac8e9f2f50..ffef3e42a8d8d 100644 --- a/libraries/joomla/form/fields/text.php +++ b/libraries/joomla/form/fields/text.php @@ -170,6 +170,45 @@ public function setup(SimpleXMLElement $element, $value, $group = null) */ protected function getInput() { + if ($this->element['useglobal']) + { + $component = JFactory::getApplication()->input->getCmd('option'); + + // Get correct component for menu items + if ($component == 'com_menus') + { + $link = $this->form->getData()->get('link'); + $uri = new JUri($link); + $component = $uri->getVar('option', 'com_menus'); + } + + $params = JComponentHelper::getParams($component); + $value = $params->get($this->fieldname); + + // Try with global configuration + if (is_null($value)) + { + $value = JFactory::getConfig()->get($this->fieldname); + } + + // Try with menu configuration + if (is_null($value) && JFactory::getApplication()->input->getCmd('option') == 'com_menus') + { + $value = JComponentHelper::getParams('com_menus')->get($this->fieldname); + } + + if (!is_null($value)) + { + $value = (string) $value; + + $this->hint = JText::sprintf('JGLOBAL_USE_GLOBAL_VALUE', $value); + } + else + { + JFactory::getApplication()->enqueueMessage(JText::_('JGLOBAL_USE_GLOBAL_VALUE_NOT_FOUND'), 'notice'); + } + } + return $this->getRenderer($this->layout)->render($this->getLayoutData()); }