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

common/css/default.css

@@ -29,6 +29,8 @@ a { text-decoration:none;}
 a:hover { text-decoration:underline;}
 address { font-style:normal;}
 
+.iePngFix { behavior:url(./common/js/iePngFix.htc);} 
+
 /* Input Style Definition */
 .inputTypeText { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px; height:1em; line-height:1em; background:#ffffff;}
 .inputTypeText:hover,

common/js/iePngFix.htc

@@ -8,7 +8,7 @@
 // For details, see: http://creativecommons.org/licenses/LGPL/2.1/
 // This must be a path to a blank image. That's all the configuration you need.
 
-if (typeof blankImg == 'undefined') var blankImg = '../img/blank.gif'; // 1x1px 짜리 투명 이미지(blank.gif)의 경로를 변경.
+if (typeof blankImg == 'undefined') var blankImg = './common/tpl/images/blank.gif'; // 1x1px 짜리 투명 이미지(blank.gif)의 경로를 변경.
 var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
 
 function filt(s, m)
@@ -61,4 +61,4 @@ function doFix()
 doFix();
 
 </script>
-</public:component>
+</public:component>

modules/admin/tpl/css/admin.css

@@ -24,9 +24,6 @@ body { margin:0; }
 .inputTypeTextArea { border:1px solid #c9c9c9; padding:3px; background:#ffffff; font-size:1em; }
 .inputTypeDate { width:10em; border:1px solid #c9c9c9; padding:3px; height:1em; line-height:1em; background:#ffffff;}
 
-/* Internet Explorer 6 PNG Bug Fix */
-.iePngFix { behavior:url(../js/iePngFix.htc);} 
-
 /* Special Class Selector */
 .fr { float:right;}
 .fl { float:left;}

modules/admin/tpl/css/admin_layout.css

@@ -19,7 +19,7 @@ IE7 Only
 * { margin:0; padding:0; font-family:"돋움", Dotum, "굴림", Gulim, AppleGothic, Sans-serif;}
 html, body { }
 html { width:100%; position:relative;}
-body { font-size:.75em; width:100%; background:#2f2f2f; margin:0em;}
+body { font-size:.75em; width:100%; background:#2f2f2f; margin:0;}
 img { border:none;}
 label { cursor:pointer;}
 select { height:1.6em;}
@@ -35,9 +35,6 @@ address { font-style:normal;}
 .inputTypeText:focus { background:#f4f4f4;}
 .inputTypeTextArea { border:1px solid #c9c9c9; padding:3px; background:#ffffff;}
 
-/* Internet Explorer 6 PNG Bug Fix */
-.iePngFix { behavior:url(../js/iePngFix.htc);} 
-
 /* Special Class Selector */
 .fr { float:right;}
 .fl { float:left;}
@@ -54,13 +51,16 @@ address { font-style:normal;}
 /* ----- Header | End ----- */
 
 #cBody { position:relative; clear:both; padding:0px 18px 0px 198px; margin:-71px 0 -38px 0; overflow:hidden; background:#ffffff url(../images/menuBg.gif) repeat-y;}
+
 #gNavigation { float:left; width:180px; padding:71px 0 200px 0; margin-right:18px; margin-left:-198px; _margin-left:-99px;}
 #gNavigation h2 { margin-bottom:8px;}
 #gNavigation ul { width:180px;}
-#gNavigation ul li { width:180px; height:30px; background:url(../images/menuBg.png) no-repeat left top; behavior:url(../js/iePngFix.htc);}
+#gNavigation ul li { width:180px; height:30px; background:url(../images/menuBg.png) no-repeat left top; } /* behavior:url(./common/js/iePngFix.htc);}*/
 #gNavigation ul li.on { background-position:left -30px; margin-top:-2px; _background:url(../images/menuBgIeFix.png) no-repeat left top;}
 #gNavigation ul li.on a { color:#ffffff; font-weight:bold;}
 #gNavigation ul li a { display:block; padding:9px 0 0 28px; height:21px; color:#606060;}
+#gNavigation ul li a:hover { background:url(../images/menuBgIeFix.png) no-repeat; margin-top:-2px; font-weight:bold; color:#ffffff; text-decoration:none;}
+#gNavigation ul li.on a:hover { background:url(../images/menuBgIeFix.png) no-repeat; margin-top:0; font-weight:bold; color:#ffffff; text-decoration:none;}
 #gNavigation .menuEdit { float:left; padding:15px 0 0 26px;}
 
 #content { float:left; width:100%; padding:71px 0 100px 0;}

modules/admin/tpl/js/iePngFix.htc

@@ -1,65 +0,0 @@
-<public:component>
-<public:attach event="onpropertychange" onevent="doFix()" />
-
-<script type="text/javascript">
-// IE5.5+ PNG Alpha Fix v1.0RC4
-// (c) 2004-2005 Angus Turnbull http://www.twinhelix.com
-// This is licensed under the CC-GNU LGPL, version 2.1 or later.
-// For details, see: http://creativecommons.org/licenses/LGPL/2.1/
-// This must be a path to a blank image. That's all the configuration you need.
-
-if (typeof blankImg == 'undefined') var blankImg = request_uri+'/common/tpl/images/blank.gif'; // 1x1px 짜리 투명 이미지(blank.gif)의 경로를 변경.
-alert(blankImg);
-var f = 'DXImageTransform.Microsoft.AlphaImageLoader';
-
-function filt(s, m)
-{
- if (filters[f])
- {
-  filters[f].enabled = s ? true : false;
-  if (s) with (filters[f]) { src = s; sizingMethod = m }
- }
- else if (s) style.filter = 'progid:'+f+'(src="'+s+'",sizingMethod="'+m+'")';
-}
-
-function doFix()
-{
- // Assume IE7 is OK.
- if (!/MSIE (5\.5|6\.)/.test(navigator.userAgent) ||
-  (event && !/(background|src)/.test(event.propertyName))) return;
-
- var bgImg = currentStyle.backgroundImage || style.backgroundImage;
-
- if (tagName == 'IMG')
- {
-  if ((/\.png$/i).test(src))
-  {
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   filt(src, 'scale'); 
-// 'scale' 을 'image' 으로 변경하면 padding 적용시 나타나는 이미지 크기의 변화(잘못된 렌더링)를 방지할 수 있다. 하지만 border 표현에 문제가 생긴다.
-   src = blankImg;
-  }
-  else if (src.indexOf(blankImg) < 0) filt();
- }
- else if (bgImg && bgImg != 'none')
- {
-  if (bgImg.match(/^url[("']+(.*\.png)[)"']+$/i))
-  {
-   var s = RegExp.$1;
-   if (currentStyle.width == 'auto' && currentStyle.height == 'auto')
-    style.width = offsetWidth + 'px';
-   style.backgroundImage = 'none';
-   filt(s, 'crop');
-   // IE link fix.
-   for (var n = 0; n < childNodes.length; n++)
-    if (childNodes[n].style) childNodes[n].style.position = 'relative';
-  }
-  else filt();
- }
-}
-
-doFix();
-
-</script>
-</public:component>

modules/admin/tpl/layout.html

@@ -14,9 +14,7 @@
         <h2><img src="./images/h2.gif" alt="Administration" width="180" height="45" /></h2>
         <ul>
             <!--@foreach($shortcut_list as $key => $val)-->
-            <li <!--@if($running_module==$val->module)-->class="on"<!--@end-->>
+            <li <!--@if($running_module==$val->module)-->class="on"<!--@end-->><a href="{getUrl('','module','admin','act',$val->default_act)}">{cut_str($val->title,14,'..')}</a></li>
-                <a href="{getUrl('','module','admin','act',$val->default_act)}">{cut_str($val->title,14,'..')}</a>
-            </li>
             <!--@end-->
         </ul>
         <div class="menuEdit">

modules/install/tpl/css/install.css

@@ -35,9 +35,6 @@ address { font-style:normal;}
 .inputTypeText:focus { background:#f4f4f4;}
 .inputTypeTextArea { border:1px solid #c9c9c9; padding:3px; background:#ffffff;}
 
-/* Internet Explorer 6 PNG Bug Fix */
-.iePngFix { behavior:url(../js/iePngFix.htc);} 
-
 /* Special Class Selector */
 .fr { float:right;}
 .fl { float:left;}