From 857b1789658656dc89dcd398cc4ab6c88382e638 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 27 Mar 2007 12:35:34 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@727
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 common/css/default.css                        |   4 ++--
 common/tpl/images/edit_component.gif          | Bin 0 -> 1527 bytes
 common/tpl/images/multimedia_icon.gif         | Bin 2531 -> 0 bytes
 common/tpl/images/plugin.gif                  | Bin 0 -> 1654 bytes
 .../components/table_maker/tpl/popup.css      |  20 +++++++++++-------
 .../components/table_maker/tpl/popup.html     |   9 ++++----
 modules/plugin/tpl.admin/js/admin.js          |   2 ++
 .../login_info/skins/default/normal/style.css |   1 +
 8 files changed, 22 insertions(+), 14 deletions(-)
 create mode 100644 common/tpl/images/edit_component.gif
 delete mode 100644 common/tpl/images/multimedia_icon.gif
 create mode 100644 common/tpl/images/plugin.gif

diff --git a/common/css/default.css b/common/css/default.css
index 540886551..d6c66c67a 100644
--- a/common/css/default.css
+++ b/common/css/default.css
@@ -21,13 +21,13 @@ a.bold {
 .folder_area { display: none; }
 
 .editor_component_output {
-  background:url(../tpl/images/multimedia_icon.gif) no-repeat center;
+  background:url(../tpl/images/edit_component.gif) no-repeat center;
   background-color:#FFFFFF;
   border:3px dotted #2661db;
 }
 
 .zbxe_plugin_output {
-  background:url(../tpl/images/multimedia_icon.gif) no-repeat center;
+  background:url(../tpl/images/plugin.gif) no-repeat center;
   background-color:#FFFFFF;
   border:3px dotted #039311;
 }
diff --git a/common/tpl/images/edit_component.gif b/common/tpl/images/edit_component.gif
new file mode 100644
index 0000000000000000000000000000000000000000..755063f95acbfc5d7938249f7e20c492366604d5
GIT binary patch
literal 1527
zcmV<T1qk{_Nk%w1VHp4*0QUd@go2yd+v@T1^48$(yTjFeeWZ4FjdXLAv$W1lOkusc
z%+%lQ+T-q=oVvEM#NOrbZETa@>-Ejh+@hhiyS>^~Q)=Vn>BY?4C5y?dv&4IQn_XLa
z;q3HmYJsJszM`SN(BkmS;qRK6s+N_esH?}GqO!@~@6FERmX^KB&D*G^y~4rK;O6jU
zV}07->C@ls?e6b`gSL#3qRrCa&d%I?e5%FA)xyKy;^y$k%GuoH@0yyj*Wc@{tHROH
z)9dZ-=jrNdXnvfX$ol&EM@C)U<nMfXlGNMh%g)@z#^9TpwfXq>`uX|w_4H|Hf25<n
zp`WwT*yYjI<9>gaotv(hm$HzMr(Ifb`TPC%`uz3z{Pg(y@%H=k_xt7V_VD%k*5>p4
z{r%MC@%sGz{r&#p?e^~U`P1d`=J5B|=kwg^^yKdL-Rkw(==0m@^wH$;=<)aL^ZDxW
z_v`cd&f@U=`}>=ktp5J~*x~Hi;_j!Uy5sKlmzJpA=<=kZwvUac{r&y>`ue7$xt^S_
z*x~Na)Zw3<v6Pdf{QUciiKF)R^`)f1)!pd+{r%6?<zQcc)z#ImugkK&%(%A3+u-i4
zt;e6B!((7~_VxJX?DY5c_Wk|*tF6zvyw-z*s5PV8wztx=z0{zdztGw1iHN3%p1yjR
zx<s(!prE^>q`3I@_MxJ#v%uN2ufo5;+K7mV#LCr$!syY{-tzMIgNmDWz2{I)Xz=g#
zt+><l^z)gVs-L5~?eq6!fT=B((vOd?lcd1B$lR5!&y}04<?i&pzt&@Eeb(IMXJ(6N
zXNG8Ii>s)>&)DLnrpn9I;?U31&(P$ksKchMxtN}@dU%g|eUO)vvVMJ$#KY5gcciMX
zyM%?An3lQe@b%Eq<>~9|+~V%m*Wu65*X!%@=<W6I@9?^}$@BC0lE>+u&Fb{@_x$|)
zaBYPB{QRrZ>#M8Dz`oC_tIvXgqvGfBySvr4*X+Bz(V(NjprXZzin{sv__e^!+~)60
zOiW^8V*mgDA^8LV00000EC2ui02u%v000R80N+ID!;b+T9*mAeky2=egcLb)*dPJq
zpGAui{@rN=XcMA3fdUO-vP6}lCb<L<*yZEmzdm<d%KS$r%or?Lv=FEVtffVMjb>WJ
zq|PQzEn7mlLs!Zt13*IG$!oFd=$0<H(#5J}>e)X$?S!JDk${L3Sy#CTJN3yIhF*|(
zteZ(@61D`k9zp2D<x4mT7lN_k_KFcAnKi}vp|$}+jTi{b@ajg4!zfYyj?{5k^X9c3
z%Cg1ChRnqrIdISf_~0)}po^Vx^0DVBUkwNwN}xvLh0+s$QeM+Enlsf21UP;@s-P>i
zmo?yi7h*E}X3i}s=ruDFXB!c1yw{ZfDWbyP41KY$cbONjL7X|q66kndrVNYn5|$80
z+NH0hXeppp0)1sf@PHovAfbtM{Pkr<1I3i!oOlJY@qi%yq@ajZ{e8h*1_*2uUVRa;
zp~eG#_>)5}>N)rxEISxLV2NtDQN#rP*pN$u9%kam40sr@4KpN~=tdhlK#`*WX?-yd
zCn%txK{5w;AWelewvh${N@62Ghm;6$!U;E25kvx&$Ux(fX@J3iA^xl&Kwsntan39O
zB=G?|2^cYjky?TwMjnIs15Y^~Qb55i;{<Sn5*;K!jR9G<DaILjP+=$x+~E@qG~Of;
z2>@4AkO%;53VOyHgxKMa0x-PPR{#K2JfQ>tEhNyvB2xr<=^G#rBEqXboL0aUPOuZi
z6$xDOhbz@sx+(~C3^1%YKcIF`1qpOpK?i?;Vud8C0!v2-1MuO`B;TYqzyU^3V?-j0
zxMBq@<x(30x+D1G01&+G;fw~PpyGiQL1d8cxgnUaK)?Tbu?L9+Of$?r(we)k2`0R7
zh(E1ZFwZ<Ju<*diMd-i)19{{@2q6Q+yub@D$l#APJ@l}Q3M%L!h#wO`0fixhP+^A%
dBJeT72#3gEj6eVQ)6djYS8esx{rD3Q06T$~hqC|x

literal 0
HcmV?d00001

diff --git a/common/tpl/images/multimedia_icon.gif b/common/tpl/images/multimedia_icon.gif
deleted file mode 100644
index d5309d362bd99fde813837d20a745b9beb86fd55..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2531
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

diff --git a/common/tpl/images/plugin.gif b/common/tpl/images/plugin.gif
new file mode 100644
index 0000000000000000000000000000000000000000..3987b826ef0c25ea6682313a2ea56e0296f98ce8
GIT binary patch
literal 1654
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
A82|tP

literal 0
HcmV?d00001

diff --git a/modules/editor/components/table_maker/tpl/popup.css b/modules/editor/components/table_maker/tpl/popup.css
index b1a02dd52..44d8c42c1 100644
--- a/modules/editor/components/table_maker/tpl/popup.css
+++ b/modules/editor/components/table_maker/tpl/popup.css
@@ -1,5 +1,5 @@
 .editor_window {
-  width:680px;
+  width:530px;
   text-align:center;
 }
 
@@ -17,9 +17,10 @@
 }
 
 .editor_option {
-  width:620px;
-  height:30px;
-  text-align:left;
+  text-align:center;
+  padding:5px 0px 5px 0px;
+  background-color:#EEEEEE;
+  margin-bottom:5px;
 }
 
 .item_area {
@@ -27,27 +28,30 @@
 }
 
 .header {
-  width:80px;
+  width:85px;
   float:left;
   text-align:right;
   font-weight:bold;
   margin:5px;
   font-size:9pt;
+  overflow:hidden;
 }
 
 .body {
-  width:120px;
+  overflow:hidden;
+  width:140px;
   float:left;
   text-align:left;
-  margin:5px 10px 5px 5px;
+  margin:5px 5px 5px 0px;
   font-size:9pt;
 }
 
 .wide_body {
   width:380px;
   float:left;
+  clear:right;
   text-align:left;
-  margin:5px 10px 5px 5px;
+  margin:5px 10px 5px 0px;
   font-size:9pt;
 }
 .table_input {
diff --git a/modules/editor/components/table_maker/tpl/popup.html b/modules/editor/components/table_maker/tpl/popup.html
index 8ac2f7b86..8970f1fcc 100644
--- a/modules/editor/components/table_maker/tpl/popup.html
+++ b/modules/editor/components/table_maker/tpl/popup.html
@@ -24,12 +24,13 @@
 
     <div class="item_area">
       <div class="header">{$lang->table_width} :</div>
-      <div class="body">
+      <div class="wide_body">
         <input type="text" class="table_input" id="width" value="100" />
         <input type="radio" name="width_unit" id="width_unit_percent" checked="true" /><label for="width_unit_percent">%</label>
         <input type="radio" name="width_unit" id="width_unit_pixel" /><label for="width_unit_pixel">px</label>
       </div>
-
+    </div>
+    <div class="item_area">
       <div class="header">{$lang->table_cellspacing} :</div>
       <div class="body"><input type="text" class="table_input" id="cellspacing" value="0" />px</div>
 
@@ -63,7 +64,7 @@
 
     <div class="item_area" id="border_color_area" style="display:none">
       <div class="header">{$lang->table_border_color} :</div>
-      <div class="body">
+      <div class="wide_body">
         <div class="editor_color_box">
           <script type="text/javascript">
           printColor("border", "{$tpl_path}/images/blank.gif");
@@ -83,7 +84,7 @@
 
     <div class="item_area" id="bg_color_area" style="display:none">
       <div class="header">{$lang->table_bg_color} :</div>
-      <div class="body">
+      <div class="wide_body">
         <div class="editor_color_box">
           <script type="text/javascript">
           printColor("bg", "{$tpl_path}/images/blank.gif");
diff --git a/modules/plugin/tpl.admin/js/admin.js b/modules/plugin/tpl.admin/js/admin.js
index dee27121b..7340a40c6 100644
--- a/modules/plugin/tpl.admin/js/admin.js
+++ b/modules/plugin/tpl.admin/js/admin.js
@@ -20,6 +20,8 @@ function completeGenerateCodeInPage(ret_obj,response_tags,params,fo_obj) {
     var iframe_obj = opener.editorGetIFrame(module_srl);
     opener.editorReplaceHTML(iframe_obj, plugin_code);
     opener.editorFocus(module_srl);
+
+    window.close();
 } 
 
 /* 플러그인 코드 생성시 스킨을 고르면 컬러셋의 정보를 표시 */
diff --git a/plugins/login_info/skins/default/normal/style.css b/plugins/login_info/skins/default/normal/style.css
index 71b828013..493043c79 100644
--- a/plugins/login_info/skins/default/normal/style.css
+++ b/plugins/login_info/skins/default/normal/style.css
@@ -94,6 +94,7 @@
 .login_info_default_normal .button_area {
     clear:both;
     height:20px;
+    margin-top:5px;
     text-align:center;
 }