issue 485 if new lang add, langcode manager apply admin layout.

but layout should be not apply to langcode manager


git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9646 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2011-10-14 02:00:11 +00:00
parent 75478d2757
commit 8ddabdefee
4 changed files with 8 additions and 2 deletions

View file

@ -161,6 +161,9 @@ class HTMLDisplayHandler {
case 'hidden': case 'hidden':
$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.$INPUT_ERROR[$match[3]].'"'; $str = preg_replace('@\svalue="[^"]*?"@', ' ', $str).' value="'.$INPUT_ERROR[$match[3]].'"';
break; break;
case 'password':
$str = preg_replace('@\svalue="[^"]*?"@', ' ', $str);
break;
case 'radio': case 'radio':
case 'checkbox': case 'checkbox':
$str = preg_replace('@\schecked(="[^"]*?")?@', ' ', $str); $str = preg_replace('@\schecked(="[^"]*?")?@', ' ', $str);

View file

@ -113,7 +113,6 @@ xe.lang.confirm_delete = "{$lang->confirm_delete}";
<p class="q"><label for="cModule_id">{$lang->create_mid_in_menu}.</label></p> <p class="q"><label for="cModule_id">{$lang->create_mid_in_menu}.</label></p>
<div class="a"> <div class="a">
<input type="text" id="cModule_id" name="create_menu_url" /> <input type="text" id="cModule_id" name="create_menu_url" />
<span class="desc"><button type="button" class="text">Validation Check</button></span>
</div> </div>
</li> </li>
<li id="selectModule"> <li id="selectModule">

View file

@ -440,6 +440,8 @@
function procModuleAdminInsertLang() { function procModuleAdminInsertLang() {
// Get language code // Get language code
$site_module_info = Context::get('site_module_info'); $site_module_info = Context::get('site_module_info');
$target = Context::get('target');
$module = Context::get('module');
$args->site_srl = (int)$site_module_info->site_srl; $args->site_srl = (int)$site_module_info->site_srl;
$args->name = str_replace(' ','_',Context::get('lang_code')); $args->name = str_replace(' ','_',Context::get('lang_code'));
$args->lang_name = str_replace(' ','_',Context::get('lang_name')); $args->lang_name = str_replace(' ','_',Context::get('lang_name'));
@ -472,7 +474,7 @@
$this->add('name', $args->name); $this->add('name', $args->name);
$this->setMessage("success_saved", 'info'); $this->setMessage("success_saved", 'info');
if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) { if(!in_array(Context::getRequestMethod(),array('XMLRPC','JSON'))) {
$returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', 'admin', 'act', 'dispModuleAdminLangcode'); $returnUrl = Context::get('success_return_url') ? Context::get('success_return_url') : getNotEncodedUrl('', 'module', $module, 'target', $target, 'act', 'dispModuleAdminLangcode');
$this->setRedirectUrl($returnUrl); $this->setRedirectUrl($returnUrl);
return; return;
} }

View file

@ -41,6 +41,8 @@
<div class="modal" id="addWord"> <div class="modal" id="addWord">
<form action="./" method="post" class="form mLangEdit fg" id="langForm_new" > <form action="./" method="post" class="form mLangEdit fg" id="langForm_new" >
<input type="hidden" name="act" value="procModuleAdminInsertLang" /> <input type="hidden" name="act" value="procModuleAdminInsertLang" />
<input type="hidden" name="module" value="{$module}" />
<input type="hidden" name="target" value="{$target}" />
<h2 class="h2">{$lang->add_word}</h2> <h2 class="h2">{$lang->add_word}</h2>
<ul> <ul>
<li class="{$key2}" loop="$lang_supported=>$key2,$value2"><label for="{$langName}_{$key2}">{$value2}</label> <textarea rows="1" cols="42" name="{$key2}" id="{$langName}_{$key2}"></textarea></li> <li class="{$key2}" loop="$lang_supported=>$key2,$value2"><label for="{$langName}_{$key2}">{$value2}</label> <textarea rows="1" cols="42" name="{$key2}" id="{$langName}_{$key2}"></textarea></li>