Issue 2385: Admin UI Refactoring - Advanced - Widgets

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

config/config.inc.php

@@ -189,7 +189,7 @@
 		 * Only particular servers may have a problem in IE browser when sending a compression
 		 * </pre>
 		 */
-		define('__OB_GZHANDLER_ENABLE__', 1);
+		define('__OB_GZHANDLER_ENABLE__', 0);
 	}
 
 	if(!defined('__ENABLE_PHPUNIT_TEST__'))

layouts/user_layout/conf/info.xml

@@ -20,4 +20,31 @@
             <title xml:lang="jp">グローバルメニュー</title>
         </menu>
     </menus>
+    <extra_vars>
+			<var name="cb" type="checkbox">
+				<title xml:lang="ko">1-1. 레이아웃 스타일</title>
+				<title xml:lang="en">1-1. Layout Style</title>
+				<options value="portal">
+					<title xml:lang="ko">포털 스타일</title>
+					<title xml:lang="en">Portal Style</title>
+				</options>
+				<options value="portalr2">
+					<title xml:lang="ko">포털 스타일</title>
+					<title xml:lang="en">Portal Style</title>
+				</options>
+			</var>
+			<var name="cbs" type="radio">
+			
+				<title xml:lang="ko">1-1. 레이아웃 스타일</title>
+				<title xml:lang="en">1-1. Layout Style</title>
+				<options value="portal" src="a.png">
+					<title xml:lang="ko">포털 스타일</title>
+					<title xml:lang="en">Portal Style</title>
+				</options>
+				<options value="portalr2">
+					<title xml:lang="ko">포털 스타일</title>
+					<title xml:lang="en">Portal Style</title>
+				</options>
+			</var>
+	</extra_vars>
 </layout>

modules/admin/tpl/js/admin.js

@@ -13,9 +13,9 @@ jQuery(function($){
 		var focusable = 'a,input,button,textarea,select';
 		$target.toggle();
 		if($target.is(':visible') && !$target.find(focusable).length){
-			$target.attr('tabindex','0').focus();
+			$target.attr('tabindex','0').not(':disabled').focus();
 		} else if($target.is(':visible') && $target.find(focusable).length) {
-			$target.find(focusable).eq(0).focus();
+			$target.find(focusable).not(':disabled').eq(0).focus();
 		} else {
 			$this.focus();
 		}
@@ -1079,7 +1079,7 @@ $('.filebox')
 					});
 
 					// text click
-					$('#lang_search').find('[href^="#lang-"]').append('<i class="x_icon-chevron-down"></i>').click(function(){
+					$('#lang_search').find('.set').append('<i class="x_icon-chevron-down"></i>').click(function(){
 						var $this = $(this);
 						var lang_code = $this.data('lang_code');
 
@@ -1091,16 +1091,16 @@ $('.filebox')
 						if($this.next('fieldset').is(':visible')){
 							$this.children('i').removeClass(up).addClass(down);
 						}else{
-							$this.children('i').removeClass(down).addClass(up);
 							$this.parent('.item').siblings('.item').find('a > i').removeClass(up).addClass(down).end().children('fieldset').hide();
+							$this.children('i').removeClass(down).addClass(up);
 						}
 
-						if($this.data('is_loaded')) return;
+						if(typeof $this.data('is_loaded') != 'undefined') return;
 
 						$.exec_json('module.getModuleAdminLangCode', {'name': lang_code}, on_complete);
 
 						function on_complete(data){
-							var $textareas = $($this.attr('href') + ' textarea');
+							var $textareas = $this.next('fieldset').find('textarea');
 
 							$textareas.each(function(){
 								var $this = $(this);
@@ -1116,6 +1116,8 @@ $('.filebox')
 
 							$this.data('is_loaded', true);
 						}
+
+
 					});
 
 					if(name){

modules/module/tpl/multilingual_v17.html

@@ -22,7 +22,7 @@
 							<button type="reset" class="x_btn cancel">{$lang->cmd_cancel}</button>
 							<span class="x_pull-right">
 								<button type="submit" class="x_btn x_btn-primary save-useit">{$lang->use_after_save}</button>
-							<span>
+							</span>
 						</div>
 					</fieldset>
 				</form>

modules/module/tpl/multilingual_v17_list.html

@@ -7,8 +7,8 @@
 <p cond="!$name">{sprintf($lang->about_multilingual_search_result, $total_count)}</p>
 <fieldset class="list">
 	<form loop="$lang_code_list => $no, $val" action="" class="item">
-		<a 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="#lang-{$no}" data-lang_code="{$val->name}"><span>{$val->value}</span></a>
-		<fieldset id="lang-{$no}">
+		<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">

modules/widget/tpl/widget_generate_code.include.html

@@ -1,7 +1,6 @@
 <load target="js/multi_order.js" usecdn="true" />
 <load target="js/module_list.js" usecdn="true" />
 <load target="js/mid.js" usecdn="true" />
-<load target="js/multi_lang.js" usecdn="true" />
 <!--%load_js_plugin("ui.colorpicker")-->
 
 <div class="x_control-group">