merge from 1.5.3 (~r10943)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10951 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-07-27 02:47:10 +00:00
parent 7aa4798373
commit 54e3a72065
334 changed files with 13011 additions and 5561 deletions

View file

@ -30,4 +30,4 @@
<include target="include.module_grant_setup.html" />
<include target="include.multilang.textarea.html" />
</div>
</div>
</div>

View file

@ -32,7 +32,7 @@
</select>
<div id="zone_{$grant_name}" style="display:none">
<!--@foreach($group_list as $group_srl => $group_item)-->
<input type="checkbox" class="checkbox" name="{$grant_name}" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" />
<input type="checkbox" class="checkbox" name="{$grant_name}[]" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" />
<label for="grant_{$grant_name}_{$group_srl}">{$group_item->title}</label>
<!--@end-->
</div>

View file

@ -89,7 +89,8 @@
<input type="hidden" name="act" value="{$act}" />
<input type="hidden" name="search_target" value="value" />
<input type="hidden" name="error_return_url" value="" />
<input title="search" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
<input type="submit" value="{$lang->cmd_search}" />
<input type="hidden" name="target" value="{$target}" />
<input title="search" name="search_keyword" value="{htmlspecialchars($search_keyword)}" />
<input type="submit" value="{$lang->cmd_search}" />
</form>
</div>

View file

@ -43,12 +43,10 @@
<td class="nowr">
<!--@foreach($val->author as $author)-->
<!--@if($author->homepage)-->
<a href="{$author->homepage}" onclick="window.open(this.href);return false;" target="_blank">
<!--@end-->
{$author->name}
<!--@if($author->homepage)-->
</a>
<!--@end-->
<a href="{$author->homepage}" onclick="window.open(this.href);return false;" target="_blank">{$author->name}</a>
<!--@else-->
{$author->name}
<!--@endif-->
<!--@endforeach-->
</td>
<td class="nowr">{$val->path}</td>