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

modules/editor/components/image_link/tpl/popup.css

@@ -39,7 +39,6 @@
 .editor_button_area {
   clear:both;
   text-align:center;
-  margin:5px;
   background-color:#EEEEEE;
   height:30px;
   padding-top:3px;

modules/editor/components/image_link/tpl/popup.html

@@ -2,46 +2,48 @@
 <!--%import("popup.css")-->
 <!--%import("../lang")-->
 
-<div class="editor_window">
-    <form action="./" method="get" onSubmit="return false" id="fo">
-        <div class="header">{$lang->image_url}</div>
-        <div class="body"><input type="text" class="image_url" id="image_url" value="" /></div>
-        <div class="header">{$lang->image_alt}</div>
-        <div class="body"><input type="text" class="image_url" id="image_alt" value="" /></div>
-        <div class="header">{$lang->image_align}</div>
-        <div class="body">
-          <div class="image_align">
-            <input type="radio" name="align" value="" id="align_normal" checked="true"/>
-            <label for="align_normal">
-              <img src="./images/align_normal.gif" alt="{$lang->image_align_normal}" />
-              {$lang->image_align_normal}
-            </label>
-          </div>
-          <div class="image_align">
-            <input type="radio" name="align" value="left" id="align_left" />
-            <label for="align_left">
-              <img src="./images/align_left.gif" alt="{$lang->image_align_left}" />
-              {$lang->image_align_left}
-            </label>
-          </div>
-          <div class="image_align">
-            <input type="radio" name="align" value="middle" id="align_middle" />
-            <label for="align_middle">
-              <img src="./images/align_middle.gif" alt="{$lang->image_align_middle}" />
-              {$lang->image_align_middle}
-            </label>
-          </div>
-          <div class="image_align">
-            <input type="radio" name="align" value="right" id="align_right" />
-            <label for="align_right">
-              <img src="./images/align_right.gif" alt="{$lang->image_align_right}" />
-              {$lang->image_align_right}
-            </label>
-          </div>
-        </div>
-        <div class="editor_button_area">
-            <input type="button" value="{$lang->cmd_insert}" class="editor_button" onclick="insertImage()" />
-            <input type="button" value="{$lang->cmd_close}" class="editor_button" onclick="window.close();" />
-        </div>
-    </form>
-</div>
+<form action="./" method="get" onSubmit="return false" id="fo">
+  <div class="editor_window">
+    <div class="header">{$lang->image_url}</div>
+    <div class="body"><input type="text" class="image_url" id="image_url" value="" /></div>
+
+    <div class="header">{$lang->image_alt}</div>
+    <div class="body"><input type="text" class="image_url" id="image_alt" value="" /></div>
+
+    <div class="header">{$lang->image_align}</div>
+    <div class="body">
+      <div class="image_align">
+        <input type="radio" name="align" value="" id="align_normal" checked="true"/>
+        <label for="align_normal">
+          <img src="./images/align_normal.gif" alt="{$lang->image_align_normal}" />
+          {$lang->image_align_normal}
+        </label>
+      </div>
+      <div class="image_align">
+        <input type="radio" name="align" value="left" id="align_left" />
+        <label for="align_left">
+          <img src="./images/align_left.gif" alt="{$lang->image_align_left}" />
+          {$lang->image_align_left}
+        </label>
+      </div>
+      <div class="image_align">
+        <input type="radio" name="align" value="middle" id="align_middle" />
+        <label for="align_middle">
+          <img src="./images/align_middle.gif" alt="{$lang->image_align_middle}" />
+          {$lang->image_align_middle}
+        </label>
+      </div>
+      <div class="image_align">
+        <input type="radio" name="align" value="right" id="align_right" />
+        <label for="align_right">
+          <img src="./images/align_right.gif" alt="{$lang->image_align_right}" />
+          {$lang->image_align_right}
+        </label>
+      </div>
+    </div>
+    <div class="editor_button_area">
+      <input type="button" value="{$lang->cmd_insert}" class="editor_button" onclick="insertImage()" />
+      <input type="button" value="{$lang->cmd_close}" class="editor_button" onclick="window.close();" />
+    </div>
+  </div>
+</form>

modules/editor/components/multimedia_link/tpl/popup.css

@@ -40,7 +40,6 @@
 .editor_button_area {
   clear:both;
   text-align:center;
-  margin:5px;
   height:25px;
   padding-top:3px;
   background-color:#EEEEEE;

modules/editor/components/multimedia_link/tpl/popup.html

@@ -17,10 +17,10 @@
         <div class="body"><input type="text" class="multimedia_size" id="multimedia_height" value="480" />px</div>
 
         <div class="header">{$lang->multimedia_auto_start}</div>
-        <div class="body"><input type="checkbox" id="multimedia_autostart" value="Y" /></div>
+        <div class="body"><input type="checkbox" id="multimedia_auto_start" value="Y" /></div>
 
         <div class="editor_button_area">
-            <input type="button" value="{$lang->cmd_insert}" class="editor_button" onclick="insertImage()" />
+            <input type="button" value="{$lang->cmd_insert}" class="editor_button" onclick="insertMultimedia()" />
             <input type="button" value="{$lang->cmd_close}" class="editor_button" onclick="window.close();" />
         </div>
     </form>

modules/editor/components/multimedia_link/tpl/popup.js

@@ -1,23 +1,25 @@
-function insertImage(obj) {
+function insertMultimedia(obj) {
     if(typeof(opener)=="undefined") return;
 
-    var url = xGetElementById("image_url").value;
-    var alt = xGetElementById("image_alt").value;
-    var align = "";
-    if(xGetElementById("align_normal").checked==true) align = "";
-    else if(xGetElementById("align_left").checked==true) align = "left";
-    else if(xGetElementById("align_middle").checked==true) align = "middle";
-    else if(xGetElementById("align_right").checked==true) align = "right";
+    var url = xGetElementById("multimedia_url").value;
+
+    var caption = xGetElementById("multimedia_caption").value;
+
+    var width = xGetElementById("multimedia_width").value;
+    if(!width) width = 640;
+
+    var height = xGetElementById("multimedia_height").value;
+    if(!height) height= 480;
+
+    var auto_start = "false";
+    if(xGetElementById("multimedia_auto_start").checked) auto_start = "true";
 
     if(!url) {
       window.close();
       return;
     }
 
-    var text = "<img src=\""+url+"\" border=\"0\"";
-    if(alt) text+= " alt=\""+alt+"\"";
-    if(align) text+= " align=\""+align+"\" ";
-    text+= " />";
+    var text = "<div class=\"editor_multimedia\" plugin=\"multimedia_link\" src=\""+url+"\" width=\""+width+"\" height=\""+height+"\" style=\"width:"+width+"px;height:"+height+"px;\" auto_start=\""+auto_start+"\">"+caption+"</div>";
 
     opener.editorFocus(opener.editorPrevSrl);
 

modules/editor/tpl/css/editor.css

@@ -182,9 +182,3 @@ input.editor_input {
   vertical-align:middle;
   cursor:pointer;
 }
-
-img.editor_multimedia {
-  background:url(../images/multimedia_icon.gif) no-repeat center;
-  background-color:#FFFFFF;
-  border:2px dotted #B7AD10;
-}