Common UI and .x_btn style cleaning.

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

modules/addon/tpl/addon_list.html

@@ -56,7 +56,7 @@
 	</table>
 	<div class="x_clearfix">
 		<div class="x_pull-right">
-			<button type="submit" class="x_btn x_btn-large x_btn-primary">{$lang->cmd_save}</button>
+			<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
 		</div>
 	</div>
 </form>

modules/addon/tpl/setup_addon.html

@@ -97,7 +97,7 @@
 	</block>
 	<div class="x_clearfix btnArea">
 		<div class="x_pull-right">
-			<button type="submit" class="x_btn x_btn-large x_btn-primary">{$lang->cmd_save}</button>
+			<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
 		</div>
 	</div>
 </block>

modules/admin/tpl/_header.html

@@ -11,7 +11,7 @@
 				<ul>
 					<li><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInfo', 'is_admin', 'Y', 'member_srl', $logged_info->member_srl)}">{$logged_info->email_address}</a></li>
 					<li><a href="{getUrl('', 'module','admin','act','procAdminLogout')}">{$lang->cmd_logout}</a></li>
-					<li><a href="#lang" class="lang" data-toggle="#lang">{$lang_supported[$lang_type]}</a>
+					<li><a href="#lang" class="lang" data-toggle>{$lang_supported[$lang_type]}</a>
 						<ul id="lang" class="x_dropdown-menu">
 							<li loop="$lang_supported=>$key,$val" class="x_active"|cond="$key==$lang_type"><a href="{getUrl('l',$key)}" data-langcode="{$key}" onclick="doChangeLangType('{$key}'); return false;">{$val}</a></li>
 						</ul>

modules/admin/tpl/admin_setup.html

@@ -61,7 +61,7 @@
 		</ul>
 		<div class="x_clearfix btnArea">
 			<div class="x_pull-left">
-				<button value="procAdminMenuReset" name="act" type="submit" class="x_btn x_btn-warning">{$lang->cmd_reset}</button>
+				<button value="procAdminMenuReset" name="act" type="submit" class="x_btn">{$lang->cmd_reset}</button>
 			</div>
 			<div class="x_pull-right">
 				<button type="submit" value="procMenuAdminArrangeItem" name="act" class="x_btn x_btn-primary">{$lang->cmd_save}</button>

modules/admin/tpl/config_ftp.html

@@ -41,19 +41,19 @@
 	</section>
 	<section class="section collapse">
 		<h1>{$lang->subtitle_advanced}</h1>
-		<div class="x_control-group" style="display:none">
+		<div class="x_control-group" hidden>
 			<label class="x_control-label" for="ftp_host">{$lang->ftp_host}</label>
 			<div class="x_controls">
 				<input type="text" name="ftp_host" id="ftp_host" value="{$ftp_info->ftp_host ? $ftp_info->ftp_host : '127.0.0.1'}" /> Default : 127.0.0.1
 			</div>
 		</div>
-		<div class="x_control-group" style="display:none">
+		<div class="x_control-group" hidden>
 			<label class="x_control-label" for="ftp_port">{$lang->ftp_port}</label>
 			<div class="x_controls">
 				<input type="text" name="ftp_port" id="ftp_port" value="{$ftp_info->ftp_port ? $ftp_info->ftp_port : '21'}" /> Default : 21
 			</div>
 		</div>
-		<div class="x_control-group" style="display:none">
+		<div class="x_control-group" hidden>
 			<p class="x_control-label">{$lang->use_ftp_passive_mode}</p>
 			<div class="x_controls">
 				<label class="x_inline" for="ftp_passive_y">
@@ -66,7 +66,7 @@
 				</label>
 			</div>
 		</div>
-		<div class="x_control-group" style="display:none">
+		<div class="x_control-group" hidden>
 			<label class="x_control-label" for="sftp_n">{$lang->use_sftp_support}</label>
 			<div class="x_controls">
 				<label class="x_inline" for="sftp_y"><input type="radio" name="sftp" id="sftp_y" value="Y" checked="checked"|cond="$ftp_info->sftp == 'Y'" disabled|cond="!$sftp_support" />{$lang->cmd_yes}</label>
@@ -76,7 +76,7 @@
 		</div>
 	</section>
 	<div class="btnArea">
-		<input type="submit" value="{$lang->cmd_save}" class="x_btn x_btn-large x_btn-primary x_pull-right" />
+		<input type="submit" value="{$lang->cmd_save}" class="x_btn x_btn-primary x_pull-right" />
 	</div>
 	</form>
 <style>

modules/admin/tpl/css/admin.css

@@ -2,7 +2,7 @@
 /* Reset */
 html,body{min-height:100%}
 body{margin:8px;-webkit-text-size-adjust:none}
-body>.x{min-width:300px;max-width:1240px}
+body>.x{min-width:300px;max-width:1240px;margin:0 auto}
 body>.x,
 .x label,
 .x table,
@@ -16,7 +16,7 @@ body>.x,
 .x dfn{font-style:normal}
 .x [disabled]{cursor:not-allowed}
 .x button[disabled]{color:#ccc !important}
-.x a[target="_blank"]:after{ content:"";display:inline-block;width:14px;height:14px;vertical-align:middle;margin:0 0 0 2px;background-position:-120px -72px;opacity:.3;filter:alpha(opacity=30)}
+.x a[target="_blank"]:after{ content:"";display:inline-block;width:14px;height:14px;vertical-align:middle;margin:-2px 0 0 2px;background-position:-120px -72px;opacity:.3;filter:alpha(opacity=30)}
 .x a[target="_blank"]:hover:after,
 .x a[target="_blank"]:focus:after{opacity:.7;filter:alpha(opacity=70)}
 /* Bootstrap Override */
@@ -48,7 +48,7 @@ body>.x,
 .x .x_pagination ul>li>strong{line-height:24px;padding:0 8px}
 .x .x_pagination ul>.x_active>a, 
 .x .x_pagination ul>.x_active>span,
-.x .x_pagination ul>.x_active>strong{line-height:26px;border:0;background-color:#555;color:#fff;font-weight:bold;font-size:18px;font-family:Arial, Helvetica, sans-serif}
+.x .x_pagination ul>.x_active>strong{line-height:26px;border:0;background-color:#666;color:#fff;font-weight:bold;font-size:18px;font-family:Arial, Helvetica, sans-serif}
 .x .x_pagination [id^="goTo"]{display:none;margin:0;padding:0}
 .x .x_pagination [id^="goTo"]>*{border:0;border-radius:0}
 .x .x_pagination [id^="goTo"]>[type="number"]{height:16px;line-height:16px;width:50px;text-align:center}
@@ -279,7 +279,7 @@ body>.x,
 	/* li>ul>li */
 .x>.xin>.body>.gnb>ul>li>ul>li{border-top:1px solid #ddd;position:relative}
 .x>.xin>.body>.gnb>ul>li>ul>li:first-child{border:0}
-.x>.xin>.body>.gnb>ul>li>ul>li.active_{box-shadow:0 0 3px #000;z-index:99;border:1px solid #000;border-left:0;border-right:0}
+.x>.xin>.body>.gnb>ul>li>ul>li.active_{box-shadow:0 0 3px #999;z-index:99;border:1px solid #666;border-left:0;border-right:0}
 	/* li>ul>li>a */
 .x>.xin>.body>.gnb>ul>li>ul>li>a{padding:4px 5px 4px 15px;background:#e8e8e8;background:-webkit-gradient(linear,left top,left bottom,from(#f1f1f1),to(#e8e8e8));background:-moz-linear-gradient(top,#f1f1f1,#e8e8e8);background:-o-linear-gradient(top,#f1f1f1,#e8e8e8)}
 .x>.xin>.body>.gnb>ul>li>ul#favorite>li>a{padding:4px 25px 4px 15px}

modules/admin/tpl/js/admin.js

@@ -53,9 +53,9 @@ jQuery(function($){
 		var focusable = 'a,input,button,textarea,select';
 		$target.toggle();
 		if($target.is(':visible') && !$target.find(focusable).length){
-			$target.attr('tabindex','0').not(':disabled').focus();
+			$target.not(':disabled').attr('tabindex','0').css('outline','0').focus();
 		} else if($target.is(':visible') && $target.find(focusable).length) {
-			$target.find(focusable).not(':disabled').eq(0).focus();
+			$target.not(':disabled').find(focusable).eq(0).focus();
 		} else {
 			$this.focus();
 		}

modules/autoinstall/tpl/install.html

@@ -29,7 +29,7 @@
 	<div cond="$show_ftp_note" class="x_well x_clearfix">
 		<p>{$lang->description_download}. (<a href="{getUrl('', 'module', 'admin', 'act', 'dispAdminConfigFtp')}">FTP Setup</a>)</p>
 		<p>{$lang->path}: {$package->path}</p>
-		<p><a class="x_btn x_btn-large x_btn-primary x_pull-right" href="{_XE_DOWNLOAD_SERVER_}?module=resourceapi&act=procResourceapiDownload&package_srl={$package->package_srl}">{$lang->cmd_download}</a>
+		<p><a class="x_btn x_btn-primary x_pull-right" href="{_XE_DOWNLOAD_SERVER_}?module=resourceapi&act=procResourceapiDownload&package_srl={$package->package_srl}">{$lang->cmd_download}</a>
 	</div>
 	<div cond="!$show_ftp_note">
 		<div cond="$XE_VALIDATOR_MESSAGE" class="x_alert x_alert-error">
@@ -53,7 +53,7 @@
 			</block>
 			<div class="x_clearfix btnArea">
 				<div class="x_pull-right">
-					<input class="x_btn x_btn-large x_btn-primary" type="submit" value="{$package->installed?$lang->update:$lang->install}" />
+					<input class="x_btn x_btn-primary" type="submit" value="{$package->installed?$lang->update:$lang->install}" />
 				</div>
 			</div>
 		</form>

modules/autoinstall/tpl/list.html

@@ -38,8 +38,8 @@
 		<block loop="$item_list => $key, $item">
 			{@ $target_url = $original_site."?mid=download&package_srl=".$item->package_srl; }
 			<div class="x_thumbnail">
-				<div class="thumb">
+				<div class="thumb" style="min-height:80px">
-					<img src="{str_replace('./', $uri, $item->item_screenshot_url)}" alt="" width="80" height="80" />
+					<img src="{str_replace('./', $uri, $item->item_screenshot_url)}" alt="" width="80" />
 				</div>
 				<div class="text">
 					<h3><span class="x_label x_label-info">{$item->category}</span> <a href="{$target_url}" title="{htmlspecialchars($item->title)}" target="_blank">{htmlspecialchars($item->title)}</a></h3>
@@ -133,7 +133,7 @@
 			<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 			{@$isGoTo = true}
 			<li>
-				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+				<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 				<span cond="$isGoTo" id="goTo" class="x_input-append">
 					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 					<button type="submit" class="x_add-on">Go</button>
@@ -147,7 +147,7 @@
 			<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 			{@$isGoTo = true}
 			<li>
-				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+				<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 				<span cond="$isGoTo" id="goTo" class="x_input-append">
 					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 					<button type="submit" class="x_add-on">Go</button>

modules/comment/tpl/comment_list.html

@@ -83,7 +83,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -99,7 +99,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -160,16 +160,16 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 	<div class="x_modal-footer">
 		<div class="x_btn-group x_pull-left">
 			<button type="submit" class="x_btn" name="is_trash" value="true">{$lang->cmd_trash}</button>
-			<button type="submit" class="x_btn x_btn-danger" name="is_trash" value="false">{$lang->cmd_delete}</button>
+			<button type="submit" class="x_btn" name="is_trash" value="false">{$lang->cmd_delete}</button>
 		</div>
 		<div class="x_btn-group x_pull-right">
 		<!--@if ($search_target=='is_published' && $search_keyword=="N")-->
-			<button type="submit" class="x_btn x_btn-primary" name="will_publish" value="1" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_publish}</button>
+			<button type="submit" class="x_btn x_btn-inverse" name="will_publish" value="1" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_publish}</button>
 		<!--@elseif ($search_target=='is_published' && $search_keyword=="Y")-->
-			<button type="submit" class="x_btn" name="will_publish" value="0" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_unpublish}</button>
+			<button type="submit" class="x_btn x_btn-inverse" name="will_publish" value="0" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_unpublish}</button>
 		<!--@else-->
-			<button type="submit" class="x_btn" name="will_publish" value="0" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_unpublish}</button>
+			<button type="submit" class="x_btn x_btn-inverse" name="will_publish" value="0" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_unpublish}</button>
-			<button type="submit" class="x_btn x_btn-primary" name="will_publish" value="1" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_publish}</button>
+			<button type="submit" class="x_btn x_btn-inverse" name="will_publish" value="1" onclick="doChangePublishedStatus(this.value);">{$lang->cmd_publish}</button>
 		<!--@end-->
 		</div>
 	</div>

modules/comment/tpl/declared_list.html

@@ -64,7 +64,7 @@
 		</div>
 		<div class="x_pull-right x_btn-group">
 			<button class="x_btn" type="submit" name="trash" onclick="this.form.is_trash.value=true">{$lang->cmd_trash}</button>
-			<button class="x_btn x_btn-danger" type="submit" onclick="this.form.is_trash.value=false">{$lang->cmd_delete_checked_comment}</button>
+			<button class="x_btn" type="submit" onclick="this.form.is_trash.value=false">{$lang->cmd_delete_checked_comment}</button>
 		</div>
 	</div>
 </form>
@@ -80,7 +80,7 @@
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -96,7 +96,7 @@
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>

modules/document/tpl/declared_list.html

@@ -81,7 +81,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -97,7 +97,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -141,12 +141,12 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 	<div class="x_modal-footer">
 		<div class="x_btn-group x_pull-left">
 			<button type="submit" name="type" value="trash" class="x_btn">{$lang->cmd_trash}</button>
-			<button type="submit" name="type" value="delete" class="x_btn x_btn-danger">{$lang->cmd_delete}</button>
+			<button type="submit" name="type" value="delete" class="x_btn">{$lang->cmd_delete}</button>
 		</div>
 		<div class="x_btn-group x_pull-right">
-			<button type="submit" name="type" value="move" class="x_btn">{$lang->cmd_move}</button>
+			<button type="submit" name="type" value="move" class="x_btn x_btn-inverse">{$lang->cmd_move}</button>
-			<button type="submit" name="type" value="copy" class="x_btn">{$lang->cmd_copy}</button>
+			<button type="submit" name="type" value="copy" class="x_btn x_btn-inverse">{$lang->cmd_copy}</button>
-			<button type="submit" name="type" value="cancelDeclare" class="x_btn">{$lang->cmd_cancel_declare}</button>
+			<button type="submit" name="type" value="cancelDeclare" class="x_btn x_btn-inverse">{$lang->cmd_cancel_declare}</button>
 		</div>
 	</div>
 </form>

modules/document/tpl/document_list.html

@@ -91,7 +91,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -107,7 +107,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -163,12 +163,12 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 	</div>
 	<div class="x_modal-footer">
 		<div class="x_btn-group x_pull-left">
-			<button type="submit" name="type" value="trash" class="x_btn x_btn-warning">{$lang->cmd_trash}</button>
+			<button type="submit" name="type" value="trash" class="x_btn">{$lang->cmd_trash}</button>
-			<button type="submit" name="type" value="delete" class="x_btn x_btn-danger">{$lang->cmd_delete}</button>
+			<button type="submit" name="type" value="delete" class="x_btn">{$lang->cmd_delete}</button>
 		</div>
 		<div class="x_btn-group x_pull-right">
 			<button type="submit" name="type" value="move" class="x_btn x_btn-inverse">{$lang->cmd_move}</button>
-			<button type="submit" name="type" value="copy" class="x_btn">{$lang->cmd_copy}</button>
+			<button type="submit" name="type" value="copy" class="x_btn x_btn-inverse">{$lang->cmd_copy}</button>
 		</div>
 	</div>
 </form>

modules/file/tpl/adminConfig.html

@@ -54,7 +54,7 @@
 	</div>
 	<div class="x_clearfix btnArea">
 		<div class="x_pull-right">
-			<button type="submit" class="x_btn x_btn-primary x_btn-large">{$lang->cmd_save}</button>
+			<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
 		</div>
 	</div>
 </form>

modules/file/tpl/file_list.html

@@ -127,7 +127,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -143,7 +143,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -191,6 +191,6 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		</table>
 	</div>
 	<div class="x_modal-footer">
-		<button type="submit" class="x_btn x_btn-danger">{$lang->cmd_delete}</button>
+		<button type="submit" class="x_btn x_btn-inverse">{$lang->cmd_delete}</button>
 	</div>
 </form>

modules/install/tpl/check_env.html

@@ -15,7 +15,7 @@
 			<p>
 				<i class="x_icon-ok-sign x_icon-white"></i>
 				<strong>XE {__ZBXE_VERSION__}</strong> {$lang->install_condition_enable} 
-				<a href="#details" data-toggle="#details">&rsaquo; {$lang->install_details}</a>
+				<a href="#details" data-toggle>&rsaquo; {$lang->install_details}</a>
 			</p>
 			<ul id="details" style="display:none;outline:none">
 				<li loop="$checklist => $key,$val">

modules/install/tpl/form.cubrid.html

@@ -23,7 +23,7 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
 				<div id="advanced" style="display:none">
 					<div class="x_control-group">
 						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>

modules/install/tpl/form.mssql.html

@@ -23,7 +23,7 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
 				<div id="advanced" style="display:none">
 					<div class="x_control-group">
 						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>

modules/install/tpl/form.mysql.html

@@ -23,7 +23,7 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
 				<div id="advanced" style="display:none">
 					<div class="x_control-group">
 						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>

modules/install/tpl/form.mysql_innodb.html

@@ -23,7 +23,7 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
 				<div id="advanced" style="display:none">
 					<div class="x_control-group">
 						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>

modules/install/tpl/form.mysqli.html

@@ -23,7 +23,7 @@
 					<label for="dbName" class="x_control-label">{$lang->db_name}</label>
 					<div class="x_controls"><input name="db_database" type="text" id="dbName" required /></div>
 				</div>
-				<p style="text-align:right"><a href="#advanced" data-toggle="#advanced">{$lang->advanced_setup}</a></p>
+				<p style="text-align:right"><a href="#advanced" data-toggle>{$lang->advanced_setup}</a></p>
 				<div id="advanced" style="display:none">
 					<div class="x_control-group">
 						<label for="dbHostName" class="x_control-label">{$lang->db_hostname}</label>

modules/integration_search/tpl/index.html

@@ -11,15 +11,15 @@
 
 	<div class="x_control-group">
 		<label for="sample_code" class="x_control-label">{$lang->sample_code}</label>
-		<div class="x_controls">
+		<div class="x_controls" style="margin-right:14px">
-			<textarea id="sample_code" readonly style="width:900px;height:100px;cursor:text">{$sample_code}</textarea>
+			<textarea id="sample_code" readonly style="width:100%;height:100px;cursor:text">{$sample_code}</textarea>
 			<span class="x_help-block">{$lang->about_sample_code}</span>
 		</div>
 	</div>
 	<div class="x_control-group">
 		<label for="skin" class="x_control-label">{$lang->skin}</label>
 		<div class="x_controls">
-			<select name="skin" id="skin">
+			<select name="skin" id="skin" style="width:220px">
 				<option loop="$skin_list => $key, $val"  value="{$key}" selected="selected"|cond="$config->skin == $key">{$val->title}</option>
 			</select>
 			<span class="x_help-block">{$lang->about_skin}</span>
@@ -28,7 +28,7 @@
 	<div class="x_control-group">
 		<label class="x_control-label">{$lang->target}</label>
 		<div class="x_controls">
-			<select name="target">
+			<select name="target" style="width:220px">
 				<option value="include">{$lang->include_search_target}</option>
 				<option value="exclude" selected="selected"|cond="$config->target=='exclude'">{$lang->exclude_search_target}</option>
 			</select>
@@ -44,6 +44,6 @@
 	</div>
 
 	<div class="btnArea">
-		<button class="x_btn x_btn-primary x_btn-large" type="submit">{$lang->cmd_registration}</button>
+		<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_registration}</button>
 	</div>
 </form>

modules/layout/lang/lang.xml

@@ -217,35 +217,16 @@
 
 	</item>
 	<item name="about_layout_code">
-		<value xml:lang="ko"><![CDATA[아래 레이아웃의 코드를 직접 수정 후 저장하면 서비스에 반영이 됩니다.
+		<value xml:lang="ko"><![CDATA[아래 레이아웃의 코드를 직접 수정 후 저장하면 서비스에 반영이 됩니다. 꼭 미리보기를 하신 후에 저장을 하세요. XE의 템플릿 문법은 <a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XE 템플릿</a> 을 참고하면 됩니다.]]></value>
-        꼭 미리보기를 하신 후에 저장을 하세요.
+		<value xml:lang="en"><![CDATA[It will be applied to the service when you save the layout code after editing it. Please first preview your code and then save it. You can refer grammar of XE's template from <a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XE Template</a>.]]></value>
-        XE의 템플릿 문법은 <a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;">XE 템플릿</a> 을 참고하면 됩니다.]]></value>
+		<value xml:lang="jp"><![CDATA[下のレイアウトコードを修正し、保存するとサービスに反映されます。必ずプレビューで確認してから保存してください。XEのテンプレート文法は<a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XEテンプレート</a>を参考してください。]]></value>
-		<value xml:lang="en"><![CDATA[It will be applied to the service when you save the layout code after editing it.
+		<value xml:lang="zh-CN"><![CDATA[修改的布局代码保存后即可生效。保存之前请必须先预览后再保存。XE布局语法请参考<strong><a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XE模板</a></strong>。]]></value>
-        Please first preview your code and then save it.
+		<value xml:lang="zh-TW"><![CDATA[儲存修改後的版面，即可生效。 儲存之前，請先預覽後再儲存。 XE 版面設計語法，請參考 <a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XE 樣版</a>。]]></value>
-        You can refer grammar of XE's template from <a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;">XE Template</a>.]]></value>
+		<value xml:lang="fr"><![CDATA[Vous conservez la code de Mise en Page après l'éditer, la code sera appliquée sur le service. Utilisez [Avant-première] avant conserver la code S.V.P. Vous pouvez référer la grammaire de modèle de XE sur <a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">Modèle du XE</a>.]]></value>
-		<value xml:lang="jp"><![CDATA[下のレイアウトコードを修正し、保存するとサービスに反映されます。
+		<value xml:lang="ru"><![CDATA[Применения к службе будут проиведены, когда Вы сохраните код лейаут после редактирование. Пожалуйста, сначала используйте предпросмотр кода и затем сохраните его. Вы можете обратиться к грамматике шаблонов XE с <a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XE Template</a>.]]></value>
-        必ずプレビューで確認してから保存してください。
+		<value xml:lang="es"><![CDATA[El diseño sera aplicado al servicio cuando usted guarda el código del diseño luego de haber editado. Primero visualiza previamente tus códigos y luego guardalos. Referente al código de planillas de XE dirijirse a<a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XE Pamphlet(Ingles)</a> ]]></value>
-        XEのテンプレート文法は<a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;">XEテンプレート</a>を参考してください。]]></value>
+		<value xml:lang="tr"><![CDATA[Yerleşim düzeni kodunu düzenledikten sonra kaydettiğinizde, hizmete girecektir. Lütfen önce kodunuzun önizlemesini yapın ve sonra kaydedin. XE'nin şablolunu örnek alabilirsiniz : <a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank">XE Template</a>.]]></value>
-		<value xml:lang="zh-CN"><![CDATA[修改的布局代码保存后即可生效。
+		<value xml:lang="vi"><![CDATA[Nó sẽ được áp dụng vào Website ngay khi bạn bấm '<b>Lưu</b>' sau khi sửa đổi. Hãy bấm '<b>Xem trước</b>' trước khi bấm '<b>Lưu</b>'. Bạn có thể tham khảo cách sửa giao diện tại <a href="http://code.google.com/p/xe-core/wiki/TemplateSyntax" target="_blank"><b>XE Template</b></a>.]]></value>
-	保存之前请必须先预览后再保存。
-        XE布局语法请参考<strong><a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;">XE模板</a></strong>。]]></value>
-		<value xml:lang="zh-TW"><![CDATA[儲存修改後的版面，即可生效。 儲存之前，請先預覽後再儲存。
-        XE 版面設計語法，請參考 <a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;">XE 樣版</a>。]]></value>
-		<value xml:lang="fr"><![CDATA[Vous conservez la code de Mise en Page après l'éditer, la code sera appliquée sur le service.
-        Utilisez [Avant-première] avant conserver la code S.V.P.
-        Vous pouvez référer la grammaire de modèle de XE sur <a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;">Modèle du XE</a>.]]></value>
-		<value xml:lang="ru"><![CDATA[Применения к службе будут проиведены, когда Вы сохраните код лейаут после редактирование.
-        Пожалуйста, сначала используйте предпросмотр кода и затем сохраните его.
-        Вы можете обратиться к грамматике шаблонов XE с <a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;">XE Template</a>.]]></value>
-		<value xml:lang="es"><![CDATA[El diseño sera aplicado al servicio cuando usted guarda el código del diseño luego de haber editado.
-		Primero visualiza previamente tus códigos y luego guardalos
-        Referente al código de planillas de XE dirijirse a<a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;">XE Pamphlet(Ingles)</a> ]]></value>
-		<value xml:lang="tr"><![CDATA[Yerleşim düzeni kodunu düzenledikten sonra kaydettiğinizde, hizmete girecektir.
-        Lütfen önce kodunuzun önizlemesini yapın ve sonra kaydedin.
-        XE'nin şablolunu örnek alabilirsiniz : <a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;">XE Template</a>.]]></value>
-		<value xml:lang="vi"><![CDATA[Nó sẽ được áp dụng vào Website ngay khi bạn bấm '<b>Lưu</b>' sau khi sửa đổi.
-        Hãy bấm '<b>Xem trước</b>' trước khi bấm '<b>Lưu</b>'.
-        Bạn có thể tham khảo cách sửa giao diện tại <a href="#" onclick="winopen('http://code.google.com/p/xe-core/wiki/TemplateSyntax');return false;"><b>XE Template</b></a>.]]></value>
 	</item>
 	<item name="layout_export">
 		<value xml:lang="ko"><![CDATA[내보내기]]></value>

modules/layout/tpl/js/adminEdit.js

@@ -1,15 +1,3 @@
-jQuery(document).ready(function($){
-	$('.uploaded_image').css('cursor', 'pointer');
-	$('.uploaded_image_path').hide();
-	$('.uploaded_image').bind('click', function(e){
-		var path = $(this).find('.uploaded_image_path').html();
-		var html = '<div class="x_well selected_image_path">' + path + '</div>';
-
-		$('.selected_image_path').remove();
-		$('.uploaded_image_list').after(html);
-	});
-});
-
 function doPreviewLayoutCode()
 {
 	var $form = jQuery('#fo_layout'), $act = $form.find('input[name=act]');

modules/layout/tpl/layout_edit.html

@@ -11,24 +11,23 @@
 	<p>{nl2br($lang->about_layout_image_repository)}</p>
 
 	<ul class="x_thumbnails uploaded_image_list">
-		<li loop="$layout_image_list => $no, $file" class="x_span2">
+		<li loop="$layout_image_list => $no, $file" class="x_span2" style="float:none;display:inline-block;_display:inline;zoom:1;vertical-align:top">
 			{@$ext=substr(strrchr($file,'.'),1)}
-			<div class="x_thumbnail a uploaded_image">
+			<div class="x_thumbnail a uploaded_image x_clearfix">
 				<script cond="$ext == 'swf' || $ext == 'flv'">
 					//<![CDATA[
 					displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100px', '100px');
 					//]]>
 				</script>
 				<img cond="$ext != 'swf' && $ext != 'flv'" src="{getUrl('')}{$layout_image_path}{$file}" />
-				<div class="x_caption">
+				<div style="width:100%;word-wrap:break-word">
-					<p class="uploaded_image_path">{$layout_image_path}{$file}</p>
+					<p class="uploaded_image_path" style="margin:5px 0 0 0;font:11px/1.25 Tahoma, Geneva, sans-serif">{$layout_image_path}{$file}</p>
-					<form action="./" method="post" style="margin:0;padding:0">
+					<form action="./" method="post" class="x_pull-right" style="margin:0;padding:0">
 						<input type="hidden" name="module" value="layout" />
 						<input type="hidden" name="act" value="procLayoutAdminUserImageDelete" />
 						<input type="hidden" name="layout_srl" value="{$layout_srl}" />
 						<input type="hidden" name="filename" value="{$file}" />
-
+						<input class="x_icon-remove" type="submit" value="{$lang->cmd_delete}" title="{$lang->cmd_delete}" style="width:14px" />
-						<input class="x_btn x_btn-mini x_btn-danger" type="submit" value="{$lang->cmd_delete}" />
 					</form>
 				</div>
 			</div>
@@ -39,11 +38,10 @@
 		<input type="hidden" name="module" value="layout" />
 		<input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
 		<input type="hidden" name="layout_srl" value="{$layout_srl}" />
-
+		<p>
-		<div class="x_control-group">
+			<input type="file" class="overlap" name="user_layout_image" value="" title="{$lang->uploaded_file}" />
-			<input type="file" name="user_layout_image" value="" />
+			<span class="x_help-inline">{$lang->msg_layout_image_target}</span>
-			<span class="x_help-block">{$lang->msg_layout_image_target}</span>
+		</p>
-		</div>
 		<div class="x_clearfix btnArea">
 			<div class="x_pull-right">
 				<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
@@ -69,15 +67,19 @@
 
 	<section class="section">
 		<h1>HTML</h1>
+		<div style="margin-right:14px">
 			<textarea name="code" rows="8" cols="42" style="width:100%;height:300px;font-size:11px;">{$layout_code}</textarea>
-		<div class="x_btn-group">
+		</div>
-			<a loop="$widget_list => $widget" class="x_btn x_btn-mini" href="{getUrl('','module','admin','act','dispWidgetAdminGenerateCode','selected_widget',$widget->widget)}" target="_blank">{$widget->title}</a>
+		<div>
+			<block loop="$widget_list => $widget"> <i>|</i> <a href="{getUrl('','module','admin','act','dispWidgetAdminGenerateCode','selected_widget',$widget->widget)}" target="_blank">{$widget->title}</a></block>
 		</div>
 	</section>
 
 	<section class="section">
 		<h1>CSS</h1>
+		<div style="margin-right:14px">
 			<textarea name="code_css" rows="8" cols="42" style="width:100%;height:300px;font-size:11px;">{$layout_code_css}</textarea>
+		</div>
 	</section>
 
 	<div class="x_clearfix btnArea">

modules/layout/tpl/layout_html_css_view.html

@@ -3,24 +3,23 @@
 	<p>{nl2br($lang->about_layout_image_repository)}</p>
 
 	<ul class="x_thumbnails uploaded_image_list">
-		<li loop="$layout_image_list => $no, $file" class="x_span2">
+		<li loop="$layout_image_list => $no, $file" class="x_span2" style="float:none;display:inline-block;_display:inline;zoom:1;vertical-align:top">
 			{@$ext=substr(strrchr($file,'.'),1)}
-			<div class="x_thumbnail a uploaded_image">
+			<div class="x_thumbnail a uploaded_image x_clearfix">
 				<script cond="$ext == 'swf' || $ext == 'flv'">
 					//<![CDATA[
 					displayMultimedia('{getUrl('')}{$layout_image_path}{$file}', '100px', '100px');
 					//]]>
 				</script>
 				<img cond="$ext != 'swf' && $ext != 'flv'" src="{getUrl('')}{$layout_image_path}{$file}" />
-				<div class="x_caption">
+				<div style="width:100%;word-wrap:break-word">
-					<p class="uploaded_image_path">{$layout_image_path}{$file}</p>
+					<p class="uploaded_image_path" style="margin:5px 0 0 0;font:11px/1.25 Tahoma, Geneva, sans-serif">{$layout_image_path}{$file}</p>
-					<form action="./" method="post" style="margin:0;padding:0">
+					<form action="./" method="post" class="x_pull-right" style="margin:0;padding:0">
 						<input type="hidden" name="module" value="layout" />
 						<input type="hidden" name="act" value="procLayoutAdminUserImageDelete" />
 						<input type="hidden" name="layout_srl" value="{$layout_srl}" />
 						<input type="hidden" name="filename" value="{$file}" />
-
+						<input class="x_icon-remove" type="submit" value="{$lang->cmd_delete}" title="{$lang->cmd_delete}" style="width:14px" />
-						<input class="x_btn x_btn-mini x_btn-danger" type="submit" value="{$lang->cmd_delete}" />
 					</form>
 				</div>
 			</div>
@@ -31,11 +30,12 @@
 		<input type="hidden" name="module" value="layout" />
 		<input type="hidden" name="act" value="procLayoutAdminUserImageUpload" />
 		<input type="hidden" name="layout_srl" value="{$layout_srl}" />
-
+		<p>
-		<div class="x_control-group">
+			<span class="x_btn fileBtn">
-			<input type="file" name="user_layout_image" value="" />
+				{$lang->uploaded_file} <input type="file" name="user_layout_image" value="" title="{$lang->uploaded_file}" />
-			<span class="x_help-block">{$lang->msg_layout_image_target}</span>
+			</span>
-		</div>
+			<span class="x_help-inline">{$lang->msg_layout_image_target}</span>
+		</p>
 		<div class="x_clearfix btnArea">
 			<div class="x_pull-right">
 				<button type="submit" class="x_btn x_btn-primary">{$lang->cmd_save}</button>
@@ -61,15 +61,19 @@
 
 	<section class="section">
 		<h1>HTML</h1>
+		<div style="margin-right:14px">
 			<textarea name="code" rows="8" cols="42" style="width:100%;height:300px;font-size:11px;">{$layout_code}</textarea>
-		<div class="x_btn-group">
+		</div>
-			<a loop="$widget_list => $widget" class="x_btn x_btn-mini" href="{getUrl('','module','admin','act','dispWidgetAdminGenerateCode','selected_widget',$widget->widget)}" target="_blank">{$widget->title}</a>
+		<div>
+			<block loop="$widget_list => $widget"> <i class="vr">|</i> <a href="{getUrl('','module','admin','act','dispWidgetAdminGenerateCode','selected_widget',$widget->widget)}" target="_blank">{$widget->title}</a></block>
 		</div>
 	</section>
 
 	<section class="section">
 		<h1>CSS</h1>
+		<div style="margin-right:14px">
 			<textarea name="code_css" rows="8" cols="42" style="width:100%;height:300px;font-size:11px;">{$layout_code_css}</textarea>
+		</div>
 	</section>
 
 	<div class="x_clearfix btnArea">

modules/layout/tpl/layout_info_view.html

@@ -44,7 +44,7 @@
 	<div class="x_control-group">
 		<label class="x_control-label" for="header_script">{$lang->header_script}</label>
 		<div class="x_controls">
-			<textarea name="header_script" id="header_script" rows="8" cols="42">{$selected_layout->header_script}</textarea>
+			<textarea name="header_script" id="header_script" rows="4" cols="42">{$selected_layout->header_script}</textarea>
 			<span class="x_help-block">{$lang->about_header_script}</span>
 		</div>
 	</div>
@@ -67,15 +67,15 @@
 
 				<div cond="$var->type == 'textarea'">
 					{@$use_multilang_textarea = true}
-					<textarea name="{$name}" rows="8" cols="42" class="lang_code"><!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value)}<!--@else-->{$var->value}<!--@end--></textarea>
+					<textarea name="{$name}" rows="4" cols="42" class="lang_code"><!--@if(strpos($var->value, "$user_lang->") !== false)-->{htmlspecialchars($var->value)}<!--@else-->{$var->value}<!--@end--></textarea>
 				</div>
 
 				<block cond="$var->type == 'image'">
 					<input type="hidden" name="{$name}" id="file_{$name}" value="{$var->value}" />
-					<div id="preview_{$name}" class="x_thumbnail" style="<!--@if(!$var->value)-->display:none;<!--@end-->max-width:250px;margin-bottom:20px;">
+					<div id="preview_{$name}" class="x_thumbnail" style="<!--@if(!$var->value)-->display:none;<!--@end-->max-width:210px;margin-bottom:20px;">
-						<img src="../../../{$var->value}"|cond="$var->value" alt="" style="max-width:250px;" />
+						<img src="../../../{$var->value}"|cond="$var->value" alt="" style="max-width:100%" />
-						<div class="x_caption">
+						<div style="text-align:right">
-							<input class="x_btn x_btn-danger x_btn-mini" type="button" value="{$lang->cmd_delete}" onclick="deleteImage('{$name}')" />
+							<button class="x_icon-remove" type="button" onclick="deleteImage('{$name}')" title="{$lang->cmd_delete}">{$lang->cmd_delete}</button>
 						</div>
 					</div>
 					<form action="./" enctype="multipart/form-data" method="post" target="hiddenIframe" class="imageUpload">
@@ -84,8 +84,8 @@
 					<input type="hidden" name="layout_srl" value="{$layout_srl}" />
 					<input type="hidden" name="name" value="{$name}" />
 						<p>
-							<input type="file" name="img" id="file_select_{$name}" value="" />
+							<input type="file" name="img" id="file_select_{$name}" value="" title="{$lang->uploaded_file}" />
-							<input class="x_btn x_btn-mini x_btn-primary" type="submit" value="{$lang->cmd_submit}" />
+							<input class="x_btn" type="submit" value="{$lang->cmd_submit}" />
 						</p>
 					</form>
 				</block>

modules/member/tpl/default_config.html

@@ -15,24 +15,24 @@
 		<label class="x_control-label" for="webmaster_name">{$lang->webmaster_name}</label>
 		<div class="x_controls">
 			<input type="text" id="webmaster_name" name="webmaster_name" value="{$config->webmaster_name}" size="20" />
-			<p class="x_help-block">{$lang->about_webmaster_name}</p>
+			<p class="x_help-inline">{$lang->about_webmaster_name}</p>
 		</div>
 	</div>
 	<div class="x_control-group">
 		<label class="x_control-label" for="webmaster_email">{$lang->webmaster_email}</label>
 		<div class="x_controls">
 			<input type="email" id="webmaster_email" name="webmaster_email" value="{$config->webmaster_email}" size="40" />
-			<p class="x_help-block">{$lang->about_webmaster_email}</p>
+			<p class="x_help-inline">{$lang->about_webmaster_email}</p>
 		</div>
 	</div>
 	<div class="x_control-group">
 		<label class="x_control-label" for="member_sync">{$lang->cmd_member_sync}</label>
 		<div class="x_controls">
-			<input id="member_sync" type="button" value="{$lang->cmd_member_sync}" class="__sync x_btn x_btn-warning" />
+			<input id="member_sync" type="button" value="{$lang->cmd_member_sync}" class="__sync x_btn x_btn-warning" style="min-width:220px" />
 			<p class="x_help-block">{$lang->about_member_sync}</p>
 		</div>
 	</div>
 	<div class="btnArea x_clearfix">
-		<span class="x_pull-right"><input class="x_btn x_btn-large x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
+		<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
 </form>

modules/member/tpl/design_config.html

@@ -43,7 +43,7 @@
 		</div>
 	</div>
 	<div class="x_clearfix btnArea">
-		<span class="x_pull-right"><input class="x_btn x_btn-large x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
+		<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
 </form>
 <script>

modules/member/tpl/group_list.html

@@ -32,7 +32,7 @@
 				<th scope="col">{$lang->group_title}</th>
 				<th scope="col">{$lang->description}</th>
 				<th scope="col">{$lang->is_default}
-					[<a href="#helpDefault" data-toggle="#helpDefault">?</a>]
+					[<a href="#helpDefault" data-toggle>?</a>]
 					<div class="layer x_alert x_alert-info" id="helpDefault">
 						<p>{$lang->about_member_default}</p>
 					</div>
@@ -84,7 +84,7 @@
 		</tbody>
 	</table>
 	<div class="x_clearfix">
-		<span class="x_pull-right"><input class="x_btn x_btn-primary x_btn-large" type="submit" value="{$lang->cmd_save}" /></span>
+		<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
 </form>
 

modules/member/tpl/insert_member.html

@@ -105,8 +105,8 @@
 		</div>
 	</div>
 	<div class="x_clearfix btnArea">
-		<span class="x_pull-left" cond="$member_srl"><button class="x_btn x_btn-large" type="button" onclick="history.go(-1)">{$lang->cmd_cancel}</button></span>
+		<span class="x_pull-left" cond="$member_srl"><button class="x_btn" type="button" onclick="history.go(-1)">{$lang->cmd_cancel}</button></span>
-		<span class="x_pull-right"><input class="x_btn x_btn-primary x_btn-large" type="submit" value="{$lang->cmd_save}" /></span>
+		<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
 </form>
 <script>

modules/member/tpl/login_config.html

@@ -46,7 +46,7 @@
 		</div>
 	</div>
 	<div class="x_clearfix btnArea">
-		<span class="x_pull-right"><input class="x_btn x_btn-large x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
+		<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
 </form>
 <script>

modules/member/tpl/member_info.html

@@ -48,6 +48,6 @@
 	</tr>
 </table>
 <div class="x_clearfix">
-	<span class="x_pull-left" cond="$member_srl"><button class="x_btn x_btn-large" type="button" onclick="history.go(-1)">{$lang->cmd_back}</button></span>
+	<span class="x_pull-left" cond="$member_srl"><button class="x_btn" type="button" onclick="history.go(-1)">{$lang->cmd_back}</button></span>
-	<span class="x_pull-right"><a class="x_btn x_btn-primary x_btn-large" href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_srl)}">{$lang->cmd_modify}...</a></span>
+	<span class="x_pull-right"><a class="x_btn x_btn-primary" href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminInsert', 'member_srl', $member_srl)}">{$lang->cmd_modify}...</a></span>
 </div>

modules/member/tpl/member_list.html

@@ -101,7 +101,7 @@
 			<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 				{@$isGoTo = true}
 				<li>
-					<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+					<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 					<span cond="$isGoTo" id="goTo" class="x_input-append">
 						<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 						<button type="submit" class="x_add-on">Go</button>
@@ -117,7 +117,7 @@
 			<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 				{@$isGoTo = true}
 				<li>
-					<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+					<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 					<span cond="$isGoTo" id="goTo" class="x_input-append">
 						<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 						<button type="submit" class="x_add-on">Go</button>
@@ -188,8 +188,8 @@
 		<div class="x_modal-footer">
 			<button type="button" class="x_btn x_pull-left" data-hide="#listManager">{$lang->cmd_close}</button>
 			<span class="x_btn-group x_pull-right">
-				<button type="submit" name="type" value="modify" class="x_btn">{$lang->cmd_modify}...</button>
+				<button type="submit" name="type" value="modify" class="x_btn x_btn-inverse">{$lang->cmd_modify}</button>
-				<button type="submit" name="type" value="delete" class="x_btn x_btn-danger">{$lang->cmd_delete}</button>
+				<button type="submit" name="type" value="delete" class="x_btn x_btn-inverse">{$lang->cmd_delete}</button>
 			</span>
 		</div>
 	</form>

modules/member/tpl/signup_config.html

@@ -71,7 +71,7 @@
 				<tr>
 					<th scope="col">{$lang->target}</th>
 					<th scope="col">{$lang->identifier}
-						[<a href="#helpDefault" data-toggle="#helpDefault">?</a>]
+						[<a href="#helpDefault" data-toggle>?</a>]
 						<div class="layer x_alert x_alert-info" id="helpDefault">
 							<p>{$lang->about_identifier}</p>
 						</div>
@@ -79,7 +79,7 @@
 					<th scope="col">{$lang->use}</th>
 					<th scope="col">{$lang->cmd_required}/{$lang->cmd_optional}</th>
 					<th scope="col">{$lang->public}
-						[<a href="#helpPublic" data-toggle="#helpPublic">?</a>]
+						[<a href="#helpPublic" data-toggle>?</a>]
 						<div class="layer x_alert x_alert-info" id="helpPublic">
 							<p>{$lang->about_public_item}</p>
 						</div>
@@ -177,7 +177,7 @@
 	</div>
 	</section>
 	<div class="x_clearfix btnArea">
-		<span class="x_pull-right"><input class="x_btn x_btn-large x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
+		<span class="x_pull-right"><input class="x_btn x_btn-primary" type="submit" value="{$lang->cmd_save}" /></span>
 	</div>
 </form>
 <form action="./" class="x_modal" id="userDefine" ruleset="insertJoinForm" method="post">

modules/menu/tpl/site_design.html

@@ -24,8 +24,8 @@
 					</div>
 				</div>
 				<ul class="nav">
-					<li><a href="#layout" data-show="#layout">레이아웃 <i class="x_icon-circle-arrow-right"></i></a></li>
+					<li><a href="#layout" data-show>레이아웃 <i class="x_icon-circle-arrow-right"></i></a></li>
-					<li><a href="#skin" data-show="#skin">{게시판} <i class="x_icon-circle-arrow-right"></i></a></li>
+					<li><a href="#skin" data-show>{게시판} <i class="x_icon-circle-arrow-right"></i></a></li>
 				</ul>
 				<div class="btnBoth">
 					<button type="reset" class="x_btn x_pull-left">취소</button>
@@ -66,7 +66,7 @@
 						</li>
 					</ul>
 					<div class="x_btn-group">
-						<a href="#downloadLayout" data-show="#downloadLayout" class="x_btn x_btn-inverse x_pull-right"><i class="x_icon-plus x_icon-white"></i> 다른 레이아웃 설치</a>
+						<a href="#downloadLayout" data-show class="x_btn x_btn-inverse x_pull-right"><i class="x_icon-plus x_icon-white"></i> 다른 레이아웃 설치</a>
 					</div>
 				</div>
 			</div>
@@ -130,7 +130,7 @@
 					</li>
 				</ul>
 				<div class="x_btn-group">
-					<a href="#downloadSkin" data-show="#downloadSkin" class="x_btn x_btn-inverse x_pull-right"><i class="x_icon-plus x_icon-white"></i> 다른 스킨 설치</a>
+					<a href="#downloadSkin" data-show class="x_btn x_btn-inverse x_pull-right"><i class="x_icon-plus x_icon-white"></i> 다른 스킨 설치</a>
 				</div>
 			</div>
 			</div>

modules/menu/tpl/sitemap.html

@@ -583,7 +583,7 @@
 	<div class="x_modal-footer">
 		<button type="button" class="x_btn x_pull-left _cancel">{$lang->cmd_cancel}</button>
 		<span class="x_btn-group x_pull-right">
-			<button type="button" class="x_btn x_btn-danger _ok">{$lang->cmd_confirm}</button>
+			<button type="button" class="x_btn x_btn-inverse _ok">{$lang->cmd_confirm}</button>
 		</span>
 	</div>
 </fieldset>

modules/message/tpl/config.html

@@ -28,6 +28,6 @@
 		</div>
 	</div>
 	<div class="btnArea">
-		<button class="x_btn x_btn-large x_btn-primary" type="submit">{$lang->cmd_registration}</button>
+		<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_registration}</button>
 	</div>
 </form>

modules/module/tpl/adminFileBox.html

@@ -86,7 +86,7 @@
 			<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 				{@$isGoTo = true}
 				<li>
-					<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+					<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 					<span cond="$isGoTo" id="goTo" class="x_input-append">
 						<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 						<button type="submit" class="x_add-on">Go</button>
@@ -102,7 +102,7 @@
 			<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 				{@$isGoTo = true}
 				<li>
-					<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+					<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 					<span cond="$isGoTo" id="goTo" class="x_input-append">
 						<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 						<button type="submit" class="x_add-on">Go</button>

modules/module/tpl/filebox_list_html.html

@@ -46,7 +46,7 @@
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 			{@$isGoTo = true}
 			<li>
-				<a href="#goToFileBox" data-toggle="#goToFileBox" title="{$lang->cmd_go_to_page}">...</a>
+				<a href="#goToFileBox" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 				<span cond="$isGoTo" id="goToFileBox" class="x_input-append">
 					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 					<button type="submit" class="x_add-on">Go</button>
@@ -62,7 +62,7 @@
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 			{@$isGoTo = true}
 			<li>
-				<a href="#goToFileBox" data-toggle="#goToFileBox" title="{$lang->cmd_go_to_page}">...</a>
+				<a href="#goToFileBox" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 				<span cond="$isGoTo" id="goToFileBox" class="x_input-append">
 					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 					<button type="submit" class="x_add-on">Go</button>

modules/module/tpl/module_grants.html

@@ -9,36 +9,37 @@
 	<input type="hidden" name="module_srl" value="{$module_srl}" />
 	<input type="hidden" name="admin_member" value="<!--@foreach($admin_member as $key => $val)--><!--@if($member_config->identifier == 'email_address')-->{$val->email_address},<!--@else-->{$val->user_id},<!--@end--><!--@end-->" />
 	
-	<div class="section">
+	<div class="section x_form-horizontal">
 		<h1>{$lang->module_admin}</h1>
-		<p class="x_help-block">{$lang->about_admin_id}</p>
 		<div class="x_control-group">
-			<label class="x_control-label">
+			<label class="x_control-label" cond="$member_config->identifier == 'email_address'">
-					<!--@if($member_config->identifier == 'email_address')-->
 				{$lang->admin_email_address}
-					<!--@else-->
+			</label>
+			<label class="x_control-label" cond="$member_config->identifier != 'email_address'">
 				{$lang->admin_id}
-					<!--@end-->
 			</label>
 			<div class="x_controls">
-				<select name="_admin_member" multiple="multiple" size="{count($admin_member)?count($admin_member):1}" style="width:290px">
+				<div class="x_input-append" style="margin-bottom:8px">
-					<!--@foreach($admin_member as $key => $val)-->
+					<select name="_admin_member" multiple="multiple" size="{count($admin_member)?count($admin_member):1}" style="width:220px">
-					<option value="<!--@if($member_config->identifier=='email_address')-->{$val->email_address}<!--@else-->{$val->user_id}<!--@end-->">{$val->nick_name} (<!--@if($member_config->identifier=='email_address')-->{$val->email_address}<!--@else-->{$val->user_id}<!--@end-->)</option>
+						<option loop="$admin_member => $key, $val" value="{$val->email_address}"|cond="$member_config->identifier=='email_address'" value="{$val->user_id}"|cond="$member_config->identifier!='email_address'">
-					<!--@end-->
+							{$val->nick_name} (<block cond="$member_config->identifier=='email_address'">{$val->email_address}</block><block cond="$member_config->identifier!='email_address'">{$val->user_id}</block>)
+						</option>
 					</select>
+					<button class="x_btn" type="button" onclick="doDeleteAdmin()">{$lang->cmd_delete}</button>
+				</div>
+				<br>
 				<div class="x_input-append">
 					<input type="text" name="admin_id" />
 					<button class="x_btn" type="button" onclick="doInsertAdmin()">{$lang->cmd_insert}</button>
-					<button class="x_btn x_btn-danger" type="button" onclick="doDeleteAdmin()">{$lang->cmd_delete}</button>
 				</div>
+				<button type="button" class="x_icon-question-sign" data-toggle="#adminListHelp">{$lang->help}</button>
+				<span id="adminListHelp" hidden>{$lang->about_admin_id}</span>
 			</div>
 		</div>
 	</div>
 
 	<div class="section">
 		<h1>{$lang->permission_setting}</h1>
-		<p class="x_help-block">{$lang->about_grant_deatil}</p>
-
 		<div class="x_form-horizontal">
 			<div loop="$grant_list => $grant_name, $grant_item" class="x_control-group">
 				<label for="{$grant_name}_default" class="x_control-label">{$grant_item->title}</label>
@@ -50,6 +51,7 @@
 						<option value="-3" <!--@if($default_grant[$grant_name]=='manager')-->selected="selected"<!--@end-->>{$lang->grant_to_admin}</option>
 						<option value="" <!--@if($default_grant[$grant_name]=='group')-->selected="selected"<!--@end-->>{$lang->grant_to_group}</option>
 					</select>
+					<p class="x_help-inline" cond="$grant_name == 'access'"><button type="button" class="x_icon-question-sign" data-toggle="#{$grant_name}">{$lang->help}</button><span hidden id="{$grant_name}">{$lang->about_grant_deatil}</span></p>
 					<div id="zone_{$grant_name}" style="display:none">
 						<!--@foreach($group_list as $group_srl => $group_item)-->
 						<label for="grant_{$grant_name}_{$group_srl}" class="x_inline"><input type="checkbox" class="checkbox" name="{$grant_name}" value="{$group_item->group_srl}" id="grant_{$grant_name}_{$group_srl}" checked="checked"|cond="is_array($selected_group[$grant_name])&&in_array($group_srl,$selected_group[$grant_name])" /> {$group_item->title}</label>

modules/module/tpl/multilingual_v17_list.html

@@ -7,14 +7,14 @@
 <p cond="!$name">{sprintf($lang->about_multilingual_search_result, $total_count, $lang_code, $lang_supported[$lang_code])}</p>
 <fieldset class="list">
 	<form loop="$lang_code_list => $no, $val" action="" class="item">
-		<a class="set" href="#lang-{$no}"  data-toggle="#lang-{$no}" data-lang_code="{$val->name}"><span>{$val->value}</span></a>
+		<a class="set" href="#lang-{$no}" data-toggle data-lang_code="{$val->name}"><span>{$val->value}</span></a>
 		<fieldset id="lang-{$no}" style="display:none">
 			<textarea loop="$lang_supported => $code, $lname" disabled class="{$code}" data-lang="{$code}" rows="1" cols="12" title="{$lname}" style="margin-right:5px"></textarea>
 			<div class="x_clearfix">
 				<span class="x_pull-left x_btn-group">
 					<button type="button" class="x_btn modify">{$lang->cmd_modify}</button>
 					<button type="reset" class="x_btn cancel">{$lang->cmd_cancel}</button>
-					<button type="button" class="x_btn x_btn-danger delete">{$lang->cmd_delete}</button>
+					<button type="button" class="x_btn delete">{$lang->cmd_delete}</button>
 				</span>
 				<span class="x_pull-right">
 					<button type="button" class="x_btn useit x_btn-primary">{$lang->use}</button>
@@ -31,7 +31,7 @@
 			<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 			{@$isGoTo = true}
 			<li>
-				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+				<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 				<span cond="$isGoTo" id="goTo" class="x_input-append">
 					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 					<button type="submit" class="x_add-on">Go</button>
@@ -45,7 +45,7 @@
 			<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 			{@$isGoTo = true}
 			<li>
-				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+				<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 				<span cond="$isGoTo" id="goTo" class="x_input-append">
 					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 					<button type="submit" class="x_add-on">Go</button>

modules/page/tpl/index.html

@@ -88,7 +88,7 @@
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 			{@$isGoTo = true}
 			<li>
-				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+				<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 				<span cond="$isGoTo" id="goTo" class="x_input-append">
 					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 					<button type="submit" class="x_add-on">Go</button>
@@ -104,7 +104,7 @@
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 			{@$isGoTo = true}
 			<li>
-				<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+				<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 				<span cond="$isGoTo" id="goTo" class="x_input-append">
 					<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 					<button type="submit" class="x_add-on">Go</button>

modules/page/tpl/page_insert.html

@@ -138,7 +138,7 @@
 	</div>
 	<div class="x_clearfix btnArea">
 		<div class="x_pull-right">
-			<button class="x_btn x_btn-primary x_btn-large" type="submit">{$lang->cmd_make}</button>
+			<button class="x_btn x_btn-primary" type="submit">{$lang->cmd_make}</button>
 		</div>
 	</div>
 	</form>

modules/point/tpl/config.html

@@ -119,7 +119,7 @@
 			<span class="x_pull-right x_input-append">
 				<input type="text" value="{$config->expression}" placeholder="Math.pow(i,2) * 90" size="30" class="level_expression" />
 				<button type="button" class="x_btn calc_point">{$lang->level_point_calc}</button> 
-				<button type="button" class="x_btn x_btn-warning calc_point _reset">{$lang->cmd_exp_reset}</button>
+				<button type="button" class="x_btn calc_point _reset">{$lang->cmd_exp_reset}</button>
 			</span>
 		</div>
 		<table class="x_table x_table-striped x_table-hover">
@@ -168,10 +168,8 @@
 
 	<section class="section">
 		<h1>{$lang->cmd_point_recal}</h1>
+		<p><input class="x_btn x_btn-warning" type="button" value="{$lang->cmd_point_recal}" onclick="doPointRecal()" style="min-width:220px" /></p>
 		<p>{$lang->about_cmd_point_recal}</p>
 		<p id="pointReCal"></p>
-		<div class="x_clearfix">
-			<span class="x_pull-right"><input class="x_btn x_btn-danger x_btn-large" type="button" value="{$lang->cmd_point_recal}" onclick="doPointRecal(); return false;"/></span>
-		</div>
 	</section>
 </form>

modules/point/tpl/member_list.html

@@ -96,7 +96,7 @@
 			<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 				{@$isGoTo = true}
 				<li>
-					<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+					<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 					<span cond="$isGoTo" id="goTo" class="x_input-append">
 						<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 						<button type="submit" class="x_add-on">Go</button>
@@ -112,7 +112,7 @@
 			<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 				{@$isGoTo = true}
 				<li>
-					<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+					<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 					<span cond="$isGoTo" id="goTo" class="x_input-append">
 						<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 						<button type="submit" class="x_add-on">Go</button>

modules/poll/tpl/poll_list.html

@@ -19,7 +19,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 		<caption>
 			All({number_format($total_count)})
 			<span class="x_pull-right">
-				<input type="submit" class="x_btn x_btn-danger _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" />
+				<input type="submit" class="x_btn _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" />
 			</span>
 		</caption>
 		<thead>
@@ -62,7 +62,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 		</tbody>
 	</table>
 	<span class="x_pull-right">
-		<input type="submit" class="x_btn x_btn-danger _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" />
+		<input type="submit" class="x_btn _allowFreqSubmit" value="{$lang->cmd_delete_checked_poll}" />
 	</span>
 </form>
 
@@ -77,7 +77,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -93,7 +93,7 @@ xe.lang.confirm_poll_delete = '{$lang->confirm_poll_delete}';
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>

modules/trackback/tpl/trackback_list.html

@@ -65,7 +65,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -81,7 +81,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -128,7 +128,7 @@ xe.lang.msg_empty_search_keyword = '{$lang->msg_empty_search_keyword}';
 		</table>
 	</div>
 	<div class="x_modal-footer">
-		<button type="submit" class="x_btn x_btn-danger">{$lang->cmd_delete}</button>
+		<button type="submit" class="x_btn x_btn-inverse">{$lang->cmd_delete}</button>
 	</div>
 </form>
 

modules/trash/tpl/trash_list.html

@@ -19,7 +19,7 @@ var no_text_comment = '{$lang->no_text_comment}';
 			{$lang->trash}({number_format($total_count)})
 			<div class="x_pull-right x_btn-group">
 				<a href="#fo_list" class="x_btn modalAnchor" onclick="getTrashList();">{$lang->document_manager}</a>
-				<button type="submit" class="x_btn x_btn-danger" name="is_all" value="true">{$lang->empty_trash_all}</button>
+				<button type="submit" class="x_btn" name="is_all" value="true">{$lang->empty_trash_all}</button>
 			</div>
 		</caption>
 		<thead>
@@ -57,7 +57,7 @@ var no_text_comment = '{$lang->no_text_comment}';
 	</table>
 	<div class="x_pull-right x_btn-group">
 		<a href="#fo_list" class="x_btn modalAnchor" onclick="getTrashList();">{$lang->document_manager}</a>
-		<button type="submit" class="x_btn x_btn-danger" name="is_all" value="true">{$lang->empty_trash_all}</button>
+		<button type="submit" class="x_btn" name="is_all" value="true">{$lang->empty_trash_all}</button>
 	</div>
 </form>
 
@@ -72,7 +72,7 @@ var no_text_comment = '{$lang->no_text_comment}';
 		<block cond="$page_navigation->first_page != 1 && $page_navigation->first_page + $page_navigation->page_count > $page_navigation->last_page - 1 && $page_navigation->page_count != $page_navigation->total_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -88,7 +88,7 @@ var no_text_comment = '{$lang->no_text_comment}';
 		<block cond="$last_page != $page_navigation->last_page && $last_page + 1 != $page_navigation->last_page">
 		{@$isGoTo = true}
 		<li>
-			<a href="#goTo" data-toggle="#goTo" title="{$lang->cmd_go_to_page}">...</a>
+			<a href="#goTo" data-toggle title="{$lang->cmd_go_to_page}">...</a>
 			<span cond="$isGoTo" id="goTo" class="x_input-append">
 				<input type="number" min="1" max="{$page_navigation->last_page}" required name="page" title="{$lang->cmd_go_to_page}" />
 				<button type="submit" class="x_add-on">Go</button>
@@ -124,10 +124,10 @@ var no_text_comment = '{$lang->no_text_comment}';
 	</div>
 	<div class="x_modal-footer">
 		<div class="x_pull-left">
-			<button type="submit" class="x_btn x_btn-primary" name="act" value="procTrashAdminRestore">{$lang->cmd_restore}</button>
+			<button type="submit" class="x_btn" name="act" value="procTrashAdminRestore">{$lang->cmd_restore}</button>
 		</div>
 		<div class="x_pull-right">
-			<button type="submit" class="x_btn x_btn-danger" name="is_all" value="false">{$lang->cmd_delete}</button>
+			<button type="submit" class="x_btn x_btn-inverse" name="is_all" value="false">{$lang->cmd_delete}</button>
 		</div>
 	</div>
 </form>

modules/widget/tpl/header.html

@@ -1,5 +1,11 @@
 <div class="x_page-header">
-	<h1>{$lang->installed_widgets}</h1>
+	<h1>
+		{$lang->installed_widgets} 
+		<block cond="$widget_info">
+			&gt; {$widget_info->title} 
+			<a href="#widgetInfo" class="x_icon-question-sign x_pull-right" data-toggle style="margin-top:15px">{$lang->help}</a>
+		</block>
+	</h1>
 </div>
 <div cond="$XE_VALIDATOR_MESSAGE" class="x_alert x_alert-{$XE_VALIDATOR_MESSAGE_TYPE}">
 	<p>{$XE_VALIDATOR_MESSAGE}</p>

modules/widget/tpl/js/generate_code.js

@@ -219,7 +219,7 @@ jQuery(document).ready(function($){
 		if(src instanceof Object ) {
 			for(var i=0;i<src.length;i++){
 				if(src[i].id) {
-					htmlCode += '<img src="'+src[i].id+'" alt="" style="border: 1px solid #ccc; padding: 5px; max-height: 200px; max-width: 200px;"><button class="filebox_del x_btn x_btn-mini x_btn-danger" type="button">'+xe.lang.cmd_delete+'</button> ';
+					htmlCode += '<img src="'+src[i].id+'" alt="" style="border:1px solid #ccc;padding:5px;max-height:200px;max-width:200px"> <button type="button" class="filebox_del x_icon-remove">'+xe.lang.cmd_delete+'</button> ';
 					if(i==0) $(this).siblings('input').val(src[i].id);
 					else {
 						var aux = $(this).siblings('input').val();
@@ -228,7 +228,7 @@ jQuery(document).ready(function($){
 				}
 				else {
 					if(src[i]){
-						htmlCode += '<img src="'+src[i]+'" alt="" style="border: 1px solid #ccc; padding: 5px; max-height: 200px; max-width: 200px;"><button class="filebox_del x_btn x_btn-mini x_btn-danger" type="button">'+xe.lang.cmd_delete+'</button> ';
+						htmlCode += '<img src="'+src[i]+'" alt="" style="border:1px solid #ccc;padding:5px;max-height:200px;max-width:200px"> <button type="button" class="filebox_del x_icon-remove">'+xe.lang.cmd_delete+'</button> ';
 						if(i==0) $(this).siblings('input').val(src[i]);
 						else {
 							var aux = $(this).siblings('input').val();

modules/widget/tpl/widget_generate_code.html

@@ -1,25 +1,22 @@
 <include cond="$in_admin" target="header.html" />
 <load target="js/generate_code.js" usecdn="true" />
-<div class="x_well">
+<div class="x_alert x_alert-info" hidden id="widgetInfo">
-	<h2>{$widget_info->title}</h2>
 	<p>{$widget_info->description}</p>
 </div>
-<form id="widget_code_form" class="x_form-horizontal" action="./" method="post">
+<form id="widget_code_form" class="x_form-horizontal section" action="./" method="post">
 	<input type="hidden" name="module" value="widget" />
 	<input type="hidden" name="act" value="procWidgetGenerateCode" />
 	<input type="hidden" name="selected_widget" value="{$widget_info->widget}" />
-	<h1>{$lang->cmd_generate_code}</h1>
+	<h1>{$lang->cmd_generate_code} <a href="#codeHelp" class="x_icon-question-sign" data-toggle style="vertical-align:middle">{$lang->help}</a></h1>
-	<p>{$lang->about_widget_code}</p>
+	<div class="x_alert x_alert-info" id="codeHelp" hidden><p>{$lang->about_widget_code}</p></div>
 	<include target="widget_generate_code.include.html" />
-	<div class="btnArea">
+	<div class="x_clearfix btnArea">
-		<input type="submit" class="x_btn x_btn-large x_btn-primary" value="{$lang->cmd_generate_code}" />
+		<a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" class="x_btn x_pull-left">{$lang->cmd_list}</a>
+		<input type="submit" class="x_btn x_btn-primary" value="{$lang->cmd_generate_code}" />
 	</div>
 </form>
 <div class="x_well">
 	<h3>{$lang->widget_code}</h3>
 	<p style="margin-right:14px"><textarea id="widget_code" rows="4" cols="42" style="width:100%;cursor:text" readonly="readonly"></textarea>
 </div>
-<div class="x_clearfix">
-	<a href="{getUrl('', 'module', 'admin', 'act', 'dispWidgetAdminDownloadedList')}" class="x_btn x_pull-left">{$lang->cmd_list}</a>
-</div>
 <include target="../../module/tpl/include.filebox.html" />

modules/widget/tpl/widget_generate_code.include.html

@@ -2,7 +2,7 @@
 <load target="../../module/tpl/js/module_list.js" usecdn="true" />
 <load target="../../module/tpl/js/mid.js" usecdn="true" />
 <!--%load_js_plugin("ui.colorpicker")-->
-<div class="x_control-group">
+<div class="x_control-group" style="border-top:0;padding-top:0">
 	<label class="x_control-label" for="skin">{$lang->skin}</label>
 	<div class="x_controls">
 		<select name="skin" id="skin" style="width:220px">