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

@ -2,122 +2,142 @@
<!--%import("filter/insert_extra_var.xml")-->
<!--%import("filter/delete_extra_var.xml")-->
<!--@if($selected_var_idx && $extra_keys[$selected_var_idx])-->
<block cond="$selected_var_idx && $extra_keys[$selected_var_idx]">
{@ $selected_var = $extra_keys[$selected_var_idx] }
<!--@end-->
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</block>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/document/tpl/extra_keys/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<!--@if($type == 'insertExtraForm' || $selected_var_idx)-->
<form ruleset="insertExtraVar" action="./" method="post">
<input type="hidden" name="module" value="document" />
<input type="hidden" name="act" value="procDocumentAdminInsertExtraVar" />
<input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="var_idx" value="{$selected_var_idx}" />
<input type="hidden" name="success_return_url" value="{getUrl('type', '')}" />
<section class="section">
<h1>{$lang->extra_vars}</h1>
<form ruleset="insertExtraVar" action="./" method="post" class="x_form-horizontal">
<input type="hidden" name="module" value="document" />
<input type="hidden" name="act" value="procDocumentAdminInsertExtraVar" />
<input type="hidden" name="module_srl" value="{$module_srl}" />
<input type="hidden" name="var_idx" value="{$selected_var_idx}" />
<input type="hidden" name="success_return_url" value="{getUrl('type', '')}" />
<input type="hidden" name="xe_validator_id" value="modules/document/tpl/extra_keys/1" />
<div class="x_control-group">
<label class="x_control-label" for="eid">{$lang->eid}</label>
<div class="x_controls">
<input type="text" name="eid" id="eid" value="{$selected_var->eid}" placeholder="Ex) extra_vars_1" />
<p class="x_help-inline">{$lang->about_extra_vars_eid_value}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="lang_name">{$lang->column_name}</label>
<div class="x_controls">
<input type="text" name="name" id="name" value="<!--@if(strpos($selected_var->name, '$user_lang->') === false)-->{$selected_var->name}<!--@else-->{htmlspecialchars($selected_var->name)}<!--@end-->" class="lang_code" placeholder="Ex) Your favorite color." />
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="type">{$lang->column_type}</label>
<div class="x_controls">
<select name="type" id="type">
<option loop="$lang->column_type_list => $k, $v" value="{$k}" selected="selected"|cond="$selected_var->type == $k">{$lang->column_type_list[$k]}</option>
</select>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->is_required}</label>
<div class="x_controls">
<label class="x_inline" for="is_required_y"><input type="radio" name="is_required" id="is_required_y" value="Y" checked="checked"|cond="$selected_var->is_required == 'Y'" /> {$lang->yes}</label>
<label class="x_inline" for="is_required_n"><input type="radio" name="is_required" id="is_required_n" value="N" checked="checked"|cond="$selected_var->is_required != 'Y'" /> {$lang->not}</label>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="default">{$lang->default_value}</label>
<div class="x_controls">
<input type="text" name="default" id="default" value="{$selected_var->default}" placeholder="Ex) Red, Green, Blue" />
<p class="x_help-inline">{$lang->about_extra_vars_default_value}</p>
</div>
</div>
<div class="x_control-group">
<label class="x_control-label" for="lang_desc">{$lang->description}</label>
<div class="x_controls">
<input type="text" name="desc" id="desc" value="{$selected_var->desc}" class="lang_code" placeholder="Ex) Displayed as your choice." />
</div>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->cmd_search}</label>
<div class="x_controls">
<label class="x_inline" for="search_y"><input type="radio" name="search" id="search_y" value="Y" checked="checked"|cond="$selected_var->search=='Y'" /> {$lang->yes}</label>
<label class="x_inline" for="search_n"><input type="radio" name="search" id="search_n" value="N" checked="checked"|cond="$selected_var->search!='Y'" /> {$lang->not}</label>
</div>
</div>
<div class="x_clearfix btnArea">
<div class="x_pull-left">
<a class="x_btn" href="{getUrl('type','','selected_var_idx','')}">{$lang->cmd_back}</a>
</div>
<div class="x_pull-right">
<!--@if($selected_var)-->
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_modify}</button>
<!--@else-->
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_insert}</button>
<!--@end-->
</div>
</div>
</form>
</section>
<h3 class="h3">{$lang->extra_vars} {$selected_var_idx}</h3>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<tr>
<th>{$lang->eid}</th>
<td >
<input type="text" name="eid" value="{$selected_var->eid}" id="eid" /><p>{$lang->about_extra_vars_eid_value}</p>
</td>
</tr>
<tr>
<th>{$lang->column_name}</th>
<td >
<input type="text" name="name" value="{htmlspecialchars($selected_var->name)}" id="name" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','name')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
</td>
</tr>
<tr>
<th>{$lang->column_type}</th>
<td>
<select name="type">
<!--@foreach($lang->column_type_list as $k => $v)-->
<!--@if($key != 'kr_zip')-->
<option value="{$k}" <!--@if($selected_var->type==$k)-->selected="selected"<!--@end-->>{$lang->column_type_list[$k]}</option>
<!--@end-->
<!--@end-->
</select>
</td>
</tr>
<tr>
<th>{$lang->is_required}</th>
<td><input type="checkbox" name="is_required" value="Y" <!--@if($selected_var->is_required=='Y')-->checked="checked"<!--@end--> /></td>
</tr>
<tr>
<th>{$lang->default_value}</th>
<td><input type="text" name="default" value="{$selected_var->default}" /><p>{$lang->about_extra_vars_default_value}</p></td>
</tr>
<tr>
<th>{$lang->description}</th>
<td><input type="text" name="desc" value="{$selected_var->desc}" id="desc" /><a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','desc')}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a></td>
</tr>
<tr>
<th>{$lang->cmd_search}</th>
<td><input type="checkbox" name="search" value="Y" <!--@if($selected_var->search=='Y')-->checked="checked"<!--@end--> /></td>
</tr>
</table>
</div>
<div class="btnArea">
<!--@if($selected_var)-->
<span class="btn"><input type="submit" value="{$lang->cmd_modify}" /></span>
<!--@else-->
<span class="btn"><input type="submit" value="{$lang->cmd_insert}" /></span>
<!--@end-->
<span class="btn"><a href="{getUrl('type','','selected_var_idx','')}">{$lang->cmd_back}</a></span>
</div>
</form>
<!--@else-->
<h3 class="h3">{$lang->extra_vars}</h3>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<thead>
<tr>
<th>{$lang->no}</th>
<th>{$lang->eid}</th>
<th>{$lang->column_name}</th>
<th>{$lang->column_type}</th>
<th>{$lang->is_required}</th>
<th>{$lang->cmd_search}</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
<!--@foreach($extra_keys as $key => $val)-->
<tr>
<td rowspan="3">{$val->idx}</td>
<td rowspan="3">{$val->eid}</td>
<td><b>{$val->name}</b></td>
<td>{$lang->column_type_list[$val->type]}</td>
<td rowspan="3"><!--@if($val->is_required=='Y')--><b>{$lang->is_required}</b><!--@else-->N<!--@end--></td>
<td rowspan="3"><!--@if($val->search=='Y')--><b>{$lang->search_target}</b><!--@else-->N<!--@end--></td>
<td rowspan="3">
<!--@if($val->idx>1)--><a href="#" onclick="moveVar('up','{$module_srl}','{$val->idx}'); return false;" class="buttonSet buttonUp"><span>{$lang->cmd_move_up}</span></a><!--@end-->
<a cond="count($extra_keys) > $val->idx" href="#" onclick="moveVar('down','{$module_srl}','{$val->idx}');return false;" class="buttonSet buttonDown">{$lang->cmd_move_down}</a>
<a href="{getUrl('selected_var_idx',$val->idx)}" class="buttonSet buttonSetting"><span>{$lang->cmd_modify}...</span></a>
<a href="#" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');" class="buttonSet buttonDelete"><span>{$lang->cmd_delete}</span></a>
</td>
</tr>
<tr>
<td>{$lang->default_value}</td>
<td >{$val->default}&nbsp;</td>
</tr>
<tr>
<td>{$lang->description}</td>
<td >{$val->desc}&nbsp;</td>
</tr>
<!--@end-->
</tbody>
</table>
<section class="section">
<div class="x_clearfix">
<div class="x_btn-group x_pull-right">
<a class="x_btn" href="{getUrl('type','insertExtraForm','selected_var_idx','')}">{$lang->cmd_insert}</a>
</div>
</div>
<div class="btnArea">
<span class="btn"><a href="{getUrl('type','insertExtraForm','selected_var_idx','')}">{$lang->cmd_insert}</a></span>
<table class="x_table x_table-striped x_table-hover">
<thead>
<tr class="nowr">
<th>{$lang->no}</th>
<th>{$lang->eid}</th>
<th>{$lang->column_name}</th>
<th>{$lang->column_type}</th>
<th>{$lang->default_value}</th>
<th>{$lang->is_required}</th>
<th>{$lang->cmd_search}</th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
<block loop="$extra_keys => $key,$val">
<tr>
<td rowspan="2"|cond="$val->desc">{$val->idx}</td>
<td>{$val->eid}</td>
<td class="nowr"><strong>{$val->name}</strong></td>
<td class="nowr">{$lang->column_type_list[$val->type]}</td>
<td>{$val->default}&nbsp;</td>
<td class="nowr"><!--@if($val->is_required=='Y')--><strong>Y</strong><!--@else-->N<!--@end--></td>
<td class="nowr"><!--@if($val->search=='Y')--><strong>Y</strong><!--@else-->N<!--@end--></td>
<td class="nowr" style="text-align:right">
<block cond="$val->idx > 1">
<button type="button" class="x_icon-arrow-up" onclick="moveVar('up','{$module_srl}','{$val->idx}')">{$lang->cmd_move_up}</button>
</block>
<block cond="count($extra_keys) > $val->idx">
<button type="button" class="x_icon-arrow-down" onclick="moveVar('down','{$module_srl}','{$val->idx}')">{$lang->cmd_move_down}</button>
</block>
<a href="{getUrl('selected_var_idx',$val->idx)}" class="x_icon-wrench">{$lang->cmd_modify}</a>
<button type="button" class="x_icon-trash" onclick="return doDeleteExtraKey('{$module_srl}','{$val->idx}');">{$lang->cmd_delete}</button>
</td>
</tr>
<tr cond="$val->desc">
<td colspan="7">{$val->desc}</td>
</tr>
</block>
</tbody>
</table>
<div class="x_clearfix">
<div class="x_pull-right">
<a class="x_btn" href="{getUrl('type','insertExtraForm','selected_var_idx','')}">{$lang->cmd_insert}</a>
</div>
</div>
</section>
<!--@end-->
<form id="fo_delete" name="fo_delete" method="post" action="./">