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

common/css/default.css

@@ -90,7 +90,6 @@ h6 {
 
 #fororiginalimagearea {
     visibility:hidden;
-    background-color:#EEEEEE;
     padding:0px;
     margin:0px;
     width:100%;
@@ -98,11 +97,25 @@ h6 {
     top:0px;
     left:0px;
     position:absolute;
-    z-index:1001;
+    z-index:1000;
     text-align:left;
     overflow:hidden;
 }
 
+#fororiginalimage {
+    z-index:1002;
+}
+
+#fororiginalimageareabg {
+    z-index:1001;
+    background-color:#000000;
+    width:100%;
+    height:100%;
+    top:0px;
+    left:0px;
+    position:relative;
+}
+
 #closeOriginalImageBtn {
     position:absolute;
     right:10px;
@@ -111,7 +124,7 @@ h6 {
     width:60px;
     height:20px;
     border:1px solid #FFFFFF;
-    z-index:1002;
+    z-index:1003;
 }
 
 #membermenuarea {

common/js/common.js

@@ -253,6 +253,13 @@ function showOriginalImage(evt) {
     orig_image.style.margin = "0px 0px 0px 0px";
     orig_image.style.cursor = "pointer";
     orig_image.src = src;
+    orig_image.style.opacity = 1;
+    orig_image.style.filter = 'alpha(opacity=100)';
+
+    var areabg = xGetElementById("fororiginalimageareabg");
+    areabg.style.opacity = 0.95;
+    areabg.style.filter = 'alpha(opacity=95)';
+    areabg.style.visibility = "visible";
 
     var area = xGetElementById("fororiginalimagearea");
 
@@ -275,6 +282,9 @@ function showOriginalImage(evt) {
     xLeft(orig_image, x);
     xTop(orig_image, y);
 
+    var sel_list = xGetElementsByTagName("select");
+    for (var i = 0; i < sel_list.length; ++i) sel_list[i].style.visibility = "hidden";
+
     xAddEventListener(orig_image, "mousedown", origImageDragEnable);
     xAddEventListener(window, "scroll", closeOriginalImage);
     xAddEventListener(window, "resize", closeOriginalImage);
@@ -287,6 +297,10 @@ function closeOriginalImage(evt) {
     var area = xGetElementById("fororiginalimagearea");
     if(area.style.visibility != "visible") return;
     area.style.visibility = "hidden";
+    xGetElementById("fororiginalimageareabg").style.visibility = "hidden";
+
+    var sel_list = xGetElementsByTagName("select");
+    for (var i = 0; i < sel_list.length; ++i) sel_list[i].style.visibility = "visible";
 
     xRemoveEventListener(area, "mousedown", closeOriginalImage);
     xRemoveEventListener(window, "scroll", closeOriginalImage);

common/tpl/common_layout.html

@@ -25,8 +25,9 @@
     {Context::getHtmlFooter()}
     <div id="waitingforserverresponse">{$lang->msg_call_server}</div>
     <div id="fororiginalimagearea">
-      <img src="./images/original_image_box_close.gif" alt="close original image" border="0" onclick="closeOriginalImage()" id="closeOriginalImageBtn"/>
       <img src="./images/blank.gif" alt="original image" border="0" id="fororiginalimage" />
+      <img src="./images/original_image_box_close.gif" alt="close original image" border="0" onclick="closeOriginalImage()" id="closeOriginalImageBtn"/>
+      <div id="fororiginalimageareabg"></div>
     </div>
     <div id="membermenuarea"></div>
 </body>

modules/editor/components/image_gallery/image_gallery.class.php

@@ -49,7 +49,7 @@
             $gallery_info->bg_color = $xml_obj->attrs->bg_color;
             $gallery_info->gallery_align = $xml_obj->attrs->gallery_align;
 
-            preg_match_all("/([^\"]){0,1}http([a-zA-Z0-9\_\-\:\/\.\~]*)(gif|jpg|jpeg|png)/i",trim($xml_obj->body),$matches);
+            preg_match_all("/([^\"]){0,1}http([a-zA-Z0-9\_\-\:\/\.\~]*)([^\.]*)\.(gif|jpg|jpeg|png)/i",trim($xml_obj->body),$matches);
             $image_list = $matches[0];
             $image_count = count($image_list);
             for($i=0;$i<$image_count;$i++) $image_list[$i] = preg_replace('/^(\>|\s)/','', $image_list[$i]);

modules/editor/editor.model.php

@@ -80,7 +80,7 @@
          **/
         function getComponentObject($component, $upload_target_srl = 0) {
             // 해당 컴포넌트의 객체를 생성해서 실행
-            $class_path = sprintf('./editor_components/%s/', $component);
+            $class_path = sprintf('%s/components/%s/', $this->module_path, $component);
             $class_file = sprintf('%s%s.class.php', $class_path, $component);
             if(!file_exists($class_file)) return new Object(-1, sprintf(Context::getLang('msg_component_is_not_founded'), $component));
 
@@ -192,7 +192,7 @@
             $lang_type = Context::getLangType();
 
             // 요청된 컴포넌트의 xml파일 위치를 구함
-            $component_path = sprintf('./editor_components/%s/', $component);
+            $component_path = sprintf('%s/components/%s/', $this->module_path, $component);
 
             $xml_file = sprintf('%sinfo.xml', $component_path);
             $cache_file = sprintf('./files/cache/editor/%s.%s.php', $component, $lang_type);