merge sandbox to trunk for 1.4.4.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@7944 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2010-11-30 07:01:36 +00:00
parent 9139515e57
commit f59deeb270
131 changed files with 11605 additions and 4218 deletions

View file

@ -35,6 +35,7 @@
<th><div>{$lang->use_sso}</div></th>
<td>
<input type="checkbox" name="use_sso" value="Y" <!--@if($use_sso=='Y')-->checked="checked"<!--@end--> />
<p>{$lang->about_sso}</p>
</td>
</tr>
<tr>
@ -51,14 +52,6 @@
<input type="text" name="_target_module" id="_target_module" class="inputTypeText w300" value="{$start_module->mid} ({htmlspecialchars($start_module->browser_title)})" readonly="readonly" /><a href="{getUrl('','module','module','act','dispModuleSelectList','id','target_module','type','single')}" onclick="popopen(this.href,'ModuleSelect');return false;" class="button green"><span>{$lang->cmd_select}</span></a>
</td>
</tr>
<tr>
<th><div>{$lang->use_optimizer}</div></th>
<td>
<input type="checkbox" name="use_optimizer" value="Y" <!--@if($use_optimizer!='N')-->checked="checked"<!--@end--> />
<p>{$lang->about_optimizer}</p>
</td>
</tr>
<tr>
<th><div>Language</div></th>
<td>

View file

@ -190,10 +190,6 @@
<tr>
<th><div>{$lang->use_sso}</div></th>
<td><!--@if($use_sso=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
</tr>
<tr>
<th><div>{$lang->use_optimizer}</div></th>
<td><!--@if($use_optimizer=='Y')-->{$lang->use}<!--@else-->{$lang->notuse}<!--@end--></td>
</tr>
<tr>
<th><div>{$lang->mobile_view}</div></th>