rollback r10320, r10298, r10276, r10272

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10318 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-03-05 09:16:55 +00:00
parent f8dd9888f6
commit 206ded7cf9
149 changed files with 3745 additions and 2812 deletions

View file

@ -3,10 +3,10 @@
<div class="tag">{$lang->tag} : <block cond="is_array($oDocument->get('tag_list'))">{implode(',', $oDocument->get('tag_list'))}</block></div>
<!--@if($grant->manager)-->
<!--%import("./js/page_admin.js")-->
<div class="btnArea">
<div class="tRight clear">
<!--@if($logged_info->is_admin=='Y')-->
<a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}">{$lang->cmd_setup}...</a>
<a href="{getUrl('act','dispPageAdminInfo','module_srl',$module_info->module_srl)}" class="button green"><span>{$lang->cmd_setup}...</span></a>
<!--@end-->
<a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}">{$lang->cmd_page_modify}...</a>
<a href="{getUrl('act','dispPageAdminContentModify','document_srl','')}" class="button red"><span>{$lang->cmd_page_modify}...</span></a>
</div>
<!--@end-->

View file

@ -65,7 +65,7 @@ class pageMobile extends pageView {
preg_match_all('!(<img)([^\>]*)(widget=)([^\>]*?)(\>)!is', $this->module_info->content, $matches);
$page_content = '';
for($i=0,$c=count($matches[0]);$i<$c;$i++) {
$page_content .= preg_replace('/ style\=\"([^\"]+)\" /i',$matches[0][$i])."\n\n";
$page_content .= preg_replace('/ style\=\"([^\"]+)\" /i',' style="overflow:hidden;clear:both;margin:0 0 20px 0; _margin-right:10px;" ',$matches[0][$i])."\n\n";
}
}
return $page_content;

View file

@ -0,0 +1,6 @@
/* Mobile XE */
body{margin:0;background:#fff;color:#000;word-wrap:break-word}
body,input,textarea,select,button,table{font-family:Tahoma, Geneva, sans-serif}
img{border:0}
em{font-style:normal}
.bd{position:relative;overflow:hidden;clear:both}

View file

@ -0,0 +1,9 @@
@charset "utf-8";
h3 { margin:0 10px 0 10px; }
.adminLayer { margin-top:30px; background-color:#eee; border:1px solid #888;}
.buttonBox { border:2px solid #EEEEEE; padding:5px; overflow:hidden; *zoom:1;}
.buttonBox .fr { height:28px; }
.buttonBox .fl { height:28px; }
.buttonBox .buttonDiv { margin:2px 0; padding:0; border-top:1px solid EEEEEE; clear:both; }

View file

@ -11,8 +11,8 @@
<fieldset>
{$lang->mid} <input type="text" name="s_mid" value="{htmlspecialchars($s_mid)}" />
{$lang->browser_title} <input type="text" name="s_browser_title" value="{htmlspecialchars($s_browser_title)}" />
<span class="btn"><input type="submit" value="{$lang->cmd_search}" /></span>
<span class="btn"><a href="{getUrl('s_mid','','s_browser_title','','page','')}">{$lang->cmd_cancel}</a></span>
<span class="button blue"><input type="submit" value="{$lang->cmd_search}" /></span>
<a href="{getUrl('s_mid','','s_browser_title','','page','')}" class="button black"><span>{$lang->cmd_cancel}</span></a>
</fieldset>
</form>
@ -81,10 +81,10 @@
<!-- 버튼 -->
<div class="btnArea">
<div class="etc">
<span class="btn"><a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;">{$lang->cmd_setup}</a></span>
<span class="btn"><a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;">{$lang->cmd_manage_grant}</a></span>
<a href="{getUrl('','module','module','act','dispModuleAdminModuleSetup')}" onclick="doCartSetup(this.href); return false;" class="button green"><span>{$lang->cmd_setup}</span></a>
<a href="{getUrl('','module','module','act','dispModuleAdminModuleGrantSetup')}" onclick="doCartSetup(this.href); return false;" class="button blue"><span>{$lang->cmd_manage_grant}</span></a>
</div>
<a href="{getUrl('act','dispPageAdminInsert','module_srl','')}" class="btn"><span>{$lang->cmd_make}</span></a>
<a href="{getUrl('act','dispPageAdminInsert','module_srl','')}" class="button black strong"><span>{$lang->cmd_make}</span></a>
</div>
</form>

View file

@ -1,3 +1,4 @@
<load target="css/mpage.css" usecdn="true" />
<div class="bd">
{$page_content}
</div>

View file

@ -1,8 +1,10 @@
<!--%import("filter/insert_page_content.xml")-->
<load target="js/page_admin.js" usecdn="true" />
<load target="css/page.css" usecdn="true" />
<load target="../../widget/tpl/js/widget.js" usecdn="true" />
<load target="../../widget/tpl/css/widget.css" usecdn="true" />
<div id="wgArea">{$page_content}</div>
<div id="zonePageContent">{$page_content}</div>
<form action="./" method="post" id="pageFo" onsubmit="return doSubmitPageContent(this);">
<input type="hidden" name="mid" value="{$module_info->mid}" />
<input type="hidden" name="module" value="page" />
@ -26,22 +28,22 @@
</div>
</form>
<div id="wgBtnArea" class="wgBtnArea">
<button type="button" class="wgStyle" title="Style"></button>
<button type="button" class="wgSetup" title="Setup"></button>
<button type="button" class="wgCopy" title="Copy"></button>
<button type="button" class="wgSize" title="Size"></button>
<button type="button" class="wgRemove" title="Remove"></button>
<div id="widgetButton" class="widgetButtons">
<div class="widgetStyle"></div>
<div class="widgetSetup"></div>
<div class="widgetCopy"></div>
<div class="widgetSize"></div>
<div class="widgetRemove"></div>
</div>
<div id="wgBoxBtnArea" class="wgBtnArea">
<button type="button" class="wgStyle" title="Style"></button>
<button type="button" class="wgBoxSize" title="Size"></button>
<button type="button" class="wgBoxRemove" title="Remove"></button>
<div id="widgetBoxButton" class="widgetButtons">
<div class="widgetStyle"></div>
<div class="widgetBoxSize"></div>
<div class="widgetBoxRemove"></div>
</div>
<script type="text/javascript">
var confirm_delete_msg = "{$lang->confirm_delete}";
xAddEventListener(window,"load",function() { doStartPageModify('wgArea', '{$module_info->module_srl}'); jQuery('div.admin').css('background-color','transparent');});
xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div.admin').css('background-color','transparent');});
</script>
<!--#include("../../widget/tpl/widget_layer.html")-->

View file

@ -57,7 +57,7 @@
<th scope="row">{$lang->browser_title}</th>
<td class="text">
<input type="text" name="browser_title" value="{$module_info->browser_title}" id="browser_title"/>
<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;">{$lang->cmd_find_langcode}</a>
<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','browser_title')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
<p>{$lang->about_browser_title}</p>
</td>
</tr>

View file

@ -1,48 +1,52 @@
<!--%import("filter/insert_mpage_content.xml")-->
<load target="js/page_admin.js" usecdn="true" />
<load target="css/page.css" usecdn="true" />
<load target="../../widget/tpl/js/widget.js" usecdn="true" />
<load target="../../widget/tpl/css/widget.css" usecdn="true" />
<div id="wgArea">{$page_content}</div>
<form action="./" method="post" id="pageFo" onsubmit="return doSubmitMPageContent(this);">
<input type="hidden" name="mid" value="{$module_info->mid}" />
<input type="hidden" name="module" value="page" />
<input type="hidden" name="act" value="dispPageAdminContentModify" />
<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
<input type="hidden" name="content" value="{htmlspecialchars($content)}" />
<input type="hidden" name="type" value="mobile" />
<div id="zonePageContent">{$page_content}</div>
<div class="adminLayer">
<form action="./" method="post" id="pageFo" onsubmit="return doSubmitMPageContent(this);">
<input type="hidden" name="mid" value="{$module_info->mid}" />
<input type="hidden" name="module" value="page" />
<input type="hidden" name="act" value="dispPageAdminContentModify" />
<input type="hidden" name="module_srl" value="{$module_info->module_srl}" />
<input type="hidden" name="content" value="{htmlspecialchars($content)}" />
<input type="hidden" name="type" value="mobile" />
<div class="btnArea">
<div class="etc">
<span class="btn"><input type="button" value="{$lang->cmd_box_widget_insert}" onclick="doAddWidgetBox(); return false;" /></span>
<span class="btn"><input type="button" value="{$lang->cmd_content_insert}" onclick="doAddContent('{$module_info->mid}'); return false;" /></span>
<select name="widget_list">
<!--@foreach($widget_list as $widget)-->
<option value="{$widget->widget}" <!--@if($widget->widget=='content')-->selected="selected"<!--@end-->>{$widget->title}</option>
<!--@end-->
</select>
<span class="btn"><input type="button" value="{$lang->cmd_insert}" onclick="doAddWidget(this.form); return false;"/></span>
</div>
<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
<span class="btn"><input type="button" value="{$lang->cmd_remove_all_widgets}" onclick="removeAllWidget();return false;"/></span>
</form>
<div id="wgBtnArea" class="wgBtnArea">
<button type="button" class="wgStyle" title="Style"></button>
<button type="button" class="wgSetup" title="Setup"></button>
<button type="button" class="wgCopy" title="Copy"></button>
<button type="button" class="wgSize" title="Size"></button>
<button type="button" class="wgRemove" title="Remove"></button>
<div class="btnArea">
<div class="etc">
<span class="btn"><input type="button" value="{$lang->cmd_box_widget_insert}" onclick="doAddWidgetBox(); return false;" /></span>
<span class="btn"><input type="button" value="{$lang->cmd_content_insert}" onclick="doAddContent('{$module_info->mid}'); return false;" /></span>
<select name="widget_list">
<!--@foreach($widget_list as $widget)-->
<option value="{$widget->widget}" <!--@if($widget->widget=='content')-->selected="selected"<!--@end-->>{$widget->title}</option>
<!--@end-->
</select>
<span class="btn"><input type="button" value="{$lang->cmd_insert}" onclick="doAddWidget(this.form); return false;"/></span>
</div>
<span class="btn"><input type="submit" value="{$lang->cmd_save}"/></span>
<span class="btn"><input type="button" value="{$lang->cmd_remove_all_widgets}" onclick="removeAllWidget();return false;"/></span>
</form>
</div>
<div id="wgBoxBtnArea" class="wgBtnArea">
<button type="button" class="wgStyle" title="Style"></button>
<button type="button" class="wgBoxSize" title="Size"></button>
<button type="button" class="wgBoxRemove" title="Remove"></button>
<div id="widgetButton" class="widgetButtons">
<div class="widgetStyle"></div>
<div class="widgetSetup"></div>
<div class="widgetCopy"></div>
<div class="widgetSize"></div>
<div class="widgetRemove"></div>
</div>
<div id="widgetBoxButton" class="widgetButtons">
<div class="widgetStyle"></div>
<div class="widgetBoxSize"></div>
<div class="widgetBoxRemove"></div>
</div>
<script type="text/javascript">
var confirm_delete_msg = "{$lang->confirm_delete}";
xAddEventListener(window,"load",function() { doStartPageModify('wgArea', '{$module_info->module_srl}'); jQuery('div.admin').css('background-color','transparent');});
xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div.admin').css('background-color','transparent');});
</script>
<!--#include("../../widget/tpl/widget_layer.html")-->