merge from 1.7.3.5(r13153:r13167)

git-svn-id: http://xe-core.googlecode.com/svn/trunk@13168 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ngleader 2013-09-29 23:32:39 +00:00
parent cc47d2b247
commit 2d3f149b5a
2042 changed files with 129266 additions and 126243 deletions

View file

@ -1,7 +1,6 @@
<!--%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="zonePageContent">{$page_content}</div>
@ -11,37 +10,38 @@
<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)}" />
<div class="btnArea" id="pageBtnArea" style="display:none;">
<div class="btnArea" id="pageBtnArea" hidden>
<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">
<span class="btn-group">
<input class="btn" type="button" value="{$lang->cmd_box_widget_insert}" onclick="doAddWidgetBox()" />
<input class="btn" type="button" value="{$lang->cmd_content_insert}" onclick="doAddContent('{$module_info->mid}')" />
</span>
<select name="widget_list" style="margin:0;width:auto">
<!--@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>
<input class="btn" type="button" value="{$lang->cmd_insert}" onclick="doAddWidget(this.form)"/>
</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>
<span class="btn-group">
<input class="btn" type="submit" value="{$lang->cmd_save}"/>
<input class="btn" type="button" value="{$lang->cmd_remove_all_widgets}" onclick="removeAllWidget()"/>
</span>
</div>
</form>
<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>
<button type="button" class="widgetSetup" title="{$lang->cmd_setup}">{$lang->cmd_setup}</button>
<button type="button" class="widgetSize" title="{$lang->cmd_widget_size}">{$lang->cmd_widget_size}</button>
<button type="button" class="widgetStyle" title="{$lang->widgetstyle}">{$lang->widgetstyle}</button>
<button type="button" class="widgetCopy" title="{$lang->cmd_copy}">{$lang->cmd_copy}</button>
<button type="button" class="widgetRemove" title="{$lang->cmd_delete}">{$lang->cmd_delete}</button>
</div>
<div id="widgetBoxButton" class="widgetButtons">
<div class="widgetStyle"></div>
<div class="widgetBoxSize"></div>
<div class="widgetBoxRemove"></div>
<button type="button" class="widgetBoxSize" title="{$lang->cmd_widget_size}">{$lang->cmd_widget_size}</button>
<button type="button" class="widgetStyle" title="{$lang->widgetstyle}">{$lang->widgetstyle}</button>
<button type="button" class="widgetBoxRemove" title="{$lang->cmd_delete}">{$lang->cmd_delete}</button>
</div>
<script type="text/javascript">
<script>
var confirm_delete_msg = "{$lang->confirm_delete}";
xAddEventListener(window,"load",function() { doStartPageModify('zonePageContent', '{$module_info->module_srl}'); jQuery('div.admin').css('background-color','transparent');});
</script>