php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include/admin category.inc.php,1.8,1.9

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

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

Modified Files:
	category.inc.php 
Log Message:
no need to use strtolower


Index: category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/category.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- category.inc.php	3 Jan 2005 19:36:44 -0000	1.8
+++ category.inc.php	17 Jan 2005 13:55:54 -0000	1.9
@@ -78,7 +78,7 @@
     if ($serendipity['GET']['cid'] != 0) {
         $remaining_cat = (int)$serendipity['POST']['cat']['remaining_catid'];
         $category_range = implode(' AND ', serendipity_fetchCategoryRange((int)$serendipity['GET']['cid']));
-        if (strtolower($serendipity['dbType']) == 'postgres') {
+        if ($serendipity['dbType'] == 'postgres' || $serendipity['dbType'] == 'sqlite') {
             $query = "UPDATE {$serendipity['dbPrefix']}entrycat
                         SET categoryid={$remaining_cat} WHERE entryid IN
                         (

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.44,1.45

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
fix loosing associated categories after POSTing


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- functions_entries.inc.php	14 Jan 2005 12:28:17 -0000	1.44
+++ functions_entries.inc.php	17 Jan 2005 13:27:26 -0000	1.45
@@ -898,7 +898,7 @@
         $entry['last_modified'] = time();
     }
 
-    /* WYSIWYG-editor inserts empty '<br />' for extended body; this is reversed here */
+    /* WYSIWYG-editor inserts empty ' ' for extended body; this is reversed here */
     if (isset($entry['extended']) && trim($entry['extended']) == '') {
         $entry['extended'] = '';
     }
@@ -1131,6 +1131,15 @@
         $allow_comments = '';
     }
 
+    // Fix category list. If the entryForm is displayed after a POST request, the additional category information is lost.
+    if (is_array($entry['categories']) && !is_array($entry['categories'][0])) {
+        $categories = (array)$entry['categories'];
+        $entry['categories'] = array();
+        foreach ($categories as $catid) {
+            $entry['categories'][] = serendipity_fetchCategoryInfo($catid);
+        }
+    }
+
     $n = "\n";
     $cat_list = '<select id="categoryselector" name="serendipity[categories][]" style="vertical-align: middle;" multiple="multiple">' . $n;
     $cat_list .= '    <option value="0">[' . NO_CATEGORY . ']</option>' . $n;

[php-blog-cvs] serendipity/plugins/serendipity_event_statistics serendipity_event_statistics.php,1.18,1.19

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

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

Modified Files:
	serendipity_event_statistics.php 
Log Message:
fix division by zero on empty article base


Index: serendipity_event_statistics.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_statistics/serendipity_event_statistics.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_event_statistics.php	8 Jan 2005 12:25:12 -0000	1.18
+++ serendipity_event_statistics.php	17 Jan 2005 11:43:25 -0000	1.19
@@ -424,11 +424,11 @@
         <br />
 
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE; ?></strong></dt>
-        <dd><?php echo round($comment_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE;2 ?></dd>
+        <dd><?php echo round($comment_count[0] / max($publish_count[0], 1), 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_COMMENTS_PER_ARTICLE;2 ?></dd>
         <br />
 
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE; ?></strong></dt>
-        <dd><?php echo round($tb_count[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd>
+        <dd><?php echo round($tb_count[0] / max($publish_count[0], 1), 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_TRACKBACKS_PER_ARTICLE2; ?></dd>
         <br />
 
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_ARTICLES_PER_DAY; ?></strong></dt>
@@ -450,7 +450,7 @@
         <br />
 
         <dt><strong><?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE; ?></strong></dt>
-        <dd><?php echo round($length[0] / $publish_count[0], 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2; ?></dd>
+        <dd><?php echo round($length[0] / max($publish_count[0], 1), 2); ?> <?php echo PLUGIN_EVENT_STATISTICS_OUT_CHARS_PER_ARTICLE2; ?></dd>
         <br />
 
         <dt><strong><?php printf(PLUGIN_EVENT_STATISTICS_OUT_LONGEST_ARTICLES, $max_items); ?></strong></dt>

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.41,1.42

[Sebastian N. <no...@us...>]

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

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
Make the order of spamblock events cost-based:

1. Checks that don't require any database or network access
2. Checks that require databases access, but no network access
3. Checks that require network access

Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_event_spamblock.php	4 Jan 2005 10:06:37 -0000	1.41
+++ serendipity_event_spamblock.php	16 Jan 2005 10:09:20 -0000	1.42
@@ -374,6 +374,43 @@
                             return false;
                         }
 
+                        // Check for forced moderation
+                        if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) {
+                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION, $addData);
+                            $eventData['moderate_comments'] = true;
+                            $serendipity['csuccess']        = 'moderate';
+                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION;
+                            return false;
+                        }
+
+                        // Check for maximum number of links before rejecting
+                        $link_count = substr_count(strtolower($addData['comment']), 'http://');
+                        if ($links_reject > 0 && $link_count > $links_reject) {
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_REJECT, $addData);
+                            $eventData = array('allow_comments' => false);
+                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                            return false;
+                        }
+
+                        // Check for maximum number of links before forcing moderation
+                        if ($links_moderate > 0 && $link_count > $links_moderate) {
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE, $addData);
+                            $eventData['moderate_comments'] = true;
+                            $serendipity['csuccess']        = 'moderate';
+                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE;
+                            return false;
+                        }
+
+                        // Captcha checking
+                        if ($show_captcha && $addData['type'] == 'NORMAL') {
+                            if (!isset($_SESSION['spamblock']['captcha']) || !isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) {
+                                $this->log($logfile, $eventData['id'], 'REJECTED', sprintf(PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS, $serendipity['POST']['captcha'], $_SESSION['spamblock']['captcha']), $addData);
+                                $eventData = array('allow_comments' => false);
+                                $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS;
+                                return false;
+                            }
+                        }
+
                         // Check for identical comments. We allow to bypass trackbacks from our server to our own blog.
                         if ( $this->get_config('bodyclone', true) === true && $_SERVER['REMOTE_ADDR'] != $_SERVER['SERVER_ADDR']) {
                             $query = "SELECT count(id) AS counter FROM {$serendipity['dbPrefix']}comments WHERE body = '" . serendipity_db_escape_string($addData['comment']) . "'";
@@ -453,41 +490,6 @@
                                 }
                             }
                         }
-
-                        // Captcha checking
-                        if ($show_captcha && $addData['type'] == 'NORMAL') {
-                            if (!isset($_SESSION['spamblock']['captcha']) || !isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) {
-                                $this->log($logfile, $eventData['id'], 'REJECTED', sprintf(PLUGIN_EVENT_SPAMBLOCK_REASON_CAPTCHAS, $serendipity['POST']['captcha'], $_SESSION['spamblock']['captcha']), $addData);
-                                $eventData = array('allow_comments' => false);
-                                $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS;
-                                return false;
-                            }
-                        }
-
-                        // Check for forced moderation
-                        if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) {
-                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION, $addData);
-                            $eventData['moderate_comments'] = true;
-                            $serendipity['csuccess']        = 'moderate';
-                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION;
-                            return false;
-                        }
-
-                        $link_count = substr_count(strtolower($addData['comment']), 'http://');
-                        if ($links_reject > 0 && $link_count > $links_reject) {
-                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_REJECT, $addData);
-                            $eventData = array('allow_comments' => false);
-                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
-                            return false;
-                        }
-
-                        if ($links_moderate > 0 && $link_count > $links_moderate) {
-                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE, $addData);
-                            $eventData['moderate_comments'] = true;
-                            $serendipity['csuccess']        = 'moderate';
-                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE;
-                            return false;
-                        }
                     }
                     return true;
                     break;

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.115,1.116

[Tom S. <tom...@us...>]

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

Modified Files:
	serendipity_lang_da.inc.php 
Log Message:
- Add danish FreeBSD locale


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- serendipity_lang_da.inc.php	10 Jan 2005 16:01:49 -0000	1.115
+++ serendipity_lang_da.inc.php	15 Jan 2005 19:29:12 -0000	1.116
@@ -9,7 +9,7 @@
 
 
 @define('LANG_CHARSET', 'ISO-8859-1');
-@define('DATE_LOCALES', 'danish, da, da_DK');
+@define('DATE_LOCALES', 'danish, da, da_DK, da_DK.ISO8859-1');
 @define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y');
 @define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'da');
@@ -665,4 +665,4 @@
 @define('ERROR_FILE_FORBIDDEN', 'You are not allowed to upload files with active content'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
\ No newline at end of file
+?>

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.10,1.11

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

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

Modified Files:
	functions_comments.inc.php 
Log Message:
When previewing an unsaved entry, the $id variable is empty and would
generate a list of all comments available (and probably timeout with many
comments).
Fix that situation by using an empty array for those.


Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- functions_comments.inc.php	28 Dec 2004 17:49:44 -0000	1.10
+++ functions_comments.inc.php	15 Jan 2005 16:46:48 -0000	1.11
@@ -125,8 +125,12 @@
 function serendipity_generateCommentList($id, $comments = NULL, $selected = 0, $parent = 0, $level = 0, $indent = '') {
     global $serendipity;
 
-    if ( !is_array($comments) ) {
-        $comments = serendipity_fetchComments($id);
+    if (!is_array($comments)) {
+        if (empty($id)) {
+            $comments = array();
+        } else {
+            $comments = serendipity_fetchComments($id);
+        }
     }
 
     $retval = $parent ? '' : '<select id="serendipity_replyTo" name="serendipity[replyTo]"><option value="0">[ ' . TOP_LEVEL . ' ]</option>';

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.43,1.44

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
updated htmlarea does no longer insert '<br />' but an ' ' instead.


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- functions_entries.inc.php	11 Jan 2005 15:00:34 -0000	1.43
+++ functions_entries.inc.php	14 Jan 2005 12:28:17 -0000	1.44
@@ -899,7 +899,7 @@
     }
 
     /* WYSIWYG-editor inserts empty '<br />' for extended body; this is reversed here */
-    if (isset($entry['extended']) && trim($entry['extended']) == '<br />') {
+    if (isset($entry['extended']) && trim($entry['extended']) == '') {
         $entry['extended'] = '';
     }
 

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

[Tom S. <tom...@us...>]

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

Modified Files:
	style.css 
Log Message:
The admin looked like shit in both FireFox and IE. So lets do it right, no browser hacks and the admin looks exactly the same in both browsers


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- style.css	11 Jan 2005 13:52:14 -0000	1.15
+++ style.css	13 Jan 2005 22:46:16 -0000	1.16
@@ -19,21 +19,20 @@
     width: 80%;
     min-width: 777px;
     margin: auto;
+    background-color: #FFFFFF;
+    border: 2px solid #0F3353;
+    padding:2px;
 }
 
 #serendipityAdminBanner {
     background-color: #FFFFFF;
-    border-right: 2px solid #0F3353;
-    border-left: 2px solid #0F3353;
     height: 80px;
 }
 
 #serendipityAdminInfopane {
     background-color: #F8F9FA;
-    font-size: 0.8em;
+    font-size: 10px;
     padding: 5px;
-    border-left: 2px solid #0F3353;
-    border-right: 2px solid #0F3353;
     border-top: 1px solid #000000;
     border-bottom: 1px solid #000000;
     vertical-align: middle;
@@ -50,39 +49,35 @@
 }
 
 .serendipityAdminContent {
-    font-size: 0.9em;
+    font-size: 12px;
     padding-top: 10px;
     padding-right: 5px;
     padding-left: 5px;
 }
 
-#serendipityAdminMainpane table {
-    width: 97%; // Stoopid IE will otherwise destroy borders
-}
-
 #serendipityAdminBanner h1 {
     padding-top: 20px;
     padding-left: 20px;
-    font-size: 1.3em;
+    font-size: 20px;
     margin: 0;
 }
 
 #serendipityAdminBanner h2 {
     padding-left: 30px;
-    font-size: 0.9em;
+    font-size: 12px;
     color: #AAAAAA;
     margin: 0;
 }
 
 
 #serendipitySideBar {
-    font-size: 0.9em;
+    font-size: 12px;
     width: 150px;
     padding-top: 10px;
 }
 
 #serendipityAdminFooter {
-    font-size: 0.8em;
+    font-size: 10px;
     text-align: center;
     color: #FFFFFF;
 }
@@ -103,7 +98,7 @@
 }
 
 .serendipity_admin_title {
-    font-size: 1.3em;
+    font-size: 20px;
     margin-bottom: 5px;
 }
 
@@ -144,7 +139,7 @@
 
 
 td, th {
-    font-size: 0.9em;
+    font-size: 12px;
 }
 
 a:visited,

[php-blog-cvs] serendipity serendipity_admin.php,1.60,1.61

[Tom S. <tom...@us...>]

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

Modified Files:
	serendipity_admin.php 
Log Message:
The admin looked like shit in both FireFox and IE. So lets do it right, no browser hacks and the admin looks exactly the same in both browsers


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- serendipity_admin.php	13 Jan 2005 18:09:38 -0000	1.60
+++ serendipity_admin.php	13 Jan 2005 22:46:15 -0000	1.61
@@ -52,24 +52,24 @@
         </script>
     </head>
     <body id="serendipity_admin_page" onload="spawn()">
-    <div id="serendipityAdminFrame">
-        <div id="serendipityAdminBanner">
-    <?php if ( IS_installed === true && IS_up2date === true ) { ?>
-            <h1><?php echo SERENDIPITY_ADMIN_SUITE ?></h1>
-            <h2><?php echo $serendipity['blogTitle'] ?></h2>
-    <?php } elseif ( IS_installed === false || IS_up2date === false ) { ?>
-            <h1><?php echo SERENDIPITY_INSTALLATION ?></h1>
-    <?php } ?>
-        </div>
-
-        <div id="serendipityAdminInfopane">
-        <?php if (serendipity_userLoggedIn()) { ?>
-            <?php echo sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) ?>
-        <?php } ?>
-        </div>
-
-        <div id="serendipityAdminMainpane">
-        <table width="100%" cellspacing="0" cellpadding="0">
+        <table cellspacing="0" cellpadding="0" border="0" id="serendipityAdminFrame">
+            <tr>
+                <td colspan="2" id="serendipityAdminBanner">
+                <?php if ( IS_installed === true && IS_up2date === true ) { ?>
+                    <h1><?php echo SERENDIPITY_ADMIN_SUITE ?></h1>
+                    <h2><?php echo $serendipity['blogTitle'] ?></h2>
+                <?php } elseif ( IS_installed === false || IS_up2date === false ) { ?>
+                    <h1><?php echo SERENDIPITY_INSTALLATION ?></h1>
+                <?php } ?>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2" id="serendipityAdminInfopane">
+                    <?php if (serendipity_userLoggedIn()) { ?>
+                        <?php echo sprintf(USER_SELF_INFO, $serendipity['serendipityUser'], $serendipity['serendipityUserlevel']) ?>
+                    <?php } ?>
+                </td>
+            </tr>
             <tr valign="top">
 <?php
 if (!isset($serendipity['serendipityPath']) || IS_installed === false || IS_up2date === false ) {
@@ -82,107 +82,101 @@
     }
 ?>
                 <td>
-                    <p><?php require_once(S9Y_INCLUDE_PATH . $file); ?>
+                    <?php require_once(S9Y_INCLUDE_PATH . $file); ?>
 <?php
 
 
 } elseif ( serendipity_userLoggedIn() == false ) {
 ?>
-    <td id="content">
-        <div class="serendipityAdminContent">
-            <div align="center"><?php echo WELCOME_TO_ADMIN ?><br /><?php echo PLEASE_ENTER_CREDENTIALS ?></div>
-            <br />
-<?php
-    if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) {
-?>
-            <div class="serendipityAdminMsgError"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>
-<?php
-    }
-?>
-            <form action="?" method="post">
-                <input type="hidden" name="serendipity[action]" value="admin" />
-                <table cellspacing="10" cellpadding="0" border="0" align="center">
-                    <tr>
-                        <td><?php echo USERNAME ?></td>
-                        <td><input type="text" name="serendipity[user]" /></td>
-                    </tr>
-                    <tr>
-                        <td><?php echo PASSWORD ?></td>
-                        <td><input type="password" name="serendipity[pass]" /></td>
-                    </tr>
-                    <tr>
-                        <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?>
-                    </tr>
-                    <tr>
-                        <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> &gt;" /></td>
-                    </tr>
-                </table>
-            </form>
-            <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a>
+                <td id="content">
+                    <div class="serendipityAdminContent">
+                        <div align="center"><?php echo WELCOME_TO_ADMIN ?><br /><?php echo PLEASE_ENTER_CREDENTIALS ?></div>
+                    <br />
+                    <?php if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) { ?>
+                    <div class="serendipityAdminMsgError"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>
+                    <?php } ?>
+                    <form action="?" method="post">
+                        <input type="hidden" name="serendipity[action]" value="admin" />
+                        <table cellspacing="10" cellpadding="0" border="0" align="center">
+                            <tr>
+                                <td><?php echo USERNAME ?></td>
+                                <td><input type="text" name="serendipity[user]" /></td>
+                            </tr>
+                            <tr>
+                                <td><?php echo PASSWORD ?></td>
+                                <td><input type="password" name="serendipity[pass]" /></td>
+                            </tr>
+                            <tr>
+                                <td colspan="2"><input id="autologin" type="checkbox" name="serendipity[auto]" /><label for="autologin"> <?php echo AUTOMATIC_LOGIN ?>
+                            </tr>
+                            <tr>
+                                <td colspan="2" align="right"><input type="submit" name="submit" value="<?php echo LOGIN ?> &gt;" /></td>
+                            </tr>
+                        </table>
+                    </form>
+                    <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG;?></a>
 <?php
 
 
 
 } else {
 ?>
-        <td id="serendipitySideBar">
-            <div class="serendipitySideBarItem">
-                <div class="serendipitySideBarContent">
-                    <a href="serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br />
-                    <a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a><br />
-                </div>
-            </div>
-
-            <ul class="serendipitySideBarMenu">
-                <lh><?php echo serendipity_mb('ucfirst', ENTRIES); ?></lh>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=category&amp;serendipity[adminAction]=view"><?php echo CATEGORIES; ?></a></li>
-                <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?>
-            </ul>
+                <td id="serendipitySideBar">
+                    <div class="serendipitySideBarItem">
+                        <div class="serendipitySideBarContent">
+                            <a href="serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br />
+                            <a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a><br />
+                        </div>
+                    </div>
 
-            <ul class="serendipitySideBarMenu">
-                <lh><?php echo MEDIA; ?></lh>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li>
-<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li>
-<?php } ?>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li>
-                <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?>
-            </ul>
+                    <ul class="serendipitySideBarMenu">
+                        <lh><?php echo serendipity_mb('ucfirst', ENTRIES); ?></lh>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php echo EDIT_ENTRIES; ?></a></li>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=comments"><?php echo COMMENTS; ?></a></li>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=category&amp;serendipity[adminAction]=view"><?php echo CATEGORIES; ?></a></li>
+                        <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?>
+                    </ul>
 
-<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
-            <ul class="serendipitySideBarMenu">
-                <lh><?php echo APPEARANCE; ?></lh>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li>
-                <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?>
-            </ul>
-<?php } ?>
+                    <ul class="serendipitySideBarMenu">
+                        <lh><?php echo MEDIA; ?></lh>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=addSelect"><?php echo ADD_MEDIA; ?></a></li>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=media"><?php echo MEDIA_LIBRARY; ?></a></li>
+                        <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=directorySelect"><?php echo MANAGE_DIRECTORIES; ?></a></li>
+                        <?php } ?>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=media&amp;serendipity[adminAction]=sync" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a></li>
+                        <?php serendipity_plugin_api::hook_event('backend_sidebar_entries_images', $serendipity); ?>
+                    </ul>
 
-            <ul class="serendipitySideBarMenu">
-                <lh><?php echo ADMIN; ?></lh>
-<?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li>
-<?php } ?>
 <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li>
+                    <ul class="serendipitySideBarMenu">
+                        <lh><?php echo APPEARANCE; ?></lh>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=templates"><?php echo MANAGE_STYLES; ?></a></li>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=plugins"><?php echo CONFIGURE_PLUGINS; ?></a></li>
+                        <?php serendipity_plugin_api::hook_event('backend_sidebar_admin_appearance', $serendipity); ?>
+                    </ul>
 <?php } ?>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li>
-                <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?>
-            </ul>
+                    <ul class="serendipitySideBarMenu">
+                        <lh><?php echo ADMIN; ?></lh>
+                        <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=configuration"><?php echo CONFIGURATION; ?></a></li>
+                        <?php } ?>
+                        <?php if ($serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) { ?>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=users"><?php echo MANAGE_USERS; ?></a></li>
+                        <?php } ?>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=import"><?php echo IMPORT_ENTRIES; ?></a></li>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=export"><?php echo EXPORT_ENTRIES; ?></a></li>
+                        <?php serendipity_plugin_api::hook_event('backend_sidebar_admin', $serendipity); ?>
+                    </ul>
 
-            <ul class="serendipitySideBarMenu">
-                <li><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li>
-                <li><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li>
-            </ul>
+                    <ul class="serendipitySideBarMenu">
+                        <li><a href="<?php echo $serendipity['baseURL']; ?>"><?php echo BACK_TO_BLOG; ?></a></li>
+                        <li><a href="serendipity_admin.php?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a></li>
+                    </ul>
 
                 </td>
-                <td id="content">
-                    <div class="serendipityAdminContent">
+                <td class="serendipityAdminContent">
 <?php
     if (!isset($serendipity['GET']['adminModule'])) {
         $serendipity['GET']['adminModule'] = (isset($serendipity['POST']['adminModule']) ? $serendipity['POST']['adminModule'] : '');
@@ -254,14 +248,11 @@
     }
 }
 ?>
-                    </div>
                 </td>
             </tr>
         </table>
-        </div>
         <br />
         <div id="serendipityAdminFooter"><?php echo sprintf(ADMIN_FOOTER_POWERED_BY, $serendipity['versionInstalled'], phpversion()); ?></div>
-    </div>
     </body>
 </html>
 <?php

[php-blog-cvs] serendipity serendipity.css.php,1.34,1.35 serendipity_admin.php,1.59,1.60 serendipity_config.inc.php,1.132,1.133

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

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

Modified Files:
	serendipity.css.php serendipity_admin.php 
	serendipity_config.inc.php 
Log Message:
hopefully fix CSS borkage of admin panel for installation


Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity.css.php	11 Jan 2005 12:53:27 -0000	1.34
+++ serendipity.css.php	13 Jan 2005 18:09:38 -0000	1.35
@@ -2,8 +2,14 @@
 
 session_start();
 
+/* This is a small hack to allow CSS display during installations and upgrades */
+define('IN_installer', true);
+define('IN_upgrader', true);
+
+include_once('serendipity_config.inc.php');
+
 if (!isset($css_mode)) {
-    $css_mode = 'frontend';
+    $css_mode = 'serendipity.css';
 }
 
 switch($css_mode) {
@@ -19,12 +25,6 @@
         break;
 }
 
-/* This is a small hack to allow CSS display during installations and upgrades */
-define('IN_installer', true);
-define('IN_upgrader', true);
-
-include_once('serendipity_config.inc.php');
-
 header('Content-type: text/css');
 function serendipity_printStylesheet($file) {
     global $serendipity;
@@ -33,7 +33,7 @@
 
 if (IS_installed === false) {
     if (file_exists('templates/' . $serendipity['defaultTemplate'] . '/' . $css_file)) {
-        echo serendipity_printStylesheet('templates/'. $serendipity['defaultTemplate'] . $css_file);
+        echo serendipity_printStylesheet('templates/' . $serendipity['defaultTemplate'] . '/' . $css_file);
     }
     die();
 }

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- serendipity_config.inc.php	11 Jan 2005 13:00:37 -0000	1.132
+++ serendipity_config.inc.php	13 Jan 2005 18:09:38 -0000	1.133
@@ -163,6 +163,7 @@
 
 if (defined('IN_installer') && IS_installed === false) {
     $serendipity['lang'] = $serendipity['autolang'];
+    $css_mode            = 'serendipity_admin.css';
     return 1;
 }
 

Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_admin.php	11 Jan 2005 13:00:36 -0000	1.59
+++ serendipity_admin.php	13 Jan 2005 18:09:38 -0000	1.60
@@ -11,6 +11,9 @@
 if (IS_installed === false) {
     require_once(S9Y_INCLUDE_PATH . 'include/functions_installer.inc.php');
     require_once S9Y_INCLUDE_PATH . 'include/functions_config.inc.php';
+    $css_file = 'serendipity.css.php';
+} else {
+    $css_file = serendipity_rewriteURL('serendipity_admin.css');
 }
 
 if (isset($serendipity['GET']['adminModule']) && $serendipity['GET']['adminModule'] == 'logout') {
@@ -31,7 +34,7 @@
     <head>
         <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
         <meta http-equiv="Content-Type" content="text/html; charset=<?php echo LANG_CHARSET; ?>" />
-        <link rel="stylesheet" type="text/css" href="<?php echo serendipity_rewriteURL('serendipity_admin.css'); ?>" />
+        <link rel="stylesheet" type="text/css" href="<?php echo $css_file; ?>" />
         <script type="text/javascript">
         function spawn() {
             if (self.Spawnextended) {

[php-blog-cvs] serendipity/plugins/serendipity_event_s9ymarkup/serendipity_event_markdown - New directory

[Jan L. <op...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_s9ymarkup/serendipity_event_markdown
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27610/serendipity_event_markdown

Log Message:
Directory /cvsroot/php-blog/serendipity/plugins/serendipity_event_s9ymarkup/serendipity_event_markdown added to the repository

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

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

Update of /cvsroot/php-blog/serendipity/htmlarea/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12393/htmlarea/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_left_to_right.gif ed_link.gif 
	ed_list_bullet.gif ed_list_num.gif ed_paste.gif ed_redo.gif 
	ed_right_to_left.gif ed_save.gif ed_show_border.gif 
	ed_splitcel.gif ed_undo.gif fullscreen_maximize.gif 
	fullscreen_minimize.gif insert_table.gif 
Added Files:
	ed_killword.gif ed_print.gif ed_rmformat.gif ed_save.png 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



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

Index: ed_align_center.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_align_center.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsje0snS and /tmp/cvshpm1X9 differ

Index: ed_color_fg.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_color_fg.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsXzUhGw and /tmp/cvstwxcHO differ

Index: ed_charmap.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_charmap.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsArWhfM and /tmp/cvsVKWDw4 differ

Index: fullscreen_maximize.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/fullscreen_maximize.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsD1P4S6 and /tmp/cvsyUr56p differ

Index: ed_left_to_right.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_left_to_right.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsXFNrVt and /tmp/cvsrJzqoN differ

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

Index: ed_align_justify.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_align_justify.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsm0zUl0 and /tmp/cvsWYTjgk differ

Index: ed_align_right.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_align_right.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsZs44Im and /tmp/cvsCPeDTG differ

Index: ed_copy.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_copy.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsQH4cDY and /tmp/cvscyydhj differ

Index: ed_format_sup.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_sup.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvs8v589J and /tmp/cvsHv4WBg differ

Index: ed_save.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_save.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs0IgR6N and /tmp/cvsy9mgBk differ

Index: ed_show_border.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_show_border.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvslfB6kH and /tmp/cvsv0UQSd differ

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

Index: ed_color_bg.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_color_bg.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsj9kz2f and /tmp/cvsthxrVM differ

Index: ed_redo.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_redo.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsTUbx6p and /tmp/cvsRvxv7W differ

Index: ed_paste.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_paste.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs4DV98H and /tmp/cvsuZeK6f differ

Index: ed_image.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_image.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsTCiGJ4 and /tmp/cvsRTbJ0C differ

Index: fullscreen_minimize.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/fullscreen_minimize.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvshKM4Af and /tmp/cvsSCsC0N differ

Index: ed_format_sub.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_sub.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsrvO5Oh and /tmp/cvsdBKgZQ differ

Index: ed_indent_less.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_indent_less.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsVKPLkv and /tmp/cvsRNN1p5 differ

Index: ed_undo.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_undo.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsr60b6Q and /tmp/cvsFdimur differ

Index: ed_format_strike.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_strike.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsNo1z8M and /tmp/cvsCfVoTo differ

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

Index: ed_help.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_help.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvskKLOk6 and /tmp/cvsPTYooI differ

Index: ed_format_bold.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_bold.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsfWsSNC and /tmp/cvsKcSfef differ

Index: ed_indent_more.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_indent_more.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsNClE2N and /tmp/cvsVLwiAq differ

Index: ed_about.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_about.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsz6UwUi and /tmp/cvsRpl2QV differ

Index: ed_right_to_left.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_right_to_left.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs40FPfz and /tmp/cvsJLoDoc differ

Index: ed_custom.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_custom.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvs6D8SvX and /tmp/cvs2wJUJB differ

Index: insert_table.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/insert_table.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsrY7Vip and /tmp/cvsZja2O3 differ

Index: ed_splitcel.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_splitcel.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsJNfEdX and /tmp/cvsZENjRC differ

Index: ed_html.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_html.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvs9zkqiQ and /tmp/cvsWZJ8Cw differ

Index: ed_format_italic.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_italic.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsvsfpjl and /tmp/cvsWZk421 differ

Index: ed_blank.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_blank.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsorSUKN and /tmp/cvswfu9Mu differ

Index: ed_hr.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_hr.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsOsK3za and /tmp/cvssaDYYR differ

Index: ed_delete.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_delete.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvseRXdHt and /tmp/cvsBaUBib differ

Index: ed_format_underline.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_format_underline.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsUunIIZ and /tmp/cvsA3BfLH differ

Index: ed_align_left.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_align_left.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvs9EQDHY and /tmp/cvsAj6smH differ

Index: ed_list_num.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_list_num.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsmSi9HU and /tmp/cvsxaKCqD differ

Index: ed_list_bullet.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_list_bullet.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvs2cn2I8 and /tmp/cvsHWNCAR differ

Index: ed_cut.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_cut.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsKCd8Jo and /tmp/cvsyGUPN7 differ

Index: ed_link.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/images/ed_link.gif,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
Binary files /tmp/cvsOMwsJU and /tmp/cvsvkyp6D differ

[php-blog-cvs] serendipity/htmlarea/plugins/TableOperations/img cell-delete.gif,1.2,1.3 cell-insert-after.gif,1.2,1.3 cell-insert-before.gif,1.2,1.3 cell-merge.gif,1.2,1.3 cell-prop.gif,1.2,1.3 cell-split.gif,1.2,1.3 col-delete.gif,1.2,1.3 col-insert-after.gif,1.2,1.3 col-insert-before.gif,1.2,1.3 col-split.gif,1.2,1.3 row-delete.gif,1.2,1.3 row-insert-above.gif,1.2,1.3 row-insert-under.gif,1.2,1.3 row-prop.gif,1.2,1.3 row-split.gif,1.2,1.3 table-prop.gif,1.2,1.3

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

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

Modified Files:
	cell-delete.gif cell-insert-after.gif cell-insert-before.gif 
	cell-merge.gif cell-prop.gif cell-split.gif col-delete.gif 
	col-insert-after.gif col-insert-before.gif col-split.gif 
	row-delete.gif row-insert-above.gif row-insert-under.gif 
	row-prop.gif row-split.gif table-prop.gif 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: col-delete.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/col-delete.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsZv876L and /tmp/cvsZMm2ah differ

Index: col-insert-before.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/col-insert-before.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs2gBPpN and /tmp/cvslG0Kwi differ

Index: cell-delete.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/cell-delete.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsOAfpFR and /tmp/cvsWvVrOm differ

Index: cell-insert-after.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/cell-insert-after.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsZUfmVX and /tmp/cvsx54p8s differ

Index: row-delete.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/row-delete.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsywZVu7 and /tmp/cvs4CKLMC differ

Index: row-insert-under.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/row-insert-under.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs3amdQl and /tmp/cvszko91R differ

Index: cell-prop.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/cell-prop.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvseVcnop and /tmp/cvs8PTmnW differ

Index: col-split.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/col-split.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsA6DuFM and /tmp/cvsqC5ETj differ

Index: table-prop.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/table-prop.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsFNJ3GN and /tmp/cvsyWwDGl differ

Index: col-insert-after.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/col-insert-after.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsl5Vh86 and /tmp/cvsh2RMqF differ

Index: row-prop.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/row-prop.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsd2cf1q and /tmp/cvsBfeKwZ differ

Index: row-insert-above.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/row-insert-above.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsxoFceg and /tmp/cvsk5iUoP differ

Index: cell-insert-before.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/cell-insert-before.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsPZdlZt and /tmp/cvsEJxth3 differ

Index: cell-merge.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/cell-merge.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsbK3TUy and /tmp/cvsSPbgg8 differ

Index: row-split.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/row-split.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsLW9EpG and /tmp/cvswdxaZf differ

Index: cell-split.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/img/cell-split.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvs0smcrv and /tmp/cvsWXVXw5 differ

[php-blog-cvs] serendipity/htmlarea dialog.js,1.2,1.3 htmlarea.css,1.2,1.3 htmlarea.js,1.6,1.7 index.html,1.1,1.2 license.txt,1.3,1.4 popupdiv.js,1.1,1.2 popupwin.js,1.1,1.2 release-notes.html,1.1,1.2

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

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

Modified Files:
	dialog.js htmlarea.css htmlarea.js index.html license.txt 
	popupdiv.js popupwin.js release-notes.html 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: htmlarea.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/htmlarea.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- htmlarea.css	23 Mar 2004 15:41:04 -0000	1.2
+++ htmlarea.css	11 Jan 2005 15:00:34 -0000	1.3
@@ -3,7 +3,7 @@
 .htmlarea .toolbar {
   cursor: default;
   background: ButtonFace;
-  padding: 1px 1px 2px 1px;
+  padding: 3px;
   border: 1px solid;
   border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
 }
@@ -42,7 +42,7 @@
 }
 
 .htmlarea .toolbar .buttonDisabled img {
-  filter: alpha(opacity = 25);
+  filter: gray() alpha(opacity = 25);
   -moz-opacity: 0.25;
 }
 

Index: index.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.html	23 Mar 2004 15:41:04 -0000	1.1
+++ index.html	11 Jan 2005 15:00:35 -0000	1.2
@@ -14,13 +14,13 @@
     <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>
+          <td class="label">Version:</td><td><% $version %></td>
         </tr>
         <tr>
-          <td class="label">Release:</td><td>rc1 (<a href="release-notes.html">release notes</a>)</td>
+          <td class="label">Release:</td><td><% $release %> (<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>
+          <td class="label bline">Compiled at:</td><td class="bline"><% $time %></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>
@@ -46,7 +46,7 @@
       Please see our About Box for details about who sponsored what plugins.
     </p>
 
-    <h2>Online demos</h2>
+    <h2><a href="examples/">Online demos</a></h2>
 
     <ul>
 
@@ -89,14 +89,15 @@
     <pre style="margin-left: 2em"
 >
 cd /var/www/html
-unzip /path/to/archive/HTMLArea-3.0-rc1.zip
-mv HTMLArea-3.0-rc1 htmlarea
+unzip /path/to/archive/<% $basename %>.zip
+mv <% $basename %> 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
+      <strong>Notes.</strong> You may chose to symlink "htmlarea" to "<%
+      $basename %>", 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
@@ -183,7 +184,7 @@
 
     </ul>
 
-    <p>You can <a href="mailto:mi...@in...">contact me directly</a>
+    <p>You can <a href="mailto:mih...@ya...">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>
@@ -191,9 +192,19 @@
     <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 -->
+<!-- hhmts start --> Last modified: Wed Jul 14 13:20:53 CEST 2004 <!-- hhmts end -->
 <!-- doc-lang: English -->
   </body>
 </html>
 
+<%ARGS>
+  $project => 'HTMLArea'
+  $version => '3.0'
+  $release => 'rc1'
+  $basename => 'HTMLArea-3.0-rc1'
+</%ARGS>
 
+<%INIT>;
+use POSIX qw(strftime);
+my $time = strftime '%b %e, %Y [%H:%M] GMT', gmtime;
+</%INIT>

Index: popupwin.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popupwin.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- popupwin.js	23 Mar 2004 15:41:04 -0000	1.1
+++ popupwin.js	11 Jan 2005 15:00:35 -0000	1.2
@@ -16,7 +16,7 @@
 	if (base && base.match(/(.*)\/([^\/]+)/)) {
 		base = RegExp.$1 + "/";
 	}
-	if (typeof _editor_url != "undefined" && !/^\//.test(_editor_url)) {
+	if (typeof _editor_url != "undefined" && !/^\//.test(_editor_url) && !/http:\/\//.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.
@@ -61,7 +61,7 @@
 PopupWin.prototype.callHandler = function() {
 	var tags = ["input", "textarea", "select"];
 	var params = new Object();
-	for (var ti in tags) {
+	for (var ti = tags.length; --ti >= 0;) {
 		var tag = tags[ti];
 		var els = this.content.getElementsByTagName(tag);
 		for (var j = 0; j < els.length; ++j) {

Index: htmlarea.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/htmlarea.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- htmlarea.js	7 Jun 2004 10:39:25 -0000	1.6
+++ htmlarea.js	11 Jan 2005 15:00:34 -0000	1.7
@@ -1,13 +1,12 @@
-// htmlArea v3.0 - Copyright (c) 2002-2004 interactivetools.com, inc.
+// htmlArea v3.0 - Copyright (c) 2003-2004 dynarch.com
+//                               2002-2003 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.
[...1234 lines suppressed...]
+		html = /^script|style$/i.test(root.parentNode.tagName) ? root.data : HTMLArea.htmlEncode(root.data);
+		break;
+	    case 4: // Node.CDATA_SECTION_NODE
+		// FIXME: it seems we never get here, but I believe we should..
+		//        maybe a browser problem?--CDATA sections are converted to plain text nodes and normalized
+		// CDATA sections should go "as is" without further encoding
+		html = "<![CDATA[" + root.data + "]]>";
 		break;
 	    case 8: // Node.COMMENT_NODE
 		html = "<!--" + root.data + "-->";
@@ -2069,8 +2419,7 @@
 };
 
 String.prototype.trim = function() {
-	a = this.replace(/^\s+/, '');
-	return a.replace(/\s+$/, '');
+	return this.replace(/^\s+/, '').replace(/\s+$/, '');
 };
 
 // creates a rgb-style color from a number

Index: release-notes.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/release-notes.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- release-notes.html	23 Mar 2004 15:41:04 -0000	1.1
+++ release-notes.html	11 Jan 2005 15:00:35 -0000	1.2
@@ -1,7 +1,8 @@
 <!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>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title><% $basename %> release notes</title>
     <style>
       .fixme { color: red; }
     </style>
@@ -9,9 +10,9 @@
 
   <body>
 
-    <h1>HTMLArea-3.0-rc1 release notes</h1>
+    <h1><% $basename %> release notes</h1>
 
-    <p>This release was compiled on Mar  1, 2004 [19:37] GMT.</p>
+    <p>This release was compiled on <% $time %>.</p>
 
     <h2>3.0-rc1</h2>
 
@@ -154,12 +155,55 @@
       <li>Cut, copy, paste, undo, redo buttons.</li>
 
     </ul>
+<%doc>
+    <h2>Rationale for Beta</h2>
+
+    <p>Why was this released as "Beta"?  The code is quite stable and it
+    didn't deserve a "Beta" qualification.  However, there are some things
+    left to do for the real 3.0 version.  These things will not affect the
+    API to work with HTMLArea, in other words, you can install the Beta
+    right now and then install the final release without modifying your
+    code.  That's if you don't modify HTMLArea itself.  ;-)</p>
+
+    <h2>To-Do before 3.0 final</h2>
+
+    <ol>
+
+      <li>We should use a single popup interface.  Currently there are two:
+      dialog.js and popupwin.js; dialog.js emulates modal dialogs, which
+      sucks when you want to open "select-color" from another popup and not
+      from the editor itself.  Very buggy in IE.  We should probably use only
+      modeless dialogs (that is, popupwin.js).</li>
+
+      <li>Internationalization for the SpellChecker plugin.</li>
+
+      <li>Internationalization for the TableOperations plugin.</li>
+
+      <li>People who sent translations are invited to re-iterate through
+        their work and make it up-to-date with lang/en.js which is the main
+        lang file for HTMLArea-3.0.  Some things have changed but not all
+        translations are updated.</li>
+
+      <li><strong>Documentation</strong>.</li>
+
+    </ol>
+</%doc>
     <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 -->
+<!-- hhmts start --> Last modified: Wed Mar 31 19:18:26 EEST 2004 <!-- hhmts end -->
 <!-- doc-lang: English -->
   </body>
 </html>
 
+<%ARGS>
+  $project => 'HTMLArea'
+  $version => '3.0'
+  $release => 'rc1'
+  $basename => 'HTMLArea-3.0-rc1'
+</%ARGS>
 
+<%INIT>;
+use POSIX qw(strftime);
+my $time = strftime '%b %e, %Y [%H:%M] GMT', gmtime;
+</%INIT>

Index: popupdiv.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popupdiv.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- popupdiv.js	23 Mar 2004 15:41:04 -0000	1.1
+++ popupdiv.js	11 Jan 2005 15:00:35 -0000	1.2
@@ -191,7 +191,7 @@
 PopupDiv.prototype.callHandler = function() {
 	var tags = ["input", "textarea", "select"];
 	var params = new Object();
-	for (var ti in tags) {
+	for (var ti = tags.length; --ti >= 0;) {
 		var tag = tags[ti];
 		var els = this.content.getElementsByTagName(tag);
 		for (var j = 0; j < els.length; ++j) {

Index: license.txt
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/license.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- license.txt	3 Apr 2004 17:36:16 -0000	1.3
+++ license.txt	11 Jan 2005 15:00:35 -0000	1.4
@@ -1,30 +1,30 @@
-htmlArea License (based on BSD license)
-Copyright (c) 2002-2004, interactivetools.com, inc.
-Copyright (c) 2003-2004 dynarch.com
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1) Redistributions of source code must retain the above copyright notice,
-   this list of conditions and the following disclaimer.
-
-2) 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.
-
-3) 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.
-
-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.
+htmlArea License (based on BSD license)
+Copyright (c) 2002-2004, interactivetools.com, inc.
+Copyright (c) 2003-2004 dynarch.com
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1) Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2) 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.
+
+3) 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.
+
+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.

Index: dialog.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/dialog.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dialog.js	23 Mar 2004 15:41:04 -0000	1.2
+++ dialog.js	11 Jan 2005 15:00:34 -0000	1.3
@@ -22,12 +22,13 @@
 };
 
 Dialog._parentEvent = function(ev) {
+	setTimeout( function() { if (Dialog._modal && !Dialog._modal.closed) { Dialog._modal.focus() } }, 50);
 	if (Dialog._modal && !Dialog._modal.closed) {
-		Dialog._modal.focus();
 		HTMLArea._stopEvent(ev);
 	}
 };
 
+
 // should be a function, the return handler of the currently opened dialog.
 Dialog._return = null;
 
@@ -40,7 +41,7 @@
 Dialog._geckoOpenModal = function(url, action, init) {
 	var dlg = window.open(url, "hadialog",
 			      "toolbar=no,menubar=no,personalbar=no,width=10,height=10," +
-			      "scrollbars=no,resizable=yes");
+			      "scrollbars=no,resizable=yes,modal=yes,dependable=yes");
 	Dialog._modal = dlg;
 	Dialog._arguments = init;
 

[php-blog-cvs] serendipity/htmlarea/plugins/ContextMenu/lang en.js,1.1,1.2

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

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

Modified Files:
	en.js 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: en.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/ContextMenu/lang/en.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en.js	23 Mar 2004 15:41:08 -0000	1.1
+++ en.js	11 Jan 2005 15:00:56 -0000	1.2
@@ -40,6 +40,8 @@
 	"Make link"                                             : "Make lin_k...",
 	"Remove the"                                            : "Remove the",
 	"Element"                                               : "Element...",
+	"Insert paragraph before"                               : "Insert paragraph before",
+	"Insert paragraph after"                                : "Insert paragraph after",
 
 	// Other labels (tooltips and alert/confirm box messages)
 
@@ -62,5 +64,7 @@
 	"Insert a new column before the current one"            : "Insert a new column before the current one",
 	"Insert a new column after the current one"             : "Insert a new column after the current one",
 	"Delete the current column"                             : "Delete the current column",
-	"Create a link"                                         : "Create a link"
+	"Create a link"                                         : "Create a link",
+	"Insert a paragraph before the current node"            : "Insert a paragraph before the current node",
+	"Insert a paragraph after the current node"             : "Insert a paragraph after the current node"
 };

[php-blog-cvs] serendipity/htmlarea/plugins/TableOperations table-operations.js,1.1,1.2

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

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

Modified Files:
	table-operations.js 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: table-operations.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/table-operations.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- table-operations.js	23 Mar 2004 15:41:09 -0000	1.1
+++ table-operations.js	11 Jan 2005 15:00:58 -0000	1.2
@@ -24,7 +24,7 @@
 
 	// register the toolbar buttons provided by this plugin
 	var toolbar = ["linebreak"];
-	for (var i in bl) {
+	for (var i = 0; i < bl.length; ++i) {
 		var btn = bl[i];
 		if (!btn) {
 			toolbar.push("separator");
@@ -65,7 +65,7 @@
 	var ancestors = editor.getAllAncestors();
 	var ret = null;
 	tagName = ("" + tagName).toLowerCase();
-	for (var i in ancestors) {
+	for (var i = 0; i < ancestors.length; ++i) {
 		var el = ancestors[i];
 		if (el.tagName.toLowerCase() == tagName) {
 			ret = el;
@@ -868,7 +868,7 @@
 		td.appendChild(select);
 		select.name = "f_st_float";
 		options = ["None", "Left", "Right"];
-		for (i in options) {
+		for (var i = 0; i < options.length; ++i) {
 			var Val = options[i];
 			var val = options[i].toLowerCase();
 			option = doc.createElement("option");
@@ -923,7 +923,7 @@
 	input.size = "1";
 	input.style.fontFamily = "monospace";
 	td.appendChild(input);
-	for (i in options) {
+	for (var i = 0; i < options.length; ++i) {
 		var Val = options[i];
 		var val = Val.toLowerCase();
 		option = doc.createElement("option");
@@ -978,7 +978,7 @@
 	select.style.marginLeft = "0.5em";
 	td.appendChild(select);
 	options = ["Top", "Middle", "Bottom", "Baseline"];
-	for (i in options) {
+	for (var i = 0; i < options.length; ++i) {
 		var Val = options[i];
 		var val = Val.toLowerCase();
 		option = doc.createElement("option");
@@ -1070,7 +1070,7 @@
 	// That is, "top right bottom left" -- we only consider the first
 	// value.
 	(currentBorderStyle.match(/([^\s]*)\s/)) && (currentBorderStyle = RegExp.$1);
-	for (i in options) {
+	for (var i in options) {
 		var val = options[i];
 		option = doc.createElement("option");
 		option.value = val;
@@ -1080,7 +1080,7 @@
 	}
 	select.style.marginRight = "0.5em";
 	function setBorderFieldsStatus(value) {
-		for (i in borderFields) {
+		for (var i = 0; i < borderFields.length; ++i) {
 			var el = borderFields[i];
 			el.style.visibility = value ? "hidden" : "visible";
 			if (!value && (el.tagName.toLowerCase() == "input")) {

[php-blog-cvs] serendipity/htmlarea/plugins/FullPage/popups docprop.html,1.1,1.2

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

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

Modified Files:
	docprop.html 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: docprop.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/FullPage/popups/docprop.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- docprop.html	23 Mar 2004 15:41:09 -0000	1.1
+++ docprop.html	11 Jan 2005 15:00:57 -0000	1.2
@@ -16,7 +16,8 @@
       f_body_bgcolor  : true,
       f_body_fgcolor  : true,
       f_base_style    : true,
-      f_alt_style     : true
+      f_alt_style     : true,
+      f_charset       : true
   };
 
 var editor = null;
@@ -120,6 +121,17 @@
         <td class="label"><span>Text color:</span></td>
         <td><input type="text" id="f_body_fgcolor" size="7" /></td>
       </tr>
+      <tr>
+        <td class="label"><span>Character set:</span></td>
+        <td><select id="f_charset">
+          <option value=""></option>
+          <option value="utf-8">UTF-8 (recommended)</option>
+          <option value="windows-1251">cyrillic (WINDOWS-1251)</option>
+          <option value="koi8-r">cyrillic (KOI8-R)</option>
+          <option value="iso-8859-5">cyrillic (ISO-8859-5)</option>
+          <option value="iso-8859-1">western (ISO-8859-1)</option>
+        </select></td>
+      </tr>
     </table>
 
     <div id="buttons">

[php-blog-cvs] serendipity/htmlarea/plugins/FullPage/img docprop.gif,1.2,1.3

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

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

Modified Files:
	docprop.gif 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: docprop.gif
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/FullPage/img/docprop.gif,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
Binary files /tmp/cvsNfdm55 and /tmp/cvsGeoABA differ

[php-blog-cvs] serendipity/htmlarea/plugins/FullPage full-page.js,1.1,1.2

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

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

Modified Files:
	full-page.js 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: full-page.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/FullPage/full-page.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- full-page.js	23 Mar 2004 15:41:08 -0000	1.1
+++ full-page.js	11 Jan 2005 15:00:57 -0000	1.2
@@ -49,6 +49,7 @@
 		var links = doc.getElementsByTagName("link");
 		var style1 = '';
 		var style2 = '';
+		var charset = '';
 		for (var i = links.length; --i >= 0;) {
 			var link = links[i];
 			if (/stylesheet/i.test(link.rel)) {
@@ -58,6 +59,14 @@
 					style1 = link.href;
 			}
 		}
+		var metas = doc.getElementsByTagName("meta");
+		for (var i = metas.length; --i >= 0;) {
+			var meta = metas[i];
+			if (/content-type/i.test(meta.httpEquiv)) {
+				r = /^text\/html; *charset=(.*)$/i.exec(meta.content);
+				charset = r[1];
+			}
+		}
 		var title = doc.getElementsByTagName("title")[0];
 		title = title ? title.innerHTML : '';
 		var init = {
@@ -67,7 +76,7 @@
 			f_body_fgcolor : HTMLArea._colorToRgb(doc.body.style.color),
 			f_base_style   : style1,
 			f_alt_style    : style2,
-
+			f_charset      : charset,
 			editor         : editor
 		};
 		editor._popupDialog("plugin://FullPage/docprop", function(params) {
@@ -82,8 +91,11 @@
 	var doc = this.editor._doc;
 	var head = doc.getElementsByTagName("head")[0];
 	var links = doc.getElementsByTagName("link");
+	var metas = doc.getElementsByTagName("meta");
 	var style1 = null;
 	var style2 = null;
+	var charset = null;
+	var charset_meta = null;
 	for (var i = links.length; --i >= 0;) {
 		var link = links[i];
 		if (/stylesheet/i.test(link.rel)) {
@@ -93,12 +105,27 @@
 				style1 = link;
 		}
 	}
+	for (var i = metas.length; --i >= 0;) {
+		var meta = metas[i];
+		if (/content-type/i.test(meta.httpEquiv)) {
+			r = /^text\/html; *charset=(.*)$/i.exec(meta.content);
+			charset = r[1];
+			charset_meta = meta;
+		}
+	}
 	function createLink(alt) {
 		var link = doc.createElement("link");
 		link.rel = alt ? "alternate stylesheet" : "stylesheet";
 		head.appendChild(link);
 		return link;
 	};
+	function createMeta(name, content) {
+		var meta = doc.createElement("meta");
+		meta.httpEquiv = name;
+		meta.content = content;
+		head.appendChild(meta);
+		return meta;
+	};
 
 	if (!style1 && params.f_base_style)
 		style1 = createLink(false);
@@ -114,7 +141,14 @@
 	else if (style2)
 		head.removeChild(style2);
 
-	for (var i in params) {
+	if (charset_meta) {
+		head.removeChild(charset_meta);
+		charset_meta = null;
+	}
+	if (!charset_meta && params.f_charset)
+		charset_meta = createMeta("Content-Type", "text/html; charset="+params.f_charset);
+
+  	for (var i in params) {
 		var val = params[i];
 		switch (i) {
 		    case "f_title":

[php-blog-cvs] serendipity/htmlarea/lang de.js,1.1,1.2 ee.js,1.1,1.2 en.js,1.1,1.2 es.js,1.1,1.2 fi.js,1.1,1.2 fr.js,1.1,1.2 he.js,1.1,1.2 hu.js,1.1,1.2 it.js,1.1,1.2 lt.js,1.1,1.2 nl.js,1.1,1.2 no.js,1.1,1.2 ru.js,1.1,1.2 vn.js,1.1,1.2

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

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

Modified Files:
	de.js ee.js en.js es.js fi.js fr.js he.js hu.js it.js lt.js 
	nl.js no.js ru.js vn.js 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: es.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/es.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- es.js	23 Mar 2004 15:41:06 -0000	1.1
+++ es.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -17,8 +17,8 @@
 		justifycenter:  "Centrar",
 		justifyright:   "Alinear a la Derecha",
 		justifyfull:    "Justificar",
-		insertorderedlist:    "Lista Ordenada",
-		insertunorderedlist:  "Lista No Ordenada",
+		orderedlist:    "Lista Ordenada",
+		unorderedlist:  "Lista No Ordenada",
 		outdent:        "Aumentar Sangría",
 		indent:         "Disminuir Sangría",
 		forecolor:      "Color del Texto",

Index: ru.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/ru.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ru.js	23 Mar 2004 15:41:06 -0000	1.1
+++ ru.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -29,8 +29,8 @@
 		justifycenter:  "По центру",
 		justifyright:   "По правому краю",
 		justifyfull:    "По ширине",
-		insertorderedlist:    "Нумерованный лист",
-		insertunorderedlist:  "Маркированный лист",
+		orderedlist:    "Нумерованный лист",
+		unorderedlist:  "Маркированный лист",
 		outdent:        "Уменьшить отступ",
 		indent:         "Увеличить отступ",
 		forecolor:      "Цвет шрифта",

Index: nl.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/nl.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- nl.js	23 Mar 2004 15:41:06 -0000	1.1
+++ nl.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -29,8 +29,8 @@
 		justifycenter:			"Centreren",
 		justifyright:			"Rechts uitlijnen",
 		justifyfull:			"Uitvullen",
-		insertorderedlist:		"Nummering",
-		insertunorderedlist:	"Opsommingstekens",
+		orderedlist:		"Nummering",
+		unorderedlist:	"Opsommingstekens",
 		outdent:				"Inspringing verkleinen",
 		indent:					"Inspringing vergroten",
 		forecolor:				"Tekstkleur",

Index: no.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/no.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- no.js	23 Mar 2004 15:41:06 -0000	1.1
+++ no.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -20,8 +20,8 @@
 		justifycenter:        "Midtjuster",
 		justifyright:         "Høyrejuster",
 		justifyfull:          "Blokkjuster",
-		insertorderedlist:    "Nummerert liste",
-		insertunorderedlist:  "Punktliste",
+		orderedlist:    "Nummerert liste",
+		unorderedlist:  "Punktliste",
 		outdent:              "Reduser innrykk",
 		indent:               "Øke innrykk",
 		forecolor:            "Tekstfarge",

Index: fr.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/fr.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fr.js	23 Mar 2004 15:41:06 -0000	1.1
+++ fr.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -1,5 +1,7 @@
 // I18N constants
-// Author: Jonathan Ernst, <Jon...@Ne...>
+
+// LANG: "fr", ENCODING: UTF-8 | ISO-8859-1
+// Author: Simon Richard, s....@sy...
 
 // FOR TRANSLATORS:
 //
@@ -10,6 +12,12 @@
 //      (if this is not possible, please include a comment
 //       that states what encoding is necessary.)
 
+// All technical terms used in this document are the ones approved
+// by the Office québécois de la langue française.
+// Tous les termes techniques utilisés dans ce document sont ceux
+// approuvés par l'Office québécois de la langue française.
+// http://www.oqlf.gouv.qc.ca/
+
 HTMLArea.I18N = {
 
 	// the following should be the filename without .js extension
@@ -21,32 +29,34 @@
 		italic:         "Italique",
 		underline:      "Souligné",
 		strikethrough:  "Barré",
-		subscript:      "Subscript",
-		superscript:    "Superscript",
+		subscript:      "Indice",
+		superscript:    "Exposant",
 		justifyleft:    "Aligné à gauche",
 		justifycenter:  "Centré",
 		justifyright:   "Aligné à droite",
-		justifyfull:    "Justifié",
+		justifyfull:    "Justifier",
 		orderedlist:    "Numérotation",
 		unorderedlist:  "Puces",
-		outdent:        "Augmenter le retrait",
-		indent:         "Diminuer le retrait",
-		forecolor:      "Couleur du texte",
-		hilitecolor:    "Couleur du fond",
+		outdent:        "Diminuer le retrait",
+		indent:         "Augmenter le retrait",
+		forecolor:      "Couleur de police",
+		hilitecolor:    "Surlignage",
 		horizontalrule: "Ligne horizontale",
-		createlink:     "Insérer un lien",
-		insertimage:    "Insérer une image",
+		createlink:     "Insérer un hyperlien",
+		insertimage:    "Insérer/Modifier une image",
 		inserttable:    "Insérer un tableau",
-		htmlmode:       "Passer au code source HTML",
+		htmlmode:       "Passer au code source",
 		popupeditor:    "Agrandir l'éditeur",
-		about:          "A propos de cet éditeur",
+		about:          "À propos de cet éditeur",
 		showhelp:       "Aide sur l'éditeur",
 		textindicator:  "Style courant",
-		undo:           "Annule la dernière action",
-		redo:           "Refait la dernière action",
-		cut:            "Coupe la sélection",
-		copy:           "Copie la sélection",
-		paste:          "Colle depuis le presse papiers"
+		undo:           "Annuler la dernière action",
+		redo:           "Répéter la dernière action",
+		cut:            "Couper la sélection",
+		copy:           "Copier la sélection",
+		paste:          "Coller depuis le presse-papier",
+		lefttoright:    "Direction de gauche à droite",
+		righttoleft:    "Direction de droite à gauche"
 	},
 
 	buttons: {
@@ -56,6 +66,32 @@
 
 	msg: {
 		"Path":         "Chemin",
-		"TEXT_MODE":    "Vous êtes en mode texte.  Utilisez le bouton [<>] pour revenir au mode WYSIWIG."
+		"TEXT_MODE":    "Vous êtes en MODE TEXTE.  Appuyez sur le bouton [<>] pour retourner au mode tel-tel.",
+
+		"IE-sucks-full-screen" :
+		// translate here
+		"Le mode plein écran peut causer des problèmes sous Internet Explorer, " +
+		"ceci dû à des bogues du navigateur qui ont été impossible à contourner.  " +
+		"Les différents symptômes peuvent être un affichage déficient, le manque de " +
+		"fonctions dans l'éditeur et/ou pannes aléatoires du navigateur.  Si votre " +
+		"système est Windows 9x, il est possible que vous subissiez une erreur de type " +
+		"«General Protection Fault» et que vous ayez à redémarrer votre ordinateur." +
+		"\n\nConsidérez-vous comme ayant été avisé.  Appuyez sur OK si vous désirez tout " +
+		"de même essayer le mode plein écran de l'éditeur."
+	},
+
+	dialogs: {
+		"Cancel"                                            : "Annuler",
+		"Insert/Modify Link"                                : "Insérer/Modifier Lien",
+		"New window (_blank)"                               : "Nouvelle fenêtre (_blank)",
+		"None (use implicit)"                               : "Aucun (par défaut)",
+		"OK"                                                : "OK",
+		"Other"                                             : "Autre",
+		"Same frame (_self)"                                : "Même cadre (_self)",
+		"Target:"                                           : "Cible:",
+		"Title (tooltip):"                                  : "Titre (infobulle):",
+		"Top frame (_top)"                                  : "Cadre du haut (_top)",
+		"URL:"                                              : "Adresse Web:",
+		"You must enter the URL where this link points to"  : "Vous devez entrer l'adresse Web du lien"
 	}
 };

Index: ee.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/ee.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- ee.js	23 Mar 2004 15:41:06 -0000	1.1
+++ ee.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -29,8 +29,8 @@
 		justifycenter:  "Joonda keskele",
 		justifyright:   "Joonda paremale",
 		justifyfull:    "Rööpjoonda",
-		insertorderedlist:    "Nummerdus",
-		insertunorderedlist:  "Täpploend",
+		orderedlist:    "Nummerdus",
+		unorderedlist:  "Täpploend",
 		outdent:        "Vähenda taanet",
 		indent:         "Suurenda taanet",
 		forecolor:      "Fondi värv",

Index: it.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/it.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- it.js	23 Mar 2004 15:41:06 -0000	1.1
+++ it.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -2,53 +2,78 @@
 
 // LANG: "it", ENCODING: UTF-8 | ISO-8859-1
 // Author: Fabio Rotondo <fa...@ro...>
+// Update for 3.0 rc1: Giovanni Premuda <gpr...@so...>
 
 HTMLArea.I18N = {
 
-	// the following should be the filename without .js extension
-	// it will be used for automatically load plugin language.
-	lang: "it",
+        // the following should be the filename without .js extension
+        // it will be used for automatically load plugin language.
+        lang: "it",
 
-	tooltips: {
-		bold:           "Grassetto",
-		italic:         "Italico",
-		underline:      "Sottolineato",
-		strikethrough:  "Barrato",
-		subscript:      "Pedice",
-		superscript:    "Apice",
-		justifyleft:    "Giustifica a Sinistra",
-		justifycenter:  "Giustifica in Centro",
-		justifyright:   "Giustifica a Destra",
-		justifyfull:    "Giustifica Completamente",
-		orderedlist:    "Lista Ordinata",
-		unorderedlist:  "Lista Puntata",
-		outdent:        "Decrementa Indentazione",
-		indent:         "Incrementa Indentazione",
-		forecolor:      "Colore del Carattere",
-		hilitecolor:    "Colore di Sfondo",
-		horizontalrule: "Linea Orizzontale",
-		createlink:     "Inserisci un Link",
-		insertimage:    "Inserisci un'Immagine",
-		inserttable:    "Inserisci una Tabella",
-		htmlmode:       "Attiva il codice HTML",
-		popupeditor:    "Allarga l'editor",
-		about:          "Info sull'editor",
-		showhelp:       "Aiuto sull'editor",
-		textindicator:  "Stile Attuale",
-		undo:           "Elimina l'ultima modifica",
-		redo:           "Ripristina l'ultima modifica",
-		cut:            "Taglia l'area selezionata",
-		copy:           "Copia l'area selezionata",
-		paste:          "Incolla dalla memoria"
-	},
+        tooltips: {
+                bold:           "Grassetto",
+                italic:         "Corsivo",
+                underline:      "Sottolineato",
+                strikethrough:  "Barrato",
+                subscript:      "Pedice",
+                superscript:    "Apice",
+                justifyleft:    "Allinea a sinistra",
+                justifycenter:  "Allinea in centro",
+                justifyright:   "Allinea a destra",
+                justifyfull:    "Giustifica",
+                insertorderedlist:    "Lista ordinata",
+                insertunorderedlist:  "Lista puntata",
+                outdent:        "Decrementa indentazione",
+                indent:         "Incrementa indentazione",
+                forecolor:      "Colore del carattere",
+                hilitecolor:    "Colore di sfondo",
+                inserthorizontalrule: "Linea orizzontale",
+                createlink:     "Inserisci un link",
+                insertimage:    "Inserisci un'immagine",
+                inserttable:    "Inserisci una tabella",
+                htmlmode:       "Visualizzazione HTML",
+                popupeditor:    "Editor a pieno schermo",
+                about:          "Info sull'editor",
+                showhelp:       "Aiuto sull'editor",
+                textindicator:  "Stile corrente",
+                undo:           "Annulla",
+                redo:           "Ripristina",
+                cut:            "Taglia",
+                copy:           "Copia",
+                paste:          "Incolla",
+                lefttoright:    "Scrivi da sinistra a destra",
+                righttoleft:    "Scrivi da destra a sinistra"
+        },
 
-	buttons: {
-		"ok":           "OK",
-		"cancel":       "Annulla"
-	},
+        buttons: {
+                "ok":           "OK",
+                "cancel":       "Annulla"
+        },
 
-	msg: {
-		"Path":         "Percorso",
-		"TEXT_MODE":    "Sei in MODALITA' TESTO. Usa il bottone [<>] per tornare alla modalità WYSIWYG."
-	}
+        msg: {
+                "Path":         "Percorso",
+                "TEXT_MODE":    "Sei in MODALITA' TESTO. Usa il bottone [<>] per tornare alla modalità WYSIWYG.",
+                "IE-sucks-full-screen" :
+                // translate here
+                "The full screen mode is known to cause problems with Internet Explorer, " +
+                "due to browser bugs that we weren't able to workaround.  You might experience garbage " +
+                "display, lack of editor functions and/or random browser crashes.  If your system is Windows 9x " +
+                "it's very likely that you'll get a 'General Protection Fault' and need to reboot.\n\n" +
+                "You have been warned.  Please press OK if you still want to try the full screen editor."
+        },
+
+        dialogs: {
+                "Annulla"                                            : "Cancel",
+                "Inserisci/modifica Link"                                : "Insert/Modify Link",
+                "Nuova finestra (_blank)"                               : "New window (_blank)",
+                "Nessuno (usa predefinito)"                               : "None (use implicit)",
+                "OK"                                                : "OK",
+                "Altro"                                             : "Other",
+                "Stessa finestra (_self)"                                : "Same frame (_self)",
+                "Target:"                                           : "Target:",
+                "Title (suggerimento):"                                  : "Title (tooltip):",
+                "Frame principale (_top)"                                  : "Top frame (_top)",
+                "URL:"                                              : "URL:",
+                "You must enter the URL where this link points to"  : "Devi inserire un indirizzo per questo link"
+        }
 };

Index: hu.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/hu.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- hu.js	23 Mar 2004 15:41:06 -0000	1.1
+++ hu.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -48,7 +48,9 @@
 		redo:           "Újra végrehajtás",
 		cut:            "Kivágás",
 		copy:           "Másolás",
-		paste:          "Beillesztés"
+		paste:          "Beillesztés",
+		lefttoright:    "Irány balról jobbra",
+		righttoleft:    "Irány jobbról balra"
 	},
 
 	buttons: {
@@ -58,6 +60,31 @@
 
 	msg: {
 		"Path":         "Hierarchia",
-		"TEXT_MODE":    "Forrás mód. Visszaváltás [<>] gomb"
+		"TEXT_MODE":    "Forrás mód. Visszaváltás [<>] gomb",
+
+		"IE-sucks-full-screen" :
+		// translate here
+		"A teljesképrenyős szerkesztés hibát okozhat Internet Explorer használata esetén, " +
+		"ez a böngésző a hibája, amit nem tudunk kikerülni. Szemetet észlelhet a képrenyőn, " +
+		"illetve néhány funkció hiányozhat és/vagy véletlenszerűen lefagyhat a böngésző. " +
+		"Windows 9x operaciós futtatása esetén elég valószínű, hogy 'General Protection Fault' " +
+		"hibát okoz és újra kell indítania a számítógépet.\n\n" +
+		"Figyelmeztettük.  Kérjük nyomja meg a Rendben gombot, ha mégis szeretné megnyitni a " +
+		"szerkesztőt külön ablakban."
+	},
+
+	dialogs: {
+		"Cancel"                                            : "Mégsem",
+		"Insert/Modify Link"                                : "Hivatkozás Beszúrása/Módosítása",
+		"New window (_blank)"                               : "Új ablak (_blank)",
+		"None (use implicit)"                               : "Nincs (use implicit)",
+		"OK"                                                : "OK",
+		"Other"                                             : "Más",
+		"Same frame (_self)"                                : "Ugyanabba a keretbe (_self)",
+		"Target:"                                           : "Cél:",
+		"Title (tooltip):"                                  : "Cím (tooltip):",
+		"Top frame (_top)"                                  : "Felső keret (_top)",
+		"URL:"                                              : "URL:",
+		"You must enter the URL where this link points to"  : "Be kell írnia az URL-t, ahova a hivatkozás mutasson"
 	}
 };

Index: de.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/de.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- de.js	23 Mar 2004 15:41:06 -0000	1.1
+++ de.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -1,7 +1,6 @@
-// german version for htmlArea v3.0 - Alpha Release
-// - translated by AtK<at...@ch...>
-// term´s and licenses are equal to htmlarea!
-// translation improved by broxx<br...@br...>
+// I18N constants
+
+// LANG: "de", ENCODING: ISO-8859-1 for the german umlaut!
 
 HTMLArea.I18N = {
 
@@ -16,30 +15,36 @@
 		strikethrough:  "Durchgestrichen",
 		subscript:      "Hochgestellt",
 		superscript:    "Tiefgestellt",
-		justifyleft:    "Links ausrichten",
-		justifycenter:  "Zentrieren",
-		justifyright:   "Rechts ausrichten",
+        justifyleft:            "Linksbündig",
+        justifycenter:          "Zentriert",
+        justifyright:           "Rechtsbündig",
 		justifyfull:    "Blocksatz",
-		orderedlist:    "Nummerierung",
-		unorderedlist:  "Aufzaehlungszeichen",
+        orderedlist:      "Nummerierung",
+        unorderedlist:    "Aufzählungszeichen",
 		outdent:        "Einzug verkleinern",
-		indent:         "Einzug vergrössern",
-		forecolor:      "Text Farbe",
-		hilitecolor:    "Hintergrund Farbe",
+        indent:                 "Einzug vergrößern",
+        forecolor:              "Schriftfarbe",
+        backcolor:              "Hindergrundfarbe",
+        hilitecolor:            "Hintergrundfarbe",
 		horizontalrule: "Horizontale Linie",
-		createlink:     "Hyperlink einfuegen",
-		insertimage:    "Bild einfuegen",
-		inserttable:    "Tabelle einfuegen",
+        inserthorizontalrule:   "Horizontale Linie",
+        createlink:             "Hyperlink einfügen",
+        insertimage:            "Bild einfügen",
+        inserttable:            "Tabelle einfügen",
 		htmlmode:       "HTML Modus",
 		popupeditor:    "Editor im Popup öffnen",
-		about:          "Ueber HtmlArea",
+        about:                  "Über htmlarea",
+        help:                   "Hilfe",
 		showhelp:       "Hilfe",
-		textindicator:  "derzeitiger Stil",
-		undo:           "Rueckgaengig",
+        textindicator:          "Derzeitiger Stil",
+        undo:                   "Rückgängig",
 		redo:           "Wiederholen",
 		cut:            "Ausschneiden",
 		copy:           "Kopieren",
-		paste:          "Einfuegen"
+        paste:                  "Einfügen aus der Zwischenablage",
+        lefttoright:            "Textrichtung von Links nach Rechts",
+        righttoleft:            "Textrichtung von Rechts nach Links",
+        removeformat:            "Formatierung entfernen"
 	},
   
  buttons: {
@@ -49,6 +54,27 @@
 
 	msg: {
 		"Path":         "Pfad",
-		"TEXT_MODE":    "Du befindest dich im HTML Modus.  Benuetze die [<>] Schaltflaeche um in den WYSIWIG-Modus zu wechseln."
+        "TEXT_MODE":            "Sie sind im Text-Modus. Benutzen Sie den [<>] Knopf um in den visuellen Modus (WYSIWIG) zu gelangen.",
+
+        "Moz-Clipboard" :
+        "Aus Sicherheitsgründen dürfen Skripte normalerweise nicht programmtechnisch auf " +
+        "Ausschneiden/Kopieren/Einfügen zugreifen. Bitte klicken Sie OK um die technische " +
+        "Erläuterung auf mozilla.org zu öffnen, in der erklärt wird, wie einem Skript Zugriff " +
+        "gewährt werden kann."
+    },
+    
+    dialogs: {
+        "OK":                   "OK",
+        "Cancel":               "Abbrechen",
+        "Insert/Modify Link":   "Verknüpfung hinzufügen/ändern",
+        "None (use implicit)":  "k.A. (implizit)",
+        "New window (_blank)":  "Neues Fenster (_blank)",
+        "Same frame (_self)":   "Selber Rahmen (_self)",
+        "Top frame (_top)":     "Oberster Rahmen (_top)",
+        "Other":                "Anderes",
+        "Target:":              "Ziel:",
+        "Title (tooltip):":     "Titel (Tooltip):",
+        "URL:":                 "URL:",
+        "You must enter the URL where this link points to": "Sie müssen eine Ziel-URL angeben für die Verknüpfung angeben"
 	}
 };

Index: vn.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/vn.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- vn.js	23 Mar 2004 15:41:06 -0000	1.1
+++ vn.js	11 Jan 2005 15:00:53 -0000	1.2
@@ -1,51 +1,77 @@
 // I18N constants : Vietnamese
 // LANG: "en", ENCODING: UTF-8
 // Author: Nguyễn Đình Nam, <hnc...@ya...>
+// Modified 21/07/2004 by Phạm Mai Quân <pm...@4v...>
 
 HTMLArea.I18N = {
 
-	// the following should be the filename without .js extension
-	// it will be used for automatically load plugin language.
-	lang: "vn",
+  // the following should be the filename without .js extension
+  // it will be used for automatically load plugin language.
+  lang: "vn",
 
-	tooltips: {
-		bold:           "Đậm",
-		italic:         "Nghiêng",
-		underline:      "Gạch Chân",
-		strikethrough:  "Gạch Xóa",
-		subscript:      "Viết Xuống Dưới",
-		superscript:    "Viết Lên Trên",
-		justifyleft:    "Căn Trái",
-		justifycenter:  "Căn Giữa",
-		justifyright:   "Căn Phải",
-		justifyfull:    "Căn Đều",
-		orderedlist:    "Danh Sách Có Thứ Tự",
-		unorderedlist:  "Danh Sách Phi Thứ Tự",
-		outdent:        "Lùi Ra Ngoài",
-		indent:         "Thụt Vào Trong",
-		forecolor:      "Màu Chữ",
-		backcolor:      "Màu Nền",
-		horizontalrule: "Dòng Kẻ Ngang",
-		createlink:     "Tạo Liên Kết",
-		insertimage:    "Chèn Ảnh",
-		inserttable:    "Chèn Bảng",
-		htmlmode:       "Chế Độ Mã HTML",
-		popupeditor:    "Phóng To Ô Soạn Thảo",
-		about:          "Tự Giới Thiệu",
-		showhelp:       "Giúp Đỡ",
-		textindicator:  "Định Dạng Hiện Thời",
-		undo:           "Undo",
-		redo:           "Redo",
-		cut:            "Cắt",
-		copy:           "Copy",
-		paste:          "Dán"
-	},
-	buttons: {
-		"ok":           "OK",
-		"cancel":       "Hủy"
-	},
-	msg: {
-		"Path":         "Đường Dẫn",
-		"TEXT_MODE":    "Bạn đang ở chế độ text.  Sử dụng nút [<>] để chuyển lại chế độ WYSIWIG."
-	}
+  tooltips: {
+    bold:           "Đậm",
+    italic:         "Nghiêng",
+    underline:      "Gạch Chân",
+    strikethrough:  "Gạch Xóa",
+    subscript:      "Viết Xuống Dưới",
+    superscript:    "Viết Lên Trên",
+    justifyleft:    "Căn Trái",
+    justifycenter:  "Căn Giữa",
+    justifyright:   "Căn Phải",
+    justifyfull:    "Căn Đều",
+    insertorderedlist:    "Danh Sách Có Thứ Tự (1, 2, 3)",
+    insertunorderedlist:  "Danh Sách Phi Thứ Tự (Chấm đầu dòng)",
+    outdent:        "Lùi Ra Ngoài",
+    indent:         "Thụt Vào Trong",
+    forecolor:      "Màu Chữ",
+    hilitecolor:    "Màu Nền",
+    inserthorizontalrule: "Dòng Kẻ Ngang",
+    createlink:     "Tạo Liên Kết",
+    insertimage:    "Chèn Ảnh",
+    inserttable:    "Chèn Bảng",
+    htmlmode:       "Chế Độ Mã HTML",
+    popupeditor:    "Phóng To Ô Soạn Thảo",
+    about:          "Tự Giới Thiệu",
+    showhelp:       "Giúp Đỡ",
+    textindicator:  "Định Dạng Hiện Thời",
+    undo:           "Hủy thao tác trước",
+    redo:           "Lấy lại thao tác vừa bỏ",
+    cut:            "Cắt",
+    copy:           "Sao chép",
+    paste:          "Dán",
+    lefttoright:    "Viết từ trái sang phải",
+    righttoleft:    "Viết từ phải sang trái"
+  },
+  buttons: {
+    "ok":           "Đồng ý",
+    "cancel":       "Hủy",
+
+    "IE-sucks-full-screen" :
+    // translate here
+    "Chế độ phóng to ô soạn thảo có thể gây lỗi với Internet Explorer vì một số lỗi của trình duyệt này," +
+    " vì thế chế độ này có thể sẽ không chạy. Hiển thị không đúng, lộn xộn, không có đầy đủ chức năng," +
+    " và cũng có thể làm trình duyệt của bạn bị tắt ngang. Nếu bạn đang sử dụng Windows 9x " +
+    "bạn có thể bị báo lỗi 'General Protection Fault' và máy tính của bạn buộc phải khởi động lại.\n\n" +
+    "Chúng tôi đã cảnh báo bạn. Nhấn nút 'Đồng ý' nếu bạn vẫn muốn sử dụng tính năng này."
+  },
+  msg: {
+    "Path":         "Đường Dẫn",
+    "TEXT_MODE":    "Bạn đang ở chế độ text.  Sử dụng nút [<>] để chuyển lại chế độ WYSIWIG."
+  },
+
+  dialogs: {
+    "Cancel"                                            : "Hủy",
+    "Insert/Modify Link"                                : "Thêm/Chỉnh sửa đường dẫn",
+    "New window (_blank)"                               : "Cửa sổ mới (_blank)",
+    "None (use implicit)"                               : "Không (sử dụng implicit)",
+    "OK"                                                : "Đồng ý",
+    "Other"                                             : "Khác",
+    "Same frame (_self)"                                : "Trên cùng khung (_self)",
+    "Target:"                                           : "Nơi hiện thị:",
+    "Title (tooltip):"                                  : "Tiêu đề (của hướng dẫn):",
+    "Top frame (_top)"                                  : "Khung trên cùng (_top)",
+    "URL:"                                              : "URL:",
+    "You must enter the URL where this link points to"  : "Bạn phải điền địa chỉ (URL) mà đường dẫn sẽ liên kết tới"
+  }
 };

Index: en.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/en.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- en.js	23 Mar 2004 15:41:06 -0000	1.1
+++ en.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -50,7 +50,10 @@
 		copy:           "Copy selection",
 		paste:          "Paste from clipboard",
 		lefttoright:    "Direction left to right",
-		righttoleft:    "Direction right to left"
+		righttoleft:    "Direction right to left",
+		removeformat:   "Remove formatting",
+		print:          "Print document",
+		killword:       "Clear MSOffice tags"
 	},
 
 	buttons: {
@@ -68,21 +71,77 @@
 		"due to browser bugs that we weren't able to workaround.  You might experience garbage " +
 		"display, lack of editor functions and/or random browser crashes.  If your system is Windows 9x " +
 		"it's very likely that you'll get a 'General Protection Fault' and need to reboot.\n\n" +
-		"You have been warned.  Please press OK if you still want to try the full screen editor."
+		"You have been warned.  Please press OK if you still want to try the full screen editor.",
+
+		"Moz-Clipboard" :
+		"Unprivileged scripts cannot access Cut/Copy/Paste programatically " +
+		"for security reasons.  Click OK to see a technical note at mozilla.org " +
+		"which shows you how to allow a script to access the clipboard."
 	},
 
 	dialogs: {
+		// Common
+		"OK"                                                : "OK",
 		"Cancel"                                            : "Cancel",
+
+		"Alignment:"                                        : "Alignment:",
+		"Not set"                                           : "Not set",
+		"Left"                                              : "Left",
+		"Right"                                             : "Right",
+		"Texttop"                                           : "Texttop",
+		"Absmiddle"                                         : "Absmiddle",
+		"Baseline"                                          : "Baseline",
+		"Absbottom"                                         : "Absbottom",
+		"Bottom"                                            : "Bottom",
+		"Middle"                                            : "Middle",
+		"Top"                                               : "Top",
+
+		"Layout"                                            : "Layout",
+		"Spacing"                                           : "Spacing",
+		"Horizontal:"                                       : "Horizontal:",
+		"Horizontal padding"                                : "Horizontal padding",
+		"Vertical:"                                         : "Vertical:",
+		"Vertical padding"                                  : "Vertical padding",
+		"Border thickness:"                                 : "Border thickness:",
+		"Leave empty for no border"                         : "Leave empty for no border",
+
+		// Insert Link
 		"Insert/Modify Link"                                : "Insert/Modify Link",
-		"New window (_blank)"                               : "New window (_blank)",
 		"None (use implicit)"                               : "None (use implicit)",
-		"OK"                                                : "OK",
-		"Other"                                             : "Other",
+		"New window (_blank)"                               : "New window (_blank)",
 		"Same frame (_self)"                                : "Same frame (_self)",
+		"Top frame (_top)"                                  : "Top frame (_top)",
+		"Other"                                             : "Other",
 		"Target:"                                           : "Target:",
 		"Title (tooltip):"                                  : "Title (tooltip):",
-		"Top frame (_top)"                                  : "Top frame (_top)",
 		"URL:"                                              : "URL:",
-		"You must enter the URL where this link points to"  : "You must enter the URL where this link points to"
+		"You must enter the URL where this link points to"  : "You must enter the URL where this link points to",
+		// Insert Table
+		"Insert Table"                                      : "Insert Table",
+		"Rows:"                                             : "Rows:",
+		"Number of rows"                                    : "Number of rows",
+		"Cols:"                                             : "Cols:",
+		"Number of columns"                                 : "Number of columns",
+		"Width:"                                            : "Width:",
+		"Width of the table"                                : "Width of the table",
+		"Percent"                                           : "Percent",
+		"Pixels"                                            : "Pixels",
+		"Em"                                                : "Em",
+		"Width unit"                                        : "Width unit",
+		"Positioning of this table"                         : "Positioning of this table",
+		"Cell spacing:"                                     : "Cell spacing:",
+		"Space between adjacent cells"                      : "Space between adjacent cells",
+		"Cell padding:"                                     : "Cell padding:",
+		"Space between content and border in cell"          : "Space between content and border in cell",
+		// Insert Image
+		"Insert Image"                                      : "Insert Image",
+		"Image URL:"                                        : "Image URL:",
+		"Enter the image URL here"                          : "Enter the image URL here",
+		"Preview"                                           : "Preview",
+		"Preview the image in a new window"                 : "Preview the image in a new window",
+		"Alternate text:"                                   : "Alternate text:",
+		"For browsers that don't support images"            : "For browsers that don't support images",
+		"Positioning of this image"                         : "Positioning of this image",
+		"Image Preview:"                                    : "Image Preview:"
 	}
 };

Index: lt.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/lt.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- lt.js	23 Mar 2004 15:41:06 -0000	1.1
+++ lt.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -3,12 +3,11 @@
 // LANG: "lt", ENCODING: UTF-8
 // Author: Jaroslav Šatkevič, <ja...@ak...>
 
-
 HTMLArea.I18N = {
 
 	// the following should be the filename without .js extension
 	// it will be used for automatically load plugin language.
-	lang: "lt",
+	lang: "en",
 
 	tooltips: {
 		bold:           "Paryškinti",
@@ -41,7 +40,7 @@
 		cut:            "IÅ¡kirpti",
 		copy:           "Kopijuoti",
 		paste:          "Įterpti"
-	},
+},
 
 	buttons: {
 		"ok":           "OK",
@@ -50,6 +49,29 @@
 
 	msg: {
 		"Path":         "Kelias",
-		"TEXT_MODE":    "Jūs esete teksto režime.  Naudokite [<>] mygtuką grįžimui į WYSIWYG."
+		"TEXT_MODE":    "Jūs esete teksto režime.  Naudokite [<>] mygtuką grįžimui į WYSIWYG.",
+
+		"IE-sucks-full-screen" :
+		// translate here
+		"The full screen mode is known to cause problems with Internet Explorer, " +
+		"due to browser bugs that we weren't able to workaround.  You might experience garbage " +
+		"display, lack of editor functions and/or random browser crashes.  If your system is Windows 9x " +
+		"it's very likely that you'll get a 'General Protection Fault' and need to reboot.\n\n" +
+		"You have been warned.  Please press OK if you still want to try the full screen editor."
+	},
+
+	dialogs: {
+		"Cancel"                                            : "Atšaukti",
+		"Insert/Modify Link"                                : "Idėti/Modifikuoti",
+		"New window (_blank)"                               : "Naujas langas (_blank)",
+		"None (use implicit)"                               : "None (use implicit)",
+		"OK"                                                : "OK",
+		"Other"                                             : "Kitas",
+		"Same frame (_self)"                                : "Same frame (_self)",
+		"Target:"                                           : "Target:",
+		"Title (tooltip):"                                  : "Pavadinimas (tooltip):",
+		"Top frame (_top)"                                  : "Top frame (_top)",
+		"URL:"                                              : "URL:",
+		"You must enter the URL where this link points to"  : "Jus privalote nurodyti URL į kuri rodo šitą nuoroda"
 	}
 };

Index: fi.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/fi.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fi.js	23 Mar 2004 15:41:06 -0000	1.1
+++ fi.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -17,8 +17,8 @@
 		justifycenter:  	"Keskitä",
 		justifyright:   	"Tasaa oikeat reunat",
 		justifyfull:    	"Tasaa molemmat reunat",
-		insertorderedlist: 	"Numerointi",
-		insertunorderedlist: 	"Luettelomerkit",
+		orderedlist: 	"Numerointi",
+		unorderedlist: 	"Luettelomerkit",
 		outdent:        	"Lisää sisennystä",
 		indent:         	"Pienennä sisennystä",
 		forecolor:      	"Fontin väri",

Index: he.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/lang/he.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- he.js	23 Mar 2004 15:41:06 -0000	1.1
+++ he.js	11 Jan 2005 15:00:39 -0000	1.2
@@ -1,7 +1,7 @@
 // I18N constants
 
 // LANG: "he", ENCODING: UTF-8
-// Author: Liron Newman, <pla...@ul...>
+// Author: Liron Newman, http://www.eesh.net, <plastish at ultinet dot org>
 
 // FOR TRANSLATORS:
 //
@@ -28,7 +28,7 @@
 		justifyleft:    " ישור לשמאל",
 		justifycenter:  "ישור למרכז",
 		justifyright:   "ישור לימין",
-		justifyfull:    "יישור לשורה מלאה",
+		justifyfull:    "ישור לשורה מלאה",
 		orderedlist:    "רשימה ממוספרת",
 		unorderedlist:  "רשימה לא ממוספרת",
 		outdent:        "הקטן כניסה",
@@ -37,7 +37,7 @@
 		hilitecolor:    "צבע רקע",
 		horizontalrule: "קו אנכי",
 		createlink:     "הכנס היפר-קישור",
-		insertimage:    "הכנס תמונה",
+		insertimage:    "הכנס/שנה תמונה",
 		inserttable:    "הכנס טבלה",
 		htmlmode:       "שנה מצב קוד HTML",
 		popupeditor:    "הגדל את העורך",
@@ -48,16 +48,42 @@
 		redo:           "מבצע מחדש את הפעולה האחרונה שביטלת",
 		cut:            "גזור בחירה",
 		copy:           "העתק בחירה",
-		paste:          "הדבק מהלוח"
+		paste:          "הדבק מהלוח",
+		lefttoright:    "כיוון משמאל לימין",
+		righttoleft:    "כיוון מימין לשמאל"
 	},
 
 	buttons: {
-		"ok":           "OK",
+		"ok":           "אישור",
 		"cancel":       "ביטול"
 	},
 
 	msg: {
 		"Path":         "נתיב עיצוב",
-		"TEXT_MODE":    "אתה במצב טקסט נקי (קוד). השתמש בכפתור [<>] כדי לחזור למצב WYSIWYG (תצוגת עיצוב)."
+		"TEXT_MODE":    "אתה במצב טקסט נקי (קוד). השתמש בכפתור [<>] כדי לחזור למצב WYSIWYG (תצוגת עיצוב).",
+
+		"IE-sucks-full-screen" :
+		// translate here
+		"מצב מסך מלא יוצר בעיות בדפדפן Internet Explorer, " +
+		"עקב באגים בדפדפן לא יכולנו לפתור את זה.  את/ה עלול/ה לחוות תצוגת זבל,  " +
+		"בעיות בתפקוד העורך ו/או קריסה של הדפדפן.  אם המערכת שלך היא Windows 9x " +
+		"סביר להניח שתקבל/י 'General Protection Fault' ותאלצ/י לאתחל את המחשב.\n\n" +
+		"ראה/י הוזהרת.  אנא לחץ/י אישור אם את/ה עדיין רוצה לנסות את העורך במסך מלא."
+	},
+
+	dialogs: {
+		"Cancel"                                            : "ביטול",
+		"Insert/Modify Link"                                : "הוסף/שנה קישור",
+		"New window (_blank)"                               : "חלון חדש (_blank)",
+		"None (use implicit)"                               : "ללא (השתמש ב-frame הקיים)",
+		"OK"                                                : "OK",
+		"Other"                                             : "אחר",
+		"Same frame (_self)"                                : "אותו frame (_self)",
+		"Target:"                                           : "יעד:",
+		"Title (tooltip):"                                  : "כותרת (tooltip):",
+		"Top frame (_top)"                                  : "Frame עליון (_top)",
+		"URL:"                                              : "URL:",
+		"You must enter the URL where this link points to"  : "חובה לכתוב URL שאליו קישור זה מצביע"
+
 	}
 };

[php-blog-cvs] serendipity/htmlarea/plugins/ContextMenu context-menu.js,1.1,1.2 menu.css,1.1,1.2

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

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

Modified Files:
	context-menu.js menu.css 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: menu.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/ContextMenu/menu.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- menu.css	23 Mar 2004 15:41:07 -0000	1.1
+++ menu.css	11 Jan 2005 15:00:56 -0000	1.2
@@ -7,6 +7,7 @@
   border: 1px solid #aca899;
   padding: 2px;
   background-color: #fff;
+  color: #000;
   cursor: default;
   z-index: 1000;
 }

Index: context-menu.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/ContextMenu/context-menu.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- context-menu.js	23 Mar 2004 15:41:07 -0000	1.1
+++ context-menu.js	11 Jan 2005 15:00:55 -0000	1.2
@@ -63,6 +63,26 @@
 		tbo.buttonPress(editor, opcode);
 	};
 
+	function insertPara(after) {
+		var el = currentTarget;
+		var par = el.parentNode;
+		var p = editor._doc.createElement("p");
+		p.appendChild(editor._doc.createElement("br"));
+		par.insertBefore(p, after ? el.nextSibling : el);
+		var sel = editor._getSelection();
+		var range = editor._createRange(sel);
+		if (!HTMLArea.is_ie) {
+			sel.removeAllRanges();
+			range.selectNodeContents(p);
+			range.collapse(true);
+			sel.addRange(range);
+		} else {
+			range.moveToElementText(p);
+			range.collapse(true);
+			range.select();
+		}
+	};
+
 	for (; target; target = target.parentNode) {
 		var tag = target.tagName;
 		if (!tag)
@@ -189,32 +209,41 @@
 				  i18n["Create a link"],
 				  config.btnList["createlink"][1] ]);
 
-	for (var i in elmenus)
+	for (var i = 0; i < elmenus.length; ++i)
 		menu.push(elmenus[i]);
 
-	menu.push(null,
-		  [ i18n["Remove the"] + " &lt;" + currentTarget.tagName + "&gt; " + i18n["Element"],
-		    function() {
-			    if (confirm(i18n["Please confirm that you want to remove this element:"] + " " + currentTarget.tagName)) {
-				    var el = currentTarget;
-				    var p = el.parentNode;
-				    p.removeChild(el);
-				    if (HTMLArea.is_gecko) {
-					    if (p.tagName.toLowerCase() == "td" && !p.hasChildNodes())
-						    p.appendChild(editor._doc.createElement("br"));
-					    editor.forceRedraw();
-					    editor.focusEditor();
-					    editor.updateToolbar();
-					    if (table) {
-						    var save_collapse = table.style.borderCollapse;
-						    table.style.borderCollapse = "collapse";
-						    table.style.borderCollapse = "separate";
-						    table.style.borderCollapse = save_collapse;
+	if (!/html|body/i.test(currentTarget.tagName))
+		menu.push(null,
+			  [ i18n["Remove the"] + " &lt;" + currentTarget.tagName + "&gt; " + i18n["Element"],
+			    function() {
+				    if (confirm(i18n["Please confirm that you want to remove this element:"] + " " +
+						currentTarget.tagName)) {
+					    var el = currentTarget;
+					    var p = el.parentNode;
+					    p.removeChild(el);
+					    if (HTMLArea.is_gecko) {
+						    if (p.tagName.toLowerCase() == "td" && !p.hasChildNodes())
+							    p.appendChild(editor._doc.createElement("br"));
+						    editor.forceRedraw();
+						    editor.focusEditor();
+						    editor.updateToolbar();
+						    if (table) {
+							    var save_collapse = table.style.borderCollapse;
+							    table.style.borderCollapse = "collapse";
+							    table.style.borderCollapse = "separate";
+							    table.style.borderCollapse = save_collapse;
+						    }
 					    }
 				    }
-			    }
-		    },
-		    i18n["Remove this node from the document"] ]);
+			    },
+			    i18n["Remove this node from the document"] ],
+			  [ i18n["Insert paragraph before"],
+			    function() { insertPara(false); },
+			    i18n["Insert a paragraph before the current node"] ],
+			  [ i18n["Insert paragraph after"],
+			    function() { insertPara(true); },
+			    i18n["Insert a paragraph after the current node"] ]
+			  );
 	return menu;
 };
 

[php-blog-cvs] serendipity/htmlarea/plugins/CSS css.js,1.1,1.2

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

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

Modified Files:
	css.js 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)

[php-blog-cvs] serendipity/htmlarea/popups about.html,1.2,1.3 blank.html,1.2,1.3 custom2.html,1.2,1.3 editor_help.html,1.2,1.3 fullscreen.html,1.2,1.3 insert_table.html,1.2,1.3 link.html,1.2,1.3 old-fullscreen.html,1.2,1.3 old_insert_image.html,1.2,1.3 popup.js,1.2,1.3

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

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

Modified Files:
	about.html blank.html custom2.html editor_help.html 
	fullscreen.html insert_table.html link.html 
	old-fullscreen.html old_insert_image.html popup.js 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: popup.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/popup.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- popup.js	23 Mar 2004 15:41:10 -0000	1.2
+++ popup.js	11 Jan 2005 15:01:01 -0000	1.3
@@ -53,12 +53,12 @@
 					// only if we call it twice we get the
 					// correct size.
 		window.addEventListener("unload", __dlg_onclose, true);
+		window.innerWidth = body.offsetWidth + 5;
+		window.innerHeight = body_height + 2;
 		// center on parent
 		var x = opener.screenX + (opener.outerWidth - window.outerWidth) / 2;
 		var y = opener.screenY + (opener.outerHeight - window.outerHeight) / 2;
 		window.moveTo(x, y);
-		window.innerWidth = body.offsetWidth + 5;
-		window.innerHeight = body_height + 2;
 	} else {
 		// window.dialogHeight = body.offsetHeight + 50 + "px";
 		// window.dialogWidth = body.offsetWidth + "px";
@@ -76,8 +76,8 @@
 };
 
 function __dlg_translate(i18n) {
-	var types = ["span", "option", "td", "button", "div"];
-	for (var type in types) {
+	var types = ["input", "select", "legend", "span", "option", "td", "button", "div"];
+	for (var type = 0; type < types.length; ++type) {
 		var spans = document.getElementsByTagName(types[type]);
 		for (var i = spans.length; --i >= 0;) {
 			var span = spans[i];
@@ -86,6 +86,11 @@
 				if (txt)
 					span.firstChild.data = txt;
 			}
+                        if (span.title) {
+				var txt = i18n[span.title];
+				if (txt)
+					span.title = txt;
+                        }
 		}
 	}
 	var txt = i18n[document.title];

Index: old-fullscreen.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/old-fullscreen.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- old-fullscreen.html	2 Dec 2004 10:54:54 -0000	1.2
+++ old-fullscreen.html	11 Jan 2005 15:01:01 -0000	1.3
@@ -128,4 +128,4 @@
 
 <textarea name="editor" style="width:100%; height:300px"></textarea><br>
 
-</body></html>
+</body></html>
\ No newline at end of file

Index: link.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/link.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- link.html	2 Apr 2004 09:58:27 -0000	1.2
+++ link.html	11 Jan 2005 15:01:01 -0000	1.3
@@ -5,7 +5,8 @@
   <script type="text/javascript" src="popup.js"></script>
   <script type="text/javascript">
     window.resizeTo(400, 200);
-    I18N = window.opener.HTMLArea.I18N.msg;
+
+I18N = window.opener.HTMLArea.I18N.dialogs;
 
 function i18n(str) {
   return (I18N[str] || str);
@@ -25,7 +26,12 @@
   __dlg_init();
   var param = window.dialogArguments;
   var target_select = document.getElementById("f_target");
+  var use_target = true;
   if (param) {
+    if ( typeof param["f_usetarget"] != "undefined" ) {
+      use_target = param["f_usetarget"];
+    }
+    if ( typeof param["f_href"] != "undefined" ) {
       document.getElementById("f_href").value = param["f_href"];
       document.getElementById("f_title").value = param["f_title"];
       comboSelectValue(target_select, param["f_target"]);
@@ -36,6 +42,12 @@
         target_select.appendChild(opt);
         opt.selected = true;
       }
+    }
+  }
+  if (! use_target) {
+    document.getElementById("f_target_label").style.visibility = "hidden";
+    document.getElementById("f_target").style.visibility = "hidden";
+    document.getElementById("f_target_other").style.visibility = "hidden";
   }
   var opt = document.createElement("option");
   opt.value = "_other";
@@ -48,7 +60,9 @@
 
 function onOK() {
   var required = {
-    "f_href": i18n("You must enter the URL where this link points to")
+    // f_href shouldn't be required or otherwise removing the link by entering an empty
+    // url isn't possible anymore.
+    // "f_href": i18n("You must enter the URL where this link points to")
   };
   for (var i in required) {
     var el = document.getElementById(i);
@@ -109,7 +123,7 @@
 
 <body onload="Init()">
 <div class="title">Insert/Modify Link</div>
-
+<form>
 <table border="0" style="width: 100%;">
   <tr>
     <td class="label">URL:</td>
@@ -120,7 +134,7 @@
     <td><input type="text" id="f_title" style="width: 100%" /></td>
   </tr>
   <tr>
-    <td class="label">Target:</td>
+    <td class="label"><span id="f_target_label">Target:</span></td>
     <td><select id="f_target">
       <option value="">None (use implicit)</option>
       <option value="_blank">New window (_blank)</option>
@@ -133,9 +147,9 @@
 </table>
 
 <div id="buttons">
-  <button type="button" name="ok" onclick="return onOK();">OK</button>
+  <button type="submit" name="ok" onclick="return onOK();">OK</button>
   <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
 </div>
-
+</form>
 </body>
 </html>

Index: old_insert_image.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/old_insert_image.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- old_insert_image.html	2 Dec 2004 10:54:54 -0000	1.2
+++ old_insert_image.html	11 Jan 2005 15:01:01 -0000	1.3
@@ -203,4 +203,4 @@
 <BUTTON ID=btnCancel style="left: 31.36em; top: 3.6504em; width: 7em; height: 2.2em; " type=reset tabIndex=45 onClick="window.close();">Cancel</BUTTON>
 
 </BODY>
-</HTML>
+</HTML>
\ No newline at end of file

Index: insert_table.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/insert_table.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- insert_table.html	23 Mar 2004 15:41:10 -0000	1.2
+++ insert_table.html	11 Jan 2005 15:01:01 -0000	1.3
@@ -10,6 +10,8 @@
 window.resizeTo(400, 100);
 
 function Init() {
+  i18n = window.opener.HTMLArea.I18N.dialogs; // load the HTMLArea plugin and lang file
+  __dlg_translate(i18n);
   __dlg_init();
   document.getElementById("f_rows").focus();
 };
@@ -27,13 +29,13 @@
       return false;
     }
   }
-  var fields = ["f_rows", "f_cols", "f_width", "f_unit",
+  var fields = ["f_rows", "f_cols", "f_width", "f_unit", "f_fixed",
                 "f_align", "f_border", "f_spacing", "f_padding"];
   var param = new Object();
   for (var i in fields) {
     var id = fields[i];
     var el = document.getElementById(id);
-    param[id] = el.value;
+    param[id] = (el.type == "checkbox") ? el.checked : el.value;
   }
   __dlg_close(param);
   return false;
@@ -88,13 +90,6 @@
   <tr>
     <td style="width: 4em; text-align: right">Rows:</td>
     <td><input type="text" name="rows" id="f_rows" size="5" title="Number of rows" value="2" /></td>
-    <td></td>
-    <td></td>
-    <td></td>
-  </tr>
-  <tr>
-    <td style="width: 4em; text-align: right">Cols:</td>
-    <td><input type="text" name="cols" id="f_cols" size="5" title="Number of columns" value="4" /></td>
     <td style="width: 4em; text-align: right">Width:</td>
     <td><input type="text" name="width" id="f_width" size="5" title="Width of the table" value="100" /></td>
     <td><select size="1" name="unit" id="f_unit" title="Width unit">
@@ -103,7 +98,13 @@
       <option value="em"              >Em</option>
     </select></td>
   </tr>
-
+  <tr>
+    <td style="width: 4em; text-align: right">Cols:</td>
+    <td><input type="text" name="cols" id="f_cols" size="5" title="Number of columns" value="4" /></td>
+    <td style="text-align: right"><input type="checkbox" checked="checked" name="fixed" id="f_fixed" /></td>
+    <td colspan="2"><label for="f_fixed"
+    >Fixed width columns</label></td>
+  </tr>
   </tbody>
 </table>
 
@@ -116,7 +117,7 @@
 
 <div class="fl">Alignment:</div>
 <select size="1" name="align" id="f_align"
-  title="Positioning of this image">
+  title="Positioning of this table">
   <option value="" selected="1"                >Not set</option>
   <option value="left"                         >Left</option>
   <option value="right"                        >Right</option>

Index: blank.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/blank.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- blank.html	2 Dec 2004 10:54:54 -0000	1.2
+++ blank.html	11 Jan 2005 15:01:01 -0000	1.3
@@ -1,2 +1,2 @@
 <html>
-</html>
+</html>
\ No newline at end of file

Index: about.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/about.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- about.html	23 Mar 2004 15:41:10 -0000	1.2
+++ about.html	11 Jan 2005 15:01:01 -0000	1.3
@@ -226,8 +226,8 @@
 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>
+<span class="version"><% $version.$release %></span></div>
+<div class="release">Compiled on <% $time %></div>
 <div class="visit">Go to http://dynarch.com/htmlarea/ [latest milestone release]</div>
 </div>
 
@@ -285,9 +285,10 @@
   </p>
 
   <ul>
-    <li><a href="http://www.neomedia.ro">Neomedia</a> (Romania)</li>
+    <li><a href="http://www.computerlove.co.uk" target="_blank">Code Computer Love Ltd.</a> (UK)</li>
+    <li><a href="http://www.neomedia.ro" target="_blank">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>
+    <li><a href="http://www.softwerk.net" target="_blank">SoftWerk</a> (Italy)</li>
   </ul>
 
   <p>Also many thanks to all people at InteractiveTools.com
@@ -375,4 +376,17 @@
 
 </body></html>
 
+<%ARGS>
+  $version => '3.0'
+  $release => 'beta+'
+  $basename => 'HTMLArea-3.0-beta'
+</%ARGS>
+
+<%INIT>;
+if ($release =~ /\S/) {
+    $release = ' <span style="position: relative; top: -0.6em; font-size: 50%; font-weight: normal">[ rev. '.$release.' ]</span>';
+}
 
+use POSIX qw(strftime);
+my $time = strftime '%b %e, %Y %H:%M GMT', gmtime;
+</%INIT>

Index: fullscreen.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/fullscreen.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- fullscreen.html	23 Mar 2004 15:41:10 -0000	1.2
+++ fullscreen.html	11 Jan 2005 15:01:01 -0000	1.3
@@ -3,8 +3,9 @@
   <head>
     <title>Fullscreen HTMLArea</title>
     <script type="text/javascript">
-      _editor_url = window.opener._editor_url;
+      _editor_url = window.opener._editor_url || '../';
       _editor_lang = window.opener._editor_lang;
+      _editor_css = window.opener._editor_css;
       var BASE = window.opener.document.baseURI || window.opener.document.URL;
       var head = document.getElementsByTagName("head")[0];
       var base = document.createElement("base");
@@ -12,13 +13,15 @@
       head.appendChild(base);
     </script>
 
-    <script type="text/javascript" src="../htmlarea.js"></script>
-
+    <script type="text/javascript">
+        document.write('<scr' + 'ipt type="text/javascript" src="' + _editor_url + 'htmlarea.js"></scr' + 'ipt>');
+    </script>
     <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>");
+	for (var i = 3; i < scripts.length; ++i) {
+           //document.write("<scr" + "ipt type='text/javascript' src='" + scripts[i] + "'></scr" + "ipt>");
+           HTMLArea.loadScript(scripts[i]);
         }
     </script>
 
@@ -33,7 +36,7 @@
 \* ---------------------------------------------------------------------- */
 
 function _CloseOnEsc(ev) {
-	ev || (ev = window.event);
+	ev || (ev = window.event) || (ev = editor._iframe.contentWindow.event);
 	if (ev.keyCode == 27) {
 		// update_parent();
 		window.close();
@@ -59,7 +62,7 @@
 	if (editor.config.statusBar) {
 		newHeight -= editor._statusBar.offsetHeight;
 	}
-	editor._textArea.style.height = editor._iframe.style.height = newHeight + "px";
+	editor._textArea.style.height = editor._iframe.style.height = newHeight - (HTMLArea.is_gecko ? 8 : 0) + "px";
 }
 
 /* ---------------------------------------------------------------------- *\
@@ -83,7 +86,10 @@
 	// register the plugins, if any
 	for (var i in parent_object.plugins) {
 		var plugin = parent_object.plugins[i];
-		editor.registerPlugin2(plugin.name, plugin.args);
+		try {
+			eval(plugin.name);
+			editor.registerPlugin2(plugin.name, plugin.args);
+		} catch(e) {};
 	}
 	// and restore the original toolbar
         config.toolbar = parent_object.config.toolbar;
@@ -125,7 +131,7 @@
     </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()">
+  <body scroll="no" onload="HTMLArea.onload = init; HTMLArea.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>

Index: custom2.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/custom2.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- custom2.html	2 Dec 2004 10:54:54 -0000	1.2
+++ custom2.html	11 Jan 2005 15:01:01 -0000	1.3
@@ -32,4 +32,4 @@
 
 </div>
 </form>
-</body></html>
+</body></html>
\ No newline at end of file

Index: editor_help.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/popups/editor_help.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- editor_help.html	2 Dec 2004 10:54:54 -0000	1.2
+++ editor_help.html	11 Jan 2005 15:01:01 -0000	1.3
@@ -13,4 +13,4 @@
 
 
 </body>
-</html>
+</html>
\ No newline at end of file

[php-blog-cvs] serendipity/htmlarea/examples full-page.html,1.1,1.2 fully-loaded.html,1.1,1.2 index.html,1.1,1.2

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

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

Modified Files:
	full-page.html fully-loaded.html index.html 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: full-page.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/examples/full-page.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- full-page.html	23 Mar 2004 15:41:05 -0000	1.1
+++ full-page.html	11 Jan 2005 15:00:35 -0000	1.2
@@ -18,11 +18,13 @@
         editor.registerPlugin(FullPage);
         editor.generate();
       }
+
+      HTMLArea.onload = initDocument;
     </script>
 
   </head>
 
-  <body onload="initDocument()">
+  <body onload="HTMLArea.init()">
     <h1>Test of FullPage plugin</h1>
 
     <textarea id="editor" style="height: 30em; width: 100%;">
@@ -69,7 +71,7 @@
     <hr />
     <address><a href="http://dynarch.com/mishoo/">Mihai Bazon</a></address>
 <!-- Created: Wed Oct  1 19:55:37 EEST 2003 -->
-<!-- hhmts start --> Last modified: Wed Jan 28 11:10:07 EET 2004 <!-- hhmts end -->
+<!-- hhmts start --> Last modified: Wed Aug 11 13:59:07 CEST 2004 <!-- hhmts end -->
 <!-- doc-lang: English -->
   </body>
 </html>

Index: fully-loaded.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/examples/fully-loaded.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fully-loaded.html	23 Mar 2004 15:41:05 -0000	1.1
+++ fully-loaded.html	11 Jan 2005 15:00:37 -0000	1.2
@@ -28,13 +28,17 @@
       // in our case "lang/en.js" loaded above).
 
       // If this lang file is not found the plugin will fail to
-      // load correctly and nothing will work.
+      // load correctly and NOTHING WILL WORK.
 
       HTMLArea.loadPlugin("TableOperations");
       HTMLArea.loadPlugin("SpellChecker");
       HTMLArea.loadPlugin("FullPage");
       HTMLArea.loadPlugin("CSS");
       HTMLArea.loadPlugin("ContextMenu");
+      //HTMLArea.loadPlugin("HtmlTidy");
+      HTMLArea.loadPlugin("ListType");
+      HTMLArea.loadPlugin("CharacterMap");
+HTMLArea.loadPlugin("DynamicCSS");
 </script>
 
 <style type="text/css">
@@ -52,6 +56,7 @@
 
 <script type="text/javascript">
 var editor = null;
+
 function initEditor() {
 
   // create an editor for the "ta" textbox
@@ -65,6 +70,15 @@
 
   // register the SpellChecker plugin
   editor.registerPlugin(SpellChecker);
+  
+  // register the HtmlTidy plugin
+  //editor.registerPlugin(HtmlTidy);
+
+  // register the ListType plugin
+  editor.registerPlugin(ListType);
+
+  editor.registerPlugin(CharacterMap);
+editor.registerPlugin(DynamicCSS);
 
   // register the CSS plugin
   editor.registerPlugin(CSS, {
@@ -104,12 +118,12 @@
   // load the stylesheet used by our CSS plugin configuration
   editor.config.pageStyle = "@import url(custom.css);";
 
-  setTimeout(function() {
-    editor.generate();
-  }, 500);
+  editor.generate();
   return false;
 }
 
+HTMLArea.onload = initEditor;
+
 function insertHTML() {
   var html = prompt("Enter some HTML code here");
   if (html) {
@@ -125,7 +139,7 @@
 
 <!-- use <body onload="HTMLArea.replaceAll()" if you don't care about
      customizing the editor.  It's the easiest way! :) -->
-<body onload="initEditor()">
+<body onload="HTMLArea.init();">
 
 <h1>HTMLArea 3.0</h1>
 

Index: index.html
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/examples/index.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- index.html	23 Mar 2004 15:41:05 -0000	1.1
+++ index.html	11 Jan 2005 15:00:37 -0000	1.2
@@ -7,34 +7,23 @@
 <h1>HTMLArea: auto-generated examples index</h1>
 
 <ul>
+% while (<*.html>) {
+% next if /^index.html$/;
   <li>
-    <a href="2-areas.html">2-areas.html</a>
-  </li>
-  <li>
-    <a href="context-menu.html">context-menu.html</a>
-  </li>
-  <li>
-    <a href="core.html">core.html</a>
-  </li>
-  <li>
-    <a href="css.html">css.html</a>
-  </li>
-  <li>
-    <a href="full-page.html">full-page.html</a>
-  </li>
-  <li>
-    <a href="fully-loaded.html">fully-loaded.html</a>
-  </li>
-  <li>
-    <a href="spell-checker.html">spell-checker.html</a>
-  </li>
-  <li>
-    <a href="table-operations.html">table-operations.html</a>
+    <a href="<% $_ %>"><% $_ %></a>
   </li>
+% }
 </ul>
 
 <hr />
-<address>mi...@in...</address>
+<address>mih...@ya...</address>
 <!-- hhmts start --> Last modified: Sun Feb  1 13:30:39 EET 2004 <!-- hhmts end -->
 </body> </html>
 
+<%INIT>
+my $dir = $m->interp->comp_root;
+$dir =~ s{/+$}{}g;
+#$dir =~ s{/[^/]+$}{}g;
+$dir .= $m->current_comp->dir_path;
+chdir $dir;
+</%INIT>

[php-blog-cvs] serendipity/htmlarea/plugins/TableOperations/lang no.js,1.1,1.2

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

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

Modified Files:
	no.js 
Log Message:
    * Upgraded htmlarea WYSIWYG editor to latest version. Entering      links now properly works, as finally does Copy+Paste from Mozilla!      (garvinhicking)



Index: no.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htmlarea/plugins/TableOperations/lang/no.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- no.js	23 Mar 2004 15:41:09 -0000	1.1
+++ no.js	11 Jan 2005 15:00:59 -0000	1.2
@@ -1,7 +1,7 @@
 // I18N constants
 
 // LANG: "en", ENCODING: UTF-8 | ISO-8859-1
-// Author: Mihai Bazon, <mi...@in...>
+// Author: Mihai Bazon, <mih...@ya...>
 // translated into Norwegia: se...@on...  11.11.03
 
 // FOR TRANSLATORS: