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

merge from branch luminous (version 1.5.4.2, ~r12561)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/trunk@12611 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2013-01-30 05:53:14 +00:00
parent 2263200ce4
commit cc47d2b247
196 changed files with 3655 additions and 2033 deletions
Download patch file Download diff file Expand all files Collapse all files

5
modules/page/tpl/article_content_footer.html Normal file
View file

@ -0,0 +1,5 @@
<div class="btnArea">
<span class="btn"><a cond="$logged_info->is_admin=='Y'" href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}...</a></span>
<span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}...</a></span>
<span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}...</a></span>
</div>

1
modules/page/tpl/article_content_modify.html
View file

@ -3,6 +3,7 @@
<input type="hidden" name="mid" value="{$mid}" />
<input type="hidden" name="content" value="{$oDocument->getContentText()}" />
<input type="hidden" name="document_srl" value="{$document_srl}" />
<input type="hidden" name="isMobile" value="{$isMobile}" />
<div class="form" style="margin-right:10px">
<input type="text" name="title" value="{htmlspecialchars($oDocument->getTitleText())}" title="{$lang->title}" style="width:100%" />
</div>

2
modules/page/tpl/content.html
View file

@ -9,7 +9,7 @@
<!--@if($module_info->page_type != 'OUTSIDE')-->
<span class="btn"><a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}...</a></span>
<!--@end-->
<!--@if($module_info->use_mobile =="Y" && $module_info->page_type == 'WIDGET')-->
<!--@if($module_info->use_mobile =="Y" && $module_info->page_type != 'OUTSIDE')-->
<span class="btn"><a href="{getUrl('act','dispPageAdminMobileContent','module_srl',$module_info->module_srl)}">Mobile</a></span>
<!--@end-->
</div>

1
modules/page/tpl/filter/insert_article.xml
View file

@ -9,5 +9,6 @@
<tag name="mid" />
<tag name="document_srl" />
<tag name="category_srl" />
<tag name="is_mobile" />
</response>
</filter>

5
modules/page/tpl/js/page_admin.js
View file

@ -30,10 +30,15 @@ function completeArticleDocumentInserted(ret_obj){
var message = ret_obj['message'];
var mid = ret_obj['mid'];
var is_mobile = ret_obj['is_mobile'];
alert(message);
var url = '';
if(is_mobile == 'Y')
url = current_url.setQuery('act', 'dispPageAdminMobileContent').setQuery('mid', mid);
else
url = current_url.setQuery('act', 'dispPageIndex').setQuery('mid', mid);

2
modules/page/tpl/page_insert.html
View file

@ -99,7 +99,7 @@
<p>{$lang->about_page_caching_interval}</p>
</td>
</tr>
<tr>
<tr class="optionnalData articleType">
<th scope="row">{$lang->skin}</th>
<td class="text">
<select name="skin">