merge from 1.5.3.2(r11162 ~ r11201)

and from luminous (r11141 ~ r11193)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11202 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-09-11 02:52:49 +00:00
parent 773a666d12
commit 42eb19ae10
32 changed files with 340 additions and 131 deletions

View file

@ -47,29 +47,29 @@
<span class="btn small"><input type="submit" value="{$lang->cmd_save}" /></span>
</div>
</form>
<form action="" class="form">
<h2 class="h2">{$lang->feed} {$lang->cmd_management}</h2>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<thead>
<tr>
<th scope="col">{$lang->mid}</th>
<th scope="col" class="title">{$lang->description}</th>
<th scope="col">{$lang->open_rss}</th>
<th scope="col">
<label for="feed_integration">{$lang->open_feed_to_total}</label>
</th>
<th scope="col">{$lang->cmd_save}</th>
</tr>
</thead>
<tbody>
<!--@foreach($feed_config AS $key=>$value)-->
<h2 class="h2">{$lang->feed} {$lang->cmd_management}</h2>
<div class="table form">
<table width="100%" border="1" cellspacing="0">
<thead>
<tr>
<th scope="col">{$lang->mid}</th>
<th scope="col" class="title">{$lang->description}</th>
<th scope="col">{$lang->open_rss}</th>
<th scope="col">
<label for="feed_integration">{$lang->open_feed_to_total}</label>
</th>
<th scope="col">{$lang->cmd_save}</th>
</tr>
</thead>
<tbody>
<tr loop="$feed_config => $key,$value">
<form ruleset="insertRssModuleConfig" action="./" method="post">
<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', 'dispRssAdminIndex')}" />
<input type="hidden" name="target_module_srl" value="{$key}" />
<tr>
<th scope="row" class="nowr"><!--@if($value['url'])--><a href="{$value['url']}" target="_blank"><!--@endif-->{$value['mid']}<!--@if($value['url'])--></a><!--@endif--></th>
<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
<input type="hidden" name="success_return_url" value="{getUrl('', 'module', $module, 'act', 'dispRssAdminIndex')}" />
<input type="hidden" name="target_module_srl" value="{$key}" />
<th scope="row" class="nowr">
<!--@if($value['url'])--><a href="{$value['url']}" target="_blank"><!--@endif-->{$value['mid']}<!--@if($value['url'])--></a><!--@endif-->
</th>
<td class="title">{$value['feed_description']}</td>
<td class="nowr">
<!--@foreach($lang->open_rss_types as $key2=>$value2)-->
@ -83,10 +83,8 @@
<label for="open_total_feed_T_N">{$lang->notuse}</label>
</td>
<td class="nowr"><input type="submit" value="{$lang->cmd_save}" class="text" /></td>
</tr>
</form>
<!--@end-->
</tbody>
</table>
</div>
</form>
</tr>
</tbody>
</table>
</div>

View file

@ -1,9 +1,9 @@
<form ruleset="insertRssModuleConfig" action="./" method="post" class="form">
<input type="hidden" name="module" value="rss" />
<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="target_module_srl" value="{$rss_config->module_srl?$rss_config->module_srl:$module_srls}" />
<input type="hidden" name="module" value="rss" />
<input type="hidden" name="act" value="procRssAdminInsertModuleConfig" />
<input type="hidden" name="success_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="target_module_srl" value="{$rss_config->module_srl?$rss_config->module_srl:$module_srls}" />
<h3 class="h3">{$lang->open_rss}</h3>
<p>{$lang->about_open_rss}</p>
<div class="table">