php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/lang serendipity_lang_de.inc.php,1.27,1.28

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6477

Modified Files:
	serendipity_lang_de.inc.php 
Log Message:
more reasonable german translation

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_lang_de.inc.php	22 Mar 2004 15:19:25 -0000	1.27
+++ serendipity_lang_de.inc.php	26 Mar 2004 14:25:55 -0000	1.28
@@ -116,7 +116,7 @@
 @define('DATE_FORMAT_1', 'd.m.Y');
 @define('CALENDAR', 'Kalender');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Kalender');
-@define('QUICKSEARCH', 'Schnellsuche');
+@define('QUICKSEARCH', 'Suche');
 @define('SEARCH_FOR_ENTRY', 'Nach Einträgen suchen');
 @define('ARCHIVES', 'Archive');
 @define('BROWSE_ARCHIVES', 'Die Archive durchstöbern');
@@ -126,7 +126,7 @@
 @define('SHOWS_TOP_EXIT', 'Zeigt die Top-Exit-Links Ihres Blogs');
 @define('SYNDICATION', 'Syndication');
 @define('SHOWS_RSS_BLAHBLAH', 'Zeigt die RSS Syndication-Links');
-@define('SUPERUSER', 'Eigentümer');
+@define('SUPERUSER', 'Login');
 @define('ALLOWS_YOU_BLAHBLAH', 'Link zum Konfigurieren von Serendipity und zum Schreiben von Einträgen - WICHTIG');
 @define('PLUG', 'Plug');
 @define('ADVERTISES_BLAHBLAH', 'Zeigt einen Hinweis, dass Serendipity die Blog Software ist');
@@ -134,8 +134,8 @@
 @define('HOLDS_A_BLAHBLAH', 'Zeigt einen kleinen Klotz HTML Code in einer der Seitenleisten an');
 @define('TITLE_FOR_NUGGET', 'Titel für den Klotz');
 @define('THE_NUGGET', 'Der HTML Klotz!');
-@define('SYNDICATE_THIS_BLOG', 'Syndicate This Blog');
-@define('QUICKJUMP', 'Schnellauswahl');
+@define('SYNDICATE_THIS_BLOG', 'Blog abonnieren');
+@define('QUICKJUMP', 'Kalender');
 @define('SEARCH_TOO_SHORT', 'Bitte geben Sie einen Suchbegriff mit mindestens drei Zeichen an.');
 @define('YOU_CHOSE', 'Sie haben sich für  %s entschieden');
 @define('IMAGE_SIZE', 'Bildgröße');

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.240,1.241

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24084

Modified Files:
	serendipity_functions.inc.php 
Log Message:
make arrays static, remove <p>-Handling, add hr-handling


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -d -r1.240 -r1.241
--- serendipity_functions.inc.php	25 Mar 2004 22:13:16 -0000	1.240
+++ serendipity_functions.inc.php	26 Mar 2004 13:21:55 -0000	1.241
@@ -1360,19 +1360,19 @@
 //      TODO:
 //          check ALL ampersands, find out if it's a valid code, and encode if not
 function xhtml_cleanup($html) {
-    $p = array("/\&([\s\<])/",       // ampersand followed by whitespace or tag
-                        "/\&$/",            // ampersand at end of body
-                        "/<br([^\/]*)>/i",  // unclosed br tag - attributes included
-                        "/<p([^\/]*)>/i",   // any unclosed p tag 
-                        "/<\/p>/i"           // closing </p> tags, dropped for feed
+    static $p = array(
+        '/\&([\s\<])/',       // ampersand followed by whitespace or tag
+        '/\&$/',              // ampersand at end of body
+        '/<(b|h)r([^\/>]*)>/i',    // unclosed br tag - attributes included
     );
-    $r = array("&amp;\\1",
-                        "&amp;",
-                        "<br\\1 />",
-                        "<p\\1 />",
-                        ""
+
+    static $r = array(
+        '&amp;\1',
+        '&amp;',
+        '<\1r\2 />'
     );
-    return preg_replace($p,$r,$html);
+
+    return preg_replace($p, $r, $html);
 }
 
 function serendipity_printEntries_rss($entries, $version, $comments = false) {

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.239,1.240

[Justin A. <jba...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19120

Modified Files:
	serendipity_functions.inc.php 
Log Message:
function to clean up blog entries as best we can to make valid ATOM
feeds.  xhtml_cleanup should be watched carefully and tested on as many feeds as possible.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- serendipity_functions.inc.php	25 Mar 2004 10:57:38 -0000	1.239
+++ serendipity_functions.inc.php	25 Mar 2004 22:13:16 -0000	1.240
@@ -1351,6 +1351,30 @@
     return $guid;
 }
 
+// jbalcorn: starter function to clean up xhtml for atom feed.  Add things to this as we find common
+//      mistakes, unless someone finds a better way to do this.
+//      DONE:
+//          since someone encoded all the urls, we can now assume any amp followed by 
+//              whitespace or a HTML tag (i.e. &<br /> )should be
+//              encoded and most not with a space are intentional
+//      TODO:
+//          check ALL ampersands, find out if it's a valid code, and encode if not
+function xhtml_cleanup($html) {
+    $p = array("/\&([\s\<])/",       // ampersand followed by whitespace or tag
+                        "/\&$/",            // ampersand at end of body
+                        "/<br([^\/]*)>/i",  // unclosed br tag - attributes included
+                        "/<p([^\/]*)>/i",   // any unclosed p tag 
+                        "/<\/p>/i"           // closing </p> tags, dropped for feed
+    );
+    $r = array("&amp;\\1",
+                        "&amp;",
+                        "<br\\1 />",
+                        "<p\\1 />",
+                        ""
+    );
+    return preg_replace($p,$r,$html);
+}
+
 function serendipity_printEntries_rss($entries, $version, $comments = false) {
     global $serendipity;
 
@@ -1373,6 +1397,8 @@
             // Do some relative -> absolute URI replacing magic. Replaces all HREF/SRC (<a>, <img>, ...) references to only the serendipitypath with the full baseURL URI
             // garvin: Could impose some problems. Closely watch this one.
             $entry['body'] = preg_replace('@(href|src)=("|\')(' . preg_quote($serendipity['serendipityHTTPPath']) . ')(.*)("|\')(.*)>@imsU', '\1=\2' . $serendipity['baseURL'] . '\4\2\6>', $entry['body']);
+            // jbalcorn: clean up body for XML compliance as best we can.
+            $entry['body'] = xhtml_cleanup($entry['body']);
             serendipity_plugin_api::hook_event('frontend_display', $entry);
             
             // extract author information

[php-blog-cvs] serendipity/htmlarea htmlarea.js,1.3,1.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/htmlarea
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11472

Modified Files:
	htmlarea.js 
Log Message:
IE strips leading '/' from inserted images. It shouldn't, because viewing
images in /archives/ then links to the wrong path.


Index: htmlarea.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/htmlarea.js,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- htmlarea.js	25 Mar 2004 10:50:46 -0000	1.3
+++ htmlarea.js	25 Mar 2004 14:25:52 -0000	1.4
@@ -1936,7 +1936,11 @@
 	var blockTags = " body form textarea fieldset ul ol dl li div " +
 		"p h1 h2 h3 h4 h5 h6 quote pre table thead " +
 		"tbody tfoot tr td iframe address ";
-	return (blockTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1);
+	if (el && el.tagName) {
+		return (blockTags.indexOf(" " + el.tagName.toLowerCase() + " ") != -1);
+	} else {
+		return false;
+	}
 };
 
 HTMLArea.needsClosingTag = function(el) {
@@ -2061,7 +2065,7 @@
 	// strip host-part of URL which is added by MSIE to links relative to server root
 	baseurl = baseurl.replace(/^(https?:\/\/[^\/]+)(.*)$/, '$1');
 	basere = new RegExp(baseurl);
-	return string.replace(basere, "");
+	return '/' + string.replace(basere, "");
 };
 
 String.prototype.trim = function() {

[php-blog-cvs] serendipity serendipity_config_local.tpl,1.35,1.36

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6416

Modified Files:
	serendipity_config_local.tpl 
Log Message:
htmlarea has bugs when editing previously stored content in Firefox (works
in IE though). So disable the editor by default again.

I will look more into this, but have no time left...


Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- serendipity_config_local.tpl	24 Mar 2004 20:02:15 -0000	1.35
+++ serendipity_config_local.tpl	25 Mar 2004 11:16:42 -0000	1.36
@@ -33,7 +33,7 @@
 // Appearance and options
 # Customize how Serendipity looks and feels
 $serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
-$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|1}';               // Do you want to use the WYSIWYG editor? (Only works on IE5+, Mozilla 1.3+)
+$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0}';               // Do you want to use the WYSIWYG editor? (Works on IE5+, partially in Mozilla 1.3+)
 $serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
 $serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1}';       // Do you want to use the blog to use popup windows for comments, trackbacks et al?
 $serendipity['embed']                = '{Is serendipity embedded?|embed|bool|0}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the INSTALL file for more information!

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.238,1.239

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3320

Modified Files:
	serendipity_functions.inc.php 
Log Message:
previewing entries with wysiwyg-entries did not work. using real submit
button now.


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.238
retrieving revision 1.239
diff -u -d -r1.238 -r1.239
--- serendipity_functions.inc.php	25 Mar 2004 10:50:45 -0000	1.238
+++ serendipity_functions.inc.php	25 Mar 2004 10:57:38 -0000	1.239
@@ -2043,7 +2043,7 @@
                             </td>
 
                             <td align="right">
-                                <input type="button" value="- <?php echo PREVIEW; ?> -" style="font-weight: bold;" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true'; document.forms['serendipityEntry'].submit();" />
+                                <input type="submit" value="- <?php echo PREVIEW; ?> -" style="font-weight: bold;" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true';" />
                                 <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
                             </td>
                         </tr>

[php-blog-cvs] serendipity/templates/blue htmlarea.css,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/blue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2114/templates/blue

Added Files:
	htmlarea.css 
Log Message:
Templates can now style the WYSIWYG-editor


--- NEW FILE: htmlarea.css ---
body {
  background-color: #e6eaee;
  padding-left: 20px;
  padding-right: 20px;
  padding-bottom: 10px;
  color: #000000;
  font-family: sans-serif;
  line-height: 20px;
}

[php-blog-cvs] serendipity/templates/mt-trendy htmlarea.css,NONE,1.1 style.css,1.13,1.14

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-trendy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2114/templates/mt-trendy

Modified Files:
	style.css 
Added Files:
	htmlarea.css 
Log Message:
Templates can now style the WYSIWYG-editor


--- NEW FILE: htmlarea.css ---
body {
  font-family: Verdana, Arial, sans-serif;
  background-color: #333333;
  color: #cccccc;
  font-size: small;
  font-weight: normal;
  line-height: 140%;
  padding: 10px;
}
Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-trendy/style.css,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- style.css	15 Mar 2004 08:51:12 -0000	1.13
+++ style.css	25 Mar 2004 10:50:47 -0000	1.14
@@ -81,7 +81,7 @@
 
 #serendipityLeftSideBar,
 #serendipityRightSideBar {
-  background: #333333;
+  background-color: #333333;
   color: #cccccc;
   display: block;
   margin-top: 35px;
@@ -136,7 +136,7 @@
 
 .serendipity_entry,
 .serendipity_admin {
-  background: #333333;
+  background-color: #333333;
   border: 1px solid #666666;
   border-top: 0;
   color: #cccccc;

[php-blog-cvs] serendipity/templates/moz-modern htmlarea.css,NONE,1.1 style.css,1.3,1.4

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/moz-modern
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2114/templates/moz-modern

Modified Files:
	style.css 
Added Files:
	htmlarea.css 
Log Message:
Templates can now style the WYSIWYG-editor


--- NEW FILE: htmlarea.css ---
body {
  font-family: Trebuchet MS, Tahoma, Verdana;
  background-color: #BAC6D1;
  color: #494F5D;
  font-size: small;
  font-weight: normal;
  padding: 10px;
}
Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/style.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- style.css	15 Mar 2004 08:52:10 -0000	1.3
+++ style.css	25 Mar 2004 10:50:48 -0000	1.4
@@ -257,7 +257,7 @@
 
 .serendipity_entry,
 .serendipity_admin {
-  background: #BAC6D1;
+  background-color: #BAC6D1;
   margin-top: 10px;
   color: #494F5D;
   font-size: small;

[php-blog-cvs] serendipity/templates/newspaper htmlarea.css,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/newspaper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2114/templates/newspaper

Added Files:
	htmlarea.css 
Log Message:
Templates can now style the WYSIWYG-editor


--- NEW FILE: htmlarea.css ---
body {
    color: #061C37;
    font-family: Georgia, Tahoma, Verdana, Arial;
    background-color: #ffffff;
    padding-left: 16px;
    font-size: 9pt;
    text-align:justify;
}

[php-blog-cvs] serendipity/templates/default htmlarea.css,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2114/templates/default

Added Files:
	htmlarea.css 
Log Message:
Templates can now style the WYSIWYG-editor


--- NEW FILE: htmlarea.css ---
body {
    font-size: 10pt;
    padding: 10px;
    color: #333333;
    background-color: #FAFFFF;
    font-size: 9.5pt;
    font-weight: normal;
    font-family: verdana, arial, geneva, helvetica, sans-serif;
}

[php-blog-cvs] serendipity/htmlarea htmlarea.js,1.2,1.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/htmlarea
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2114/htmlarea

Modified Files:
	htmlarea.js 
Log Message:
Templates can now style the WYSIWYG-editor


Index: htmlarea.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/htmlarea.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- htmlarea.js	23 Mar 2004 15:41:04 -0000	1.2
+++ htmlarea.js	25 Mar 2004 10:50:46 -0000	1.3
@@ -741,12 +741,14 @@
 			html += "<head>\n";
 			if (editor.config.baseURL)
 				html += '<base href="' + editor.config.baseURL + '" />';
-			html += "<style> html,body { border: 0px; } " +
+			html += "<style type=\"text/css\">html,body { border: 0px; } " +
 				editor.config.pageStyle + "</style>\n";
+			if (editor.config.cssFile)
+				html += "<style type=\"text/css\">" + editor.config.cssFile + "</style>\n";
 			html += "</head>\n";
 			html += "<body>\n";
 			html += editor._textArea.value;
-			html += "</body>\n";
+			html += " </body>\n";
 			html += "</html>";
 			doc.write(html);
 			doc.close();

[php-blog-cvs] serendipity NEWS,1.96,1.97 serendipity_functions.inc.php,1.237,1.238

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2114

Modified Files:
	NEWS serendipity_functions.inc.php 
Log Message:
Templates can now style the WYSIWYG-editor


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -d -r1.237 -r1.238
--- serendipity_functions.inc.php	24 Mar 2004 20:02:16 -0000	1.237
+++ serendipity_functions.inc.php	25 Mar 2004 10:50:45 -0000	1.238
@@ -2314,6 +2314,20 @@
     <style  type="text/css">@import url(htmlarea/htmlarea.css);</style>
 <?php
         }
+
+    $csscode = str_replace(
+                 array(
+                   "\n",
+                   "'"
+                 ),
+                 
+                 array(
+                   '\n',
+                   "\'",
+                 ),
+                 
+                 file_get_contents($serendipity['serendipityPath'] . serendipity_getTemplateFile('htmlarea.css'))
+    );
 ?>
     <script type="text/javascript">
     var editor<?php echo $jsname; ?> = null; var config<?php echo $jsname; ?> = null;
@@ -2327,6 +2341,7 @@
             }
         );
         config<?php echo $jsname; ?>.toolbar.push([ "image_selector"]);
+        config<?php echo $jsname; ?>.cssFile = '<?php echo $csscode; ?>';
         config<?php echo $jsname; ?>.toolbar = [
             [ "fontname", "space",
               "fontsize", "space",

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- NEWS	23 Mar 2004 15:49:24 -0000	1.96
+++ NEWS	25 Mar 2004 10:50:45 -0000	1.97
@@ -4,7 +4,9 @@
 ------------------------------------------------------------------------
 
     * Updated WYSIWYG-Editor (htmlarea) to latest version. Integrated
-      s9y image manager in htmlarea window. (garvinhicking)
+      s9y image manager in htmlarea window. Template file 'htmlarea.css'
+      can be used to adjust the editor's look to your template.
+      (garvinhicking)
 
     * Templates: New CSS classes for better customization
       - 'serendipity_entry_body_folded' for the entry body on the

[php-blog-cvs] serendipity/templates/default style.css,1.14,1.15

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25818

Modified Files:
	style.css 
Log Message:
Fixes for padding and breakage of surrounding borders when using <p> as
top-level element (can happen when using the WYSIWYG-editor)


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- style.css	22 Mar 2004 17:17:45 -0000	1.14
+++ style.css	25 Mar 2004 10:07:51 -0000	1.15
@@ -127,7 +127,8 @@
     -moz-border-radius: .0em 0em 1em 1em;
     font-size: 9.5pt;
     font-weight: normal;
-    padding-left: 10px ;
+    padding-left: 10px;
+    padding-right: 10px;
     display: block;
     background-color: #FAFFFF;
 }
@@ -296,3 +297,8 @@
     padding: 15px;
     border: dashed 1px #000000;
 }
+
+.serendipity_entry p {
+    margin: 0px;
+    padding-bottom: 10px;
+}

[php-blog-cvs] serendipity/templates/newspaper layout.php,1.8,1.9

[Kristian K?h. <is...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/newspaper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13799/templates/newspaper

Modified Files:
	layout.php 
Log Message:
- Introduce a variable enablePopup governing the use of
  window.open and target= in Comment-(Link) and for the
  Comments and Trackback windows (default is enabled, to
  be compatible).
- Fix newspaper layout (Illegal syntax, missing '}', introduce
  use of fetchLimit parameter, make layout capable of 3 column
  layout, make layout variable width (previously statically 750px,
- Delete spurious windows line endings, fix indentation 


Index: layout.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/layout.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- layout.php	21 Mar 2004 16:35:33 -0000	1.8
+++ layout.php	24 Mar 2004 20:02:16 -0000	1.9
@@ -1,35 +1,36 @@
 <?php
-
 ##########################################################################
-# serendipity - another blogger...                                             #
+# serendipity - another blogger...                                       #
 ##########################################################################
 #                                                                        #
 # (c) 2003 Jannis Hermanns <J...@ha...>                                 #
-# http://www.jannis.to/programming/serendipity.html                            #
+#          Kristian Köhntopp fucked it up                                #
+# http://www.jannis.to/programming/serendipity.html                      #
 #                                                                        #
 ##########################################################################
+
 $OPENSHADOW = '<table  cellspacing="0" width="100%" cellpadding="0" style="padding:0px">
-                                                        <tr>                               
-                                                        <td valign="top" align="left" style="padding:10px;border-top:1px solid #cdcdcd; border-left: 1px solid #cdcdcd;">
-                                          ';                                                               
+                 <tr>                               
+                   <td valign="top" align="left" style="padding:10px;border-top:1px solid #cdcdcd; border-left: 1px solid #cdcdcd;">
+';                                                               
                                             
 $CLOSESHADOW = '</td>       
-                                                        <td style="width:8px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowr.png);" valign="top"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowt.png" border="0" hspace="0" vspace="0" alt="neu" /></td>
-                                                        </tr>                                                                                                                                                         
-                                                        <tr> 
-                                                        <td style="height:10px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowb.png);"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbl.png" border="0" hspace="0" vspace="0" alt="new" /></td>
-                                                        <td style="height:10px; width:8px;"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbr.png" border="0" hspace="0" vspace="0" alt="neu" /></td>
-                                                        </tr>
-                                                        </table>
-                                                   ';
+                <td style="width:8px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowr.png);" valign="top"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowt.png" border="0" hspace="0" vspace="0" alt="neu" /></td>
+              </tr>                                                                                                                                                         
+              <tr> 
+                <td style="height:10px; background-image:url('.$serendipity['baseURL'].'/templates/newspaper/img/shadowb.png);"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbl.png" border="0" hspace="0" vspace="0" alt="new" /></td>
+                <td style="height:10px; width:8px;"><img src="'.$serendipity['baseURL'].'/templates/newspaper/img/shadowbr.png" border="0" hspace="0" vspace="0" alt="neu" /></td>
+              </tr>
+            </table>
+';
 ?>
 
-<table width="750" cellspacing="10">
-	<tr>
-		<td colspan="2" width="100%" class="serendipityBanner">
-			<div id="serendipity_banner">
-				<h1><a class="homelink1" href="<?php echo $serendipity['baseURL']; ?>"><?php echo htmlentities($serendipity['blogTitle']); ?></a></h1>
-			<h2>
+<table width="100%" cellspacing="4" border="0">
+    <tr>
+        <td colspan="3" width="100%" class="serendipityBanner">
+            <div id="serendipity_banner">
+                <h1><a class="homelink1" href="<?php echo $serendipity['baseURL']; ?>"><?php echo htmlentities($serendipity['blogTitle']); ?></a></h1>
+            <h2>
 <?php
 $sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
 if (strlen($sub)) {
@@ -40,53 +41,48 @@
 ?>
 
 </h2>
-			</div>	
-		</td>
-	</tr>
-	<tr>
-		<td width="150" valign="top" align="left" class="serendipitySideBar" style="	border-left: 1px dotted #ABABAB;
-	border-top: 1px dotted #ABABAB;
-	border-right: 1px dotted #ABABAB;
-	border-bottom: 1px dotted #ABABAB;
-	background-color:#FCFFF9;
-">
-			
-			<?php
-				serendipity_plugin_api::generate_plugins('left', 'span');
-serendipity_plugin_api::generate_plugins('right', 'span');
-			?>
-			
-		</td>
-		<td width="100%" valign="top" align="left" class="serendipityContent">
-			<?=$OPENSHADOW?>
-			<?php
-				if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
-	               	$serendipity["GET"]["range"] = date("Ymd");
+            </div>  
+        </td>
+    </tr>
+    <tr>
+        <td width="150" valign="top" align="left" class="serendipitySideBar">
+            <?php
+                serendipity_plugin_api::generate_plugins('left', 'span');
+//              serendipity_plugin_api::generate_plugins('right', 'span');
+            ?>
+            
+        </td>
+        <td width="100%" valign="top" align="left" class="serendipityContent">
+            <?=$OPENSHADOW?>
+            <?php
+                if (!isset($serendipity['GET']['range']) || !is_numeric($serendipity['GET']['range'])) {
+                    $serendipity["GET"]["range"] = date("Ymd");
+                }
 
                 // The main area
-				switch ($serendipity["GET"]["action"]) {
+                switch ($serendipity["GET"]["action"]) {
 
-                	// User wants to read the diary
-                	case "read":
+                    // User wants to read the diary
+                    case "read":
                         if (isset($serendipity['GET']['id'])) {
                             serendipity_printEntries(array(serendipity_fetchEntry("id", $serendipity['GET']['id'])), 1);
                         } else {
-                        	serendipity_printEntries(serendipity_fetchEntries($serendipity["GET"]["range"]));
+                            serendipity_printEntries(serendipity_fetchEntries($serendipity["GET"]["range"]));
                         }
                     break;
 
                     // User searches
                     case "search":
-						$r = serendipity_searchEntries($serendipity["GET"]["searchTerm"]);
-						if ( strlen($serendipity["GET"]["searchTerm"]) <= 3 ) {
-						        echo SEARCH_TOO_SHORT;
-						        break;
-						}
-						
-						if ($r === true) {
-							echo sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']);
-							break;
-						}
+                        $r = serendipity_searchEntries($serendipity["GET"]["searchTerm"]);
+                        if ( strlen($serendipity["GET"]["searchTerm"]) <= 3 ) {
+                                echo SEARCH_TOO_SHORT;
+                                break;
+                        }
+                        
+                        if ($r === true) {
+                            echo sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']);
+                            break;
+                        }
                         echo sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity["GET"]["searchTerm"], count($r));
                         serendipity_printEntries($r);
                     break;
@@ -99,11 +95,17 @@
 
                     // Welcome screen or whatever
                     default:
-                    	serendipity_printEntries(serendipity_fetchEntries(null, true, 5));
+                        serendipity_printEntries(serendipity_fetchEntries(null, true, $serendipity['fetchLimit'] ));
                 }
             ?>
-			<?=$CLOSESHADOW?>
-		</td>		
-	</tr>
+            <?=$CLOSESHADOW?>
+        </td>       
+        <td valign="top" align="left" class="serendipitySideBar">
+            <?php
+//              serendipity_plugin_api::generate_plugins('left', 'span');
+                serendipity_plugin_api::generate_plugins('right', 'span');
+            ?>
+            
+        </td>
+    </tr>
 </table>
-<font size="1">&copy; 2003 <a href="http://www.jannis.to">Jannis Hermanns</a><br /><?php @include("/www/apache/htdocs/textads.txt");?></font>

[php-blog-cvs] serendipity serendipity_config_local.tpl,1.34,1.35 serendipity_functions.inc.php,1.236,1.237

[Kristian K?h. <is...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13799

Modified Files:
	serendipity_config_local.tpl serendipity_functions.inc.php 
Log Message:
- Introduce a variable enablePopup governing the use of
  window.open and target= in Comment-(Link) and for the
  Comments and Trackback windows (default is enabled, to
  be compatible).
- Fix newspaper layout (Illegal syntax, missing '}', introduce
  use of fetchLimit parameter, make layout capable of 3 column
  layout, make layout variable width (previously statically 750px,
- Delete spurious windows line endings, fix indentation 


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -d -r1.236 -r1.237
--- serendipity_functions.inc.php	24 Mar 2004 12:45:23 -0000	1.236
+++ serendipity_functions.inc.php	24 Mar 2004 20:02:16 -0000	1.237
@@ -856,16 +856,18 @@
                     if (!isset($serendipity['GET']['id'])) {
                         $label = $entry['comments'] == 1 ? COMMENT : COMMENTS;
                         echo ' | <a href="' . $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&amp;serendipity[type]=comments"';
-                        echo '      onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
-                        echo $label . ' (' . $entry['comments'] . ')</a>';
+                        if ($serendipity['enablePopup'])
+                          echo '      onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;"';
+                        echo '>' . $label . ' (' . $entry['comments'] . ')</a>';
                     }
                 }
 
                 if (serendipity_db_bool($entry['allow_comments']) || !isset($entry['allow_comments']) || $entry['trackbacks'] > 0) {
                     $label = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS;
                     echo ' | <a href="' . $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&amp;serendipity[type]=trackbacks"';
-                    echo '      onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
-                    echo $label . ' (' . $entry['trackbacks'] . ')</a>';
+                    if ($serendipity['enablePopup'])
+                      echo '      onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;"';
+                    echo '>' . $label . ' (' . $entry['trackbacks'] . ')</a>';
                 }
 
                 if ($_SESSION['serendipityAuthedUser'] === true) {
@@ -2325,24 +2327,24 @@
             }
         );
         config<?php echo $jsname; ?>.toolbar.push([ "image_selector"]);
-        config<?php echo $jsname; ?>.toolbar = [
-            [ "fontname", "space",
-              "fontsize", "space",
-              "formatblock", "space",
-              "bold", "italic", "underline", "strikethrough", "separator",
-              "subscript", "superscript", "separator",
-              "copy", "cut", "paste", "space", "undo", "redo" ],
-
-            [ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
-              "lefttoright", "righttoleft", "separator",
-              "insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
-              "forecolor", "hilitecolor", "separator",
-              "inserthorizontalrule", "createlink", "insertimage", "image_selector", "inserttable", "htmlmode", "separator",
+        config<?php echo $jsname; ?>.toolbar = [
+            [ "fontname", "space",
+              "fontsize", "space",
+              "formatblock", "space",
+              "bold", "italic", "underline", "strikethrough", "separator",
+              "subscript", "superscript", "separator",
+              "copy", "cut", "paste", "space", "undo", "redo" ],
+
+            [ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
+              "lefttoright", "righttoleft", "separator",
+              "insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
+              "forecolor", "hilitecolor", "separator",
+              "inserthorizontalrule", "createlink", "insertimage", "image_selector", "inserttable", "htmlmode", "separator",
               "popupeditor", "separator", "showhelp", "about" ]
         ];
         editor<?php echo $jsname; ?>.generate();
         editor<?php echo $jsname; ?>._textArea.className = 'serendipity_entry';
-    }
+    }
     </script>
 <?php
     }
@@ -2461,6 +2463,9 @@
 {
     global $serendipity;
 
+    if ($serendipity['enablePopup'] != true)
+        return "";
+
     if ($serendipity['XHTML11']) {
         return ' onclick="window.open(this.href, \'target' . time() . '\'); return false;" ';
     } else {

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_config_local.tpl	23 Mar 2004 15:49:25 -0000	1.34
+++ serendipity_config_local.tpl	24 Mar 2004 20:02:15 -0000	1.35
@@ -35,6 +35,7 @@
 $serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
 $serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|1}';               // Do you want to use the WYSIWYG editor? (Only works on IE5+, Mozilla 1.3+)
 $serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
+$serendipity['enablePopup']          = '{Enable use of popup windows for comments, trackbacks et al|enablePopup|bool|1}';       // Do you want to use the blog to use popup windows for comments, trackbacks et al?
 $serendipity['embed']                = '{Is serendipity embedded?|embed|bool|0}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the INSTALL file for more information!
 $serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;}';          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
 $serendipity['rewrite']              = '{URL Rewriting|rewrite|list|none=>Disable URL Rewriting,errordocs=>Use Apache errorhandling,rewrite=>Use Apache mod_rewrite}';                  // Select which rules you wish to use when generating URLs. Enabling rewrite rules will make pretty URLs for your blog and make it better indexable for spiders like google. The webserver needs to support either mod_rewrite or "AllowOverride All" for your serendipity dir. The default setting is auto-detected.

[php-blog-cvs] serendipity serendipity_entries.php,1.25,1.26 serendipity_functions.inc.php,1.235,1.236

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17619

Modified Files:
	serendipity_entries.php serendipity_functions.inc.php 
Log Message:
Fix WYSIWYG bug for IE6, where no textarea was displayed.

I am still looking into CSS-styling the editor's content to match with
'serendipity_entry' class...


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- serendipity_functions.inc.php	23 Mar 2004 15:49:25 -0000	1.235
+++ serendipity_functions.inc.php	24 Mar 2004 12:45:23 -0000	1.236
@@ -2028,7 +2028,7 @@
 
             <tr>
                 <td colspan="3">
-                    <textarea name="serendipity[body]" id="serendipity[body]" cols="80" rows="20"><?php echo isset($entry['body']) ? htmlentities($entry['body']) : ''; ?></textarea>
+                    <textarea style="width: 100%" name="serendipity[body]" id="serendipity[body]" cols="80" rows="20"><?php echo isset($entry['body']) ? htmlentities($entry['body']) : ''; ?></textarea>
                 </td>
             </tr>
 
@@ -2055,7 +2055,7 @@
 
             <tr>
                 <td colspan="3">
-                    <textarea name="serendipity[extended]" id="serendipity[extended]" cols="80" rows="20"><?php echo isset($entry['extended']) ? htmlentities($entry['extended']) : ''; ?></textarea>
+                    <textarea style="width: 100%" name="serendipity[extended]" id="serendipity[extended]" cols="80" rows="20"><?php echo isset($entry['extended']) ? htmlentities($entry['extended']) : ''; ?></textarea>
                 </td>
             </tr>
             
@@ -2074,8 +2074,8 @@
     </form>
 <?php
     if ($serendipity['wysiwyg']) {
-        serendipity_emit_htmlarea_code('serendipity[body]');
-        serendipity_emit_htmlarea_code('serendipity[extended]');
+        serendipity_emit_htmlarea_code('serendipity[body]', 'body');
+        serendipity_emit_htmlarea_code('serendipity[extended]', 'extended');
     }
 
     echo '    <script type="text/javascript" language="JavaScript" src="serendipity_define.js.php"></script>';
@@ -2293,7 +2293,7 @@
     echo "</span>";
 }
 
-function serendipity_emit_htmlarea_code($item)
+function serendipity_emit_htmlarea_code($item, $jsname)
 {
     static $init = false;
     global $serendipity;
@@ -2305,41 +2305,46 @@
     <script type="text/javascript">
         _editor_url = "<?php echo $serendipity['serendipityHTTPPath'] . 'htmlarea/'; ?>";
         _editor_lang = "<?php echo $serendipity['lang']; ?>";
+        var editorref = '';
     </script>
     <script type="text/javascript" src="htmlarea/htmlarea.js"></script>
-    <script type="text/javascript" src="htmlarea/lang/<?php echo (file_exists($serendipity['serendipityHTTPPath'] . 'htmlarea/lang/' . $serendipity['lang'] . '.js') ? $serendipity['lang'] : 'en'); ?>.js"></script>
     <script type="text/javascript" src="htmlarea/dialog.js"></script>
     <style  type="text/css">@import url(htmlarea/htmlarea.css);</style>
+<?php
+        }
+?>
     <script type="text/javascript">
-        var config = new HTMLArea.Config();
-        var editorref = '';
-        config.registerButton('image_selector', '<?PHP echo MANAGE_IMAGES; ?>', 'htmlarea/images/ed_s9yimage.gif', false,
+    var editor<?php echo $jsname; ?> = null; var config<?php echo $jsname; ?> = null;
+    function Spawn<?php echo $jsname; ?>() {
+        var editor<?php echo $jsname; ?>    = new HTMLArea("<?php echo $item; ?>");
+        var config<?php echo $jsname; ?>    = editor<?php echo $jsname; ?>.config;
+        config<?php echo $jsname; ?>.registerButton('image_selector', '<?PHP echo MANAGE_IMAGES; ?>', 'htmlarea/images/ed_s9yimage.gif', false,
             function(editor, id) {
                 window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
-                editorref = editor;
+                editorref = editor<?php echo $jsname; ?>;
             }
         );
-        config.toolbar.push([ "image_selector"]);
-        config.toolbar = [
-                [ "fontname", "space",
-                  "fontsize", "space",
-                  "formatblock", "space",
-                  "bold", "italic", "underline", "strikethrough", "separator",
-                  "subscript", "superscript", "separator",
-                  "copy", "cut", "paste", "space", "undo", "redo" ],
+        config<?php echo $jsname; ?>.toolbar.push([ "image_selector"]);
+        config<?php echo $jsname; ?>.toolbar = [
+            [ "fontname", "space",
+              "fontsize", "space",
+              "formatblock", "space",
+              "bold", "italic", "underline", "strikethrough", "separator",
+              "subscript", "superscript", "separator",
+              "copy", "cut", "paste", "space", "undo", "redo" ],
 
-                [ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
-                  "lefttoright", "righttoleft", "separator",
-                  "insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
-                  "forecolor", "hilitecolor", "separator",
-                  "inserthorizontalrule", "createlink", "insertimage", "image_selector", "inserttable", "htmlmode", "separator",
-                  "popupeditor", "separator", "showhelp", "about" ]
-        ];
+            [ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
+              "lefttoright", "righttoleft", "separator",
+              "insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
+              "forecolor", "hilitecolor", "separator",
+              "inserthorizontalrule", "createlink", "insertimage", "image_selector", "inserttable", "htmlmode", "separator",
+              "popupeditor", "separator", "showhelp", "about" ]
+        ];
+        editor<?php echo $jsname; ?>.generate();
+        editor<?php echo $jsname; ?>._textArea.className = 'serendipity_entry';
+    }
     </script>
 <?php
-        }
-
-        echo '<script defer="defer">HTMLArea.replace("' . $item . '", config);</script>';
     }
 
     $init = true;

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_entries.php	21 Mar 2004 16:35:32 -0000	1.25
+++ serendipity_entries.php	24 Mar 2004 12:45:23 -0000	1.26
@@ -31,7 +31,7 @@
 
 </head>
 
-<body id="serendipity_admin_entries_page">
+<body id="serendipity_admin_entries_page" onload="if (self.Spawnbody) { Spawnbody(); } if (self.Spawnextended) { Spawnextended(); }">
     <div id="serendipity_banner">
         <h1><?php echo $serendipity['blogTitle'] ; ?></h1>
 <?php

[php-blog-cvs] serendipity TODO,1.15,1.16

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22665

Modified Files:
	TODO 
Log Message:
ToDo list has moved to wiki: http://www.s9y.org/32.html
Developers should feel free to tweak and edit the document there.
Developers without write-access to our wiki are kindly redirected to Jannis :-)


Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/serendipity/TODO,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- TODO	23 Mar 2004 18:08:24 -0000	1.15
+++ TODO	23 Mar 2004 18:09:26 -0000	1.16
@@ -4,47 +4,3 @@
 
 http://www.s9y.org/32.html
 
-(! = High Priority, * = Medium Priority, - = Low Priority)
-
-CODE CLEANUP
-============
-
-  ! Fix outstanding bugs on SF.net bugtracker
-  * Finalize the plugin API
-  * Don't trackback files (zip, rar etc.) (Check headers for 
-    content-type? or just file extension?)
-  - Split up the configuration page and the installer
-  - Convert some of the internal plugins into external plugins
-  - Split up serendipity_functions.inc.php into logical files
-  - Rename serendipity_config.inc.php to serendipity.inc.php
-
-NEW FUNCTIONALITY
-=================
-
-  ! Support for multiple weblogs with per-user and shared categories,
-    admin interface for user management, per-user uploads
-  
-INTEGRATION ISSUES
-==================
-
-  - Allow for blogging in Mozilla/Firebird sidebars
-  - Allow for blogging from GNOME Blog (http://www.gnome.org/~seth/gnome-blog/)
-    and gaim-blogger (http://gaim-blogger.sourceforge.net/).  
-
-USABILITY
-=========
-
-  * Printer friendly version of a page
-
-DOCUMENTATION
-=============
-
-  ! Document all available CSS classes/ids
-  * Document plugin architecture
-
-PLUGINS
-=======
-
-  * OPML/Blogroll plugin [import/export/maintenance]
-  - Citation extractor plugin
-  

[php-blog-cvs] serendipity TODO,1.14,1.15

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22599

Modified Files:
	TODO 
Log Message:
Last commit (backup) before this will be moved to our wiki


Index: TODO
===================================================================
RCS file: /cvsroot/php-blog/serendipity/TODO,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TODO	4 Feb 2004 19:14:50 -0000	1.14
+++ TODO	23 Mar 2004 18:08:24 -0000	1.15
@@ -1,23 +1,50 @@
 # $Id$
 
-* Split up serendipity_functions.inc.php
-* Make uploads per-user (one folder per user?)
-* Finalize the plugin API
-* Add an OPML plugin for easy blogroll inclusion
-* Add a citation extractor plugin
-* Add support for multiple weblogs
-* Add the ability to have a printer friendly format for the weblog
+This document has been moved to our WiKi: 
 
-* Convert localization into a phpMyAdmin-like system
-* Rename serendipity_config.inc.php to serendipity.inc.php
-* Allow for blogging in Mozilla/Firebird sidebars
-* Allow for blogging from GNOME Blog (http://www.gnome.org/~seth/gnome-blog/)
-  and gaim-blogger (http://gaim-blogger.sourceforge.net/).
-* Instead of keeping track of how many comments in the entries table, do some kind of JOIN with the comments table.
+http://www.s9y.org/32.html
 
-! Don't trackback files (zip, rar etc.) (Check headers for content-type? or just file extension?)
-! Allow for upgrades of Serendipity in the installer
+(! = High Priority, * = Medium Priority, - = Low Priority)
 
-? Split up the configuration page and the installer
-? Make a better "Powered By" logo
-? Convert some of the internal plugins into external plugins
+CODE CLEANUP
+============
+
+  ! Fix outstanding bugs on SF.net bugtracker
+  * Finalize the plugin API
+  * Don't trackback files (zip, rar etc.) (Check headers for 
+    content-type? or just file extension?)
+  - Split up the configuration page and the installer
+  - Convert some of the internal plugins into external plugins
+  - Split up serendipity_functions.inc.php into logical files
+  - Rename serendipity_config.inc.php to serendipity.inc.php
+
+NEW FUNCTIONALITY
+=================
+
+  ! Support for multiple weblogs with per-user and shared categories,
+    admin interface for user management, per-user uploads
+  
+INTEGRATION ISSUES
+==================
+
+  - Allow for blogging in Mozilla/Firebird sidebars
+  - Allow for blogging from GNOME Blog (http://www.gnome.org/~seth/gnome-blog/)
+    and gaim-blogger (http://gaim-blogger.sourceforge.net/).  
+
+USABILITY
+=========
+
+  * Printer friendly version of a page
+
+DOCUMENTATION
+=============
+
+  ! Document all available CSS classes/ids
+  * Document plugin architecture
+
+PLUGINS
+=======
+
+  * OPML/Blogroll plugin [import/export/maintenance]
+  - Citation extractor plugin
+  

[php-blog-cvs] serendipity serendipity_plugin_api.php,1.15,1.16

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27743

Modified Files:
	serendipity_plugin_api.php 
Log Message:
shared installation: local plugins are preferred over global ones


Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_plugin_api.php	21 Mar 2004 16:58:31 -0000	1.15
+++ serendipity_plugin_api.php	23 Mar 2004 16:11:34 -0000	1.16
@@ -189,6 +189,12 @@
                         unset($classes[$existing]);
                     }
                     
+                    $existing = array_search($f, $classes);
+                    if ($existing !== null && $existing !== false) {
+                        // A local plugin will be preferred over general plugins
+                        unset($classes[$existing]);
+                    }
+
                     if (file_exists($local_ppath . '/' . $f . '/' . $f . '.php')) {
                         $classes[] = $f;
                     }

[php-blog-cvs] serendipity NEWS,1.95,1.96 htaccess.rewrite.tpl,1.5,1.6 serendipity_config_local.tpl,1.33,1.34 serendipity_editor.js,1.6,1.7 serendipity_functions.inc.php,1.234,1.235

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21818

Modified Files:
	NEWS htaccess.rewrite.tpl serendipity_config_local.tpl 
	serendipity_editor.js serendipity_functions.inc.php 
Log Message:
Upgrade to latest HTMLArea.

Finally get our image manager implemented there. Made WYSIWYG-editor default
as it works on most browsers and cross-platform. s9y should look great
out-of-the-box, and advanced users who directly type their html-code should
be advanced enough to turn it off.


Index: serendipity_editor.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_editor.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_editor.js	8 Jul 2003 13:51:19 -0000	1.6
+++ serendipity_editor.js	23 Mar 2004 15:49:25 -0000	1.7
@@ -165,7 +165,12 @@
         insert = img;
     }
 
-    self.opener.serendipity_imageSelector_addToBody(insert);
+    if (self.opener.editorref) {
+        self.opener.editorref.surroundHTML(insert, '');
+    } else {
+        self.opener.serendipity_imageSelector_addToBody(insert);
+    }
+
     self.close();
 }
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.234
retrieving revision 1.235
diff -u -d -r1.234 -r1.235
--- serendipity_functions.inc.php	22 Mar 2004 17:17:45 -0000	1.234
+++ serendipity_functions.inc.php	23 Mar 2004 15:49:25 -0000	1.235
@@ -2074,12 +2074,12 @@
     </form>
 <?php
     if ($serendipity['wysiwyg']) {
-        serendipity_emit_htmlarea_code('document.forms[\'serendipityEntry\'][\'serendipity[body]\']');
-        serendipity_emit_htmlarea_code('document.forms[\'serendipityEntry\'][\'serendipity[extended]\']');
-    } else {
-        echo '    <script type="text/javascript" language="JavaScript" src="serendipity_define.js.php"></script>';
-        echo '    <script type="text/javascript" language="JavaScript" src="serendipity_editor.js"></script>';
+        serendipity_emit_htmlarea_code('serendipity[body]');
+        serendipity_emit_htmlarea_code('serendipity[extended]');
     }
+
+    echo '    <script type="text/javascript" language="JavaScript" src="serendipity_define.js.php"></script>';
+    echo '    <script type="text/javascript" language="JavaScript" src="serendipity_editor.js"></script>';
 }
 
 function serendipity_authenticate_author($username = '', $password = '') {
@@ -2302,14 +2302,44 @@
 
         if (!$init) {
 ?>
+    <script type="text/javascript">
+        _editor_url = "<?php echo $serendipity['serendipityHTTPPath'] . 'htmlarea/'; ?>";
+        _editor_lang = "<?php echo $serendipity['lang']; ?>";
+    </script>
     <script type="text/javascript" src="htmlarea/htmlarea.js"></script>
-    <script type="text/javascript" src="htmlarea/htmlarea-lang-en.js"></script>
+    <script type="text/javascript" src="htmlarea/lang/<?php echo (file_exists($serendipity['serendipityHTTPPath'] . 'htmlarea/lang/' . $serendipity['lang'] . '.js') ? $serendipity['lang'] : 'en'); ?>.js"></script>
     <script type="text/javascript" src="htmlarea/dialog.js"></script>
     <style  type="text/css">@import url(htmlarea/htmlarea.css);</style>
+    <script type="text/javascript">
+        var config = new HTMLArea.Config();
+        var editorref = '';
+        config.registerButton('image_selector', '<?PHP echo MANAGE_IMAGES; ?>', 'htmlarea/images/ed_s9yimage.gif', false,
+            function(editor, id) {
+                window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
+                editorref = editor;
+            }
+        );
+        config.toolbar.push([ "image_selector"]);
+        config.toolbar = [
+                [ "fontname", "space",
+                  "fontsize", "space",
+                  "formatblock", "space",
+                  "bold", "italic", "underline", "strikethrough", "separator",
+                  "subscript", "superscript", "separator",
+                  "copy", "cut", "paste", "space", "undo", "redo" ],
+
+                [ "justifyleft", "justifycenter", "justifyright", "justifyfull", "separator",
+                  "lefttoright", "righttoleft", "separator",
+                  "insertorderedlist", "insertunorderedlist", "outdent", "indent", "separator",
+                  "forecolor", "hilitecolor", "separator",
+                  "inserthorizontalrule", "createlink", "insertimage", "image_selector", "inserttable", "htmlmode", "separator",
+                  "popupeditor", "separator", "showhelp", "about" ]
+        ];
+    </script>
 <?php
         }
 
-        echo '<script defer="defer">(new HTMLArea(' . $item . ')).generate();</script>';
+        echo '<script defer="defer">HTMLArea.replace("' . $item . '", config);</script>';
     }
 
     $init = true;

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- NEWS	22 Mar 2004 17:17:45 -0000	1.95
+++ NEWS	23 Mar 2004 15:49:24 -0000	1.96
@@ -3,6 +3,9 @@
 Version 0.6 ()
 ------------------------------------------------------------------------
 
+    * Updated WYSIWYG-Editor (htmlarea) to latest version. Integrated
+      s9y image manager in htmlarea window. (garvinhicking)
+
     * Templates: New CSS classes for better customization
       - 'serendipity_entry_body_folded' for the entry body on the
          weblog index page

Index: htaccess.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- htaccess.rewrite.tpl	21 Mar 2004 16:26:56 -0000	1.5
+++ htaccess.rewrite.tpl	23 Mar 2004 15:49:24 -0000	1.6
@@ -14,6 +14,7 @@
 RewriteRule ^{PAT_CATEGORIES} {indexFile}?url={PATH_ARCHIVE}/$1 [L,QSA]
 RewriteRule ^{PAT_FEED} rss.php?file=$1&ext=$2
 RewriteRule ^index\.(html?|php.?) {indexFile}?url=index.html [L,QSA]
+RewriteRule ^htmlarea/(.*) htmlarea/$1 [L,QSA]
 RewriteRule (.*\.html?) {indexFile}?url=/$1 [L,QSA]
 
 <Files *.tpl>

Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- serendipity_config_local.tpl	26 Feb 2004 11:37:42 -0000	1.33
+++ serendipity_config_local.tpl	23 Mar 2004 15:49:25 -0000	1.34
@@ -33,7 +33,7 @@
 // Appearance and options
 # Customize how Serendipity looks and feels
 $serendipity['extCSS']               = '{External Stylesheet|extCSS|string|none}';          // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
-$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|0}';               // Do you want to use the experimental WYSIWYG editor?
+$serendipity['wysiwyg']              = '{Use WYSIWYG editor|wysiwyg|bool|1}';               // Do you want to use the WYSIWYG editor? (Only works on IE5+, Mozilla 1.3+)
 $serendipity['XHTML11']              = '{Force XHTML 1.1 compliance|XHTML11|bool|0}';       // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
 $serendipity['embed']                = '{Is serendipity embedded?|embed|bool|0}';           // If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the INSTALL file for more information!
 $serendipity['blockReferer']         = '{Blocked Referers|blockReferer|string|;}';          // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!

[php-blog-cvs] serendipity/deployment serendipity_editor.js,NONE,1.1

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/deployment
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21818/deployment

Added Files:
	serendipity_editor.js 
Log Message:
Upgrade to latest HTMLArea.

Finally get our image manager implemented there. Made WYSIWYG-editor default
as it works on most browsers and cross-platform. s9y should look great
out-of-the-box, and advanced users who directly type their html-code should
be advanced enough to turn it off.


--- NEW FILE: serendipity_editor.js ---
<!-- // Hide from older browsers
/* $Id: serendipity_editor.js,v 1.1 2004/03/23 15:49:25 garvinhicking Exp $ */

/*
    Written by chris wetherell
    http://www.massless.org
    chris [THE AT SIGN] massless.org
    
    warning: it only works for IE4+/Win and Moz1.1+
    feel free to take it for your site
    if there are any problems, let chris know.
*/

var thisForm;

function getMozSelection(txtarea) {
    var selLength = txtarea.textLength;
    var selStart = txtarea.selectionStart;
    var selEnd = txtarea.selectionEnd;
    if (selEnd==1 || selEnd==2) {
        selEnd=selLength;
    }
    return (txtarea.value).substring(selStart, selEnd);
}

function mozWrap(txtarea, lft, rgt) {
    var selLength = txtarea.textLength;
    var selStart = txtarea.selectionStart;
    var selEnd = txtarea.selectionEnd;
    if (selEnd==1 || selEnd==2) selEnd=selLength;
    var s1 = (txtarea.value).substring(0,selStart);
    var s2 = (txtarea.value).substring(selStart, selEnd)
    var s3 = (txtarea.value).substring(selEnd, selLength);
    txtarea.value = s1 + lft + s2 + rgt + s3;
}

function IEWrap(lft, rgt) {
    strSelection = document.selection.createRange().text;
    if (strSelection != "") {
        document.selection.createRange().text = lft + strSelection + rgt;
    }
}

function wrapSelection(txtarea, lft, rgt) {
    if (document.all) {
        IEWrap(lft, rgt);
    } else if (document.getElementById) {
        mozWrap(txtarea, lft, rgt);
    }
}

function wrapSelectionWithLink(txtarea) {
    var my_link = prompt("Enter URL:","http://");

    if (getMozSelection(txtarea) == "") {
        var my_desc = prompt("Enter Description");
    }

    if (my_link != null) {
        lft = "<a href=\"" + my_link + "\">";
        if (my_desc != null && my_desc != "") {
            rgt = my_desc +"</a>";
        } else {
            rgt = "</a>";
        }
        wrapSelection(txtarea, lft, rgt);
    }

    return;
}
/* end chris w. script */

function mozInsert(txtarea, str) {
    var selLength = txtarea.textLength;
    var selStart = txtarea.selectionStart;
    var selEnd = txtarea.selectionEnd;
    if (selEnd==1 || selEnd==2) {
        selEnd=selLength;
    }
    var s1 = (txtarea.value).substring(0,selStart);
    var s2 = (txtarea.value).substring(selStart, selEnd)
    var s3 = (txtarea.value).substring(selEnd, selLength);
    txtarea.value = s1 + str + s2 + s3;
}

function wrapInsImage(area) {
    var loc = prompt('Enter the Image Location: ');
    if (!loc) {
        return;
    }
    mozInsert(area,'<img src="'+ loc + '" alt="" />');
}

/* end Better-Editor functions */

function serendipity_insImage (area) {
    var loc = prompt('Enter the Image Location: ');
    if (!loc) {
        area.focus();
        return;
    }

    area.value = area.value + '<img src="' + loc + '" alt="" />';
    area.focus();
}

function serendipity_insBasic (area, tag) {
    area.value = area.value + "<" + tag + "></" + tag + ">";
    area.focus();
}

function serendipity_insLink (area) {
    var loc  = prompt('Enter Location: ');
    var text = prompt('Enter Description: ');

    if (!loc) {
        area.focus();
        return;
    }

    area.value = area.value + '<a href="' + loc + '">' + (text ? text : loc) + '</a>';
    area.focus();
}

function serendipity_imageSelector_addToBody (str)
{
    document.forms['serendipityEntry']['serendipity[body]'].value += str;
    document.forms['serendipityEntry']['serendipity[body]'].focus();
}

function serendipity_imageSelector_done() 
{
    var insert = '';
    var img = '';
    var src = '';
    var f = document.forms['serendipity[selForm]'].elements;

    if (f['serendipity[linkThumbnail]'][0].checked == true) {
        img = f['thumbName'].value;
    } else {
        img = f['imgName'].value;
    }

    if (XHTML11) {
        if (f['serendipity[align]'][0].checked == true) {
            img = "<img style='border: 0px; padding-left: 5px; padding-right: 5px;' src='" + img + "' alt='' />\n";
        } else if (f['serendipity[align]'][1].checked == true) {
            img = "<img style='border: 0px; padding-left: 5px; padding-right: 5px; float: left; vertical-align: top' src='" + img + "' alt='' />";
        } else if (f['serendipity[align]'][2].checked == true) {
            img = "<img style='border: 0px; padding-left: 5px; padding-right: 5px; float: right; vertical-align: top' src='" + img + "' alt='' />";
        }
    } else {
        if (f['serendipity[align]'][0].checked == true) {
            img = "<img border='0' hspace='5' src='" + img + "' alt='' />\n";
        } else if (f['serendipity[align]'][1].checked == true) {
            img = "<img border='0' hspace='5' align='left' src='" + img + "' alt='' />";
        } else if (f['serendipity[align]'][2].checked == true) {
            img = "<img border='0' hspace='5' align='right' src='" + img + "' alt='' />";
        }
    }

    if (f['serendipity[isLink]'][1].checked == true) {
        insert = "<a href='" + f['serendipity[url]'].value + "'>" + img + "</a>";
    } else {
        insert = img;
    }

    if (self.opener.editorref) {
        self.opener.editorref.surroundHTML(insert, '');
    } else {
        self.opener.serendipity_imageSelector_addToBody(insert);
    }

    self.close();
}

// -->

[php-blog-cvs] serendipity/htmlarea/images ed_left_to_right.gif,NONE,1.1 ed_paste.gif,NONE,1.1 ed_right_to_left.gif,NONE,1.1 ed_s9yimage.gif,NONE,1.1 ed_save.gif,NONE,1.1 ed_show_border.gif,NONE,1.1 ed_splitcel.gif,NONE,1.1 ed_about.gif,1.1.1.1,1.2 ed_align_center.gif,1.1.1.1,1.2 ed_align_justify.gif,1.1.1.1,1.2 ed_align_left.gif,1.1.1.1,1.2 ed_align_right.gif,1.1.1.1,1.2 ed_blank.gif,1.1.1.1,1.2 ed_charmap.gif,1.1.1.1,1.2 ed_color_bg.gif,1.1.1.1,1.2 ed_color_fg.gif,1.1.1.1,1.2 ed_copy.gif,1.1.1.1,1.2 ed_custom.gif,1.1.1.1,1.2 ed_cut.gif,1.1.1.1,1.2 ed_delete.gif,1.1.1.1,1.2 ed_format_bold.gif,1.1.1.1,1.2 ed_format_italic.gif,1.1.1.1,1.2 ed_format_strike.gif,1.1.1.1,1.2 ed_format_sub.gif,1.1.1.1,1.2 ed_format_sup.gif,1.1.1.1,1.2 ed_format_underline.gif,1.1.1.1,1.2 ed_help.gif,1.1.1.1,1.2 ed_hr.gif,1.1.1.1,1.2 ed_html.gif,1.1.1.1,1.2 ed_image.gif,1.1.1.1,1.2 ed_indent_less.gif,1.1.1.1,1.2 ed_indent_more.gif,1.1.1.1,1.2 ed_link.gif,1.1.1.1,1.2 ed_list_bullet.gif,1.1.1.1,1.2 ed_list_num.gif,1.1.1.1,1.2 ed_redo.gif,1.1.1.1,1.2 ed_undo.gif,1.1.1.1,1.2 fullscreen_maximize.gif,1.1.1.1,1.2 fullscreen_minimize.gif,1.1.1.1,1.2 insert_table.gif,1.1.1.1,1.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/htmlarea/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20038/images

Modified Files:
	ed_about.gif ed_align_center.gif ed_align_justify.gif 
	ed_align_left.gif ed_align_right.gif ed_blank.gif 
	ed_charmap.gif ed_color_bg.gif ed_color_fg.gif ed_copy.gif 
	ed_custom.gif ed_cut.gif ed_delete.gif ed_format_bold.gif 
	ed_format_italic.gif ed_format_strike.gif ed_format_sub.gif 
	ed_format_sup.gif ed_format_underline.gif ed_help.gif 
	ed_hr.gif ed_html.gif ed_image.gif ed_indent_less.gif 
	ed_indent_more.gif ed_link.gif ed_list_bullet.gif 
	ed_list_num.gif ed_redo.gif ed_undo.gif 
	fullscreen_maximize.gif fullscreen_minimize.gif 
	insert_table.gif 
Added Files:
	ed_left_to_right.gif ed_paste.gif ed_right_to_left.gif 
	ed_s9yimage.gif ed_save.gif ed_show_border.gif ed_splitcel.gif 
Log Message:
Upgrade to latest WYSIWYG manager


Index: ed_format_strike.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_strike.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs9RC6Ec and /tmp/cvslpMJtV differ

Index: ed_help.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_help.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsWaO6nk and /tmp/cvs3vrgg3 differ

Index: ed_format_bold.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_bold.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs2y6pXo and /tmp/cvsTThyS7 differ

Index: ed_indent_more.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_indent_more.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs4wMdAq and /tmp/cvsOZrWx9 differ

Index: ed_about.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_about.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsVHJ4MO and /tmp/cvsjZY4Yx differ

Index: ed_color_fg.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_color_fg.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsHJMq3R and /tmp/cvsIS9yhB differ

--- NEW FILE: ed_s9yimage.gif ---
(This appears to be a binary file; contents omitted.)

Index: ed_copy.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_copy.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvspn5l7V and /tmp/cvsAcQ8nF differ

Index: fullscreen_maximize.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/fullscreen_maximize.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsiLwwNY and /tmp/cvsaqG45H differ

--- NEW FILE: ed_right_to_left.gif ---
(This appears to be a binary file; contents omitted.)

Index: ed_custom.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_custom.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs917yXU and /tmp/cvsXP9TjE differ

Index: ed_format_underline.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_underline.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsfOpbjX and /tmp/cvssQ1slH differ

--- NEW FILE: ed_left_to_right.gif ---
(This appears to be a binary file; contents omitted.)

Index: ed_hr.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_hr.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs6kixa0 and /tmp/cvs5TwGeK differ

Index: ed_cut.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_cut.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsNSEgz4 and /tmp/cvsSMMmGO differ

Index: insert_table.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/insert_table.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs3JqGuj and /tmp/cvsbolIR3 differ

--- NEW FILE: ed_splitcel.gif ---
(This appears to be a binary file; contents omitted.)

Index: ed_align_right.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_align_right.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsiEtU6n and /tmp/cvs99rVw8 differ

Index: ed_align_center.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_align_center.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsx8eRSs and /tmp/cvsRfxZld differ

Index: ed_html.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_html.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvslwUOev and /tmp/cvsf8MuJf differ

Index: ed_format_sup.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_sup.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsC897Xz and /tmp/cvsWvdTvk differ

--- NEW FILE: ed_save.gif ---
(This appears to be a binary file; contents omitted.)

Index: ed_format_italic.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_italic.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsrAhDpD and /tmp/cvsyGGa1n differ

--- NEW FILE: ed_show_border.gif ---
(This appears to be a binary file; contents omitted.)

Index: ed_blank.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_blank.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvszhhAhJ and /tmp/cvshgvHVt differ

Index: ed_charmap.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_charmap.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsABUwDK and /tmp/cvsFtbNjv differ

Index: ed_delete.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_delete.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsiD5foQ and /tmp/cvsK0YP6A differ

Index: ed_align_justify.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_align_justify.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsMJspjT and /tmp/cvs7PzN3D differ

Index: ed_color_bg.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_color_bg.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsN4jXx2 and /tmp/cvsUdhooN differ

Index: ed_redo.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_redo.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsPcmuNX and /tmp/cvsRzfCII differ

Index: ed_align_left.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_align_left.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs09mYC0 and /tmp/cvsLGyUzL differ

Index: ed_format_sub.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_sub.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsoNuSh3 and /tmp/cvs7JIxgO differ

--- NEW FILE: ed_paste.gif ---
(This appears to be a binary file; contents omitted.)

Index: ed_list_num.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_list_num.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs6rin96 and /tmp/cvsWuGzaS differ

Index: ed_image.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_image.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsw4UCH9 and /tmp/cvsF63tKU differ

Index: ed_list_bullet.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_list_bullet.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsCYtEaf and /tmp/cvs3Ceyf0 differ

Index: fullscreen_minimize.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/fullscreen_minimize.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsnAtBjk and /tmp/cvsDpmRr5 differ

Index: ed_link.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_link.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs1IR8sq and /tmp/cvsidUWGb differ

Index: ed_indent_less.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_indent_less.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvs6ihb9Q and /tmp/cvs9fcYCC differ

Index: ed_undo.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_undo.gif,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsUgcqBU and /tmp/cvsIf9n7F differ

[php-blog-cvs] serendipity/htmlarea ChangeLog,NONE,1.1 index.html,NONE,1.1 popupdiv.js,NONE,1.1 popupwin.js,NONE,1.1 reference.html,NONE,1.1 release-notes.html,NONE,1.1 dialog.js,1.1.1.1,1.2 htmlarea.css,1.1.1.1,1.2 htmlarea.js,1.1.1.1,1.2 license.txt,1.1.1.1,1.2 htmlarea-lang-en.js,1.1.1.1,NONE tmp,1.1.1.1,NONE

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/htmlarea
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20038

Modified Files:
	dialog.js htmlarea.css htmlarea.js license.txt 
Added Files:
	ChangeLog index.html popupdiv.js popupwin.js reference.html 
	release-notes.html 
Removed Files:
	htmlarea-lang-en.js tmp 
Log Message:
Upgrade to latest WYSIWYG manager


--- tmp DELETED ---

Index: htmlarea.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/htmlarea.css,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- htmlarea.css	28 Mar 2003 20:05:28 -0000	1.1.1.1
+++ htmlarea.css	23 Mar 2004 15:41:04 -0000	1.2
@@ -1,12 +1,15 @@
 .htmlarea { background: #fff; }
 
-.htmlarea .toolbar { 
-  background: ButtonFace; 
-  padding: 1px; 
+.htmlarea .toolbar {
+  cursor: default;
+  background: ButtonFace;
+  padding: 1px 1px 2px 1px;
   border: 1px solid;
   border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
 }
+.htmlarea .toolbar table { font-family: tahoma,verdana,sans-serif; font-size: 11px; }
 .htmlarea .toolbar img { border: none; }
+.htmlarea .toolbar .label { padding: 0px 3px; }
 
 .htmlarea .toolbar .button {
   background: ButtonFace;
@@ -14,6 +17,8 @@
   border: 1px solid ButtonFace;
   padding: 1px;
   margin: 0px;
+  width: 18px;
+  height: 18px;
 }
 .htmlarea .toolbar .buttonHover {
   border: 1px solid;
@@ -38,7 +43,7 @@
 
 .htmlarea .toolbar .buttonDisabled img {
   filter: alpha(opacity = 25);
-  -moz-opacity: 25%;
+  -moz-opacity: 0.25;
 }
 
 .htmlarea .toolbar .separator {
@@ -55,4 +60,121 @@
 
 .htmlarea .toolbar select { font: 11px Tahoma,Verdana,sans-serif; }
 
-select, select:hover, select:active { background: FieldFace; color: ButtonText; }
+.htmlarea .toolbar select,
+.htmlarea .toolbar select:hover,
+.htmlarea .toolbar select:active { background: FieldFace; color: ButtonText; }
+
+.htmlarea .statusBar {
+  border: 1px solid;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+  padding: 2px 4px;
+  background-color: ButtonFace;
+  color: ButtonText;
+  font: 11px Tahoma,Verdana,sans-serif;
+}
+
+.htmlarea .statusBar .statusBarTree a {
+  padding: 2px 5px;
+  color: #00f;
+}
+
+.htmlarea .statusBar .statusBarTree a:visited { color: #00f; }
+.htmlarea .statusBar .statusBarTree a:hover {
+  background-color: Highlight;
+  color: HighlightText;
+  padding: 1px 4px;
+  border: 1px solid HighlightText;
+}
+
+
+/* Hidden DIV popup dialogs (PopupDiv) */
+
+.dialog {
+  color: ButtonText;
+  background: ButtonFace;
+}
+
+.dialog .content { padding: 2px; }
+
+.dialog, .dialog button, .dialog input, .dialog select, .dialog textarea, .dialog table {
+  font: 11px Tahoma,Verdana,sans-serif;
+}
+
+.dialog table { border-collapse: collapse; }
+
+.dialog .title {
+  background: #008;
+  color: #ff8;
+  border-bottom: 1px solid #000;
+  padding: 1px 0px 2px 5px;
+  font-size: 12px;
+  font-weight: bold;
+  cursor: default;
+}
+
+.dialog .title .button {
+  float: right;
+  border: 1px solid #66a;
+  padding: 0px 1px 0px 2px;
+  margin-right: 1px;
+  color: #fff;
+  text-align: center;
+}
+
+.dialog .title .button-hilite { border-color: #88f; background: #44c; }
+
+.dialog button {
+  width: 5em;
+  padding: 0px;
+}
+
+.dialog .buttonColor {
+  padding: 1px;
+  cursor: default;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+}
+
+.dialog .buttonColor-hilite {
+  border-color: #000;
+}
+
+.dialog .buttonColor .chooser, .dialog .buttonColor .nocolor {
+  height: 0.6em;
+  border: 1px solid;
+  padding: 0px 1em;
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
+
+.dialog .buttonColor .nocolor { padding: 0px; }
+.dialog .buttonColor .nocolor-hilite { background-color: #fff; color: #f00; }
+
+.dialog .label { text-align: right; width: 6em; }
+.dialog .value input { width: 100%; }
+.dialog .buttons { text-align: right; padding: 2px 4px 0px 4px; }
+
+.dialog legend { font-weight: bold; }
+.dialog fieldset table { margin: 2px 0px; }
+
+.popupdiv {
+  border: 2px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+}
+
+.popupwin {
+  padding: 0px;
+  margin: 0px;
+}
+
+.popupwin .title {
+  background: #fff;
+  color: #000;
+  font-weight: bold;
+  font-size: 120%;
+  padding: 3px 10px;
+  margin-bottom: 10px;
+  border-bottom: 1px solid black;
+  letter-spacing: 2px;
+}
+
+form { margin: 0px; border: none; }

--- NEW FILE: ChangeLog ---
2004-02-17  Mihai Bazon  <mishoo@localhost.localdomain>

	* lang/el.js, plugins/ContextMenu/lang/el.js, plugins/TableOperations/lang/el.js:
	updated headers

	* lang/no.js: updated (thanks havardw)

2004-02-09  Mihai Bazon  <mishoo@localhost.localdomain>

	* plugins/EnterParagraphs/enter-paragraphs.js:
	Plugin that enables Mozilla to create a <p> instead of <br /> at ENTER.
	Code contributed by Adam Wright.

	* htmlarea.js: code to call onKeyPress for plugins that define it
	code that keeps single spaces as &nbsp;
	(thanks to hipikat @ IT forums (Adam Wright))

	* ChangeLog:
	ChangeLog is acutally automatically generated so there's no point keep it in CVS
[...1146 lines suppressed...]
	* dialog.js, images/.xvpics/ed_align_justify.gif, images/ed_about.gif, images/ed_align_center.gif, images/ed_align_justify.gif, images/ed_align_left.gif, images/ed_align_right.gif, images/ed_blank.gif, images/ed_charmap.gif, images/ed_color_bg.gif, images/ed_color_fg.gif, images/ed_copy.gif, images/ed_custom.gif, images/ed_cut.gif, images/ed_delete.gif, images/ed_format_bold.gif, images/ed_format_italic.gif, images/ed_format_strike.gif, images/ed_format_sub.gif, images/ed_format_sup.gif, images/ed_format_underline.gif, images/ed_help.gif, images/ed_hr.gif, images/ed_html.gif, images/ed_image.gif, images/ed_indent_less.gif, images/ed_indent_more.gif, images/ed_link.gif, images/ed_list_bullet.gif, images/ed_list_num.gif, images/ed_redo.gif, images/ed_undo.gif, images/fullscreen_maximize.gif, images/fullscreen_minimize.gif, images/insert_table.gif, popups/about.html, popups/blank.html, popups/custom2.html, popups/editor_help.html, popups/fullscreen.html, popups/insert_image.html, popups/insert_table.html, popups/old-fullscreen.html, popups/old_insert_image.html, popups/popup.js, popups/select_color.html:
	New file.

	* dialog.js, images/.xvpics/ed_align_justify.gif, images/ed_about.gif, images/ed_align_center.gif, images/ed_align_justify.gif, images/ed_align_left.gif, images/ed_align_right.gif, images/ed_blank.gif, images/ed_charmap.gif, images/ed_color_bg.gif, images/ed_color_fg.gif, images/ed_copy.gif, images/ed_custom.gif, images/ed_cut.gif, images/ed_delete.gif, images/ed_format_bold.gif, images/ed_format_italic.gif, images/ed_format_strike.gif, images/ed_format_sub.gif, images/ed_format_sup.gif, images/ed_format_underline.gif, images/ed_help.gif, images/ed_hr.gif, images/ed_html.gif, images/ed_image.gif, images/ed_indent_less.gif, images/ed_indent_more.gif, images/ed_link.gif, images/ed_list_bullet.gif, images/ed_list_num.gif, images/ed_redo.gif, images/ed_undo.gif, images/fullscreen_maximize.gif, images/fullscreen_minimize.gif, images/insert_table.gif, popups/about.html, popups/blank.html, popups/custom2.html, popups/editor_help.html, popups/fullscreen.html, popups/insert_image.html, popups/insert_table.html, popups/old-fullscreen.html, popups/old_insert_image.html, popups/popup.js, popups/select_color.html:
	first moved to CVS (close to release 3.0-beta)

	* htmlarea.js, test.cgi: New file.

	* htmlarea.js, test.cgi: first moved to CVS (close to release 3.0-beta)

	* htmlarea-lang-en.js, readme.html: New file.

	* htmlarea-lang-en.js, readme.html:
	first moved to CVS (close to release 3.0-beta)

	* example.html, htmlarea.css, license.txt: New file.

	* example.html, htmlarea.css, license.txt:
	first moved to CVS (close to release 3.0-beta)


Index: dialog.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/dialog.js,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- dialog.js	28 Mar 2003 20:05:28 -0000	1.1.1.1
+++ dialog.js	23 Mar 2004 15:41:04 -0000	1.2
@@ -1,3 +1,16 @@
+// htmlArea v3.0 - Copyright (c) 2003-2004 interactivetools.com, inc.
+// This copyright notice MUST stay intact for use (see license.txt).
+//
+// Portions (c) dynarch.com, 2003-2004
+//
+// A free WYSIWYG editor replacement for <textarea> fields.
+// For full source code and docs, visit http://www.interactivetools.com/
+//
+// Version 3.0 developed by Mihai Bazon.
+//   http://dynarch.com/mishoo
+//
+// $Id$
+
 // Though "Dialog" looks like an object, it isn't really an object.  Instead
 // it's just namespace for protecting global symbols.
 
@@ -5,26 +18,13 @@
 	if (typeof init == "undefined") {
 		init = window;	// pass this window object by default
 	}
-	if (document.all) {	// here we hope that Mozilla will never support document.all
-		var value =
-			showModalDialog(url, init,
-//			window.open(url, '_blank',
-					"resizable: no; help: no; status: no; scroll: no");
-		if (action) {
-			action(value);
-		}
-	} else {
-		return Dialog._geckoOpenModal(url, action, init);
-	}
+	Dialog._geckoOpenModal(url, action, init);
 };
 
 Dialog._parentEvent = function(ev) {
 	if (Dialog._modal && !Dialog._modal.closed) {
 		Dialog._modal.focus();
-		// we get here in Mozilla only, anyway, so we can safely use
-		// the DOM version.
-		ev.preventDefault();
-		ev.stopPropagation();
+		HTMLArea._stopEvent(ev);
 	}
 };
 
@@ -38,23 +38,23 @@
 Dialog._arguments = null;
 
 Dialog._geckoOpenModal = function(url, action, init) {
-	var dlg = window.open(url, "ha_dialog",
+	var dlg = window.open(url, "hadialog",
 			      "toolbar=no,menubar=no,personalbar=no,width=10,height=10," +
-			      "scrollbars=no,resizable=no");
+			      "scrollbars=no,resizable=yes");
 	Dialog._modal = dlg;
 	Dialog._arguments = init;
 
 	// capture some window's events
 	function capwin(w) {
-		w.addEventListener("click", Dialog._parentEvent, true);
-		w.addEventListener("mousedown", Dialog._parentEvent, true);
-		w.addEventListener("focus", Dialog._parentEvent, true);
+		HTMLArea._addEvent(w, "click", Dialog._parentEvent);
+		HTMLArea._addEvent(w, "mousedown", Dialog._parentEvent);
+		HTMLArea._addEvent(w, "focus", Dialog._parentEvent);
 	};
 	// release the captured events
 	function relwin(w) {
-		w.removeEventListener("focus", Dialog._parentEvent, true);
-		w.removeEventListener("mousedown", Dialog._parentEvent, true);
-		w.removeEventListener("click", Dialog._parentEvent, true);
+		HTMLArea._removeEvent(w, "click", Dialog._parentEvent);
+		HTMLArea._removeEvent(w, "mousedown", Dialog._parentEvent);
+		HTMLArea._removeEvent(w, "focus", Dialog._parentEvent);
 	};
 	capwin(window);
 	// capture other frames

--- htmlarea-lang-en.js DELETED ---

--- NEW FILE: index.html ---
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
<html>
  <head>
    <title>HTMLArea -- the free, customizable online editor</title>

    <style type="text/css">
      html, body { font-family: georgia,"times new roman",serif; background-color: #fff; color: #000; }
      .label { text-align: right; padding-right: 0.3em; }
      .bline { border-bottom: 1px solid #aaa; }
    </style>
  </head>

  <body>
    <div style="float: right; border: 1px solid #aaa; background-color: #eee; padding: 3px; margin-left: 10px; margin-bottom: 10px;">
      <table cellspacing="0" cellpadding="0" border="0">
        <tr>
          <td class="label">Version:</td><td>3.0</td>
        </tr>
        <tr>
          <td class="label">Release:</td><td>rc1 (<a href="release-notes.html">release notes</a>)</td>
        </tr>
        <tr>
          <td class="label bline">Compiled at:</td><td class="bline">Mar  1, 2004 [19:37] GMT</td>
        </tr>
        <tr>
          <td class="label">SourceForge page:</td><td><a href="http://sf.net/projects/itools-htmlarea/">http://sf.net/projects/itools-htmlarea/</a></td>
      </table>
    </div>
    <h1>HTMLArea -- the free<br/>customizable online editor</h1>

    <p>
      HTMLArea is a free, customizable online editor.  It works inside your
      browser.  It uses a non-standard feature implemented in Internet
      Explorer 5.5 or better for Windows and Mozilla 1.3 or better (any
      platform), therefore it will only work in one of these browsers.
    </p>

    <p>
      HTMLArea is copyright <a
      href="http://interactivetools.com">InteractiveTools.com</a> and <a
      href="http://dynarch.com">Dynarch.com</a> and it is
      released under a BSD-style license.  HTMLArea is created and developed
      upto version 2.03 by InteractiveTools.com.  Version 3.0 developed by
      <a href="http://dynarch.com/mishoo/">Mihai Bazon</a> for
      InteractiveTools.  It contains code sponsored by third-party companies as well.
      Please see our About Box for details about who sponsored what plugins.
    </p>

    <h2>Online demos</h2>

    <ul>

      <li><a href="examples/core.html">HTMLArea standard</a> -- contains the core
        editor.</li>

      <li><a href="examples/table-operations.html">HTMLArea + tables</a> --
        loads the <tt>TableOperations</tt> plugin which provides some extra
        editing features for tables.</li>

      <li><a href="examples/spell-checker.html">HTMLArea + spell checher</a>
        -- loads the <tt>SpellChecker</tt> plugin which provides what its
        name says: a spell checker.  This one requires additional support on
        the server-side.</li>

      <li><a href="examples/full-page.html">HTMLArea Full HTML Editor</a> --
        loads the <tt>FullPage</tt> plugin which allows you to edit a full
        HTML page, including &lt;title&gt;, &lt;!DOCTYPE...&gt; and some
        other options.</li>

      <li><a href="examples/context-menu.html">HTMLArea with Context
          Menu</a> -- this plugin provides a nice and useful context menu.</li>

      <li><a href="examples/fully-loaded.html">HTMLArea fully loaded</a> --
        all of the above. ;-)</li>

    </ul>

    <h2>Installation</h2>

    <p>
      Installation is (or should be) easy.  You need to unpack the ZIP file
      in a directory accessible through your webserver.  Supposing you
      unpack in your <tt>DocumentRoot</tt> and your <tt>DocumentRoot</tt> is
      <tt>/var/www/html</tt> as in a standard RedHat installation, you need
      to acomplish the following steps: (the example is for a Unix-like
      operating system)
    </p>

    <pre style="margin-left: 2em"
>
cd /var/www/html
unzip /path/to/archive/HTMLArea-3.0-rc1.zip
mv HTMLArea-3.0-rc1 htmlarea
find htmlarea/ -type f -exec chmod 644 {} \;
find htmlarea/ -type d -exec chmod 755 {} \;
find htmlarea/ -name "*.cgi" -exec chmod 755 {} \;</pre>

    <p>
      <strong>Notes.</strong> You may chose to symlink "htmlarea" to "HTMLArea-3.0-rc1", in which case your server needs to be configured to
      "<tt>FollowSymLinks</tt>".  You need to make sure that *.cgi files are
      interpreted as CGI scripts.  If you want to use the SpellChecker
      plugin you need to have a recent version of Perl installed (I
      recommend 5.8.0) on the server, and the module Text::Aspell, available
      from CPAN.  More info in "<a
      href="plugins/SpellChecker/readme-tech.html">plugins/SpellChecker/readme-tech.html</a>".
    </p>

    <p>About how to setup your pages to use the editor, please read the
      [outdated yet generally valid] <a
        href="reference.html">documentation</a>.</p>

    <h2>Status and links</h2>

    <p>HTMLArea has reached version 3.0.  As of this version, it
      supports:</p>

    <ul>

      <li>Customizable toolbar</li>

      <li>Easy internationalization</li>

      <li>Plugin-based infrastructure</li>

      <li>Delivers W3-compliant HTML (with few exceptions)</li>

      <li>Has a subset of Microsoft Word's keyboard shortcuts</li>

      <li>Full-screen editor</li>

      <li>Advanced table operations (by external plugin
        "TableOperations")</li>

      <li>Spell checker (by external plugin "SpellChecker")</li>

      <li>probably more... ;-)</li>

    </ul>

    <p>We have a <a
    href="http://sourceforge.net/projects/itools-htmlarea/">project page</a>
    at <a href="http://sourceforge.net">SourceForge.net</a>.  There you can
    also find out <a href="http://sourceforge.net/cvs/?group_id=69750">how
    to retrieve the code from CVS</a>, or you can <a
    href="http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/itools-htmlarea">browse
    the CVS online</a>.  We also have a <a
    href="http://sourceforge.net/tracker/?atid=525656&group_id=69750&func=browse">bug
    system</a>, a <a
    href="http://sourceforge.net/tracker/?atid=525658&group_id=69750&func=browse">patch
    tracking system</a> and a <a
    href="http://sourceforge.net/tracker/?atid=525659&group_id=69750&func=browse">feature
    request page</a>.</p>

    <p>We invite you to say everything you want about HTMLArea <a
    href="http://www.interactivetools.com/forum/gforum.cgi?forum=14;">on the
    forums</a> at InteractiveTools.com.  There you should also find the
    latest news.</p>

    <p>Sometimes I post news about the latest developments on <a
    href="http://dynarch.com/mishoo/">my personal homepage</a>.</p>

    <h2>"It doesn't work, what's wrong?"</h2>

    <p>If it doesn't work, you have several options:</p>

    <ul>

      <li>Post a message to the forum.  Describe your problem in as much
      detail as possible.  Include errors you might find in the JavaScript
      console (if you are a Mozilla user), or errors displayed by IE (though
      they're most of the times useless).</li>

      <li>If you're positive that you discovered a bug in HTMLArea then feel
      free to fill a bug report in our bug system.  If you have the time you
      should check to see if a similar bug was reported or not; it might be
      fixed already in the CVS ;-) If you're positive that a similar bug was
      not yet reported, do fill a bug report and please include as much
      detail as possible, such as your browser, OS, errors from JavaScript
      console, etc.</li>

      <li>If you want a new feature to be implemented, post it on the
      features request and someone will hopefully take care of it.</li>

    </ul>

    <p>You can <a href="mailto:mi...@in...">contact me directly</a>
    <em>only</em> if you want to pay me for implementing custom features to
    HTMLArea.  If you want to sponsor these features (that is, allow them to
    get back into the public HTMLArea distribution) I'll be cheaper. ;-)</p>

    <hr />
    <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address>
<!-- Created: Sun Aug  3 14:11:26 EEST 2003 -->
<!-- hhmts start --> Last modified: Wed Jan 28 11:54:47 EET 2004 <!-- hhmts end -->
<!-- doc-lang: English -->
  </body>
</html>



--- NEW FILE: popupwin.js ---
// (c) dynarch.com 2003-2004
// Distributed under the same terms as HTMLArea itself.

function PopupWin(editor, title, handler, initFunction) {
	this.editor = editor;
	this.handler = handler;
	var dlg = window.open("", "__ha_dialog",
			      "toolbar=no,menubar=no,personalbar=no,width=600,height=600,left=20,top=40" +
			      "scrollbars=no,resizable=no");
	this.window = dlg;
	var doc = dlg.document;
	this.doc = doc;
	var self = this;

	var base = document.baseURI || document.URL;
	if (base && base.match(/(.*)\/([^\/]+)/)) {
		base = RegExp.$1 + "/";
	}
	if (typeof _editor_url != "undefined" && !/^\//.test(_editor_url)) {
		// _editor_url doesn't start with '/' which means it's relative
		// FIXME: there's a problem here, it could be http:// which
		// doesn't start with slash but it's not relative either.
		base += _editor_url;
	} else
		base = _editor_url;
	if (!/\/$/.test(base)) {
		// base does not end in slash, add it now
		base += '/';
	}
	this.baseURL = base;

	doc.open();
	var html = "<html><head><title>" + title + "</title>\n";
	// html += "<base href='" + base + "htmlarea.js' />\n";
	html += "<style type='text/css'>@import url(" + base + "htmlarea.css);</style></head>\n";
	html += "<body class='dialog popupwin' id='--HA-body'></body></html>";
	doc.write(html);
	doc.close();

	// sometimes I Hate Mozilla... ;-(
	function init2() {
		var body = doc.body;
		if (!body) {
			setTimeout(init2, 25);
			return false;
		}
		dlg.title = title;
		doc.documentElement.style.padding = "0px";
		doc.documentElement.style.margin = "0px";
		var content = doc.createElement("div");
		content.className = "content";
		self.content = content;
		body.appendChild(content);
		self.element = body;
		initFunction(self);
		dlg.focus();
	};
	init2();
};

PopupWin.prototype.callHandler = function() {
	var tags = ["input", "textarea", "select"];
	var params = new Object();
	for (var ti in tags) {
		var tag = tags[ti];
		var els = this.content.getElementsByTagName(tag);
		for (var j = 0; j < els.length; ++j) {
			var el = els[j];
			var val = el.value;
			if (el.tagName.toLowerCase() == "input") {
				if (el.type == "checkbox") {
					val = el.checked;
				}
			}
			params[el.name] = val;
		}
	}
	this.handler(this, params);
	return false;
};

PopupWin.prototype.close = function() {
	this.window.close();
};

PopupWin.prototype.addButtons = function() {
	var self = this;
	var div = this.doc.createElement("div");
	this.content.appendChild(div);
	div.className = "buttons";
	for (var i = 0; i < arguments.length; ++i) {
		var btn = arguments[i];
		var button = this.doc.createElement("button");
		div.appendChild(button);
		button.innerHTML = HTMLArea.I18N.buttons[btn];
		switch (btn) {
		    case "ok":
			button.onclick = function() {
				self.callHandler();
				self.close();
				return false;
			};
			break;
		    case "cancel":
			button.onclick = function() {
				self.close();
				return false;
			};
			break;
		}
	}
};

PopupWin.prototype.showAtElement = function() {
	var self = this;
	// Mozilla needs some time to realize what's goin' on..
	setTimeout(function() {
		var w = self.content.offsetWidth + 4;
		var h = self.content.offsetHeight + 4;
		// size to content -- that's fuckin' buggy in all fuckin' browsers!!!
		// so that we set a larger size for the dialog window and then center
		// the element inside... phuck!

		// center...
		var el = self.content;
		var s = el.style;
		// s.width = el.offsetWidth + "px";
		// s.height = el.offsetHeight + "px";
		s.position = "absolute";
		s.left = (w - el.offsetWidth) / 2 + "px";
		s.top = (h - el.offsetHeight) / 2 + "px";
		if (HTMLArea.is_gecko) {
			self.window.innerWidth = w;
			self.window.innerHeight = h;
		} else {
			self.window.resizeTo(w + 8, h + 35);
		}
	}, 25);
};

--- NEW FILE: release-notes.html ---
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
<html xmlns="http://www.w3.org/1999/xhtml">
  <head>
    <title>HTMLArea-3.0-rc1 release notes</title>
    <style>
      .fixme { color: red; }
    </style>
  </head>

  <body>

    <h1>HTMLArea-3.0-rc1 release notes</h1>

    <p>This release was compiled on Mar  1, 2004 [19:37] GMT.</p>

    <h2>3.0-rc1</h2>

    <p>Changes since 3.0-Beta:</p>

    <ul>
      <li>
        <b>New plugins</b>
        <ul>
          <li>
            ContextMenu plugin (provides a nice context menu with common
            operations, including table ops, link ops, etc.)
          </li>
          <li>
            CSS plugin (provides an easy way to insert/change CSS classes)
          </li>
          <li>
            FullPage plugin (allows HTMLArea to edit a whole HTML file,
            not only the content within &lt;body&gt;.)
          </li>
        </ul>
      </li>
      <li>
        <b>Changes in the SpellChecker plugin</b>
        <ul>
          <li>
            Many bugfixes: now it works ;-)  Fully Unicode-safe.
          </li>
          <li>
            Speed and bandwidth optimization: reports the list of
            suggestions only once for each mispelled word; this helps
            in cases where you have, for instance, the word “HTMLArea”
            in 10 places all over the document; the list of
            suggestions for it--which is kind of huge--will only be
            included <em>once</em>.
          </li>
          <li>
            User interface improvements: the highlighted word will
            remain in view; in cases where it's normally outside, the
            window will be scrolled to it.
          </li>
          <li>
            Added a "Revert" button for those that change their minds ;-)
          </li>
          <li>
            Added a "Info" button which reports information about the
            document, retrieved by the server-side spell checker:
            total number of words, total number of mispelled words,
            number of suggestions made, spell check time, etc.  More
            can be easily added.  <span class="fixme">FIXME: this part
            is not yet internationalized.</span>
          </li>
          <li>
            The server-side spell checker now uses XML::DOM instead of
            HTML::Parser, which means that it will be unable to parse
            “tag-soup” HTML.  It needs valid code.  Usually HTMLArea
            generates valid code, but on rare occasions it might fail
            and the spell checker will report a gross error message.
            This gonna have to be fixed, but instead of making the
            spell checker accept invalid HTML I prefer to make
            HTMLArea generate valid code, so changes are to be done in
            other places ;-)
          </li>
        </ul>
      </li>
      <li>
        <b>Changes in the core editor</b>
        <ul>
          <li>
            Easier to setup: you only need to load
            <tt>htmlarea.js</tt>; other scripts will be loaded
            automatically.  <a href="reference.html">Documentation</a>
            and <a href="examples/">examples</a> updated.
          </li>
          <li>
            Better plugin support (they register information about
            themselves with the editor; can register event handlers for
            the editor, etc.)
          </li>
          <li>
            New about box; check it out, it's cool ;-)
          </li>
          <li>
            Word cleaner (can be enabled to automatically kill Word crap
            on paste (see Config.killWordOnPaste); otherwise accessible by
            pressing CTRL-0 in the editor; a toolbar button will come up
            soon)
          </li>
          <li>
            Image preview in "insert image" dialog.  Also allows
            modification of current image, if selected.
          </li>
          <li>
            New "insert link" dialog, allows target and title
            specification, allows editing links.
          </li>
          <li>
            Implemented support for text direction (left-to-right or
            right-to-left).
          </li>
          <li>
            Lots of bug fixes!  ... and more, I guess ;-) an
            automatically generated <a href="ChangeLog">change log</a>
            is now available.
          </li>
        </ul>
      </li>
    </ul>

    <p>I don't have the power to go through the <a
href="http://sourceforge.net/tracker/?atid=525656&group_id=69750&func=browse">bug
system</a> at SourceForge
    now.  Some of the bugs reported there may be fixed; I'll update
    their status, some other time.  If you reported bugs there and now
    find them to be fixed, please let me know.</p>

    <h2>3.0-Beta</h2>

    <p>Changes since 3.0-Alpha:</p>

    <ul>

      <li>Performance improvements.</li>

      <li>Many bugs fixed.</li>

      <li>Plugin infrastructure.</li>

      <li>TableOperations plugin.</li>

      <li>SpellChecker plugin.</li>

      <li>Status bar.</li>

      <li>API for registering custom buttons and drop-down boxes in the
        toolbar.</li>

      <li>Toolbar can contain text labels.</li>

      <li>Cut, copy, paste, undo, redo buttons.</li>

    </ul>
    <hr />
    <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address>
<!-- Created: Sun Aug  3 16:55:08 EEST 2003 -->
<!-- hhmts start --> Last modified: Sun Feb  1 13:16:10 EET 2004 <!-- hhmts end -->
<!-- doc-lang: English -->
  </body>
</html>



--- NEW FILE: popupdiv.js ---
/** This file is derived from PopupDiv, developed by Mihai Bazon for
 * SamWare.net.  Modifications were needed to make it usable in HTMLArea.
 * HTMLArea is a free WYSIWYG online HTML editor from InteractiveTools.com.
 *
 * This file does not function standalone.  It is dependent of global functions
 * defined in HTMLArea-3.0 (htmlarea.js).
 *
 * Please see file htmlarea.js for further details.
 **/

var is_ie = ( (navigator.userAgent.toLowerCase().indexOf("msie") != -1) &&
	      (navigator.userAgent.toLowerCase().indexOf("opera") == -1) );
var is_compat = (document.compatMode == "BackCompat");

function PopupDiv(editor, titleText, handler, initFunction) {
	var self = this;

	this.editor = editor;
	this.doc = editor._mdoc;
	this.handler = handler;

	var el = this.doc.createElement("div");
	el.className = "content";

	var popup = this.doc.createElement("div");
	popup.className = "dialog popupdiv";
	this.element = popup;
	var s = popup.style;
	s.position = "absolute";
	s.left = "0px";
	s.top = "0px";

	var title = this.doc.createElement("div");
	title.className = "title";
	this.title = title;
	popup.appendChild(title);

	HTMLArea._addEvent(title, "mousedown", function(ev) {
		self._dragStart(is_ie ? window.event : ev);
	});

	var button = this.doc.createElement("div");
	button.className = "button";
	title.appendChild(button);
	button.innerHTML = "&#x00d7;";
	title.appendChild(this.doc.createTextNode(titleText));
	this.titleText = titleText;

	button.onmouseover = function() {
		this.className += " button-hilite";
	};
	button.onmouseout = function() {
		this.className = this.className.replace(/\s*button-hilite\s*/g, " ");
	};
	button.onclick = function() {
		this.className = this.className.replace(/\s*button-hilite\s*/g, " ");
		self.close();
	};

	popup.appendChild(el);
	this.content = el;

	this.doc.body.appendChild(popup);

	this.dragging = false;
	this.onShow = null;
	this.onClose = null;
	this.modal = false;

	initFunction(this);
};

PopupDiv.currentPopup = null;

PopupDiv.prototype.showAtElement = function(el, mode) {
	this.defaultSize();
	var pos, ew, eh;
	var popup = this.element;
	popup.style.display = "block";
	var w = popup.offsetWidth;
	var h = popup.offsetHeight;
	popup.style.display = "none";
	if (el != window) {
		pos = PopupDiv.getAbsolutePos(el);
		ew = el.offsetWidth;
		eh = el.offsetHeight;
	} else {
		pos = {x:0, y:0};
		var size = PopupDiv.getWindowSize();
		ew = size.x;
		eh = size.y;
	}
	var FX = false, FY = false;
	if (mode.indexOf("l") != -1) {
		pos.x -= w;
		FX = true;
	}
	if (mode.indexOf("r") != -1) {
		pos.x += ew;
		FX = true;
	}
	if (mode.indexOf("t") != -1) {
		pos.y -= h;
		FY = true;
	}
	if (mode.indexOf("b") != -1) {
		pos.y += eh;
		FY = true;
	}
	if (mode.indexOf("c") != -1) {
		FX || (pos.x += Math.round((ew - w) / 2));
		FY || (pos.y += Math.round((eh - h) / 2));
	}
	this.showAt(pos.x, pos.y);
};

PopupDiv.prototype.defaultSize = function() {
	var s = this.element.style;
	var cs = this.element.currentStyle;
	var addX = (is_ie && is_compat) ? (parseInt(cs.borderLeftWidth) +
					   parseInt(cs.borderRightWidth) +
					   parseInt(cs.paddingLeft) +
					   parseInt(cs.paddingRight)) : 0;
	var addY = (is_ie && is_compat) ? (parseInt(cs.borderTopWidth) +
					   parseInt(cs.borderBottomWidth) +
					   parseInt(cs.paddingTop) +
					   parseInt(cs.paddingBottom)) : 0;
	s.display = "block";
	s.width = (this.content.offsetWidth + addX) + "px";
	s.height = (this.content.offsetHeight + this.title.offsetHeight) + "px";
	s.display = "none";
};

PopupDiv.prototype.showAt = function(x, y) {
	this.defaultSize();
	var s = this.element.style;
	s.display = "block";
	s.left = x + "px";
	s.top = y + "px";
	this.hideShowCovered();

	PopupDiv.currentPopup = this;
	HTMLArea._addEvents(this.doc.body, ["mousedown", "click"], PopupDiv.checkPopup);
	HTMLArea._addEvents(this.editor._doc.body, ["mousedown", "click"], PopupDiv.checkPopup);
	if (is_ie && this.modal) {
		this.doc.body.setCapture(false);
		this.doc.body.onlosecapture = function() {
			(PopupDiv.currentPopup) && (this.doc.body.setCapture(false));
		};
	}
	window.event && HTMLArea._stopEvent(window.event);

	if (typeof this.onShow == "function") {
		this.onShow();
	} else if (typeof this.onShow == "string") {
		eval(this.onShow);
	}

	var field = this.element.getElementsByTagName("input")[0];
	if (!field) {
		field = this.element.getElementsByTagName("select")[0];
	}
	if (!field) {
		field = this.element.getElementsByTagName("textarea")[0];
	}
	if (field) {
		field.focus();
	}
};

PopupDiv.prototype.close = function() {
	this.element.style.display = "none";
	PopupDiv.currentPopup = null;
	this.hideShowCovered();
	HTMLArea._removeEvents(this.doc.body, ["mousedown", "click"], PopupDiv.checkPopup);
	HTMLArea._removeEvents(this.editor._doc.body, ["mousedown", "click"], PopupDiv.checkPopup);
	is_ie && this.modal && this.doc.body.releaseCapture();
	if (typeof this.onClose == "function") {
		this.onClose();
	} else if (typeof this.onClose == "string") {
		eval(this.onClose);
	}
	this.element.parentNode.removeChild(this.element);
};

PopupDiv.prototype.getForm = function() {
	var forms = this.content.getElementsByTagName("form");
	return (forms.length > 0) ? forms[0] : null;
};

PopupDiv.prototype.callHandler = function() {
	var tags = ["input", "textarea", "select"];
	var params = new Object();
	for (var ti in tags) {
		var tag = tags[ti];
		var els = this.content.getElementsByTagName(tag);
		for (var j = 0; j < els.length; ++j) {
			var el = els[j];
			params[el.name] = el.value;
		}
	}
	this.handler(this, params);
	return false;
};

PopupDiv.getAbsolutePos = function(el) {
	var r = { x: el.offsetLeft, y: el.offsetTop };
	if (el.offsetParent) {
		var tmp = PopupDiv.getAbsolutePos(el.offsetParent);
		r.x += tmp.x;
		r.y += tmp.y;
	}
	return r;
};

PopupDiv.getWindowSize = function() {
	if (window.innerHeight) {
		return { y: window.innerHeight, x: window.innerWidth };
	}
	if (this.doc.body.clientHeight) {
		return { y: this.doc.body.clientHeight, x: this.doc.body.clientWidth };
	}
	return { y: this.doc.documentElement.clientHeight, x: this.doc.documentElement.clientWidth };
};

PopupDiv.prototype.hideShowCovered = function () {
	var self = this;
	function isContained(el) {
		while (el) {
			if (el == self.element) {
				return true;
			}
			el = el.parentNode;
		}
		return false;
	};
	var tags = new Array("applet", "select");
	var el = this.element;

	var p = PopupDiv.getAbsolutePos(el);
	var EX1 = p.x;
	var EX2 = el.offsetWidth + EX1;
	var EY1 = p.y;
	var EY2 = el.offsetHeight + EY1;

	if (el.style.display == "none") {
		EX1 = EX2 = EY1 = EY2 = 0;
	}

	for (var k = tags.length; k > 0; ) {
		var ar = this.doc.getElementsByTagName(tags[--k]);
		var cc = null;

		for (var i = ar.length; i > 0;) {
			cc = ar[--i];
			if (isContained(cc)) {
				cc.style.visibility = "visible";
				continue;
			}

			p = PopupDiv.getAbsolutePos(cc);
			var CX1 = p.x;
			var CX2 = cc.offsetWidth + CX1;
			var CY1 = p.y;
			var CY2 = cc.offsetHeight + CY1;

			if ((CX1 > EX2) || (CX2 < EX1) || (CY1 > EY2) || (CY2 < EY1)) {
				cc.style.visibility = "visible";
			} else {
				cc.style.visibility = "hidden";
			}
		}
	}
};

PopupDiv.prototype._dragStart = function (ev) {
	if (this.dragging) {
		return false;
	}
	this.dragging = true;
	PopupDiv.currentPopup = this;
	var posX = ev.clientX;
	var posY = ev.clientY;
	if (is_ie) {
		posY += this.doc.body.scrollTop;
		posX += this.doc.body.scrollLeft;
	} else {
		posY += window.scrollY;
		posX += window.scrollX;
	}
	var st = this.element.style;
	this.xOffs = posX - parseInt(st.left);
	this.yOffs = posY - parseInt(st.top);
	HTMLArea._addEvent(this.doc, "mousemove", PopupDiv.dragIt);
	HTMLArea._addEvent(this.doc, "mouseover", HTMLArea._stopEvent);
	HTMLArea._addEvent(this.doc, "mouseup", PopupDiv.dragEnd);
	HTMLArea._stopEvent(ev);
};

PopupDiv.dragIt = function (ev) {
	var popup = PopupDiv.currentPopup;
	if (!(popup && popup.dragging)) {
		return false;
	}
	is_ie && (ev = window.event);
	var posX = ev.clientX;
	var posY = ev.clientY;
	if (is_ie) {
		posY += this.doc.body.scrollTop;
		posX += this.doc.body.scrollLeft;
	} else {
		posY += window.scrollY;
		posX += window.scrollX;
	}
	popup.hideShowCovered();
	var st = popup.element.style;
	st.left = (posX - popup.xOffs) + "px";
	st.top = (posY - popup.yOffs) + "px";
	HTMLArea._stopEvent(ev);
};

PopupDiv.dragEnd = function () {
	var popup = PopupDiv.currentPopup;
	if (!popup) {
		return false;
	}
	popup.dragging = false;
	HTMLArea._removeEvent(popup.doc, "mouseup", PopupDiv.dragEnd);
	HTMLArea._removeEvent(popup.doc, "mouseover", HTMLArea._stopEvent);
	HTMLArea._removeEvent(popup.doc, "mousemove", PopupDiv.dragIt);
	popup.hideShowCovered();
};

PopupDiv.checkPopup = function (ev) {
	is_ie && (ev = window.event);
	var el = is_ie ? ev.srcElement : ev.target;
	var cp = PopupDiv.currentPopup;
	for (; (el != null) && (el != cp.element); el = el.parentNode);
	if (el == null) {
		cp.modal || ev.type == "mouseover" || cp.close();
		HTMLArea._stopEvent(ev);
	}
};

PopupDiv.prototype.addButtons = function() {
	var self = this;
	var div = this.doc.createElement("div");
	this.content.appendChild(div);
	div.className = "buttons";
	for (var i = 0; i < arguments.length; ++i) {
		var btn = arguments[i];
		var button = this.doc.createElement("button");
		div.appendChild(button);
		button.innerHTML = HTMLArea.I18N.buttons[btn];
		switch (btn) {
		    case "ok":
			button.onclick = function() {
				self.callHandler();
				self.close();
			};
			break;
		    case "cancel":
			button.onclick = function() {
				self.close();
			};
			break;
		}
	}
};

Index: htmlarea.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/htmlarea.js,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- htmlarea.js	28 Mar 2003 20:05:28 -0000	1.1.1.1
+++ htmlarea.js	23 Mar 2004 15:41:04 -0000	1.2
@@ -1,15 +1,31 @@
-//
-// htmlArea v3.0 - Copyright (c) 2002 interactivetools.com, inc.
+// htmlArea v3.0 - Copyright (c) 2002-2004 interactivetools.com, inc.
 // This copyright notice MUST stay intact for use (see license.txt).
 //
+// Portions (c) dynarch.com, 2003-2004
+//
 // A free WYSIWYG editor replacement for <textarea> fields.
 // For full source code and docs, visit http://www.interactivetools.com/
 //
-// Version 3.0 developed by Mihai Bazon for InteractiveTools.
[...2300 lines suppressed...]
+
+/**
+ * FIX: Internet Explorer returns an item having the _name_ equal to the given
+ * id, even if it's not having any id.  This way it can return a different form
+ * field even if it's not a textarea.  This workarounds the problem by
+ * specifically looking to search only elements having a certain tag name.
+ */
+HTMLArea.getElementById = function(tag, id) {
+	var el, i, objs = document.getElementsByTagName(tag);
+	for (i = objs.length; --i >= 0 && (el = objs[i]);)
+		if (el.id == id)
+			return el;
+	return null;
 };
 
+
+
 // EOF
 // Local variables: //
 // c-basic-offset:8 //

--- NEW FILE: reference.html ---
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 3.2//EN">
<html> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>HTMLArea-3.0 Reference</title>

<style type="text/css">
  @import url(htmlarea.css);
  body { font: 14px verdana,sans-serif; background: #fff; color: #000; }
  h1, h2 { font-family:tahoma,sans-serif; }
  h1 { border-bottom: 2px solid #000; }
  h2 { border-bottom: 1px solid #aaa; }
  h3, h4 { margin-bottom: 0px; font-family: Georgia,serif; font-style: italic; }
  h4 { font-size: 90%; margin-left: 1em; }
  acronym { border-bottom: 1px dotted #063; color: #063; }
  p { margin-left: 2em; margin-top: 0.3em; }
  li p { margin-left: 0px; }
  .abstract { padding: 5px; margin: 0px 10em; font-size: 90%; border: 1px dashed #aaa; background: #eee;}
  li { margin-left: 2em; }
  em { color: #042; }
  a { color: #00f; }
  a:hover { color: #f00; }
  a:active { color: #f80; }
  span.browser { font-weight: bold; color: #864; }
  .fixme { font-size: 20px; font-weight: bold; color: red; background: #fab;
padding: 5px; text-align: center; }
  .code {
   background: #e4efff; padding: 5px; border: 1px dashed #abc; margin-left: 2em; margin-right: 2em;
   font-family: fixed,"lucidux mono","andale mono","courier new",monospace;
  }
  .note, .warning { font-weight: bold; color: #0a0; font-variant: small-caps; }
  .warning { color: #a00; }

.string {
  color: #06c;
} /* font-lock-string-face */
.comment {
  color: #840;
} /* font-lock-comment-face */
.variable-name {
  color: #000;
} /* font-lock-variable-name-face */
.type {
  color: #008;
  font-weight: bold;
} /* font-lock-type-face */
.reference {
  color: #048;
} /* font-lock-reference-face */
.preprocessor {
  color: #808;
} /* font-lock-preprocessor-face */
.keyword {
  color: #00f;
  font-weight: bold;
} /* font-lock-keyword-face */
.function-name {
  color: #044;
} /* font-lock-function-name-face */
.html-tag {
  font-weight: bold;
} /* html-tag-face */
.html-helper-italic {
  font-style: italic;
} /* html-helper-italic-face */
.html-helper-bold {
  font-weight: bold;
} /* html-helper-bold-face */

</style>

<script type="text/javascript">
  _editor_url = './';
  _editor_lang = 'en';
</script>
<script type="text/javascript" src="htmlarea.js"></script>
<script type="text/javascript" src="dialog.js"></script>
<script tyle="text/javascript" src="lang/en.js"></script>

</head>

<body onload="HTMLArea.replace('TA')">


<h1>HTMLArea-3.0 Documentation</h1>

<div class="abstract" style="color: red; font-weight: bold">

      This documentation contains valid information, but is outdated in the
      terms that it does not covers all the features of HTMLArea.  A new
      documentation project will be started, based on LaTeX.

</div>


<h2>Introduction</h2>

<h3>What is HTMLArea?</h3>

<p>HTMLArea is a free <acronym title="What You See Is What You Get"
>WYSIWYG</acronym> editor replacement for <code>&lt;textarea&gt;</code>
fields.  By adding a few simple lines of JavaScript code to your web page
you can replace a regular textarea with a rich text editor that lets your
users do the following:</p>

<ul>
  <li>Format text to be bold, italicized, or underlined.</li>
  <li>Change the face, size, style and color.</li>
  <li>Left, center, or right-justify paragraphs.</li>
  <li>Make bulleted or numbered lists.</li>
  <li>Indent or un-indent paragraphs.</li>
  <li>Insert a horizontal line.</li>
  <li>Insert hyperlinks and images.</li>
  <li>View the raw HTML source of what they're editing.</li>
  <li>and much more...</li>
</ul>

<p>Some of the interesting features of HTMLArea that set's it apart from
other web based WYSIWYG editors are as follows:</p>

<ul>
  <li>It's lightweight, fast loading and can transform a regular textarea
  into a rich-text editor with a single line of JavaScript.</li>
  <li>Generates clean, valid HTML.</li>
  <li>It degrades gracefully to older or non-supported browsers
  (they get the original textarea field).</li>
  <li>It's free and can be incorporated into any free or commercial
  program.</li>
  <li>It works with any server-side languages (ASP, PHP, Perl, Java,
  etc).</li>
  <li>It's written in JavaScript and can be easily viewed, modified or
  extended.</li>
  <li>It remembers entered content when a user navigates away and then hits
  "back" in their browser.</li>
  <li>Since it replaces existing textareas it doesn't require a lot of code
  to add it to your pages (just one line).</li>
  <li>Did we mention it was free? ;-)</li>
</ul>

<h3>Is it really free?  What's the catch?</h3>

<p>Yes! It's really free. You can use it, modify it, distribute it with your
software, or do just about anything you like with it.</p>

<h3>What are the browser requirements?</h3>

<p>HTMLArea requires <span class="browser"><a
href="http://www.microsoft.com/ie">Internet Explorer</a> &gt;= 5.5</span>
(Windows only), or <span class="browser"><a
href="http://mozilla.org">Mozilla</a> &gt;= 1.3-Beta</span> on any platform.
Any browser based on <a href="http://mozilla.org/newlayout">Gecko</a> will
also work, provided that Gecko version is at least the one included in
Mozilla-1.3-Beta (for example, <a
href="http://galeon.sf.net">Galeon-1.2.8</a>).  However, it degrades
gracefully to other browsers. They will get a regular textarea field
instead of a WYSIWYG editor.</p>

<h3>Can I see an example of what it looks like?</h3>

<p>Just make sure you're using one of the browsers mentioned above and see
below.</p>

<form onsubmit="return false;">
<textarea id="TA" style="width: 100%; height: 15em;">
<p>Here is some sample text in textarea that's been transformed with <font
color="#0000CC"><b>HTMLArea</b></font>.<br />
You can make things <b>bold</b>, <i>italic</i>, <u>underline</u>.  You can change the
<font size="3">size</font> and <b><font color="#0000CC">c</font><font color="#00CC00">o</font><font color="#00CCCC">l</font><font color="#CC0000">o</font><font color="#CC00CC">r</font><font color="#CCCC00">s</font><font color="#CCCCCC">!</font></b>
And lots more...</p>

<p align="center"><font size="4" color="#ff0000"><b><u>Try HTMLArea
today!</u></b></font><br /></p>
</textarea>
</form>

<h3>Where can I find out more info, download the latest version and talk to
other HTMLArea users?</h3>

<p>You can find out more about HTMLArea and download the latest version on
the <a href="http://dynarch.com/htmlarea/">HTMLArea
homepage</a> and you can talk to other HTMLArea users and post any comments
or suggestions you have in the <a
href="http://www.interactivetools.com/iforum/Open_Source_C3/htmlArea_v3.0_-_Alpha_Release_F14/"
>HTMLArea forum</a>.</p>

<h2>Keyboard shortcuts</h2>

<p>The editor provides the following key combinations:</p>

<ul>
  <li>CTRL-A -- select all</li>
  <li>CTRL-B -- bold</li>
  <li>CTRL-I -- italic</li>
  <li>CTRL-U -- underline</li>
  <li>CTRL-S -- strikethrough</li>
  <li>CTRL-L -- justify left</li>
  <li>CTRL-E -- justify center</li>
  <li>CTRL-R -- justify right</li>
  <li>CTRL-J -- justify full</li>
  <li>CTRL-1 .. CTRL-6 -- headings (&lt;h1&gt; .. &lt;h6&gt;)</li>
  <li>CTRL-0 (zero) -- clean content pasted from Word</li>
</ul>

<h2>Installation</h2>

<h3>How do I add HTMLArea to my web page?</h3>

<p>It's easy.  First you need to upload HTMLArea files to your website.
Just follow these steps.</p>

<ol>
  <li>Download the latest version from the <a
  href="http://www.interactivetools.com/products/htmlarea/">htmlArea
  homepage</a>.</li>
  <li>Unzip the files onto your local computer (making sure to maintain the
  directory structure contained in the zip).</li>
  <li>Create a new folder on your website called /htmlarea/ (make sure it's
  NOT inside the cgi-bin).</li>
  <li>Transfer all the HTMLArea files from your local computer into the
  /htmlarea/ folder on your website.</li>
  <li>Open the example page /htmlarea/examples/core.html with your browser to make
  sure everything works.</li>
</ol>

<p>Once htmlArea is on your website all you need to do is add some
JavaScript to any pages that you want to add WYSIWYG editors to.  Here's how
to do that.</p>

<ol>

  <li>Define some global variables.  "_editor_url" has to be the absolute
  URL where HTMLArea resides within your
  website; as we discussed, this would be “/htmlarea/”.  "_editor_lang" must
  be the language code in which you want HTMLArea to appear.  This defaults
  to "en" (English); for a list of supported languages, please look into
  the "lang" subdirectory in the distribution.
  <pre class="code"
  ><span class="function-name">&lt;</span><span class="html-tag">script</span> <span class="variable-name">type=</span><span class="string">&quot;text/javascript&quot;</span><span class="function-name">&gt;</span>
   _editor_url = <span class="string">&quot;/htmlarea/&quot;</span>;
   _editor_lang = <span class="string">&quot;en&quot;</span>;
<span class="function-name">&lt;</span><span class="html-tag">/script</span><span class="function-name">&gt;</span></pre>

  <li>Include the "htmlarea.js" script:
  <pre class="code"
  ><span class="function-name">&lt;</span><span class="html-tag">script</span> <span class="variable-name">type=</span><span class="string">&quot;text/javascript&quot;</span> <span class="variable-name">src=</span><span class="string">&quot;/htmlarea/htmlarea.js&quot;</span><span class="function-name">&gt;</span><span class="paren-face-match">&lt;</span><span class="html-tag">/script</span><span class="paren-face-match">&gt;</span></pre>
  </li>

  <li><p>If you want to change all your &lt;textarea&gt;-s into
  HTMLArea-s then you can use the simplest way to create HTMLArea:</p>
  <pre class="code"
  ><span class="function-name">&lt;</span><span class="html-tag">script</span> <span class="variable-name">type=</span><span class="string">&quot;text/javascript&quot;</span> <span class="variable-name">defer=</span><span class="string">&quot;1&quot;</span><span class="function-name">&gt;</span>
    HTMLArea.replaceAll<span class="function-name">()</span>;
<span class="paren-face-match">&lt;</span><span class="html-tag">/script</span><span class="paren-face-match">&gt;</span></pre>
  <p><span class="note">Note:</span> you can also add the
  <code>HTMLArea.replaceAll()</code> code to the <code>onload</code>
  event handler for the <code>body</code> element, if you find it more appropriate.</p>

  <p>A different approach, if you have more than one textarea and only want
  to change one of them, is to use <code>HTMLArea.replace("id")</code> --
  pass the <code>id</code> of your textarea.  Do not use the
  <code>name</code> attribute anymore, it's not a standard solution!</p>

</ol>

<p>This section applies to HTMLArea-3.0 release candidate 1 or later; prior
to this version, one needed to include more files; however, now HTMLArea is
able to include other files too (such as stylesheet, language definition
file, etc.) so you only need to define the editor path and load
"htmlarea.js".  Nice, eh? ;-)</p>

<h3>I want to change the editor settings, how do I do that?</h3>

<p>While it's true that all you need is one line of JavaScript to create an
htmlArea WYSIWYG editor, you can also specify more config settings in the
code to control how the editor works and looks.  Here's an example of some of
the available settings:</p>

<pre class="code"
><span class="keyword">var</span> <span class="variable-name">config</span> = <span class="keyword">new</span> HTMLArea.Config(); <span class="comment">// create a new configuration object
</span>                                    <span class="comment">// having all the default values
</span>config.width = '<span class="string">90%</span>';
config.height = '<span class="string">200px</span>';

<span class="comment">// the following sets a style for the page body (black text on yellow page)
// and makes all paragraphs be bold by default
</span>config.pageStyle =
  '<span class="string">body { background-color: yellow; color: black; font-family: verdana,sans-serif } </span>' +
  '<span class="string">p { font-width: bold; } </span>';

<span class="comment">// the following replaces the textarea with the given id with a new
// HTMLArea object having the specified configuration
</span>HTMLArea.replace('<span class="string">id</span>', config);</pre>

<p><span class="warning">Important:</span> It's recommended that you add
custom features and configuration to a separate file.  This will ensure you
that when we release a new official version of HTMLArea you'll have less
trouble upgrading it.</p>

<h3>How do I customize the toolbar?</h3>

<p>Using the configuration object introduced above allows you to completely
control what the toolbar contains.  Following is an example of a one-line,
customized toolbar, much simpler than the default one:</p>

<pre class="code"
><span class="keyword">var</span> <span class="variable-name">config</span> = <span class="keyword">new</span> HTMLArea.Config();
config.toolbar = [
  ['<span class="string">fontname</span>', '<span class="string">space</span>',
   '<span class="string">fontsize</span>', '<span class="string">space</span>',
   '<span class="string">formatblock</span>', '<span class="string">space</span>',
   '<span class="string">bold</span>', '<span class="string">italic</span>', '<span class="string">underline</span>']
];
HTMLArea.replace('<span class="string">id</span>', config);</pre>

<p>The toolbar is an Array of Array objects.  Each array in the toolbar
defines a new line.  The default toolbar looks like this:</p>

<pre class="code"
>config.toolbar = [
[ &quot;<span class="string">fontname</span>&quot;, &quot;<span class="string">space</span>&quot;,
  &quot;<span class="string">fontsize</span>&quot;, &quot;<span class="string">space</span>&quot;,
  &quot;<span class="string">formatblock</span>&quot;, &quot;<span class="string">space</span>&quot;,
  &quot;<span class="string">bold</span>&quot;, &quot;<span class="string">italic</span>&quot;, &quot;<span class="string">underline</span>&quot;, &quot;<span class="string">separator</span>&quot;,
  &quot;<span class="string">strikethrough</span>&quot;, &quot;<span class="string">subscript</span>&quot;, &quot;<span class="string">superscript</span>&quot;, &quot;<span class="string">separator</span>&quot;,
  &quot;<span class="string">copy</span>&quot;, &quot;<span class="string">cut</span>&quot;, &quot;<span class="string">paste</span>&quot;, &quot;<span class="string">space</span>&quot;, &quot;<span class="string">undo</span>&quot;, &quot;<span class="string">redo</span>&quot; ],
		
[ &quot;<span class="string">justifyleft</span>&quot;, &quot;<span class="string">justifycenter</span>&quot;, &quot;<span class="string">justifyright</span>&quot;, &quot;<span class="string">justifyfull</span>&quot;, &quot;<span class="string">separator</span>&quot;,
  &quot;<span class="string">insertorderedlist</span>&quot;, &quot;<span class="string">insertunorderedlist</span>&quot;, &quot;<span class="string">outdent</span>&quot;, &quot;<span class="string">indent</span>&quot;, &quot;<span class="string">separator</span>&quot;,
  &quot;<span class="string">forecolor</span>&quot;, &quot;<span class="string">hilitecolor</span>&quot;, &quot;<span class="string">textindicator</span>&quot;, &quot;<span class="string">separator</span>&quot;,
  &quot;<span class="string">inserthorizontalrule</span>&quot;, &quot;<span class="string">createlink</span>&quot;, &quot;<span class="string">insertimage</span>&quot;, &quot;<span class="string">inserttable</span>&quot;, &quot;<span class="string">htmlmode</span>&quot;, &quot;<span class="string">separator</span>&quot;,
  &quot;<span class="string">popupeditor</span>&quot;, &quot;<span class="string">separator</span>&quot;, &quot;<span class="string">showhelp</span>&quot;, &quot;<span class="string">about</span>&quot; ]
];</pre>

<p>Except three strings, all others in the examples above need to be defined
in the <code>config.btnList</code> object (detailed a bit later in this
document).  The three exceptions are: 'space', 'separator' and 'linebreak'.
These three have the following meaning, and need not be present in
<code>btnList</code>:</p>

<ul>
  <li>'space' -- Inserts a space of 5 pixels (the width is configurable by external
  <acronym title="Cascading Style Sheets">CSS</acronym>) at the current
  position in the toolbar.</li>
  <li>'separator' -- Inserts a small vertical separator, for visually grouping related
  buttons.</li>
  <li>'linebreak' -- Starts a new line in the toolbar.  Subsequent controls will be
  inserted on the new line.</li>
</ul>

<p><span class="warning">Important:</span> It's recommended that you add
custom features and configuration to a separate file.  This will ensure you
that when we release a new official version of HTMLArea you'll have less
trouble upgrading it.</p>

<h3>How do I create custom buttons?</h3>

<p>By design, the toolbar is easily extensible.  For adding a custom button
one needs to follow two steps.</p>

<h4 id="regbtn">1. Register the button in <code>config.btnList</code>.</h4>

<p>For each button in the toolbar, HTMLArea needs to know the following
information:</p>
<ul>
  <li>a name for it (we call it the ID of the button);</li>
  <li>the path to an image to be displayed in the toolbar;</li>
  <li>a tooltip for it;</li>
  <li>whether the button is enabled or not in text mode;</li>
  <li>what to do when the button is clicked;</li>
</ul>
<p>You need to provide all this information for registering a new button
too.  The button ID can be any string identifier and it's used when
defining the toolbar, as you saw above.  We recommend starting
it with "my-" so that it won't clash with the standard ID-s (those from
the default toolbar).</p>

<p class="note">Register button example #1</p>

<pre class="code"
><span class="comment">// get a default configuration
</span><span class="keyword">var</span> <span class="variable-name">config</span> = <span class="keyword">new</span> HTMLArea.Config();
<span class="comment">// register the new button using Config.registerButton.
// parameters:        button ID,   tooltip,          image,           textMode,
</span>config.registerButton(&quot;<span class="string">my-hilite</span>&quot;, &quot;<span class="string">Highlight text</span>&quot;, &quot;<span class="string">my-hilite.gif</span>&quot;, <span class="keyword">false</span>,
<span class="comment">// function that gets called when the button is clicked
</span>  <span class="keyword">function</span>(editor, id) {
    editor.surroundHTML('<span class="string">&lt;span class=&quot;hilite&quot;&gt;</span>', '<span class="string">&lt;/span&gt;</span>');
  }
);</pre>

<p>An alternate way of calling registerButton is exemplified above.  Though
the code might be a little bit larger, using this form makes your code more
maintainable.  It doesn't even needs comments as it's pretty clear.</p>

<p class="note">Register button example #2</p>

<pre class="code"
><span class="keyword">var</span> <span class="variable-name">config</span> = <span class="keyword">new</span> HTMLArea.Config();
config.registerButton({
  id        : &quot;<span class="string">my-hilite</span>&quot;,
  tooltip   : &quot;<span class="string">Highlight text</span>&quot;,
  image     : &quot;<span class="string">my-hilite.gif</span>&quot;,
  textMode  : <span class="keyword">false</span>,
  action    : <span class="keyword">function</span>(editor, id) {
                editor.surroundHTML('<span class="string">&lt;span class=&quot;hilite&quot;&gt;</span>', '<span class="string">&lt;/span&gt;</span>');
              }
});</pre>

<p>You might notice that the "action" function receives two parameters:
<b>editor</b> and <b>id</b>.  In the examples above we only used the
<b>editor</b> parameter.  But it could be helpful for you to understand
both:</p>

<ul>
  <li><b>editor</b> is a reference to the HTMLArea object.  Since our entire
  code now has an <acronym title="Object Oriented Programming">OOP</acronym>-like
  design, you need to have a reference to
  the editor object in order to do things with it.  In previous versions of
  HTMLArea, in order to identify the object an ID was used -- the ID of the
  HTML element.  In this version ID-s are no longer necessary.</li>

  <li><b>id</b> is the button ID.  Wondering why is this useful?  Well, you
  could use the same handler function (presuming that it's not an anonymous
  function like in the examples above) for more buttons.  You can <a
  href="#btnex">see an example</a> a bit later in this document.</li>
</ul>

<h4>2. Inserting it into the toolbar</h4>

<p>At this step you need to specify where in the toolbar to insert the
button, or just create the whole toolbar again as you saw in the previous
section.  You use the button ID, as shown in the examples of customizing the
toolbar in the previous section.</p>

<p>For the sake of completion, following there are another examples.</p>

<p class="note">Append your button to the default toolbar</p>

<pre class="code"
>config.toolbar.push([ &quot;<span class="string">my-hilite</span>&quot; ]);</pre>

<p class="note">Customized toolbar</p>

<pre class="code"
>config.toolbar = [
  ['<span class="string">fontname</span>', '<span class="string">space</span>',
   '<span class="string...
 
[truncated message content]

[php-blog-cvs] serendipity/htmlarea/popups link.html,NONE,1.1 about.html,1.1.1.1,1.2 fullscreen.html,1.1.1.1,1.2 insert_image.html,1.1.1.1,1.2 insert_table.html,1.1.1.1,1.2 popup.js,1.1.1.1,1.2 select_color.html,1.1.1.1,1.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/htmlarea/popups
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20038/popups

Modified Files:
	about.html fullscreen.html insert_image.html insert_table.html 
	popup.js select_color.html 
Added Files:
	link.html 
Log Message:
Upgrade to latest WYSIWYG manager


Index: popup.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/popup.js,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- popup.js	28 Mar 2003 20:05:29 -0000	1.1.1.1
+++ popup.js	23 Mar 2004 15:41:10 -0000	1.2
@@ -1,42 +1,109 @@
-function __dlg_onclose() {
-	if (!document.all) {
-		opener.Dialog._return(null);
+// htmlArea v3.0 - Copyright (c) 2002, 2003 interactivetools.com, inc.
+// This copyright notice MUST stay intact for use (see license.txt).
+//
+// Portions (c) dynarch.com, 2003
+//
+// A free WYSIWYG editor replacement for <textarea> fields.
+// For full source code and docs, visit http://www.interactivetools.com/
+//
+// Version 3.0 developed by Mihai Bazon.
+//   http://dynarch.com/mishoo
+//
+// $Id$
+
+function getAbsolutePos(el) {
+	var r = { x: el.offsetLeft, y: el.offsetTop };
+	if (el.offsetParent) {
+		var tmp = getAbsolutePos(el.offsetParent);
+		r.x += tmp.x;
+		r.y += tmp.y;
 	}
+	return r;
 };
 
-function __dlg_init() {
+function comboSelectValue(c, val) {
+	var ops = c.getElementsByTagName("option");
+	for (var i = ops.length; --i >= 0;) {
+		var op = ops[i];
+		op.selected = (op.value == val);
+	}
+	c.value = val;
+};
+
+function __dlg_onclose() {
+	opener.Dialog._return(null);
+};
+
+function __dlg_init(bottom) {
+	var body = document.body;
+	var body_height = 0;
+	if (typeof bottom == "undefined") {
+		var div = document.createElement("div");
+		body.appendChild(div);
+		var pos = getAbsolutePos(div);
+		body_height = pos.y;
+	} else {
+		var pos = getAbsolutePos(bottom);
+		body_height = pos.y + bottom.offsetHeight;
+	}
+	window.dialogArguments = opener.Dialog._arguments;
 	if (!document.all) {
-		// init dialogArguments, as IE gets it
-		window.dialogArguments = opener.Dialog._arguments;
 		window.sizeToContent();
 		window.sizeToContent();	// for reasons beyond understanding,
 					// only if we call it twice we get the
 					// correct size.
 		window.addEventListener("unload", __dlg_onclose, true);
 		// center on parent
-		var px1 = opener.screenX;
-		var px2 = opener.screenX + opener.outerWidth;
-		var py1 = opener.screenY;
-		var py2 = opener.screenY + opener.outerHeight;
-		var x = (px2 - px1 - window.outerWidth) / 2;
-		var y = (py2 - py1 - window.outerHeight) / 2;
+		var x = opener.screenX + (opener.outerWidth - window.outerWidth) / 2;
+		var y = opener.screenY + (opener.outerHeight - window.outerHeight) / 2;
 		window.moveTo(x, y);
-		var body = document.body;
-		window.innerHeight = body.offsetHeight;
-		window.innerWidth = body.offsetWidth;
+		window.innerWidth = body.offsetWidth + 5;
+		window.innerHeight = body_height + 2;
 	} else {
-		var body = document.body;
-		window.dialogHeight = body.offsetHeight + 50 + "px";
-		window.dialogWidth = body.offsetWidth + "px";
+		// window.dialogHeight = body.offsetHeight + 50 + "px";
+		// window.dialogWidth = body.offsetWidth + "px";
+		window.resizeTo(body.offsetWidth, body_height);
+		var ch = body.clientHeight;
+		var cw = body.clientWidth;
+		window.resizeBy(body.offsetWidth - cw, body_height - ch);
+		var W = body.offsetWidth;
+		var H = 2 * body_height - ch;
+		var x = (screen.availWidth - W) / 2;
+		var y = (screen.availHeight - H) / 2;
+		window.moveTo(x, y);
+	}
+	document.body.onkeypress = __dlg_close_on_esc;
+};
+
+function __dlg_translate(i18n) {
+	var types = ["span", "option", "td", "button", "div"];
+	for (var type in types) {
+		var spans = document.getElementsByTagName(types[type]);
+		for (var i = spans.length; --i >= 0;) {
+			var span = spans[i];
+			if (span.firstChild && span.firstChild.data) {
+				var txt = i18n[span.firstChild.data];
+				if (txt)
+					span.firstChild.data = txt;
+			}
+		}
 	}
+	var txt = i18n[document.title];
+	if (txt)
+		document.title = txt;
 };
 
 // closes the dialog and passes the return info upper.
 function __dlg_close(val) {
-	if (document.all) {	// IE
-		window.returnValue = val;
-	} else {
-		opener.Dialog._return(val);
-	}
+	opener.Dialog._return(val);
 	window.close();
 };
+
+function __dlg_close_on_esc(ev) {
+	ev || (ev = window.event);
+	if (ev.keyCode == 27) {
+		window.close();
+		return false;
+	}
+	return true;
+};

--- NEW FILE: link.html ---
<html>

<head>
  <title>Insert/Modify Link</title>
  <script type="text/javascript" src="popup.js"></script>
  <script type="text/javascript">
    window.resizeTo(400, 200);

I18N = window.opener.HTMLArea.I18N.dialogs;

function i18n(str) {
  return (I18N[str] || str);
};

function onTargetChanged() {
  var f = document.getElementById("f_other_target");
  if (this.value == "_other") {
    f.style.visibility = "visible";
    f.select();
    f.focus();
  } else f.style.visibility = "hidden";
};

function Init() {
  __dlg_translate(I18N);
  __dlg_init();
  var param = window.dialogArguments;
  var target_select = document.getElementById("f_target");
  if (param) {
      document.getElementById("f_href").value = param["f_href"];
      document.getElementById("f_title").value = param["f_title"];
      comboSelectValue(target_select, param["f_target"]);
      if (target_select.value != param.f_target) {
        var opt = document.createElement("option");
        opt.value = param.f_target;
        opt.innerHTML = opt.value;
        target_select.appendChild(opt);
        opt.selected = true;
      }
  }
  var opt = document.createElement("option");
  opt.value = "_other";
  opt.innerHTML = i18n("Other");
  target_select.appendChild(opt);
  target_select.onchange = onTargetChanged;
  document.getElementById("f_href").focus();
  document.getElementById("f_href").select();
};

function onOK() {
  var required = {
    "f_href": i18n("You must enter the URL where this link points to")
  };
  for (var i in required) {
    var el = document.getElementById(i);
    if (!el.value) {
      alert(required[i]);
      el.focus();
      return false;
    }
  }
  // pass data back to the calling window
  var fields = ["f_href", "f_title", "f_target" ];
  var param = new Object();
  for (var i in fields) {
    var id = fields[i];
    var el = document.getElementById(id);
    param[id] = el.value;
  }
  if (param.f_target == "_other")
    param.f_target = document.getElementById("f_other_target").value;
  __dlg_close(param);
  return false;
};

function onCancel() {
  __dlg_close(null);
  return false;
};

</script>

<style type="text/css">
html, body {
  background: ButtonFace;
  color: ButtonText;
  font: 11px Tahoma,Verdana,sans-serif;
  margin: 0px;
  padding: 0px;
}
body { padding: 5px; }
table {
  font: 11px Tahoma,Verdana,sans-serif;
}
select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
button { width: 70px; }
table .label { text-align: right; width: 8em; }

.title { background: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px;
border-bottom: 1px solid black; letter-spacing: 2px;
}

#buttons {
      margin-top: 1em; border-top: 1px solid #999;
      padding: 2px; text-align: right;
}
</style>

</head>

<body onload="Init()">
<div class="title">Insert/Modify Link</div>

<table border="0" style="width: 100%;">
  <tr>
    <td class="label">URL:</td>
    <td><input type="text" id="f_href" style="width: 100%" /></td>
  </tr>
  <tr>
    <td class="label">Title (tooltip):</td>
    <td><input type="text" id="f_title" style="width: 100%" /></td>
  </tr>
  <tr>
    <td class="label">Target:</td>
    <td><select id="f_target">
      <option value="">None (use implicit)</option>
      <option value="_blank">New window (_blank)</option>
      <option value="_self">Same frame (_self)</option>
      <option value="_top">Top frame (_top)</option>
    </select>
    <input type="text" name="f_other_target" id="f_other_target" size="10" style="visibility: hidden" />
    </td>
  </tr>
</table>

<div id="buttons">
  <button type="button" name="ok" onclick="return onOK();">OK</button>
  <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
</div>

</body>
</html>

Index: insert_table.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/insert_table.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- insert_table.html	28 Mar 2003 20:05:29 -0000	1.1.1.1
+++ insert_table.html	23 Mar 2004 15:41:10 -0000	1.2
@@ -1,4 +1,4 @@
-<html style="width: 398; height: 218">
+<html>
 
 <head>
   <title>Insert Table</title>
@@ -7,6 +7,8 @@
 
 <script type="text/javascript">
 
+window.resizeTo(400, 100);
+
 function Init() {
   __dlg_init();
   document.getElementById("f_rows").focus();
@@ -161,8 +163,7 @@
 
 </fieldset>
 
-<div style="margin-top: 85px; text-align: right;">
-<hr />
+<div style="margin-top: 85px; border-top: 1px solid #999; padding: 2px; text-align: right;">
 <button type="button" name="ok" onclick="return onOK();">OK</button>
 <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
 </div>

Index: insert_image.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/insert_image.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- insert_image.html	28 Mar 2003 20:05:29 -0000	1.1.1.1
+++ insert_image.html	23 Mar 2004 15:41:10 -0000	1.2
@@ -1,216 +1,191 @@
-<html style="width: 398; height: 218">
-
-<head>
-  <title>Insert Image</title>
-
-<script type="text/javascript" src="popup.js"></script>
-
-<script type="text/javascript">
-var preview_window = null;
-
-function Init() {
-  __dlg_init();
-  document.getElementById("f_url").focus();
-};
-
-function onOK() {
-  var required = {
-    "f_url": "You must enter the URL",
-    "f_alt": "Please enter the alternate text"
-  };
-  for (var i in required) {
-    var el = document.getElementById(i);
-    if (!el.value) {
-      alert(required[i]);
-      el.focus();
-      return false;
-    }
-  }
-  // pass data back to the calling window
-  var fields = ["f_url", "f_alt", "f_align", "f_border",
-                "f_horiz", "f_vert"];
-  var param = new Object();
-  for (var i in fields) {
-    var id = fields[i];
-    var el = document.getElementById(id);
-    param[id] = el.value;
-  }
-  if (preview_window) {
-    preview_window.close();
-  }
-  __dlg_close(param);
-  return false;
-};
-
-function onCancel() {
-  if (preview_window) {
-    preview_window.close();
-  }
-  __dlg_close(null);
-  return false;
-};
-
-function onPreview() {
-  alert("FIXME: preview needs rewritten:\n  show the image inside this window instead of opening a new one.");
-  var f_url = document.getElementById("f_url");
-  var url = f_url.value;
-  if (!url) {
-    alert("You have to enter an URL first");
-    f_url.focus();
-    return false;
-  }
-  var img = new Image();
-  img.src = url;
-  var win = null;
-  if (!document.all) {
-    win = window.open("about:blank", "ha_imgpreview", "toolbar=no,menubar=no,personalbar=no,innerWidth=100,innerHeight=100,scrollbars=no,resizable=yes");
-  } else {
-    win = window.open("about:blank", "ha_imgpreview", "channelmode=no,directories=no,height=100,width=100,location=no,menubar=no,resizable=yes,scrollbars=no,toolbar=no");
-  }
-  preview_window = win;
-  var doc = win.document;
-  var body = doc.body;
-  if (body) {
-    body.innerHTML = "";
-    body.style.padding = "0px";
-    body.style.margin = "0px";
-    var el = doc.createElement("img");
-    el.src = url;
-
-    var table = doc.createElement("table");
-    body.appendChild(table);
-    table.style.width = "100%";
-    table.style.height = "100%";
-    var tbody = doc.createElement("tbody");
-    table.appendChild(tbody);
-    var tr = doc.createElement("tr");
-    tbody.appendChild(tr);
-    var td = doc.createElement("td");
-    tr.appendChild(td);
-    td.style.textAlign = "center";
-
-    td.appendChild(el);
-    win.resizeTo(el.offsetWidth + 30, el.offsetHeight + 30);
-  }
-  win.focus();
-  return false;
-};
-</script>
-
-<style type="text/css">
-html, body {
-  background: ButtonFace;
-  color: ButtonText;
-  font: 11px Tahoma,Verdana,sans-serif;
-  margin: 0px;
-  padding: 0px;
-}
-body { padding: 5px; }
-table {
-  font: 11px Tahoma,Verdana,sans-serif;
-}
-form p {
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-.fl { width: 9em; float: left; padding: 2px 5px; text-align: right; }
-.fr { width: 6em; float: left; padding: 2px 5px; text-align: right; }
-fieldset { padding: 0px 10px 5px 5px; }
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-button { width: 70px; }
-.space { padding: 2px; }
-
-.title { background: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px;
-border-bottom: 1px solid black; letter-spacing: 2px;
-}
-form { padding: 0px; margin: 0px; }
-</style>
-
-</head>
-
-<body onload="Init()">
-
-<div class="title">Insert Image</div>
-
-<form action="" method="get">
-<table border="0" width="100%" style="padding: 0px; margin: 0px">
-  <tbody>
-
-  <tr>
-    <td style="width: 7em; text-align: right">Image URL:</td>
-    <td><input type="text" name="url" id="f_url" style="width:75%"
-      title="Enter the image URL here" />
-      <button name="preview" onclick="return onPreview();"
-      title="Preview the image in a new window">Preview</button>
-    </td>
-  </tr>
-  <tr>
-    <td style="width: 7em; text-align: right">Alternate text:</td>
-    <td><input type="text" name="alt" id="f_alt" style="width:100%"
-      title="For browsers that don't support images" /></td>
-  </tr>
-
-  </tbody>
-</table>
-
-<p />
-
-<fieldset style="float: left; margin-left: 5px;">
-<legend>Layout</legend>
-
-<div class="space"></div>
-
-<div class="fl">Alignment:</div>
-<select size="1" name="align" id="f_align"
-  title="Positioning of this image">
-  <option value=""                             >Not set</option>
-  <option value="left"                         >Left</option>
-  <option value="right"                        >Right</option>
-  <option value="texttop"                      >Texttop</option>
-  <option value="absmiddle"                    >Absmiddle</option>
-  <option value="baseline" selected="1"        >Baseline</option>
-  <option value="absbottom"                    >Absbottom</option>
-  <option value="bottom"                       >Bottom</option>
-  <option value="middle"                       >Middle</option>
-  <option value="top"                          >Top</option>
-</select>
-
-<p />
-
-<div class="fl">Border thickness:</div>
-<input type="text" name="border" id="f_border" size="5"
-title="Leave empty for no border" />
-
-<div class="space"></div>
-
-</fieldset>
-
-<fieldset style="float:right; margin-right: 5px;">
-<legend>Spacing</legend>
-
-<div class="space"></div>
-
-<div class="fr">Horizontal:</div>
-<input type="text" name="horiz" id="f_horiz" size="5"
-title="Horizontal padding" />
-
-<p />
-
-<div class="fr">Vertical:</div>
-<input type="text" name="vert" id="f_vert" size="5"
-title="Vertical padding" />
-
-<div class="space"></div>
-
-</fieldset>
-
-<div style="margin-top: 85px; text-align: right;">
-<hr />
-<button type="button" name="ok" onclick="return onOK();">OK</button>
-<button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
-</div>
-
-</form>
-
-</body>
-</html>
+<html>
+
+<head>
+  <title>Insert Image</title>
+
+<script type="text/javascript" src="popup.js"></script>
+
+<script type="text/javascript">
+
+window.resizeTo(400, 100);
+
+function Init() {
+  __dlg_init();
+  var param = window.dialogArguments;
+  if (param) {
+      document.getElementById("f_url").value = param["f_url"];
+      document.getElementById("f_alt").value = param["f_alt"];
+      document.getElementById("f_border").value = param["f_border"];
+      document.getElementById("f_align").value = param["f_align"];
+      document.getElementById("f_vert").value = param["f_vert"];
+      document.getElementById("f_horiz").value = param["f_horiz"];
+      window.ipreview.location.replace(param.f_url);
+  }
+  document.getElementById("f_url").focus();
+};
+
+function onOK() {
+  var required = {
+    "f_url": "You must enter the URL"
+  };
+  for (var i in required) {
+    var el = document.getElementById(i);
+    if (!el.value) {
+      alert(required[i]);
+      el.focus();
+      return false;
+    }
+  }
+  // pass data back to the calling window
+  var fields = ["f_url", "f_alt", "f_align", "f_border",
+                "f_horiz", "f_vert"];
+  var param = new Object();
+  for (var i in fields) {
+    var id = fields[i];
+    var el = document.getElementById(id);
+    param[id] = el.value;
+  }
+  __dlg_close(param);
+  return false;
+};
+
+function onCancel() {
+  __dlg_close(null);
+  return false;
+};
+
+function onPreview() {
+  var f_url = document.getElementById("f_url");
+  var url = f_url.value;
+  if (!url) {
+    alert("You have to enter an URL first");
+    f_url.focus();
+    return false;
+  }
+  window.ipreview.location.replace(url);
+  return false;
+};
+</script>
+
+<style type="text/css">
+html, body {
+  background: ButtonFace;
+  color: ButtonText;
+  font: 11px Tahoma,Verdana,sans-serif;
+  margin: 0px;
+  padding: 0px;
+}
+body { padding: 5px; }
+table {
+  font: 11px Tahoma,Verdana,sans-serif;
+}
+form p {
+  margin-top: 5px;
+  margin-bottom: 5px;
+}
+.fl { width: 9em; float: left; padding: 2px 5px; text-align: right; }
+.fr { width: 6em; float: left; padding: 2px 5px; text-align: right; }
+fieldset { padding: 0px 10px 5px 5px; }
+select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
+button { width: 70px; }
+.space { padding: 2px; }
+
+.title { background: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px;
+border-bottom: 1px solid black; letter-spacing: 2px;
+}
+form { padding: 0px; margin: 0px; }
+</style>
+
+</head>
+
+<body onload="Init()">
+
+<div class="title">Insert Image</div>
+<!--- new stuff --->
+<form action="" method="get">
+<table border="0" width="100%" style="padding: 0px; margin: 0px">
+  <tbody>
+
+  <tr>
+    <td style="width: 7em; text-align: right">Image URL:</td>
+    <td><input type="text" name="url" id="f_url" style="width:75%"
+      title="Enter the image URL here" />
+      <button name="preview" onclick="return onPreview();"
+      title="Preview the image in a new window">Preview</button>
+    </td>
+  </tr>
+  <tr>
+    <td style="width: 7em; text-align: right">Alternate text:</td>
+    <td><input type="text" name="alt" id="f_alt" style="width:100%"
+      title="For browsers that don't support images" /></td>
+  </tr>
+
+  </tbody>
+</table>
+
+<p />
+
+<fieldset style="float: left; margin-left: 5px;">
+<legend>Layout</legend>
+
+<div class="space"></div>
+
+<div class="fl">Alignment:</div>
+<select size="1" name="align" id="f_align"
+  title="Positioning of this image">
+  <option value=""                             >Not set</option>
+  <option value="left"                         >Left</option>
+  <option value="right"                        >Right</option>
+  <option value="texttop"                      >Texttop</option>
+  <option value="absmiddle"                    >Absmiddle</option>
+  <option value="baseline" selected="1"        >Baseline</option>
+  <option value="absbottom"                    >Absbottom</option>
+  <option value="bottom"                       >Bottom</option>
+  <option value="middle"                       >Middle</option>
+  <option value="top"                          >Top</option>
+</select>
+
+<p />
+
+<div class="fl">Border thickness:</div>
+<input type="text" name="border" id="f_border" size="5"
+title="Leave empty for no border" />
+
+<div class="space"></div>
+
+</fieldset>
+
+<fieldset style="float:right; margin-right: 5px;">
+<legend>Spacing</legend>
+
+<div class="space"></div>
+
+<div class="fr">Horizontal:</div>
+<input type="text" name="horiz" id="f_horiz" size="5"
+title="Horizontal padding" />
+
+<p />
+
+<div class="fr">Vertical:</div>
+<input type="text" name="vert" id="f_vert" size="5"
+title="Vertical padding" />
+
+<div class="space"></div>
+
+</fieldset>
+<br clear="all" />
+<table width="100%" style="margin-bottom: 0.2em">
+ <tr>
+  <td valign="bottom">
+    Image Preview:<br />
+    <iframe name="ipreview" id="ipreview" frameborder="0" style="border : 1px solid gray;" height="200" width="300" src=""></iframe>
+  </td>
+  <td valign="bottom" style="text-align: right">
+    <button type="button" name="ok" onclick="return onOK();">OK</button><br>
+    <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
+  </td>
+ </tr>
+</table>
+</form>
+</body>
+</html>

Index: about.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/about.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- about.html	28 Mar 2003 20:05:29 -0000	1.1.1.1
+++ about.html	23 Mar 2004 15:41:10 -0000	1.2
@@ -1,29 +1,378 @@
-<html style="width: 380px; height: 185px;">
-<head><title>About HTMLArea</title>
-<script type="text/javascript" src="popup.js"></script>
-<script type="text/javascript">
-function closeAbout() {
-  __dlg_close(null);
-}
-</script>
-<style>
-  html,body,textarea { font-family: tahoma,verdana,arial; font-size: 11px;
-padding: 0px; margin: 0px; }
-  tt { font-size: 120%; }
-  body { padding: 5px; background: ButtonFace; color: ButtonText; }
-</style></head>
-<body onload="__dlg_init()">
-<div style="font-family: arial black, arial; font-size: 28px;
-letter-spacing: -2px;">HTMLArea 3.0</div>
-
-<p>A free WYSIWYG editor replacement for <tt>&lt;textarea&gt;</tt> fields.</p>
-
-<p>For full source code and docs, visit:<br />
-<a href="http://www.interactivetools.com/products/htmlarea/" target="_blank"
->http://www.interactivetools.com/products/htmlarea/</a></p>
-
-<button style="float: right" type="button" onclick="closeAbout()">Close</button>
-
-<p>&copy; 2002, 2003 interactivetools.com, inc. All Rights Reserved.</p>
-
-</body></html>
+<!--
+
+(c) dynarch.com, 2003-2004
+Author: Mihai Bazon, http://dynarch.com/mishoo
+Distributed as part of HTMLArea 3.0
+
+"You are not expected to understand this...  I don't neither."
+
+                      (from The Linux Kernel Source Code,
+                            ./arch/x86_64/ia32/ptrace.c:90)
+
+;-)
+
+-->
+
+<html style="height: 100%">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>About HTMLArea</title>
+<script type="text/javascript" src="popup.js"></script>
+<script type="text/javascript">
+window.resizeTo(450, 250);
+var TABS = [];
+var CURRENT_TAB = 0;
+var CONTENT_HEIGHT_DIFF = 0;
+var CONTENT_WIDTH_DIFF = 0;
+function selectTab(idx) {
+  var ct = TABS[CURRENT_TAB];
+  ct.className = ct.className.replace(/\s*tab-current\s*/, ' ');
+  ct = TABS[CURRENT_TAB = idx];
+  ct.className += ' tab-current';
+  for (var i = TABS.length; --i >= 0;) {
+    var area = document.getElementById("tab-area-" + i);
+    if (CURRENT_TAB == i) {
+      area.style.display = "block";
+    } else {
+      area.style.display = "none";
+    }
+  }
+  document.body.style.visibility = "hidden";
+  document.body.style.visibility = "visible";
+  document.cookie = "HTMLAREA-ABOUT-TAB=" + idx;
+}
+var editor = null;
+function initDocument() {
+  editor = window.dialogArguments;
+  HTMLArea = window.opener.HTMLArea;
+
+  var plugins = document.getElementById("plugins");
+  var j = 0;
+  var html = "<table width='99%' cellpadding='0' style='margin-top: 1em; collapse-borders: collapse; border: 1px solid #8b8;'>" +
+	  "<thead><tr>" +
+	  "<td>Name</td>" +
+	  "<td>Developer</td>" +
+	  "<td>Sponsored by</td>" +
+	  "<td>License<sup>*</sup></td>" +
+	  "</tr></thead><tbody>";
+  for (var i in editor.plugins) {
+    var info = editor.plugins[i];
+    html += "<tr><td>" + info.name + " v" + info.version + "</td>" + 
+            "<td><a href='" + info.developer_url + "' target='_blank' title='Visit developer website'>" +
+	    info.developer + "</a></td>" +
+	    "<td><a href='" + info.sponsor_url + "' target='_blank' title='Visit sponsor website'>" +
+	    info.sponsor + "</a></td>" +
+	    "<td>" + info.license + "</td></tr>";
+    ++j;
+  }
+
+  if (j) {
+          html += "</tbody></table>" +
+		  "<p><sup>*</sup> License \"htmlArea\" means that the plugin is distributed under the same terms " +
+		  "as HTMLArea itself.  Such plugins are likely to be those included in the official " +
+		  "HTMLArea distribution</p>";
+	  plugins.innerHTML = "<p>The following plugins have been loaded.</p>" + html;
+  } else {
+	  plugins.innerHTML = "<p>No plugins have been loaded</p>";
+  }
+
+  plugins.innerHTML += "<p>User agent reports:<br/>" + navigator.userAgent + "</p>";
+
+  var content = document.getElementById("content");
+  if (window.innerHeight) {
+    CONTENT_HEIGHT_DIFF = window.innerHeight - 250;
+    CONTENT_WIDTH_DIFF = window.innerWidth - content.offsetWidth;
+  } else {
+    CONTENT_HEIGHT_DIFF = document.body.offsetHeight - 250;
+    CONTENT_WIDTH_DIFF = document.body.offsetWidth - 400;
+  }
+  window.onresize();
+  var bar = document.getElementById("tabbar");
+  j = 0;
+  for (var i = bar.firstChild; i; i = i.nextSibling) {
+    TABS.push(i);
+    i.__msh_tab = j;
+    i.onmousedown = function(ev) { selectTab(this.__msh_tab); HTMLArea._stopEvent(ev || window.event); };
+    var area = document.getElementById("tab-area-" + j);
+    if (/tab-current/.test(i.className)) {
+      CURRENT_TAB = j;
+      area.style.display = "block";
+    } else {
+      area.style.display = "none";
+    }
+    ++j;
+  }
+  if (document.cookie.match(/HTMLAREA-ABOUT-TAB=([0-9]+)/))
+    selectTab(RegExp.$1);
+}
+window.onresize = function() {
+  var content = document.getElementById("content");
+  if (window.innerHeight) {
+    content.style.height = (window.innerHeight - CONTENT_HEIGHT_DIFF) + "px";
+    content.style.width = (window.innerWidth - CONTENT_WIDTH_DIFF) + "px";
+  } else {
+    content.style.height = (document.body.offsetHeight - CONTENT_HEIGHT_DIFF) + "px";
+    //content.style.width = (document.body.offsetWidth - CONTENT_WIDTH_DIFF) + "px";
+  }
+}
+</script>
+<style>
+  html,body,textarea,table { font-family: tahoma,verdana,arial; font-size: 11px;
+padding: 0px; margin: 0px; }
+  tt { font-size: 120%; }
+  body { padding: 0px; background: #cea; color: 000; }
+  a:link, a:visited { color: #00f; }
+  a:hover { color: #f00; }
+  a:active { color: #f80; }
+  button { font: 11px tahoma,verdana,sans-serif; background-color: #cea;
+      border-width: 1px; }
+
+  p { margin: 0.5em 0px; }
+
+  h1 { font: bold 130% georgia,"times new roman",serif; margin: 0px; border-bottom: 1px solid #6a6; }
+  h2 { font: bold 110% georgia,"times new roman",serif; margin: 0.7em 0px; }
+
+  thead {
+    font-weight: bold;
+    background-color: #dfb;
+  }
+
+  .logo, .logo-hover {
+    white-space: nowrap;
+    background-color: #8f4; color: #040; padding: 3px; border-bottom: 1px solid #555;
+    height: 5em;
+  }
+  .logo .brand, .logo-hover .brand {
+    margin-left: 0.5em; margin-right: 0.5em; padding-bottom: 0.1em;
+    font-family: impact,'arial black',arial,sans-serif; font-size: 28px;
+    border-bottom: 1px solid #595; text-align: center;
+    cursor: pointer;
+  }
+  .logo-hover {
+    background-color: #fff;
+  }
+  .logo-hover .brand {
+    color: #800;
+    border-color: #04f;
+  }
+  .logo .letter, .logo-hover .letter { position: relative; font-family: monospace; }
+  .logo .letter1 { top: 0.1em; }
+  .logo .letter2 { top: 0.05em; }
+  .logo .letter3 { top: -0.05em; }
+  .logo .letter4 { top: -0.1em; }
+
+  .logo-hover .letter1 { top: -0.1em; }
+  .logo-hover .letter2 { top: -0.05em; }
+  .logo-hover .letter3 { top: 0.05em; }
+  .logo-hover .letter4 { top: 0.1em; }
+  .logo .version, .logo-hover .version { font-family: georgia,"times new roman",serif; }
+  .logo .release {
+    font-size: 90%; margin-bottom: 1em;
+    text-align: center; color: #484;
+  }
+  .logo .visit { display: none; }
+  .logo-hover .release { display: none; }
+  .logo-hover .visit {
+    font-size: 90%; margin-bottom: 1em;
+    text-align: center; color: #448;
+  }
+  .buttons {
+    text-align: right; padding: 3px; background-color: #8f4;
+    border-top: 1px solid #555;
+  }
+  #tabbar {
+    position: relative;
+    left: 10px;
+  }
+  .tab {
+    color: #454;
+    cursor: pointer;
+    margin-left: -5px;
+    float: left; position: relative;
+    border: 1px solid #555;
+    top: -3px; left: -2px;
+    padding: 2px 10px 3px 10px;
+    border-top: none; background-color: #9b7;
+    -moz-border-radius: 0px 0px 4px 4px;
+    z-index: 0;
+  }
+  .tab-current {
+    color: #000;
+    top: -4px;
+    background-color: #cea;
+    padding: 3px 10px 4px 10px;
+    z-index: 10;
+  }
+  table.sponsors { border-top: 1px solid #aca; }
+  table.sponsors td {
+    border-bottom: 1px solid #aca; vertical-align: top;
+  }
+  table.sponsors tr td { padding: 2px 0px; }
+  table.sponsors tr td.sponsor { text-align: right; padding-right: 0.3em; white-space: nowrap; }
+  li, ol, ul { margin-top: 0px; margin-bottom: 0px; }
+</style></head>
+<body onload="__dlg_init(); initDocument();"
+><table cellspacing="0" cellpadding="0" style="border-collapse: collapse;
+      width: 100%; height: 100%;">
+
+<tr style="height: 1em"><td id="tdheader">
+
+<div class="logo">
+<div class="brand"
+onmouseover="this.parentNode.className='logo-hover';"
+onmouseout="this.parentNode.className='logo';"
+onclick="window.open('http://dynarch.com/htmlarea/');">
+<span class="letter letter1">&lt;H</span><span
+class="letter letter2">T</span><span
+class="letter letter3">M</span><span
+class="letter letter4">L</span>Area <span class="letter">/&gt;</span>
+<span class="version">3.0 <span style="position: relative; top: -0.6em; font-size: 50%; font-weight: normal">[ rev. rc1 ]</span></span></div>
+<div class="release">Compiled on Mar  1, 2004 19:37 GMT</div>
+<div class="visit">Go to http://dynarch.com/htmlarea/ [latest milestone release]</div>
+</div>
+
+</td></tr>
+<tr><td id="tdcontent" style="padding: 0.5em;">
+
+<div style="overflow: auto; height: 250px;" id="content">
+<div id="tab-areas">
+
+<div id="tab-area-0">
+
+  <h1>HTMLArea</h1>
+  
+  <p>A free WYSIWYG editor replacement for <tt>&lt;textarea&gt;</tt> fields.<br />
+  For Mozilla 1.3+ (any platform) or Internet Explorer 5.5+ (Windows).
+  </p>
+
+  <p style="text-align: center"
+  >&copy; 2002-2004 <a href="http://interactivetools.com" target="_blank">interactivetools.com</a>, inc.<br />
+  &copy; 2003-2004 <a href="http://dynarch.com" target="_blank">dynarch.com</a> LLC.<br />
+  All Rights Reserved.</p>
+
+  <h2>Project resources</h2>
+
+  <ul>
+  <li><a href="http://sourceforge.net/projects/itools-htmlarea/" target="_blank"
+  >Project page</a> (@ sourceforge.net)</li>
+  <li><a href="http://sourceforge.net/cvs/?group_id=69750" target="_blank"
+  >Anonymous CVS access</a> (@ sourceforge.net)</li>
+  <li><a href="http://sourceforge.net/tracker/?atid=525656&group_id=69750&func=browse" target="_blank"
+  >Bug system</a> (@ sourceforge.net)</li>
+  <li><a href="http://www.interactivetools.com/forum/gforum.cgi?forum=14;" target="_blank"
+  >Forum</a> (@ interactivetools.com)</li>
+  <li><a href="http://www.dynarch.com/htmlarea/" target="_blank"
+  >Last public release</a> (@ dynarch.com)</li>
+  </ul>
+
+  <p>
+  For download section please see the <a href="http://sourceforge.net/projects/itools-htmlarea/" target="_blank"
+  >project page @ SourceForge</a>.
+  </p>
+
+<p style="margin-top: 1em; text-align: center;">Version 3.0 developed and maintained by <a
+href="http://dynarch.com/mishoo/" title="http://dynarch.com/mishoo/" target="_blank">Mihai Bazon</a> / <a
+href="http://dynarch.com" title="http://dynarch.com/" target="_blank">dynarch.com</a></p>
+
+</div>
+
+<div id="tab-area-1">
+<h1>Thank you</h1>
+
+  <p>
+  <a href="http://dynarch.com" target="_blank">dynarch.com</a> would like to thank the following
+  companies/persons for their <em>donations</em> to support development of HTMLArea (listed alphabetically):
+  </p>
+
+  <ul>
+    <li><a href="http://www.neomedia.ro">Neomedia</a> (Romania)</li>
+    <li><a href="http://www.os3.it" target="_blank">OS3</a> (Italy)</li>
+    <li><a href="http://www.softwerk.net">SoftWerk</a> (Italy)</li>
+  </ul>
+
+  <p>Also many thanks to all people at InteractiveTools.com
+  <a href="http://www.interactivetools.com/forum/gforum.cgi?forum=14;">HTMLArea forums</a> for
+  contributing translations, feedback, bug reports and fixes.</p>
+
+  <p>
+  Last but not least, this project wouldn't have existed without
+  <a href="http://interactivetools.com" target="_blank">InteractiveTools.com</a>.
+  </p>
+
+</div>
+
+<div id="tab-area-2">
+<h1>htmlArea License (based on BSD license)</h1>
+
+<p style="text-align: center">© 2002-2004, interactivetools.com, inc.<br />
+  © 2003-2004 dynarch.com LLC<br />
+  All rights reserved.</p>
+
+<p>
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+</p>
+
+<ol>
+<li>
+Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+</li>
+
+<li>
+Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
+</li>
+
+<li>
+Neither the name of interactivetools.com, inc. nor the names of its
+contributors may be used to endorse or promote products derived from this
+software without specific prior written permission.
+</li>
+</ol>
+
+<p>
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+</p>
+
+</div>
+
+<div id="tab-area-3">
+<h1>Plugins</h1>
+<div id="plugins">
+</div>
+</div>
+
+</div></div>
+
+
+</tr></td>
+<tr style="height: 1em"><td id="tdfooter">
+
+
+<div class="buttons">
+<div id="tabbar"
+><div class="tab tab-current"
+>About</div><div class="tab"
+>Thanks</div><div class="tab"
+>License</div><div class="tab"
+>Plugins</div></div>
+<button type="button" onclick="__dlg_close(null);">I agree it's cool</button>
+</div>
+
+</td></tr></table>
+
+</body></html>
+
+

Index: fullscreen.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/fullscreen.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- fullscreen.html	28 Mar 2003 20:05:29 -0000	1.1.1.1
+++ fullscreen.html	23 Mar 2004 15:41:10 -0000	1.2
@@ -1,133 +1,133 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html>
-<head><title>Fullscreen Editor</title>
-<style type="text/css">
-@import url(../htmlarea.css);
-html, body {	margin: 0px; border: 0px; background-color: buttonface; } </style>
+  <head>
+    <title>Fullscreen HTMLArea</title>
+    <script type="text/javascript">
+      _editor_url = window.opener._editor_url;
+      _editor_lang = window.opener._editor_lang;
+      var BASE = window.opener.document.baseURI || window.opener.document.URL;
+      var head = document.getElementsByTagName("head")[0];
+      var base = document.createElement("base");
+      base.href = BASE;
+      head.appendChild(base);
+    </script>
 
-<script type="text/javascript" src="../htmlarea.js"></script>
-<script type="text/javascript" src="../htmlarea-lang-en.js"></script>
-<script type="text/javascript" src="../dialog.js"></script>
+    <script type="text/javascript" src="../htmlarea.js"></script>
 
-<script type="text/javascript">
+    <script type="text/javascript">
+	// load HTMLArea scripts that are present in the opener frame
+	var scripts = window.opener.HTMLArea._scripts;
+	for (var i = 4; i < scripts.length; ++i) {
+           document.write("<scr" + "ipt type='text/javascript' src='" + scripts[i] + "'></scr" + "ipt>");
+        }
+    </script>
 
-var parent_object = opener.HTMLArea._object;
-var editor         = null;      // to be initialized later [ function init() ]
+    <!-- browser takes a coffee break here -->
+    <script type="text/javascript">
+var parent_object  = null;
+var editor	   = null;	// to be initialized later [ function init() ]
 
 /* ---------------------------------------------------------------------- *\
-  Function    : 
-  Description : 
+   Function    : 
+   Description : 
 \* ---------------------------------------------------------------------- */
 
 function _CloseOnEsc(ev) {
-  if (document.all) {
-    // IE
-    ev = window.event;
-  }
-  if (ev.keyCode == 27) {
-    // update_parent();
-    window.close();
-    return;
-  }
-}
-
-/* ---------------------------------------------------------------------- *\
-  Function    : cloneObject
-  Description : copy an object by value instead of by reference
-  Usage       : var newObj = cloneObject(oldObj);
-\* ---------------------------------------------------------------------- */
-
-function cloneObject(obj) {
-  var newObj          = new Object; 
-
-  // check for array objects
-  if (obj.constructor.toString().indexOf('function Array(') == 1) {
-    newObj = obj.constructor();
-  }
-
-  for (var n in obj) {
-    var node = obj[n];
-    if (typeof node == 'object') { newObj[n] = cloneObject(node); }
-    else                         { newObj[n] = node; }
-  }
-  
-  return newObj;
+	ev || (ev = window.event);
+	if (ev.keyCode == 27) {
+		// update_parent();
+		window.close();
+		return;
+	}
 }
 
 /* ---------------------------------------------------------------------- *\
-  Function    : resize_editor
-  Description : resize the editor when the user resizes the popup
+   Function    : resize_editor
+   Description : resize the editor when the user resizes the popup
 \* ---------------------------------------------------------------------- */
 
 function resize_editor() {  // resize editor to fix window
-  var newHeight;
-  if (document.all) {
-    // IE
-    newHeight = document.body.offsetHeight - editor._toolbar.offsetHeight;
-    if (newHeight < 0) { newHeight = 0; }
-  } else {
-    // Gecko
-    newHeight = window.innerHeight - editor._toolbar.offsetHeight;
-  }
-  editor._textArea2.style.height = editor._iframe.style.height = newHeight + "px";
+	var newHeight;
+	if (document.all) {
+		// IE
+		newHeight = document.body.offsetHeight - editor._toolbar.offsetHeight;
+		if (newHeight < 0) { newHeight = 0; }
+	} else {
+		// Gecko
+		newHeight = window.innerHeight - editor._toolbar.offsetHeight;
+	}
+	if (editor.config.statusBar) {
+		newHeight -= editor._statusBar.offsetHeight;
+	}
+	editor._textArea.style.height = editor._iframe.style.height = newHeight + "px";
 }
 
 /* ---------------------------------------------------------------------- *\
-  Function    : init
-  Description : run this code on page load
+   Function    : init
+   Description : run this code on page load
 \* ---------------------------------------------------------------------- */
 
 function init() {
-  var config         = cloneObject( parent_object.config );
-  config.editorURL   = "../";
-  config.width       = "100%";
-  config.height      = "auto";
+	parent_object	   = opener.HTMLArea._object;
+	var config	   = HTMLArea.cloneObject( parent_object.config );
+	config.width	   = "100%";
+	config.height	   = "auto";
 
-  // change maximize button to minimize button
-  config.btnList["popupeditor"] = [ function() { window.close(); },
-                                    'Minimize Editor', 'fullscreen_minimize.gif', true ];
+	// change maximize button to minimize button
+	config.btnList["popupeditor"] = [ 'Minimize Editor', _editor_url + 'images/fullscreen_minimize.gif', true,
+					  function() { window.close(); } ];
 
-  // generate editor and resize it
-  editor = new HTMLArea("editor", config);
-  editor.generate();
-  resize_editor();
-  editor._iframe.style.width = "100%";
-  editor._textArea2.style.width = "100%";
+	// generate editor and resize it
+	editor = new HTMLArea("editor", config);
 
-  // set child window contents and event handlers, after a small delay
-  setTimeout(function() {
-    editor.setHTML(parent_object.getInnerHTML());
+	// register the plugins, if any
+	for (var i in parent_object.plugins) {
+		var plugin = parent_object.plugins[i];
+		editor.registerPlugin2(plugin.name, plugin.args);
+	}
+	// and restore the original toolbar
+        config.toolbar = parent_object.config.toolbar;
+	editor.generate();
+	editor._iframe.style.width = "100%";
+	editor._textArea.style.width = "100%";
+	resize_editor();
 
-    // switch mode if needed
-    if (parent_object._mode == "textmode") { editor.setMode("textmode"); }
+	editor.doctype = parent_object.doctype;
 
-    // continuously update parent editor window
-    setInterval(update_parent, 500);
+	// set child window contents and event handlers, after a small delay
+	setTimeout(function() {
+			   editor.setHTML(parent_object.getInnerHTML());
 
-    // setup event handlers
-    document.body.onkeypress = _CloseOnEsc;
-    editor._doc.body.onkeypress = _CloseOnEsc;
-    editor._textArea2.onkeypress = _CloseOnEsc;
-    window.onresize = resize_editor;
-  }, 333);                      // give it some time to meet the new frame
+			   // switch mode if needed
+			   if (parent_object._mode == "textmode") { editor.setMode("textmode"); }
+
+			   // continuously update parent editor window
+			   setInterval(update_parent, 500);
+
+			   // setup event handlers
+			   document.body.onkeypress = _CloseOnEsc;
+			   editor._doc.body.onkeypress = _CloseOnEsc;
+			   editor._textArea.onkeypress = _CloseOnEsc;
+			   window.onresize = resize_editor;
+		   }, 333);			 // give it some time to meet the new frame
 }
 
 /* ---------------------------------------------------------------------- *\
-  Function    : update_parent
-  Description : update parent window editor field with contents from child window
-\* ---------------------------------------------------------------------- */
+   Function    : update_parent
+   Description : update parent window editor field with contents from child window
+   \* ---------------------------------------------------------------------- */
 
 function update_parent() {
-  // use the fast version
-  parent_object.setHTML(editor.getInnerHTML());
+	// use the fast version
+	parent_object.setHTML(editor.getInnerHTML());
 }
 
-
-</script>
-</head>
-<body scroll="no" onload="init()" onunload="update_parent()">
-
-<form style="margin: 0px; border: 1px solid; border-color: threedshadow threedhighlight threedhighlight threedshadow;">
-<textarea name="editor" id="editor" style="width:100%; height:300px">&nbsp;</textarea>
-</form>
-
-</body></html>
+    </script>
+    <style type="text/css"> html, body { height: 100%; margin: 0px; border: 0px; background-color: buttonface; } </style>
+  </head>
+  <body scroll="no" onload="setTimeout(function(){init();}, 500)" onunload="update_parent()">
+    <form style="margin: 0px; border: 1px solid; border-color: threedshadow threedhighlight threedhighlight threedshadow;">
+      <textarea name="editor" id="editor" style="width:100%; height:300px">&nbsp;</textarea>
+    </form>
+  </body>
+</html>

Index: select_color.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/select_color.html,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- select_color.html	28 Mar 2003 20:05:29 -0000	1.1.1.1
+++ select_color.html	23 Mar 2004 15:41:10 -0000	1.2
@@ -1,11 +1,12 @@
 <!-- note: this version of the color picker is optimized for IE 5.5+ only -->
 
-<html style="width: 238px; height: 182px"><head><title>Select Color</title>
+<html><head><title>Select Color</title>
 
 <script type="text/javascript" src="popup.js"></script>
 
 <script type="text/javascript">
 
+window.resizeTo(240, 182);
 function _CloseOnEsc() {
   if (event.keyCode == 27) { window.close(); return; }
 }