From 3a4e8847bb1d50b3074abcdc224994fed4af9a88 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Fri, 23 Mar 2007 05:53:19 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@623
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 .../components/image_gallery/tpl/popup.css    |  2 +-
 .../components/image_gallery/tpl/popup.js     | 22 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/modules/editor/components/image_gallery/tpl/popup.css b/modules/editor/components/image_gallery/tpl/popup.css
index 4cd7b0d8e..9633e3796 100644
--- a/modules/editor/components/image_gallery/tpl/popup.css
+++ b/modules/editor/components/image_gallery/tpl/popup.css
@@ -108,7 +108,7 @@ img.border_preview_color {
   width:30px;
   height:16px;
   border:1px solid #EEEEEE;
-  background-color:#88EE22;
+  background-color:#000000;
 }
 
 img.color_icon {
diff --git a/modules/editor/components/image_gallery/tpl/popup.js b/modules/editor/components/image_gallery/tpl/popup.js
index 12edb2808..25dbe6acf 100644
--- a/modules/editor/components/image_gallery/tpl/popup.js
+++ b/modules/editor/components/image_gallery/tpl/popup.js
@@ -11,9 +11,22 @@ function getSlideShow() {
 
         var width = xWidth(selected_node)-6;
         var height = xHeight(selected_node)-6;
+        var gallery_style = selected_node.getAttribute("gallery_style");
+        var border_color = selected_node.getAttribute("border_color");
+        var bg_color = selected_node.getAttribute("bg_color");
+
         xGetElementById("width").value = width; 
         xGetElementById("height").value = height; 
 
+        if(gallery_style=="list") xGetElementById("gallery_style").selectedIndex = 1;
+        else xGetElementById("gallery_style").selectedIndex = 0;
+
+        xGetElementById("border_color_input").value = border_color; 
+        manual_select_color("border", xGetElementById("border_color_input"));
+
+        xGetElementById("bg_color_input").value = bg_color; 
+        manual_select_color("bg", xGetElementById("bg_color_input"));
+
         selected_images = xInnerHtml(selected_node);
     }
 
@@ -62,6 +75,10 @@ function insertSlideShow() {
     var width = xGetElementById("width").value;
     var height = xGetElementById("height").value;
 
+    var gallery_style = xGetElementById("gallery_style").options[xGetElementById("gallery_style").selectedIndex].value;
+    var border_color = xGetElementById("border_color_input").value;
+    var bg_color = xGetElementById("bg_color_input").value;
+
     var images_list = "";
     for(var i=0; i<list.length;i++) {
         images_list += list[i]+"\n";
@@ -70,11 +87,14 @@ function insertSlideShow() {
     if(selected_node) {
         selected_node.setAttribute("width", width);
         selected_node.setAttribute("height", height);
+        selected_node.setAttribute("gallery_style", gallery_style);
+        selected_node.setAttribute("border_color", border_color);
+        selected_node.setAttribute("bg_color", bg_color);
         selected_node.style.width = width+"px";
         selected_node.style.height = height+"px";
         xInnerHtml(selected_node, images_list);
     } else {
-        var text = "<div editor_component=\"image_gallery\" class=\"editor_component_output\" width=\""+width+"\" height=\""+height+"\" style=\"width:"+width+"px;height:"+height+"px;\" >"+images_list+"</div>";
+        var text = "<div editor_component=\"image_gallery\" class=\"editor_component_output\" width=\""+width+"\" height=\""+height+"\" gallery_style=\"+gallery_style+\" border_color=\""+border_color+"\" bg_color=\""+bg_color+"\" style=\"width:"+width+"px;height:"+height+"px;\" >"+images_list+"</div>";
         opener.editorFocus(opener.editorPrevSrl);
         var iframe_obj = opener.editorGetIFrame(opener.editorPrevSrl)
         opener.editorReplaceHTML(iframe_obj, text);