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,63 +1,59 @@
<load target="../../admin/tpl/js/admin.js" usecdn="true" />
<load target="../../admin/tpl/css/admin.bootstrap.css" usecdn="true" />
<load target="../../admin/tpl/css/admin.css" usecdn="true" />
<load cond="$lang_type=='ko'" target="../../admin/tpl/css/admin_ko.css" usecdn="true" />
<load cond="$lang_type=='en'" target="../../admin/tpl/css/admin_en.css" usecdn="true" />
<load target="../../admin/tpl/js/admin.js" usecdn="true" />
<load target="js/generate_code.js" usecdn="true" />
<script type="text/javascript">
<load target="../../admin/tpl/js/jquery.tmpl.js" usecdn="true" />
<load target="../../admin/tpl/js/jquery.jstree.js" usecdn="true" />
<script>
xe.lang.cmd_delete = '{$lang->cmd_delete}';
jQuery(document).ready(function(){
doFillWidgetVars();
});
</script>
<div cond="$type=='faceoff'" class="x" style="padding: 0 10px;">
<form class="form">
<input type="hidden" name="module" value="widget" />
<input type="hidden" name="type" value="faceoff" />
<input type="hidden" name="act" value="dispWidgetGenerateCodeInPage" />
<input type="hidden" name="error_return_url" value="" />
<h2 class="h2">{$lang->widget}</h2>
<ul>
<li>
<p class="a">
<select name="selected_widget">
<div class="x">
<div class="x_modal-header">
<h1>{$widget_info->title} {$lang->cmd_generate_code}</h1>
</div>
<div id="content" class="x_modal-body">
<p>{$widget_info->description} {$lang->about_widget_code_in_page}</p>
<form cond="$type=='faceoff'" class="x_form-horizontal">
<input type="hidden" name="module" value="widget" />
<input type="hidden" name="type" value="faceoff" />
<input type="hidden" name="act" value="dispWidgetGenerateCodeInPage" />
<input type="hidden" name="error_return_url" value="" />
<div class="x_control-group">
<label for="selected_widget" class="x_control-label">
{$lang->widget}
</label>
<div class="x_controls">
<select name="selected_widget" id="selected_widget" style="margin:0">
<option loop="$widget_list => $list_widget_info" value="{$list_widget_info->widget}">{$list_widget_info->title}</option>
</select>
<input type="submit" value="{$lang->cmd_select}" />
</p>
</li>
</ul>
</form>
</div>
<div class="x" style="padding: 0 10px;">
<h2 class="h2">{$widget_info->title}</h2>
<p>{$widget_info->description}</p>
<h3 class="h3">{$lang->cmd_generate_code}</h3>
<p>{$lang->about_widget_code_in_page}</p>
<form class="form" action="./" method="post" id="fo_widget">
<input type="hidden" name="module" value="widget" />
<input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="widget_sequence" value="" />
<input type="hidden" name="style" value="float:left;width:100%;margin:none;padding:none;" />
<input type="hidden" name="widget_padding_left" value="" />
<input type="hidden" name="widget_padding_right" value="" />
<input type="hidden" name="widget_padding_top" value="" />
<input type="hidden" name="widget_padding_bottom" value="" />
<input type="hidden" name="selected_widget" value="{$widget_info->widget}" />
<include target="widget_generate_code.include.html" />
<div class="btnArea">
<span class="btn small"><input type="submit" value="{$lang->cmd_generate_code}" /></span>
</div>
</form>
<include target="widget_generate_code.filebox.html" />
<include target="widget_generate_code.multilang.html" />
<include target="widget_generate_code.multilang.textarea.html" />
<input type="submit" value="{$lang->cmd_select}" class="x_btn" />
</div>
</div>
</form>
<form class="x_form-horizontal" action="./" method="post" id="fo_widget">
<input type="hidden" name="module" value="widget" />
<input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="widget_sequence" value="" />
<input type="hidden" name="style" value="float:left;width:100%;margin:none;padding:none;" />
<input type="hidden" name="widget_padding_left" value="" />
<input type="hidden" name="widget_padding_right" value="" />
<input type="hidden" name="widget_padding_top" value="" />
<input type="hidden" name="widget_padding_bottom" value="" />
<input type="hidden" name="selected_widget" value="{$widget_info->widget}" />
<include target="widget_generate_code.include.html" />
<div class="btnArea">
<input type="submit" class="x_btn x_btn-primary" value="{$lang->cmd_generate_code}" />
</div>
</form>
</div>
<include target="../../module/tpl/include.filebox.html" />
</div>