Using the new modal_menu field in various core places

joomla · Aug 20, 2016 · e7a5d56 · e7a5d56
1 parent 1f48268
commit e7a5d56
Show file tree

Hide file tree

Showing 6 changed files with 67 additions and 14 deletions.
diff --git a/administrator/components/com_menus/models/fields/modal/menu.php b/administrator/components/com_menus/models/fields/modal/menu.php
@@ -87,10 +87,25 @@ protected function getInput()
 		{
 			$scriptClear = true;
 
+			if (isset($this->element['language']))
+			{
+				$clearField = htmlspecialchars(JText::_('COM_MENUS_SELECT_A_MENUITEM', true), ENT_COMPAT, 'UTF-8');
+			}
+			else
+			{
+				if ((string) $this->element->option['value'] == '')
+				{
+					$clearField =  htmlspecialchars(JText::_($this->element->option, true), ENT_COMPAT, 'UTF-8');
+				}
+				else
+				{
+					$clearField = htmlspecialchars(JText::_('JDEFAULT', true), ENT_COMPAT, 'UTF-8');
+				}
+			}
+
 			$script[] = '	function jClearMenu(id) {';
 			$script[] = '		document.getElementById(id + "_id").value = "";';
-			$script[] = '		document.getElementById(id + "_name").value = "' .
-				htmlspecialchars(JText::_('COM_MENUS_SELECT_A_MENUITEM', true), ENT_COMPAT, 'UTF-8') . '";';
+			$script[] = '		document.getElementById(id + "_name").value = "' . $clearField . '";';
 			$script[] = '		jQuery("#"+id + "_clear").addClass("hidden");';
 			$script[] = '		if (document.getElementById(id + "_edit")) {';
 			$script[] = '			jQuery("#"+id + "_edit").addClass("hidden");';
@@ -116,6 +131,11 @@ protected function getInput()
 		{
 			$linkItems .= '&amp;forcedLanguage=' . $this->element['language'];
 			$linkItem  .= '&amp;forcedLanguage=' . $this->element['language'];
+			$modalTitle = JText::_('COM_MENUS_CHANGE_MENUITEM') . ' (' . $this->element['label'] . ')';
+		}
+		else
+		{
+			$modalTitle = JText::_('COM_MENUS_CHANGE_MENUITEM');
 		}
 
 		$urlSelect = $linkItems . '&amp;' . JSession::getFormToken() . '=1';
@@ -143,7 +163,21 @@ protected function getInput()
 
 		if (empty($title))
 		{
-			$title = JText::_('COM_MENUS_SELECT_A_MENUITEM');
+			if (isset($this->element['language']))
+			{
+				$title = JText::_('COM_MENUS_SELECT_A_MENUITEM', true);
+			}
+			else
+			{
+				if ((string) $this->element->option['value'] == '')
+				{
+					$title = JText::_($this->element->option, true);
+				}
+				else
+				{
+					$title = JText::_('JDEFAULT');
+				}
+			}
 		}
 
 		$title = htmlspecialchars($title, ENT_QUOTES, 'UTF-8');
@@ -194,7 +228,7 @@ protected function getInput()
 			'bootstrap.renderModal',
 			'menuSelect' . $this->id . 'Modal',
 			array(
-				'title'       => JText::_('COM_MENUS_CHANGE_MENUITEM'),
+				'title'       => $modalTitle,
 				'url'         => $urlSelect,
 				'height'      => '400px',
 				'width'       => '800px',

diff --git a/administrator/components/com_menus/models/forms/item_alias.xml b/administrator/components/com_menus/models/forms/item_alias.xml
@@ -5,10 +5,13 @@
 	<fields name="params">
 
 		<fieldset name="aliasoptions">
-			<field name="aliasoptions" type="menuitem"
+			<field name="aliasoptions" type="modal_menu"
 				description="COM_MENUS_ITEM_FIELD_ALIAS_MENU_DESC"
 				label="COM_MENUS_ITEM_FIELD_ALIAS_MENU_LABEL"
-				required="true" />
+				required="true"
+				edit="true"
+				clear="false"
+			/>
 		</fieldset>
 
 		<fieldset name="menu-options"

diff --git a/components/com_users/views/login/tmpl/default.xml b/components/com_users/views/login/tmpl/default.xml
@@ -42,11 +42,13 @@
 
 		<field
 			name="login_redirect_menuitem"
-			type="menuitem"
+			type="modal_menu"
 			disable="separator,alias,heading,url"
 			label="COM_USERS_FIELD_LOGIN_REDIRECTMENU_LABEL"
 			description="COM_USERS_FIELD_LOGIN_REDIRECTMENU_DESC"
 			showon="loginredirectchoice:1"
+			edit="true"
+			clear="true"
 		>
 			<option value="">JDEFAULT</option>
 		</field>
@@ -111,11 +113,13 @@
 
 		<field
 			name="logout_redirect_menuitem"
-			type="menuitem"
+			type="modal_menu"
 			disable="separator,alias,heading,url"
 			label="COM_USERS_FIELD_LOGOUT_REDIRECTMENU_LABEL"
 			description="COM_USERS_FIELD_LOGOUT_REDIRECTMENU_DESC"
 			showon="logoutredirectchoice:1"
+			edit="true"
+			clear="true"
 		>
 			<option value="">JDEFAULT</option>
 		</field>

diff --git a/components/com_users/views/login/tmpl/logout.xml b/components/com_users/views/login/tmpl/logout.xml
@@ -23,10 +23,12 @@
 		<fieldset name="basic" label="COM_MENUS_BASIC_FIELDSET_LABEL">
 			<field
 				name="logout"
-				type="menuitem"
+				type="modal_menu"
 				disable="separator,alias,heading,url"
 				label="JFIELD_LOGOUT_REDIRECT_PAGE_LABEL"
 				description="JFIELD_LOGOUT_REDIRECT_PAGE_DESC"
+				edit="true"
+				clear="true"
 			>
 				<option value="">JDEFAULT</option>
 			</field>

diff --git a/modules/mod_login/mod_login.xml b/modules/mod_login/mod_login.xml
@@ -21,7 +21,9 @@
 	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_LOGIN" />
 	<config>
 		<fields name="params">
-			<fieldset name="basic">
+			<fieldset name="basic"
+				addfieldpath="/administrator/components/com_menus/models/fields">
+			>
 				<field
 					name="pretext"
 					type="textarea"
@@ -44,20 +46,24 @@
 
 				<field
 					name="login"
-					type="menuitem"
+					type="modal_menu"
 					label="MOD_LOGIN_FIELD_LOGIN_REDIRECTURL_LABEL"
 					description="MOD_LOGIN_FIELD_LOGIN_REDIRECTURL_DESC"
 					disable="separator,alias,heading,url"
+					edit="true"
+					clear="true"
 					>
 					<option value="">JDEFAULT</option>
 				</field>
 
 				<field
 					name="logout"
-					type="menuitem"
+					type="modal_menu"
 					label="MOD_LOGIN_FIELD_LOGOUT_REDIRECTURL_LABEL"
 					description="MOD_LOGIN_FIELD_LOGOUT_REDIRECTURL_DESC"
 					disable="separator,alias,heading,url"
+					edit="true"
+					clear="true"
 					>
 					<option value="">JDEFAULT</option>
 				</field>

diff --git a/modules/mod_menu/mod_menu.xml b/modules/mod_menu/mod_menu.xml
@@ -21,7 +21,9 @@
 	<help key="JHELP_EXTENSIONS_MODULE_MANAGER_MENU" />
 	<config>
 		<fields name="params">
-			<fieldset name="basic">
+			<fieldset name="basic"
+				addfieldpath="/administrator/components/com_menus/models/fields">
+			>
 				<field
 					name="menutype"
 					type="menu"
@@ -31,9 +33,11 @@
 
 				<field
 					name="base"
-					type="menuitem"
+					type="modal_menu"
 					label="MOD_MENU_FIELD_ACTIVE_LABEL"
 					description="MOD_MENU_FIELD_ACTIVE_DESC"
+					edit="true"
+					clear="true"
 					>
 					<option value="">JCURRENT</option>
 				</field>