merge from 1.5.2

git-svn-id: http://xe-core.googlecode.com/svn/trunk@10446 201d5d3c-b55e-5fd7-737f-ddc643e51545

modules/module/tpl/category_list.html

@@ -16,8 +16,8 @@
 		<thead>
 			<tr>
 				<th scope="col" class="title">{$lang->category_title}</th>
-				<th scope="col">{$lang->regdate}</th>
-				<th scope="col">&nbsp;</th>
+				<th scope="col" class="nowr">{$lang->regdate}</th>
+				<th scope="col" class="nowr">&nbsp;</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -29,9 +29,9 @@
 			<!--@foreach($category_list as $key => $val)-->
 			<tr>
 				<td class="title">{$val->title}</td>
-				<td>{zdate($val->regdate,"Y-m-d H:i:s")}</td>
-				<td>
-					<a href="{getUrl('module_category_srl',$val->module_category_srl)}">{$lang->cmd_modify}</a>
+				<td class="nowr">{zdate($val->regdate,"Y-m-d")}</td>
+				<td class="nowr">
+					<a href="{getUrl('module_category_srl',$val->module_category_srl)}">{$lang->cmd_modify}...</a>
 					<button type="button" class="text" onclick="doUpdateCategory('{$val->module_category_srl}','{$lang->confirm_delete}');return false;">{$lang->cmd_delete}</button>
 				</td>
 			</tr>

modules/module/tpl/category_update_form.html

@@ -16,7 +16,7 @@
 		</li>
 	</ul>
 	<div class="btnArea">
-		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
 	</div>
 </form>
 <!--@end-->

modules/module/tpl/include.module_setup.html

@@ -44,7 +44,7 @@
 			<li>
 				<p class="q"><label for="description">{$lang->description}</label></p>
 				<p class="a">
-					<textarea name="description" id="description" rows="4" cols="45">{htmlspecialchars($module_info->description)}</textarea>
+					<textarea name="description" id="description" rows="8" cols="42">{htmlspecialchars($module_info->description)}</textarea>
 				</p>
 				<p class="desc">{$lang->about_description}</p>
 			</li>
@@ -53,7 +53,7 @@
 				<p class="a multiLangEdit">
 					{@$use_multilang_textarea=true}
 					<input type="hidden" name="header_text" class="vLang" />
-					<textarea id="header_text" rows="4" cols="45" class="vLang"></textarea>
+					<textarea id="header_text" rows="8" cols="42" class="vLang"></textarea>
 					<span class="desc"><a href="#langEditTextarea" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
 				</p>
 				<p class="desc">{$lang->about_header_text}</p>
@@ -62,7 +62,7 @@
 				<p class="q"><label for="footer_text">{$lang->footer_text}</label></p>
 				<p class="a multiLangEdit">
 					<input type="hidden" name="footer_text" class="vLang" />
-					<textarea id="footer_text" rows="4" cols="45" class="vLang"></textarea>
+					<textarea id="footer_text" rows="8" cols="42" class="vLang"></textarea>
 					<span class="desc"><a href="#langEditTextarea" class="editUserLang tgAnchor">{$lang->cmd_set_multilingual}</a></span>
 				</p>
 				<p class="desc">{$lang->about_footer_text}</p>

modules/module/tpl/include.multilang.html

@@ -2,7 +2,7 @@
 	<div id="langEdit" class="langEdit tgContent">
 		<ul class="langList"></ul>
 		<div class="langInput form">
-			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}...</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
 			<ul>
 				{@
 					/* move current language to the top */

modules/module/tpl/include.multilang.textarea.html

@@ -6,7 +6,7 @@
 	<div id="langEditTextarea" class="langEdit tgContent">
 		<ul class="langList"></ul>
 		<div class="langInput form">
-			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
+			<h2>{$lang->multilingual} <strong>{$lang->cmd_modify}...</strong> | <a href="#langEdit">{$lang->cmd_insert}</a></h2>
 			<ul>
 				{@
 					/* move current language to the top */
@@ -14,7 +14,7 @@
 					unset($lang_supported[$lang_type]);
 					$lang_supported = array_merge($a, $lang_supported);
 				}
-				<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <textarea id="{$code}_var1"></textarea></li>
+				<li loop="$lang_supported=>$code,$name" class="{$code}"><label for="{$code}_var1">{$name}</label> <textarea id="{$code}_var1" rows="8" cols="42"></textarea></li>
 			</ul>
 			<div class="action">
 				<div class="btnArea">

modules/module/tpl/module_list.html

@@ -1,24 +1,25 @@
 <include target="header.html" />
 
-<div class="table even easyList">
+<div class="table even easyList dsTg">
 	<table width="100%" border="1" cellspacing="0">
 		<caption>
 		All({count($module_list)})
+		<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">{$lang->favorite}</th>
+				<th scope="col" class="nowr">{$lang->favorite}</th>
 				<th scope="col" class="title">{$lang->module_name}</th>
-				<th scope="col">{$lang->version}</th>
-				<th scope="col">{$lang->author}</th>
-				<th scope="col">{$lang->path}</th>
-				<th scope="col">{$lang->cmd_delete}</th>
+				<th scope="col" class="nowr">{$lang->version}</th>
+				<th scope="col" class="nowr">{$lang->author}</th>
+				<th scope="col" class="nowr">{$lang->path}</th>
+				<th scope="col" class="nowr">{$lang->cmd_delete}</th>
 			</tr>
 		</thead>
 		<tbody>
 			<!--@foreach($module_list as $key => $val)-->
 			<tr>
-				<td>
+				<td class="nowr">
 					<!--@if(in_array($val->module,$favoriteModuleList))-->
 					<a href="#" class="fvOn" onclick="doToggleFavoriteModule(this, '{$val->module}'); return false;">{$lang->favorite}({$lang->on})</a>
 					<!--@else-->
@@ -34,12 +35,12 @@
 						<!--@end-->
 					</p>
 					<p>{$val->description}</p>
-						<p cond="$val->need_install" class="update">{$lang->msg_avail_install} <a href="#" onclick="doInstallModule('{$val->module}');return false;">{$lang->msg_do_you_like_install}</a></p>
-						<p cond="$val->need_update" class="update">{$lang->msg_avail_update} <a href=="#" onclick="doUpdateModule('{$val->module}'); return false;">{$lang->msg_do_you_like_update}</a></p>
-						<p cond="$val->need_autoinstall_update == 'Y'" class="update">{$lang->msg_avail_easy_update}<a href="{$val->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a></p>
+					<p cond="$val->need_install" class="update">{$lang->msg_avail_install} <button class="text" type="button" onclick="doInstallModule('{$val->module}')">{$lang->msg_do_you_like_install}</button></p>
+					<p cond="$val->need_update" class="update">{$lang->msg_avail_update} <button class="text" type="button" onclick="doUpdateModule('{$val->module}')">{$lang->msg_do_you_like_update}</button></p>
+					<p cond="$val->need_autoinstall_update == 'Y'" class="update">{$lang->msg_avail_easy_update}<a href="{$val->update_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->msg_do_you_like_update}</a></p>
 				</td>
-				<td>{$val->version}</td>
-				<td>
+				<td class="nowr">{$val->version}</td>
+				<td class="nowr">
 					<!--@foreach($val->author as $author)-->
 						<!--@if($author->homepage)-->
 						<a href="{$author->homepage}" onclick="window.open(this.href);return false;"  target="_blank">
@@ -50,15 +51,14 @@
 						<!--@end-->
 					<!--@endforeach-->
 				</td>
-				<td>{$val->path}</td>
-				<td>
+				<td class="nowr">{$val->path}</td>
+				<td class="nowr">
 					<!--@if($val->delete_url)-->
 					<a href="{$val->delete_url}&amp;return_url={urlencode(getRequestUriByServerEnviroment())}">{$lang->cmd_delete}</a>
 					<!--@end-->
 				</td>
 			</tr>
 			<!--@end-->
-
 		</tbody>
 	</table>
 </div>

modules/module/tpl/module_selector.html

@@ -1,5 +1,4 @@
 <load target="./js/module_admin.js" usecdn="true" />
-<load target="../../common/css/popup.css" usecdn="true" />
 <h1 class="h1">{$lang->module_selector}</h1>
 <form action="./" method="post">
 	<input type="hidden" name="module" value="module" />

modules/module/tpl/module_setup.html

@@ -46,21 +46,21 @@
 		<li>
 			<p class="q"><label for="description">{$lang->description}</label></p>
 			<p class="a">
-				<textarea name="description" id="description" rows="4" cols="45">{htmlspecialchars($module_info->description)}</textarea>
+				<textarea name="description" id="description" rows="8" cols="42">{htmlspecialchars($module_info->description)}</textarea>
 			</p>
 			<p class="desc">{$lang->about_description}</p>
 		</li>
 		<li>
 			<p class="q"><label for="header_text">{$lang->header_text}</label></p>
 			<p class="a">
-				<textarea name="header_text" id="header_text" rows="4" cols="45">{htmlspecialchars($module_info->header_text)}</textarea>
+				<textarea name="header_text" id="header_text" rows="8" cols="42">{htmlspecialchars($module_info->header_text)}</textarea>
 			</p>
 			<p class="desc">{$lang->about_header_text}</p>
 		</li>
 		<li>
 			<p class="q"><label for="footer_text">{$lang->footer_text}</label></p>
 			<p class="a">
-				<textarea name="footer_text" rows="4" cols="45">{htmlspecialchars($module_info->footer_text)}</textarea>
+				<textarea name="footer_text" rows="8" cols="42">{htmlspecialchars($module_info->footer_text)}</textarea>
 			</p>
 			<p class="desc">{$lang->about_footer_text}</p>
 		</li>

modules/module/tpl/skin_config.html

@@ -15,36 +15,34 @@
 			</tr>
 			<tr>
 				<th scope="row">{$lang->skin_author}</th>
-				<td>
-					<!--@foreach($skin_info->author as $author)-->
-					{$author->name} <!--@if($author->homepage || $author->email_address)-->(<!--@if($author->homepage)--><a href="{$author->homepage}" onclick="window.open(this.href);return false;">{$author->homepage}</a><!--@end--><!--@if($author->homepage && $author->email_address)-->, <!--@end--><!--@if($author->email_address)--><a href="mailto:{$author->email_address}">{$author->email_address}</a><!--@end-->)<!--@end--><br />
-					<!--@endforeach-->
+				<td loop="$skin_info->author=>$author">
+					{$author->name}
+					<block cond="$author->homepage || $author->email_address">
+						(<a href="{$author->homepage}" onclick="window.open(this.href);return false;" cond="$author->homepage">{$author->homepage}</a>
+						<block cond="$author->homepage && $author->email_address">, </block>
+						<a href="mailto:{$author->email_address}" cond="$author->email_address">{$author->email_address}</a>)
+					</block><br />
 				</td>
 			</tr>
-	<!--@if($skin_info->homepage)-->
-			<tr>
+			<tr cond="$skin_info->homepage">
 				<th scope="row">{$lang->homepage}</th>
 				<td><a href="{$skin_info->homepage}" onclick="window.open(this.href);return false;">{$skin_info->homepage}</a></td>
-			</tr><!--@end-->
+			</tr>
 			<tr>
 				<th scope="row">{$lang->date}</th>
 				<td>{zdate($skin_info->date, 'Y-m-d')}&nbsp;</td>
 			</tr>
-	<!--@if($skin_info->license || $skin_info->license_link)-->
-			<tr>
+			<tr cond="$skin_info->license || $skin_info->license_link">
 				<th scope="row">{$lang->skin_license}</th>
 				<td>
 					{nl2br(trim($skin_info->license))}
-					<!--@if($skin_info->license_link)-->
-					<p><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
-					<!--@end-->
+					<p cond="$skin_info->license_link"><a href="{$skin_info->license_link}" onclick="window.close(); return false;">{$skin_info->license_link}</a></p>
 				</td>
-			</tr><!--@end-->
-	<!--@if($skin_info->description)-->
-			<tr>
+			</tr>
+			<tr cond="$skin_info->description">
 				<th scope="row">{$lang->description}</th>
 				<td>{nl2br(trim($skin_info->description))}</td>
-			</tr><!--@end-->
+			</tr>
 		</table>
 	</div>
 
@@ -90,20 +88,20 @@
 					<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','target'.$val->name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
 					
 					<!--@elseif($val->type=="textarea")-->
-					<textarea name="{$val->name}" id="target{$val->name}" rows="5" cols="42">{$val->value}</textarea>
+					<textarea name="{$val->name}" id="target{$val->name}" rows="8" cols="42">{$val->value}</textarea>
 					<a href="{getUrl('','module','module','act','dispModuleAdminLangcode','target','target'.$val->name)}" onclick="popopen(this.href);return false;" class="buttonSet buttonSetting"><span>{$lang->cmd_find_langcode}</span></a>
 					
 					<!--@elseif($val->type=="select")-->
 					<select name="{$val->name}">
 						<!--@foreach($val->options as $k=>$v)-->
-						<option value="{$v->value}" <!--@if($v->value == $val->value)-->selected="selected"<!--@end-->>{$v->title}</option>
+						<option value="{$v->value}" selected="selected"|cond="$v->value == $val->value">{$v->title}</option>
 						<!--@end-->
 					</select>
 					
 					<!--@elseif($val->type=="checkbox")-->
 					<!--@foreach($val->options as $k=>$v)-->
 					<span>
-						<input type="checkbox" name="{$val->name}[]" value="{$v->value}" id="ch_{$key}_{$k}" <!--@if(in_array($v->value, $val->value))-->checked="checked"<!--@end--> class="checkbox" /> 
+						<input type="checkbox" name="{$val->name}[]" value="{$v->value}" id="ch_{$key}_{$k}" checked="checked"|cond="in_array($v->value, $val->value)" class="checkbox" /> 
 						<label for="ch_{$key}_{$k}">{$v->title}</label>
 					</span>
 					<!--@end-->
@@ -111,7 +109,7 @@
 					<!--@elseif($val->type=="radio")-->
 					<!--@foreach($val->options as $k=>$v)-->
 					<span>
-						<input type="radio" name="{$val->name}" value="{$v->value}" id="ch_{$key}_{$k}" <!--@if($v->value==$val->value)-->checked="checked"<!--@end-->/> 
+						<input type="radio" name="{$val->name}" value="{$v->value}" id="ch_{$key}_{$k}" checked="checked"|cond="$v->value==$val->value" /> 
 						<label for="ch_{$key}_{$k}">{$v->title}</label>
 					</span>
 					<!--@end-->
@@ -134,10 +132,8 @@
 				</td>
 			</tr>
 			<!--@end-->
-			<!--@if(!$group)-->
 		</table>
 	</div>
-    <!--@end-->
     <div class="btnArea">
 		<span class="btn"><input type="submit" value="{$lang->cmd_registration}" /></span>
 	</div>