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,6 +1,5 @@
<h1 class="h1">{$lang->addon_maker}</h1>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<h1>{$lang->addon_maker}</h1>
<table class="x_table x_table-striped x_table-hover">
<tr>
<th scope="row">{$lang->title}</th>
<td>{$addon_info->title} ver. {$addon_info->version}</td>
@ -13,7 +12,7 @@
<!--@endforeach-->
</td>
</tr>
<!--@if($addon_info->homepage)-->
<!--@if($addon_info->homepage)-->
<tr>
<th scope="row">{$lang->homepage}</th>
<td><a href="{$addon_info->homepage}" onclick="window.open(this.href);return false;">{$addon_info->homepage}</a></td>
@ -22,7 +21,7 @@
<th scope="row">{$lang->regdate}</th>
<td>{zdate($addon_info->date, 'Y-m-d')}</td>
</tr>
<!--@if($addon_info->license || $addon_info->license_link)-->
<!--@if($addon_info->license || $addon_info->license_link)-->
<tr>
<th scope="row">{$lang->addon_license}</th>
<td>
@ -32,47 +31,41 @@
<!--@end-->
</td>
</tr><!--@end-->
<!--@if($addon_info->description)-->
<!--@if($addon_info->description)-->
<tr>
<th scope="row">{$lang->description}</th>
<td>{nl2br(trim($addon_info->description))}</td>
</tr><!--@end-->
</table>
</div>
</table>
<!--@if($addon_info->history)-->
<h1 class="h1">{$lang->addon_history}</h1>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<col width="100" />
<col />
<!--@foreach($addon_info->history as $history)-->
<tr>
<th scope="row">
{$history->version}<br />
{$history->date} </th>
<td>
<!--@foreach($history->author as $author)-->
<p>{$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a> / <a href="mailto:{$author->email_address}">{$author->email_address}</a>)</p>
<h1>{$lang->addon_history}</h1>
<table class="x_table x_table-striped x_table-hover">
<!--@foreach($addon_info->history as $history)-->
<tr>
<th scope="row">
{$history->version}<br />
{$history->date} </th>
<td>
<!--@foreach($history->author as $author)-->
<p>{$author->name} (<a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a> / <a href="mailto:{$author->email_address}">{$author->email_address}</a>)</p>
<!--@endforeach-->
<!--@if($history->description)-->
<p>{nl2br(trim($history->description))}</p>
<!--@endif-->
<!--@if($history->logs)-->
<ul>
<!--@foreach($history->logs as $log)-->
<!--@if($log->link)-->
<li><a href="{$log->link}">{$log->text}</a></li>
<!--@else-->
<li>{$log->text}</li>
<!--@endif-->
<!--@endforeach-->
<!--@if($history->description)-->
<p>{nl2br(trim($history->description))}</p>
<!--@endif-->
<!--@if($history->logs)-->
<ul>
<!--@foreach($history->logs as $log)-->
<!--@if($log->link)-->
<li><a href="{$log->link}">{$log->text}</a></li>
<!--@else-->
<li>{$log->text}</li>
<!--@endif-->
<!--@endforeach-->
</ul>
<!--@endif-->
</td>
</tr>
<!--@endforeach-->
</table>
</div>
</ul>
<!--@endif-->
</td>
</tr>
<!--@endforeach-->
</table>
<!--@endif-->

View file

@ -1,57 +1,63 @@
<div class="x_page-header">
<h1>{$lang->installed_addons} <a class="x_icon-question-sign" href="./admin/help/index.html#UMAN_advanced_installed_addon" target="_blank">{$lang->help}</a></h1>
</div>
<p>{$lang->about_installed_addon}</p>
<form action="./" method="post">
<input type="hidden" name="module" value="addon" />
<input type="hidden" name="act" value="procAddonAdminSaveActivate" />
<input type="hidden" name="sccess_return_url" value="{getRequestUriByServerEnviroment()}" />
<input type="hidden" name="xe_validator_id" value="modules/addon/tpl/addon_list/1" />
<h1 class="h1">{$lang->installed_addons}</h1>
<p>{$lang->about_installed_addon}</p>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/addon/tpl/addon_list/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<div class="table even easyList dsTg">
<table width="100%" border="1" cellspacing="0">
<caption>
All({$addon_count})
<span class="side"><button type="button" class="text"><span class="hide">{$lang->simple_view}</span><span class="show">{$lang->detail_view}</span></button></span>
</caption>
<thead>
<tr>
<th scope="col" class="title">{$lang->addon_name}</th>
<th scope="col" class="nowr">{$lang->version}</th>
<th scope="col" class="nowr">{$lang->author}</th>
<th scope="col" class="nowr">{$lang->installed_path}</th>
<th scope="col" class="nowr">{$lang->cmd_setup}</th>
<th scope="col" class="nowr">PC</th>
<th scope="col" class="nowr">Mobile</th>
<th scope="col" class="nowr">{$lang->cmd_delete}</th>
</tr>
</thead>
<tbody>
<tr loop="$addon_list => $addon">
<td class="title">
<p><strong>{$addon->title}</strong></p>
<p>{$addon->description}</p>
<p cond="$addon->need_update == 'Y'" class="update">
{$lang->msg_avail_easy_update} <a href="{$addon->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a>
</p>
</td>
<td class="nowr">{$addon->version}</td>
<td class="nowr">
<block loop="$addon->author => $author">
<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->name}</a>
<block cond="!$author->homepage">{$author->name}</block>
</block>
</td>
<td class="nowr">{$addon->path}</td>
<td class="nowr"><a href="{getUrl('act', 'dispAddonAdminSetup', 'selected_addon', $addon->addon_name)}">{$lang->cmd_setup}</a></td>
<td class="nowr"><input type="checkbox" name="pc_on[]" title="PC" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->activated" /></td>
<td class="nowr"><input type="checkbox" name="mobile_on[]" title="Mobile" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->mactivated" /></td>
<td class="nowr"><a cond="$addon->remove_url" href="{$addon->remove_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a></td>
</tr>
</tbody>
</table>
</div>
<div class="btnArea">
<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
<table class="x_table x_table-striped x_table-hover dsTg">
<caption>
<strong>All({$addon_count})</strong>
<div class="x_pull-right x_btn-group">
<button type="button" class="x_btn x_active __simple">{$lang->simple_view}</button>
<button type="button" class="x_btn __detail">{$lang->detail_view}</button>
</div>
</caption>
<thead>
<tr>
<th class="title">{$lang->addon_name}</th>
<th class="nowr">{$lang->version}</th>
<th class="nowr">{$lang->author}</th>
<th class="nowr">{$lang->installed_path}</th>
<th class="nowr">{$lang->cmd_setup}</th>
<th class="nowr">PC</th>
<th class="nowr">Mobile</th>
<th class="nowr">{$lang->cmd_delete}</th>
</tr>
</thead>
<tbody>
<tr loop="$addon_list => $addon">
<td class="title">
<p><strong>{$addon->title}</strong></p>
<p>{$addon->description}</p>
<p cond="$addon->need_update == 'Y'" class="update">
{$lang->msg_avail_easy_update} <a href="{$addon->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a>
</p>
</td>
<td>{$addon->version}</td>
<td class="nowr">
<block loop="$addon->author => $author">
<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->name}</a>
<block cond="!$author->homepage">{$author->name}</block>
</block>
</td>
<td>{$addon->path}</td>
<td><a href="{getUrl('act', 'dispAddonAdminSetup', 'selected_addon', $addon->addon_name)}">{$lang->cmd_setup}</a></td>
<td><input type="checkbox" name="pc_on[]" title="PC" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->activated" /></td>
<td><input type="checkbox" name="mobile_on[]" title="Mobile" value="{htmlspecialchars($addon->addon_name)}" checked="checked"|cond="$addon->mactivated" /></td>
<td><a cond="$addon->remove_url" href="{$addon->remove_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a></td>
</tr>
</tbody>
</table>
<div class="x_clearfix">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>
</div>
</form>

View file

@ -1,77 +1,114 @@
<h1 class="h1">{$lang->installed_addons}</h1>
<h2 class="h2">{$addon_info->title}</h2>
<ul>
<li>{$lang->version}: {$addon_info->version} ({zdate($addon_info->date, 'Y-m-d')})</li>
<li>
{$lang->author}:
<block loop="$addon_info->author => $author">
{$author->name} (<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->homepage}</a>, <a cond="$author->email_address" href="mailto:{$author->email_address}">{$author->email_address}</a>) <br />
</block>
</li>
<li cond="$addon_info->homepage">{$lang->homepage}: <a href="{$addon_info->homepage}" target="_blank">{$addon_info->homepage}</a></li>
<li cond="$addon_info->license">{$lang->addon_license}: <a href="{$addon_info->license_link}"|cond="$addon_info->license_link" target="_blank">{$addon_info->license}</a></li>
</ul>
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<div class="x_page-header">
<h1>{$lang->installed_addons}</h1>
</div>
<h2>{$addon_info->title}</h2>
<table class="x_table">
<tbody>
<tr>
<th class="nowr">{$lang->version}</th>
<td>{$addon_info->version} ({zdate($addon_info->date, 'Y-m-d')})</td>
</tr>
<tr>
<th class="nowr">{$lang->author}</th>
<td>
<block loop="$addon_info->author => $author">
{$author->name} (<a cond="$author->homepage" href="{$author->homepage}" target="_blank">{$author->homepage}</a>, <a cond="$author->email_address" href="mailto:{$author->email_address}">{$author->email_address}</a>) <br />
</block>
</td>
</tr>
<tr cond="$addon_info->homepage">
<th class="nowr">{$lang->homepage}</th>
<td><a href="{$addon_info->homepage}" target="_blank">{$addon_info->homepage}</a></td>
</tr>
<tr cond="$addon_info->license">
<th class="nowr">{$lang->addon_license}</th>
<td><a href="{$addon_info->license_link}"|cond="$addon_info->license_link" target="_blank">{$addon_info->license}</a></td>
</tr>
<tr cond="$addon_info->description">
<th class="nowr">{$lang->description}</th>
<td>{$addon_info->description}</td>
</tr>
</tbody>
</table>
<div cond="$XE_VALIDATOR_MESSAGE && $XE_VALIDATOR_ID == 'modules/addon/tpl/setup_addon/1'" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form action="./" method="post" class="form">
<form action="./" method="post" class="x_form-horizontal">
<section class="section">
<input type="hidden" name="module" value="{$module}" />
<input type="hidden" name="act" value="procAddonAdminSetupAddon" />
<input type="hidden" name="addon_name" value="{$addon_info->addon_name}" />
<input type="hidden" name="xe_validator_id" value="modules/addon/tpl/setup_addon/1" />
<block cond="count($addon_info->extra_vars)">
<block loop="$addon_info->extra_vars => $id, $var">
<block cond="!$not_first && !$var->group"><ul></block>
<block cond="$group != $var->group">
<block cond="$not_first"></ul></block>
<h3 class="h3">{$var->group}</h3>
<ul>
<h2>{$var->group}</h2>
{@$group = $var->group}
</block>
{@$not_first = true}
<li>
<p class="q"><label for="{$var->name}">{$var->title}</label></p>
<p class="a">
<input cond="$var->type == 'text'" type="text" name="{$var->name}" id="{$var->name}" value="{htmlspecialchars($var->value)}" class="lang_code">
<div class="x_control-group" cond="!$not_first && $group != $var->group"></div>
<div class="x_control-group">
<label class="x_control-label" for="{$var->name}"|cond="$var->type != 'textarea'" for="lang_{$var->name}"|cond="$var->type == 'textarea'">{$var->title}</label>
<div class="x_controls">
<input cond="$var->type == 'text'" type="text" name="{$var->name}" id="{$var->name}" value="{htmlspecialchars($var->value)}">
<textarea cond="$var->type == 'textarea'" name="{$var->name}" id="{$var->name}" class="lang_code" rows="8" cols="42">{htmlspecialchars($var->value)}</textarea>
<select cond="$var->type == 'select'" name="{$var->name}" id="{$var->name}">
<option loop="$var->options => $option" value="{$option->value}" selected="selected"|cond="$var->value == $option->value">{$option->title}</option>
</select>
</p>
<p class="desc">{nl2br($var->description)}</p>
</li>
<span class="x_help-inline">{nl2br($var->description)}</span>
</div>
</div>
</block>
</ul>
</block>
<div cond="!count($addon_info->extra_vars)" class="message info">
<p>{$lang->msg_not_exist_option}</p>
</div>
</section>
<section class="section">
<block cond="$mid_list">
<h3 class="h3">{$lang->module}</h3>
<p>{$lang->about_addon_mid}</p>
<p class="q">{$lang->run_method}</p>
<p class="a">
<select name="xe_run_method">
<option value="run_selected" selected="selected"|cond="$addon_info->xe_run_method === 'run_selected'">{$lang->run_selected_module}</option>
<option value="no_run_selected" selected="selected"|cond="$addon_info->xe_run_method === 'no_run_selected'">{$lang->no_run_selected_module}</option>
</select>
</p>
<p><input type="checkbox" id="check_all" /> <label for="check_all">Check all</label></p>
<fieldset loop="$mid_list => $module_category_srl, $modules" style="border: 1px solid #ccc; margin:1em 0; padding:.5em 1em">
<legend cond="$modules->title">{$modules->title}</legend>
<legend cond="!$modules->title">{$lang->none_category}</legend>
<div loop="$modules->list => $key, $val">
<input type="checkbox" value="{$key}" name="mid_list[]" id="chk_mid_list_{$key}" checked="checked"|cond="in_array($key, $addon_info->mid_list)"/>
<label for="chk_mid_list_{$key}">{$key} ({$val->browser_title})</label>
<h1>{$lang->target}</h1>
<div class="x_control-group">{$lang->about_addon_mid}</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->run_method}</label>
<div class="x_controls">
<select name="xe_run_method">
<option value="run_selected" selected="selected"|cond="$addon_info->xe_run_method === 'run_selected'">{$lang->run_selected_module}</option>
<option value="no_run_selected" selected="selected"|cond="$addon_info->xe_run_method === 'no_run_selected'">{$lang->no_run_selected_module}</option>
</select>
</div>
</fieldset>
</div>
<div class="x_control-group">
<label class="x_control-label">{$lang->target}</label>
<div class="x_controls">
<label for="check_all"><input type="checkbox" id="check_all" /> Check all</label>
<block loop="$mid_list => $module_category_srl, $modules">
<!--@if(count($mid_list) > 1)-->
<fieldset>
<legend><!--@if($modules->title)-->{$modules->title}<!--@else-->{$lang->none_category}<!--@end--></legend>
<!--@end-->
<label loop="$modules->list => $key, $val">
<input type="checkbox" value="{$key}" name="mid_list[]" id="chk_mid_list_{$key}" checked="checked"|cond="in_array($key, $addon_info->mid_list)"/>
{$key} ({$val->browser_title})
</label>
<!--@if(count($mid_list) > 1)-->
</fieldset>
<!--@end-->
</block>
</div>
</div>
</block>
<div class="btnArea">
<span class="btn medium"><input type="submit" value="{$lang->cmd_save}" /></span>
<div class="x_clearfix btnArea">
<div class="x_pull-right">
<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
</div>
</div>
</form>
</block>
<script type="text/javascript">
</section>
</form>
<script>
(function($){
$('#check_all')
.bind('click', function(e){