fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-27 23:29:57 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.2

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/file/tpl/adminConfig.html
View file

@ -24,7 +24,7 @@
<li style="display:none"|cond="$config->allow_outlink == 'N'" class="_outLink">
<p class="q">{$lang->allow_outlink_site}</p>
<p class="a">
<textarea type="text" name="allow_outlink_site">{$config->allow_outlink_site}</textarea>
<textarea type="text" name="allow_outlink_site" rows="8" cols="42">{$config->allow_outlink_site}</textarea>
<p>{$lang->about_allow_outlink_site}</p>
</p>
</li>

2
modules/file/tpl/file_config.html
View file

@ -29,7 +29,7 @@
<tr>
<th scope="col">{$lang->allow_outlink_site}</th>
<td class="text">
<textarea name="allow_outlink_site" class="fullWidth">{$config->allow_outlink_site}</textarea>
<textarea name="allow_outlink_site" rows="8" cols="42">{$config->allow_outlink_site}</textarea>
<p>{$lang->about_allow_outlink_site}</p>
</td>
</tr>

41
modules/file/tpl/file_list.html
View file

@ -30,24 +30,24 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<thead>
<tr>
<th scope="col" class="text">{$lang->file}</th>
<th scope="col">{$lang->file_size}</th>
<th scope="col">{$lang->cmd_download}</th>
<th scope="col">{$lang->author}</th>
<th scope="col">{$lang->date}</th>
<th scope="col">{$lang->ipaddress}</th>
<th scope="col">{$lang->status}</th>
<th scope="col" class="nowr">{$lang->file_size}</th>
<th scope="col" class="nowr">{$lang->cmd_download}</th>
<th scope="col" class="nowr">{$lang->author}</th>
<th scope="col" class="nowr">{$lang->date}</th>
<th scope="col" class="nowr">{$lang->ipaddress}</th>
<th scope="col" class="nowr">{$lang->status}</th>
<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
</tr>
</thead>
<tfoot>
<tr>
<th scope="col" class="text">{$lang->file}</th>
<th scope="col">{$lang->file_size}</th>
<th scope="col">{$lang->cmd_download}</th>
<th scope="col">{$lang->author}</th>
<th scope="col">{$lang->date}</th>
<th scope="col">{$lang->ipaddress}</th>
<th scope="col">{$lang->status}</th>
<th scope="col" class="nowr">{$lang->file_size}</th>
<th scope="col" class="nowr">{$lang->cmd_download}</th>
<th scope="col" class="nowr">{$lang->author}</th>
<th scope="col" class="nowr">{$lang->date}</th>
<th scope="col" class="nowr">{$lang->ipaddress}</th>
<th scope="col" class="nowr">{$lang->status}</th>
<th scope="col"><input type="checkbox" data-name="cart" title="Check All" /></th>
</tr>
</tfoot>
@ -88,18 +88,18 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<!-- one document end -->
<tr>
<td class="text"><a href="{$val->download_url}">{htmlspecialchars($val->source_filename)}</a></td>
<td>{FileHandler::filesize($val->file_size)}</td>
<td>{$val->download_count}</td>
<td>
<td class="nowr">{FileHandler::filesize($val->file_size)}</td>
<td class="nowr">{$val->download_count}</td>
<td class="nowr">
<!--@if($val->upload_target_type == 'doc' && $document_list[$document_srl])-->
<a href="#popup_menu_area" class="member_{$document_list[$document_srl]->get('member_srl')}">{$document_list[$document_srl]->getNickName()}</a>
<!--@elseif($val->upload_target_type == 'com' && $comment_list[$val->upload_target_srl])-->
<a href="#popup_menu_area" class="member_{$comment_list[$val->upload_target_srl]->get('member_srl')}">{$comment_list[$val->upload_target_srl]->getNickName()}</a>
<!--@end-->
</td>
<td>{zdate($val->regdate,"Y-m-d H:i")}</td>
<td><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
<td><!--@if($val->isvalid=='Y')-->{$lang->is_valid}<!--@else-->{$lang->is_stand_by}<!--@end--></td>
<td class="nowr">{zdate($val->regdate,"Y-m-d H:i")}</td>
<td class="nowr"><a href="{getUrl('search_target','ipaddress','search_keyword',$val->ipaddress)}">{$val->ipaddress}</a></td>
<td class="nowr"><!--@if($val->isvalid=='Y')-->{$lang->is_valid}<!--@else-->{$lang->is_stand_by}<!--@end--></td>
<td>
<input type="checkbox" name="cart" value="{$val->file_srl}" />
</td>
@ -124,9 +124,8 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
<thead>
<tr>
<th scope="col" class="text">{$lang->file}</th>
<th scope="col">{$lang->file_size}</th>
<th scope="col">{$lang->nick_name}</th>
<th scope="col">{$lang->status}</th>
<th scope="col" class="nowr">{$lang->file_size}</th>
<th scope="col" class="nowr">{$lang->status}</th>
</tr>
</thead>
<tbody>

5
modules/file/tpl/js/file_admin.js
View file

@ -34,9 +34,8 @@ function completeGetFileList(ret_obj, response_tags)
var objFile = file_list[x];
htmlListBuffer += '<tr>' +
'<td class="text">'+objFile.source_filename+'</td>' +
'<td>'+objFile.human_file_size+'</td>' +
'<td></td>' +
'<td>'+objFile.validName+'</td>' +
'<td class="nowr">'+objFile.human_file_size+'</td>' +
'<td class="nowr">'+objFile.validName+'</td>' +
'</tr>' +
'<input type="hidden" name="cart[]" value="'+objFile.file_srl+'" />';
}