Fixes to include ALT tags in smilies - by Janne Mikkonen

diff --git a/lib/editor/popups/dlg_ins_smile.php b/lib/editor/popups/dlg_ins_smile.php
index b3fc6ab69a89c1f0cde28b861a7f0fa2b00363b1..45f4147dbaf8d931dfe8c3323b1241c97aa3a9c0 100644 (file)
--- a/lib/editor/popups/dlg_ins_smile.php
+++ b/lib/editor/popups/dlg_ins_smile.php
@@ -65,17 +65,17 @@ function attr(name, value) {
        if (!value || value == "") return "";
        return ' ' + name + '="' + value + '"';
 }
-function insert(img) {
+function insert(img,text) {
        if (img) {
                        var src = img;
+                       var alt = text;
        }
   // pass data back to the calling window
-  var fields = ["f_url"];
+  var fields = ["f_url","f_alt"];
   var param = new Object();
-  for (var i in fields) {
-    var id = fields[i];
-    param[id] = src;
-  }
+  param['f_url'] = src;
+  param['f_alt'] = alt;
+ 
   __dlg_close(param);
   return false;
 };
@@ -96,52 +96,52 @@ function cancel() {
         <td>
         <table border="0" align="center">
           <tr>
-            <td><img border="0" hspace="10" src="<?php echo $pix ?>/smiley.gif" onclick="insert('<?php echo $pix ?>/smiley.gif')" width="15" height="15"></td>
+            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/smiley.gif" onclick="insert('<?php echo $pix ?>/smiley.gif',':-)')" width="15" height="15"></td>
             <td>smile</td>
             <td class="smile">:-)</td>
           </tr>
           <tr>
-            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/biggrin.gif" onclick="insert('<?php echo $pix ?>/biggrin.gif')" width="15" height="15"></td>
+            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/biggrin.gif" onclick="insert('<?php echo $pix ?>/biggrin.gif',':-D')" width="15" height="15"></td>
             <td>big grin</td>
             <td class="smile">:-D</td>
           </tr>
           <tr>
-            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/wink.gif" onclick="insert('<?php echo $pix ?>/wink.gif')" width="15" height="15"></td>
+            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/wink.gif" onclick="insert('<?php echo $pix ?>/wink.gif',';-)')" width="15" height="15"></td>
             <td>wink</td>
             <td class="smile">;-)</td>
           </tr>
           <tr>
-            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/mixed.gif" onclick="insert('<?php echo $pix ?>/mixed.gif')" width="15" height="15"></td>
+            <td><img alt= border="0" hspace="10" src="<?php echo $pix ?>/mixed.gif" onclick="insert('<?php echo $pix ?>/mixed.gif',':-/')" width="15" height="15"></td>
             <td>mixed</td>
             <td class="smile">:-/</td>
           </tr>
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/thoughtful.gif" onclick="insert('<?php echo $pix ?>/thoughtful.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/thoughtful.gif" onclick="insert('<?php echo $pix ?>/thoughtful.gif','V-.')" width="15" height="15"></td>
               <td>thoughtful</td>
               <td class="smile">V-.</td>
             </tr>
           <tr>
-            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/tongueout.gif" onclick="insert('<?php echo $pix ?>/tongueout.gif')" width="15" height="15"></td>
+            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/tongueout.gif" onclick="insert('<?php echo $pix ?>/tongueout.gif',':-P')" width="15" height="15"></td>
             <td>tongue out</td>
             <td class="smile">:-P</td>
          </tr>
           <tr>
-            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/cool.gif" onclick="insert('<?php echo $pix ?>/cool.gif')" width="15" height="15"></td>
+            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/cool.gif" onclick="insert('<?php echo $pix ?>/cool.gif','B-)')" width="15" height="15"></td>
             <td>cool</td>
             <td class="smile">B-)</td>
           </tr>
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/approve.gif" onclick="insert('<?php echo $pix ?>/approve.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/approve.gif" onclick="insert('<?php echo $pix ?>/approve.gif','^-)')" width="15" height="15"></td>
               <td>approve</td>
               <td class="smile">^-)</td>
             </tr>
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/wideeyes.gif" onclick="insert('<?php echo $pix ?>/wideeyes.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/wideeyes.gif" onclick="insert('<?php echo $pix ?>/wideeyes.gif','8-)')" width="15" height="15"></td>
               <td>wide eyes</td>
               <td class="smile">8-)</td>
             </tr>
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/surprise.gif" onclick="insert('<?php echo $pix ?>/surprise.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/surprise.gif" onclick="insert('<?php echo $pix ?>/surprise.gif','8-o')" width="15" height="15"></td>
               <td>surprise</td>
               <td class="smile">8-o</td>
             </tr>
@@ -150,52 +150,52 @@ function cancel() {
         <td>
         <table border="0" align="center">
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/sad.gif" onclick="insert('<?php echo $pix ?>/sad.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/sad.gif" onclick="insert('<?php echo $pix ?>/sad.gif',':-(')" width="15" height="15"></td>
               <td>sad</td>
               <td class="smile">:-(</td>
             </tr>
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/shy.gif" onclick="insert('<?php echo $pix ?>/shy.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/shy.gif" onclick="insert('<?php echo $pix ?>/shy.gif','8-.')" width="15" height="15"></td>
               <td>shy</td>
               <td class="smile">8-.</td>
             </tr>
           <tr>
-            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/blush.gif" onclick="insert('<?php echo $pix ?>/blush.gif')" width="15" height="15"></td>
+            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/blush.gif" onclick="insert('<?php echo $pix ?>/blush.gif',':-I')" width="15" height="15"></td>
             <td>blush</td>
             <td class="smile">:-I</td>
           </tr>
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/kiss.gif" onclick="insert('<?php echo $pix ?>/kiss.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/kiss.gif" onclick="insert('<?php echo $pix ?>/kiss.gif',':-X')" width="15" height="15"></td>
               <td>kisses</td>
               <td class="smile">:-X</td>
             </tr>
           <tr>
-            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/clown.gif" onclick="insert('<?php echo $pix ?>/clown.gif')" width="15" height="15"></td>
+            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/clown.gif" onclick="insert('<?php echo $pix ?>/clown.gif',':o)')" width="15" height="15"></td>
             <td>clown</td>
             <td class="smile">:o)</td>
           </tr>
           <tr>
-            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/blackeye.gif" onclick="insert('<?php echo $pix ?>/blackeye.gif')" width="15" height="15"></td>
+            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/blackeye.gif" onclick="insert('<?php echo $pix ?>/blackeye.gif','P-|')" width="15" height="15"></td>
             <td>black eye</td>
             <td class="smile">P-|</td>
           </tr>
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/angry.gif" onclick="insert('<?php echo $pix ?>/angry.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/angry.gif" onclick="insert('<?php echo $pix ?>/angry.gif','8-[')" width="15" height="15"></td>
               <td>angry</td>
               <td class="smile">8-[</td>
             </tr>
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/dead.gif" onclick="insert('<?php echo $pix ?>/dead.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/dead.gif" onclick="insert('<?php echo $pix ?>/dead.gif','xx-P')" width="15" height="15"></td>
               <td>dead</td>
               <td class="smile">xx-P</td>
             </tr>
             <tr>
-              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/sleepy.gif" onclick="insert('<?php echo $pix ?>/sleepy.gif')" width="15" height="15"></td>
+              <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/sleepy.gif" onclick="insert('<?php echo $pix ?>/sleepy.gif','|-.')" width="15" height="15"></td>
               <td>sleepy</td>
               <td class="smile">|-.</td>
             </tr>
           <tr>
-            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/evil.gif" onclick="insert('<?php echo $pix ?>/evil.gif')" width="15" height="15"></td>
+            <td><img alt border="0" hspace="10" src="<?php echo $pix ?>/evil.gif" onclick="insert('<?php echo $pix ?>/evil.gif','}-]')" width="15" height="15"></td>
             <td>evil</td>
             <td class="smile">}-]</td>
           </tr>
@@ -211,4 +211,4 @@ function cancel() {
        <button type="button" onclick="cancel()"><?php print_string("close","editor") ?></button></td></tr>
 </table>
 </body>
-</html>
+</html>
\ No newline at end of file