merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-03-20 08:03:02 +00:00
parent 6c23751ef8
commit c727926d9e
382 changed files with 6855 additions and 3603 deletions

View file

@ -92,6 +92,7 @@
$output['multimedia'] = $oIS->getImages($target, $module_srl_list, $is_keyword, $page, 5);
$output['file'] = $oIS->getFiles($target, $module_srl_list, $is_keyword, $page, 5);
Context::set('search_result', $output);
Context::set('search_target', 'title');
$this->setTemplateFile("index", $page);
break;
}

View file

@ -65,7 +65,7 @@
<value xml:lang="en"><![CDATA[Click 'Search Next' button to keep searching.]]></value>
<value xml:lang="jp"><![CDATA[継続サーチボタンを選択すると、まだ検索結果として引っかからなかった箇所を引き続き検索を行います。]]></value>
<value xml:lang="zh-CN"><![CDATA[利用'继续搜索'按钮可以进一步搜索。]]></value>
<value xml:lang="zh-TW"><![CDATA[계속 검색 버튼을 선택하시면 아직 검색하지 않은 부분까지 계속 검색 하실 수 있습니다]]></value>
<value xml:lang="zh-TW"><![CDATA[按"繼續尋找"按鈕繼續搜尋。]]></value>
<value xml:lang="ru"><![CDATA['Искать дальше' Если выберете эту кнопку, то продолжится поиск]]></value>
</item>
<item name="is_result_text">
@ -95,7 +95,7 @@
<value xml:lang="en"><![CDATA[Search for selected modules]]></value>
<value xml:lang="jp"><![CDATA[選択された対象のみ]]></value>
<value xml:lang="zh-CN"><![CDATA[只搜索所选对象]]></value>
<value xml:lang="zh-TW"><![CDATA[只有在選定的目標]]></value>
<value xml:lang="zh-TW"><![CDATA[尋找所選模組]]></value>
<value xml:lang="fr"><![CDATA[Seulement dans certaines cibles ]]></value>
<value xml:lang="ru"><![CDATA[Поиск только для выбранных модулей]]></value>
<value xml:lang="es"><![CDATA[Sólo en determinados ]]></value>
@ -106,7 +106,7 @@
<value xml:lang="en"><![CDATA[Exclude selected modules from search]]></value>
<value xml:lang="jp"><![CDATA[選択した対象を検索から除外]]></value>
<value xml:lang="zh-CN"><![CDATA[所选对象从搜索中排除]]></value>
<value xml:lang="zh-TW"><![CDATA[搜索選定目的地從]]></value>
<value xml:lang="zh-TW"><![CDATA[排除所選模組]]></value>
<value xml:lang="fr"><![CDATA[Recherche de la destination sélectionnée à partir de]]></value>
<value xml:lang="ru"><![CDATA[Исключить выбранные модули из поиска]]></value>
<value xml:lang="es"><![CDATA[Búsqueda para el destino de]]></value>

View file

@ -19,7 +19,7 @@
<input type="hidden" name="act" value="IS" />
<input type="hidden" name="where" value="{$where}" />
<input type="hidden" name="search_target" value="title_content" />
<input name="is_keyword" type="text" class="inputText" value="{$is_keyword}"/>
<input name="is_keyword" type="text" class="iText" value="{$is_keyword}"/>
<span class="button large strong black"><input type="submit" value="{$lang->cmd_search}" /></span>
</form>
</div>

View file

@ -2,7 +2,7 @@
#spot { padding-left:10px; margin-bottom:20px; }
#spot .search * { vertical-align:middle;}
#spot .search .inputText { border:4px solid #b6b6b6; padding:2px; width:252px; font-size:16px; font-weight:bold; }
#spot .search .iText { border:4px solid #b6b6b6; padding:2px; width:252px; font-size:16px; font-weight:bold; }
.localNavigation { border-bottom:1px solid #ccc; *zoom:1; margin:0 0 20px 0px; padding:0; overflow:hidden; padding-left:10px; }
.localNavigation:after {content:""; display:block; clear:both;}

View file

@ -2,7 +2,7 @@
<h3 class="xeAdmin">{$lang->integration_search} <span class="gray">{$lang->cmd_management}</span></h3>
<div class="header4 gap1">
<div class="header4">
<ul class="localNavigation">
<li <!--@if($act=='dispIntegration_searchAdminContent')-->class="on"<!--@end-->><a href="{getUrl('act','dispIntegration_searchAdminContent')}">{$lang->cmd_setup}</a></li>
<li <!--@if($act=='dispIntegration_searchAdminSkinInfo')-->class="on"<!--@end-->><a href="{getUrl('act','dispIntegration_searchAdminSkinInfo')}">{$lang->cmd_manage_skin}</a></li>

View file

@ -4,7 +4,7 @@
<div cond="$XE_VALIDATOR_MESSAGE" class="message {$XE_VALIDATOR_MESSAGE_TYPE}">
<p>{$XE_VALIDATOR_MESSAGE}</p>
</div>
<form ruleset="insertConfig" action="./" method="post">
<form ruleset="insertConfig" action="./" method="post" class="form">
<input type="hidden" name="act" value="procIntegration_searchAdminInsertConfig" />
<input type="hidden" name="module" value="admin" />
<input type="hidden" name="target_module_srl" id="target_module_srl" value="{$config->target_module_srl}" />
@ -13,7 +13,7 @@
<tr>
<th scope="row">{$lang->sample_code}</th>
<td >
<textarea readonly="readonly">{$sample_code}</textarea>
<textarea readonly="readonly" rows="8" cols="42">{$sample_code}</textarea>
<p>{$lang->about_sample_code}</p>
</td>
</tr>

View file

@ -50,32 +50,32 @@
<div class="table">
<table width="100%" border="1" cellspacing="0">
<tr valign="top">
<th scope="row">{$lang->colorset}</th>
<td >
<!--@foreach($skin_info->colorset as $key => $val)-->
<!--@if($val->screenshot)-->
{@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
<!--@else-->
{@ $_width = 200; $_height = 20; $_talign = "left"; }
<!--@end-->
<div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
<input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($module_info->colorset==$val->name)-->checked="checked"<!--@end-->/>
<label for="colorset_{$key}">{$val->title}</label>
<!--@if($val->screenshot)-->
<br />
<img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
<!--@end-->
</div>
<!--@end-->
</td>
</tr>
<th scope="row">{$lang->colorset}</th>
<td>
<!--@foreach($skin_info->colorset as $key => $val)-->
<!--@if($val->screenshot)-->
{@ $_img_info = getImageSize($val->screenshot); $_height = $_img_info[1]+40; $_width = $_img_info[0]+20; $_talign = "center"; }
<!--@else-->
{@ $_width = 200; $_height = 20; $_talign = "left"; }
<!--@end-->
<div style="float:left;text-align:{$_talign};margin-bottom:1em;width:{$_width}px;height:{$_height}px;margin-right:10px;">
<input type="radio" name="colorset" value="{$val->name}" id="colorset_{$key}" <!--@if($module_info->colorset==$val->name)-->checked="checked"<!--@end-->/>
<label for="colorset_{$key}">{$val->title}</label>
<!--@if($val->screenshot)-->
<br />
<img src="{$val->screenshot}" alt="{$val->title}" style="border:1px solid #888888;padding:2px;margin:2px;"/>
<!--@end-->
</div>
<!--@end-->
</td>
</tr>
</table>
</div>
<!--@foreach($skin_info->extra_vars as $key => $val)-->
<!--@if($val->group && ((!$group) || $group != $val->group))-->
{@$group = $val->group}
</table>
</div>
<div class="table">
<table width="100%" border="1" cellspacing="0">
<caption>{$group}</caption>
@ -89,7 +89,7 @@
<input type="text" name="{$val->name}" value="{$val->value}" />
<!--@elseif($val->type=="textarea")-->
<textarea name="{$val->name}">{$val->value}</textarea>
<textarea name="{$val->name}" rows="8" cols="42">{$val->value}</textarea>
<!--@elseif($val->type=="select")-->
<select name="{$val->name}">