OSDN Git Service

ブックマークレットの不具合(投稿できない・プレビューが動かない)を修正
authorshizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Tue, 24 Feb 2009 15:52:57 +0000 (15:52 +0000)
committershizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Tue, 24 Feb 2009 15:52:57 +0000 (15:52 +0000)
<%jsbuttonbar%>の出力調整

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@953 1ca29b6e-896d-4ea0-84a5-967f57386b96

utf8/nucleus/libs/PAGEFACTORY.php
utf8/nucleus/libs/include/bookmarklet-add.template
utf8/nucleus/libs/include/bookmarklet-edit.template

index 8552488..41235b4 100755 (executable)
@@ -1,26 +1,26 @@
-<?php
-/*
- * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)
- * Copyright (C) 2002-2009 The Nucleus Group
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * (see nucleus/documentation/index.html#license for more info)
- */
-/**
- * @license http://nucleuscms.org/license.txt GNU General Public License
- * @copyright Copyright (C) 2002-2009 The Nucleus Group
- * @version $Id$
- * $NucleusJP: PAGEFACTORY.php,v 1.8.2.2 2007/10/30 16:12:27 shizuki Exp $
- */
-
-/**
- * The formfactory class can be used to insert add/edit item forms into
- * admin area, bookmarklet, skins or any other places where such a form
- * might be needed
- */
+<?php\r
+/*\r
+ * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/)\r
+ * Copyright (C) 2002-2009 The Nucleus Group\r
+ *\r
+ * This program is free software; you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License\r
+ * as published by the Free Software Foundation; either version 2\r
+ * of the License, or (at your option) any later version.\r
+ * (see nucleus/documentation/index.html#license for more info)\r
+ */\r
+/**\r
+ * @license http://nucleuscms.org/license.txt GNU General Public License\r
+ * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
+ * @version $Id$\r
+ * $NucleusJP: PAGEFACTORY.php,v 1.8.2.2 2007/10/30 16:12:27 shizuki Exp $\r
+ */\r
+\r
+/**\r
+ * The formfactory class can be used to insert add/edit item forms into\r
+ * admin area, bookmarklet, skins or any other places where such a form\r
+ * might be needed\r
+ */\r
 class PAGEFACTORY extends BaseActions {\r
 \r
        // ref to the blog object for which an add:edit form is created\r
@@ -272,35 +272,23 @@ class PAGEFACTORY extends BaseActions {
 \r
        function parse_checkedonval($value, $name) {\r
                if ($this->variables[$name] == $value)\r
-                       echo "checked='checked'";\r
+                       echo 'checked="checked"';\r
        }\r
 \r
        // extra javascript for input and textarea fields\r
        function parse_jsinput($which) {\r
                global $CONF;\r
-       ?>\r
-                       name="<?php echo $which?>"\r
-                       id="input<?php echo $which?>"\r
-       <?php\r
+               $out = 'name="' . $which . '" id="input' . $which . '"';\r
                if ($CONF['DisableJsTools'] != 1) {\r
-       ?>\r
-                       onkeyup="storeCaret(this); updPreview('<?php echo $which?>'); doMonitor();"\r
-                       onclick="storeCaret(this);"\r
-                       onselect="storeCaret(this);"\r
-\r
-       <?php\r
-               }\r
-               else if ($CONF['DisableJsTools'] == 0) {\r
-       ?>\r
-                       onkeyup="doMonitor();"\r
-                       onkeypress="shortCuts();"\r
-       <?php\r
-               }\r
-               else {\r
-       ?>\r
-                       onkeyup="doMonitor();"\r
-       <?php\r
+                       $out .= 'onkeyup="storeCaret(this); updPreview(' . $which . '); doMonitor();"'\r
+                                 . 'onclick="storeCaret(this);"'\r
+                                 . 'onselect="storeCaret(this);"';\r
+               } elseif ($CONF['DisableJsTools'] == 0) {\r
+                       $out .= ' onkeyup="doMonitor();" onkeypress="shortCuts();"';\r
+               } else {\r
+                       $out .= ' onkeyup="doMonitor();"';\r
                }\r
+               echo $out;\r
        }\r
 \r
        // shows the javascript button bar\r
@@ -422,19 +410,18 @@ class PAGEFACTORY extends BaseActions {
         * convenience method\r
         */\r
        function _jsbutton($type, $code ,$tooltip) {\r
-       ?>\r
-                       <span class="jsbutton"\r
-                               onmouseover="BtnHighlight(this);"\r
-                               onmouseout="BtnNormal(this);"\r
-                               onclick="<?php echo $code?>" >\r
-                               <img src="images/button-<?php echo $type?>.gif" alt="<?php echo $tooltip?>" width="16" height="16"/>\r
+               echo <<<__JSBUTTON__\r
+                       <span class="jsbutton" onmouseover="BtnHighlight(this);" onmouseout="BtnNormal(this);" onclick="{$code}">\r
+                               <img src="images/button-{$type}.gif" alt="{$tooltip}" width="16" height="16" />\r
                        </span>\r
-       <?php   }\r
+\r
+__JSBUTTON__;\r
+       }\r
 \r
        function _jsbuttonspacer() {\r
-               echo '<span class="jsbuttonspacer"></span>';\r
+               echo '<span class="jsbuttonspacer">&nbsp;</span>';\r
        }\r
 \r
 }\r
 \r
- ?>
\ No newline at end of file
+?>
\ No newline at end of file
index 6f95f5f..b6a513f 100755 (executable)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="<%text(_CHARSET)%>"?>\r
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
        <html <%text(_HTML_XML_NAME_SPACE_AND_LANG_CODE)%>>\r
        <head>\r
        -->\r
                <title><%text(_ADD_ADDTO)%> '<%blogname%>'</title>\r
                <link rel="stylesheet" type="text/css" href="styles/bookmarklet.css" /> \r
-               <link rel="stylesheet" type="text/css" href="styles/addedit.css" />             \r
+               <link rel="stylesheet" type="text/css" href="styles/addedit.css" />\r
                <link rel="stylesheet" type="text/css" href="styles/jqueryui/ui.all.css" />\r
+               <meta http-equiv="Content-Script-Type" content="text/javascript" />\r
                <script type="text/javascript" src="javascript/bookmarklet.js"></script>\r
                <script type="text/javascript" src="javascript/edit.js"></script>\r
                <script type="text/javascript" src="javascript/numbercheck.js"></script>\r
                <%ifautosave()%><script type="text/javascript" src="javascript/xmlhttprequest.js"></script><%endif%>\r
-               <script src="http://www.google.com/jsapi"></script>\r
+               <script type="text/javascript" src="http://www.google.com/jsapi"></script>\r
                <%init%>\r
                <%extrahead%>\r
                <script type="text/javascript">\r
+               //<![CDATA[\r
                        google.load("jquery", "1");\r
                        google.load("jqueryui", "1");\r
                        var nucleus_initbm_oldonload = window.onload;\r
                                $(".autosavestatus").text('(' + lastsavedtext + ' ' + formattedDate() + ')');\r
                                autoSaveDraft();\r
                        }\r
+               //]]>\r
                </script>\r
        </head>\r
        <body>\r
                <h1><%text(_ADD_ADDTO)%> '<%bloglink%>'</h1>\r
-               <div id="tabs" class="ui-tabs ui-widget ui-widget-content ui-corner-all">\r
-                       <ul class=" ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">\r
-                               <li class="ui-state-default ui-corner-top"><a href="#body"><%text(_BMLET_BODY)%> &gt;&gt;</a></li>\r
-                               <li class="ui-state-default ui-corner-top"><a href="#more"><%text(_BMLET_MORE)%> &gt;&gt;</a></li>\r
-                               <li class="ui-state-default ui-corner-top"><a href="#options"><%text(_BMLET_OPTIONS)%> &gt;&gt;</a></li>\r
-                               <li class="ui-state-default ui-corner-top"><a href="#preview"><%text(_BMLET_PREVIEW)%> &gt;&gt;</a></li>\r
-                       </ul>\r
-               <form id="addform" method="post" action="bookmarklet.php" ><div>\r
-                       <input name="action" type="hidden" value="additem" />\r
-                       <input name="blogid" type="hidden" value="<%blogid%>" />\r
-                       <input type="hidden" name="draftid" value="0" />\r
-                       <%ticket%>\r
-                       <!-- div id="submit" class="buttonbar" -->\r
-                               <!-- div id="switchbuttons" -->\r
-                                       <!-- input type="button" onclick="flipBlock('body');" value="<%text(_BMLET_BODY)%> &gt;&gt;" / -->\r
-                                       <!-- input type="button" onclick="flipBlock('more');" value="<%text(_BMLET_MORE)%> &gt;&gt;" / -->\r
-                                       <!-- input type="button" onclick="flipBlock('options');" value="<%text(_BMLET_OPTIONS)%> &gt;&gt;" / -->\r
-                                       <!-- input type="button" onclick="updAllPreviews(); flipBlock('preview');" value="<%text(_BMLET_PREVIEW)%> &gt;&gt;" / -->\r
-                               <!-- /div -->\r
-                               <!-- input type="submit" value="<%text(_BMLET_ADD)%>" onclick="return checkSubmit();" / -->\r
-                               <!-- input type="button" value="<%text(_BMLET_CANCEL)%>" onclick="window.close();" / -->\r
-                       <!-- /div -->\r
-\r
-                       <div id="body" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-\r
-                               <table>\r
-                               <tr>\r
-                               <td><%text(_ADD_TITLE)%></td>\r
-                               <td>\r
-                               <input \r
-                                       <%jsinput(title)%>\r
-                                       type="text" size="60" maxlength="160" \r
-                                       value="<%contents(title)%>"\r
-                               /></td>\r
-                               </tr><tr>\r
-                               <td>\r
-                               <%text(_ADD_BODY)%> <%helplink(additem)%></td>\r
-                               <td>\r
-                               <%jsbuttonbar(media)%>\r
-                               <textarea \r
-                                       <%jsinput(body)%>\r
-                                       cols="58" \r
-                                       rows="12"><%contents(body)%></textarea>\r
-                                       \r
-                               </td></tr>\r
-                               <tr><td>\r
-                               <%text(_ADD_CATEGORY)%></td>\r
-                               <td><%categories%></td>\r
-                               </tr>\r
-                               <!-- tr>\r
-                               <%ifautosave()%><td><%text(_AUTOSAVEDRAFT_NOW)%></td>\r
-                               <td><input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>" onclick="autoSaveDraft();" /></td><%endif%>\r
-                               </tr -->\r
-                               </table>\r
-\r
-                                       \r
-                       </div>\r
-                       \r
-                       <div id="more" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-                               <table>\r
-                               <tr>\r
-                               <td><%text(_ADD_MORE)%> <%helplink(extended)%></td>\r
-                               <td>\r
-                               <%jsbuttonbar(media)%>\r
-                               <textarea \r
-                                       <%jsinput(more)%>\r
-                                       cols="58" \r
-                                       rows="17"><%contents(more)%></textarea>\r
-                               </td></tr></table>\r
-                       </div>\r
-                       <div id="options" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-                               <table>\r
-                               <%ifblogsetting(bcomments)%>\r
-                                       <tr>\r
-                                       <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
-                                       <td>\r
-                                       <input type='radio' name='closed' value='1' id="closed_yes" /><label for="closed_yes"><%text(_YES)%></label>\r
-                                       <input type='radio' name='closed' value='0' checked='checked' id="closed_no"/><label for="closed_no"><%text(_NO)%></label>\r
-                                       </td>\r
-                                       </tr>\r
-                               <%endif%>\r
-                               \r
-                               <tr>\r
-                               <td><%text(_ADD_DRAFTNFUTURE)%></td>\r
-                               <td>\r
-                                       <input name="actiontype" value="addnow" type="radio" checked='checked' id="act_now" /><label for="act_now"><%text(_ADD_ADDNOW)%></label>\r
+               <form id="addform" method="post" action="bookmarklet.php" >\r
+                       <div id="tabs" class="ui-tabs ui-widget ui-widget-content ui-corner-all">\r
+                               <ul class=" ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">\r
+                                       <li class="ui-state-default ui-corner-top"><a href="#body"><%text(_BMLET_BODY)%> &gt;&gt;</a></li>\r
+                                       <li class="ui-state-default ui-corner-top"><a href="#more"><%text(_BMLET_MORE)%> &gt;&gt;</a></li>\r
+                                       <li class="ui-state-default ui-corner-top"><a href="#options"><%text(_BMLET_OPTIONS)%> &gt;&gt;</a></li>\r
+                                       <li class="ui-state-default ui-corner-top"><a href="#preview" onclick="updAllPreviews();"><%text(_BMLET_PREVIEW)%> &gt;&gt;</a></li>\r
+                               </ul>\r
+                               <input name="action" type="hidden" value="additem" />\r
+                               <input name="blogid" type="hidden" value="<%blogid%>" />\r
+                               <input type="hidden" name="draftid" value="0" />\r
+                               <%ticket%>\r
+                               <div id="body" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
+                                       <table summary="item body">\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_TITLE)%></td>\r
+                                                       <td><input <%jsinput(title)%> type="text" size="60" maxlength="160" value="<%contents(title)%>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_BODY)%> <%helplink(additem)%></td>\r
+                                                       <td>\r
+                                                               <%jsbuttonbar(media)%>\r
+                                                               <textarea <%jsinput(body)%> cols="58" rows="12"><%contents(body)%></textarea>\r
+                                                       </td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_CATEGORY)%></td>\r
+                                                       <td><%categories%></td>\r
+                                               </tr>\r
+                                       </table>\r
+                               </div>\r
+                               <div id="more" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
+                                       <table summary="item more">\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_MORE)%> <%helplink(extended)%></td>\r
+                                                       <td>\r
+                                                               <%jsbuttonbar(media)%>\r
+                                                               <textarea <%jsinput(more)%> cols="58" rows="17"><%contents(more)%></textarea>\r
+                                                       </td>\r
+                                               </tr>\r
+                                       </table>\r
+                               </div>\r
+                               <div id="options" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
+                                       <table summary="item options">\r
+                                               <%ifblogsetting(bcomments)%><tr>\r
+                                                       <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
+                                                       <td>\r
+                                                               <input type='radio' name='closed' value='1' id="closed_yes" /><label for="closed_yes"><%text(_YES)%></label>\r
+                                                               <input type='radio' name='closed' value='0' checked='checked' id="closed_no" /><label for="closed_no"><%text(_NO)%></label>\r
+                                                       </td>\r
+                                               </tr><%endif%>\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_DRAFTNFUTURE)%></td>\r
+                                                       <td>\r
+                                                               <input name="actiontype" value="addnow" type="radio" checked='checked' id="act_now" /><label for="act_now"><%text(_ADD_ADDNOW)%></label>\r
+                                                               <br />\r
+                                                               <input name="actiontype" value="addfuture" type="radio" id="act_future" /><label for="act_future"><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
+                                                               <div class="indent">\r
+                                                                       <%text(_ADD_PLACE_ON)%>\r
+                                                                       <input id="inputyear" name="year" size="4" value="<%currenttime(year)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>\r
+                                                                       <input id="inputmonth" name="month" size="2" value="<%currenttime(mon)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>\r
+                                                                       <input id="inputday" name="day" size="2" value="<%currenttime(mday)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_DAY)%>\r
+                                                                       <input id="inputhour" name="hour" size="2" value="<%currenttime(hours)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>\r
+                                                                       <input id="inputminutes" name="minutes" size="2" value="<%currenttime(minutes)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
+                                                                       <br />\r
+                                                                       <%text(_ITEM_ADDEDITTEMPLATE_FORMAT)%>(yyyy)<%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>(dd)<%text(_ITEM_ADDEDITTEMPLATE_DAY)%> (hh)<%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
+                                                                       <%ifblogsetting(ballowpast,0)%><br /><%text(_ADD_NOPASTDATES)%><%endif%>\r
+                                                               </div>\r
+                                                               <input name="actiontype" value="adddraft" type="radio" id="act_draft" /><label for="act_draft"><%text(_ADD_ADDDRAFT)%></label> <%helplink(draft)%><br />\r
+                                                               <input id="dosendping" name="dosendping" value="1" type="checkbox" checked="checked" /><label for="dosendping"><%text(_UPDATEDPING_GOSENDPING)%></label>\r
+                                                       </td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
+                                                       <td><%pluginextras%></td>\r
+                                               </tr>\r
+                                               <%itemoptions%>\r
+                                       </table>\r
+                               </div>\r
+                               <div id="preview" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
+                                       <h2><%text(_ADD_PREVIEW)%></h2>\r
+                                       <strong><span id="prevtitle">&#160;</span></strong>\r
                                        <br />\r
-                                       <input name="actiontype" value="addfuture" type="radio" id="act_future" /><label for="act_future"><%text(_ADD_ADDLATER)%></label> <%helplink(future)%>\r
-                                       <div class="indent">\r
-                                               <%text(_ADD_PLACE_ON)%>\r
-                                               <input id="inputyear" name="year" size="4" value="<%currenttime(year)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>\r
-                                               <input id="inputmonth" name="month" size="2" value="<%currenttime(mon)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>\r
-                                               <input id="inputday" name="day" size="2" value="<%currenttime(mday)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_DAY)%>\r
-\r
-                                               <input id="inputhour" name="hour" size="2" value="<%currenttime(hours)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>\r
-                                               <input id="inputminutes" name="minutes" size="2" value="<%currenttime(minutes)%>" onchange="document.forms[0].act_future.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
-                                               <br /><%text(_ITEM_ADDEDITTEMPLATE_FORMAT)%>(yyyy)<%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>(dd)<%text(_ITEM_ADDEDITTEMPLATE_DAY)%> (hh)<%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
-                                               <%ifblogsetting(ballowpast,0)%>\r
-                                                       <br />\r
-                                                       <%text(_ADD_NOPASTDATES)%>\r
-                                               <%endif%>\r
-                                       </div>\r
-                                       <input name="actiontype" value="adddraft" type="radio" id="act_draft" /><label for="act_draft"><%text(_ADD_ADDDRAFT)%></label> <%helplink(draft)%>\r
+                                       <span id="prevbody">&#160;</span>\r
                                        <br />\r
-                                       <input id="dosendping" name="dosendping" value="1" type="checkbox" checked="checked"><label for="dosendping"><%text(_UPDATEDPING_GOSENDPING)%></label>\r
-                               </td>\r
-                               </tr>\r
-                               <tr>\r
-                               <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
-                               <td>\r
-                               <%pluginextras%></td>\r
-                               </tr>\r
-                               \r
-                               \r
-                                 <%itemoptions%>\r
-                               </table>\r
-                               \r
-\r
-                       </div>\r
-                       \r
-                       <div id="preview" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-                               <h2><%text(_ADD_PREVIEW)%></h2>\r
-                               \r
-                               <b><span id="prevtitle">&#160;</span></b>\r
-                               <br />\r
-                               <span id="prevbody">&#160;</span>\r
-                               <br />\r
-                               <span id="prevmore">&#160;</span>\r
+                                       <span id="prevmore">&#160;</span>\r
+                               </div>\r
                        </div>\r
-                       \r
-               </div></form>\r
-               </div>\r
-\r
                        <div class="submitbuttons">\r
                                <input type="submit" value="<%text(_BMLET_EDIT)%>" onclick="return checkSubmit();" />\r
                                <%ifautosave()%><input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>" onclick="preautoSaveDraft();" /><%endif%>\r
                                <input type="button" value="<%text(_BMLET_CANCEL)%>" onclick="window.close();" />\r
                                <%ifautosave()%><span class="autosavestatus">(<%text(_AUTOSAVEDRAFT)%>&nbsp;:&nbsp;<span class="lastsavedtime"><%text(_AUTOSAVEDRAFT_NOTYETSAVED)%>)</span></span><%endif%>\r
                        </div>\r
-\r
-       <%ifautosave()%><script type="text/javascript">\r
-               var xmlhttprequest = new Array();\r
-               xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
-               xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
-               var seconds = now(); // Last AutoDraft time\r
-               var checks = 0; // Number of checks since last AutoDraft\r
-               var addform = document.getElementById('addform'); // The form id\r
-               var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
-               var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
-               var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
-               var formtype = 'add'; // Add or edit form\r
-       </script><%endif%>\r
-\r
+               </form>\r
+               <%ifautosave()%><script type="text/javascript">\r
+                       var xmlhttprequest = new Array();\r
+                       xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
+                       xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
+                       var seconds = now(); // Last AutoDraft time\r
+                       var checks = 0; // Number of checks since last AutoDraft\r
+                       var addform = document.getElementById('addform'); // The form id\r
+                       var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
+                       var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
+                       var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
+                       var formtype = 'add'; // Add or edit form\r
+               </script><%endif%>\r
        </body>\r
-       </html>\r
-       
\ No newline at end of file
+</html>\r
index a3eb67c..b87e6d9 100755 (executable)
@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="<%text(_CHARSET)%>"?>\r
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\r
        <html <%text(_HTML_XML_NAME_SPACE_AND_LANG_CODE)%>>\r
        <head>\r
                <link rel="stylesheet" type="text/css" href="styles/bookmarklet.css" />\r
                <link rel="stylesheet" type="text/css" href="styles/addedit.css" />\r
                <link rel="stylesheet" type="text/css" href="styles/jqueryui/ui.all.css" />\r
+               <meta http-equiv="Content-Script-Type" content="text/javascript" />\r
                <script type="text/javascript" src="javascript/bookmarklet.js"></script>\r
                <script type="text/javascript" src="javascript/edit.js"></script>\r
                <script type="text/javascript" src="javascript/numbercheck.js"></script>\r
                <%ifautosave()%><script type="text/javascript" src="javascript/xmlhttprequest.js"></script><%endif%>\r
-               <script src="http://www.google.com/jsapi"></script>\r
+               <script type="text/javascript" src="http://www.google.com/jsapi"></script>\r
                <%init%>\r
                <%extrahead%>\r
                <script type="text/javascript">\r
+               //<![CDATA[\r
                        google.load("jquery", "1");\r
                        google.load("jqueryui", "1");\r
                        var nucleus_initbm_oldonload = window.onload;\r
                                $(".autosavestatus").text('(' + lastsavedtext + ' ' + formattedDate() + ')');\r
                                autoSaveDraft();\r
                        }\r
+               //]]>\r
                </script>\r
        </head>\r
        <body>\r
                <h1><%text(_EDIT_ITEM)%> (<%contents(itemid)%>)</h1>\r
-               <div id="tabs" class="ui-tabs ui-widget ui-widget-content ui-corner-all">\r
-                       <ul class=" ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">\r
-                               <li class="ui-state-default ui-corner-top"><a href="#body"><%text(_BMLET_BODY)%> &gt;&gt;</a></li>\r
-                               <li class="ui-state-default ui-corner-top"><a href="#more"><%text(_BMLET_MORE)%> &gt;&gt;</a></li>\r
-                               <li class="ui-state-default ui-corner-top"><a href="#options"><%text(_BMLET_OPTIONS)%> &gt;&gt;</a></li>\r
-                               <li class="ui-state-default ui-corner-top"><a href="#preview"><%text(_BMLET_PREVIEW)%> &gt;&gt;</a></li>\r
-                       </ul>\r
-                       <form id="editform" method="post" action="bookmarklet.php" ><div>\r
-                       <input name="action" type="hidden" value="edititem" />\r
-                       <input name="itemid" type="hidden" value="<%contents(itemid)%>" />\r
-                       <input type="hidden" name="draftid" value="0" />\r
-                       <%ticket%>\r
-                       <!-- div id="submit" class="buttonbar" -->\r
-                               <!-- div id="switchbuttons" -->\r
-                                       <!-- input type="button" onclick="flipBlock('body');" value="<%text(_BMLET_BODY)%> &gt;&gt;" / -->\r
-                                       <!-- input type="button" onclick="flipBlock('more');" value="<%text(_BMLET_MORE)%> &gt;&gt;" / -->\r
-                                       <!-- input type="button" onclick="flipBlock('options');" value="<%text(_BMLET_OPTIONS)%> &gt;&gt;" / -->\r
-                                       <!-- input type="button" onclick="updAllPreviews(); flipBlock('preview');" value="<%text(_BMLET_PREVIEW)%> &gt;&gt;" / -->\r
-                               <!-- /div -->\r
-                               <!-- input type="submit" value="<%text(_BMLET_EDIT)%>" onclick="return checkSubmit();" / -->\r
-                               <!-- input type="button" value="<%text(_BMLET_CANCEL)%>" onclick="window.close();" / -->\r
-                       <!-- /div -->\r
-\r
-                       <div id="body" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-\r
-                               <table>\r
-                               <tr>\r
-                               <td><%text(_ADD_TITLE)%></td>\r
-                               <td>\r
-                               <input \r
-                                       <%jsinput(title)%>\r
-                                       type="text" size="60" maxlength="160" \r
-                                       value="<%contents(title)%>"\r
-                               /></td>\r
-                               </tr><tr>\r
-                               <td>\r
-                               <%text(_ADD_BODY)%> <%helplink(additem)%></td>\r
-                               <td>\r
-                               <%jsbuttonbar(media)%>\r
-                               <textarea \r
-                                       <%jsinput(body)%>\r
-                                       cols="58" \r
-                                       rows="12"><%contents(body)%></textarea>\r
-\r
-                               </td></tr>\r
-                               <tr><td>\r
-                               <%text(_ADD_CATEGORY)%></td>\r
-                               <td><%categories%></td>\r
-                               </tr>\r
-                               <!-- tr>\r
-                               <%ifautosave()%><td><%text(_AUTOSAVEDRAFT_NOW)%></td>\r
-                               <td><input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>" onclick="autoSaveDraft();" /></td><%endif%>\r
-                               </tr -->\r
-                               </table>\r
-\r
-\r
-                       </div>\r
-                       \r
-                       <div id="more" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-                               <table>\r
-                               <tr>\r
-                               <td><%text(_ADD_MORE)%> <%helplink(extended)%></td>\r
-                               <td>\r
-                               <%jsbuttonbar(media)%>\r
-                               <textarea \r
-                                       <%jsinput(more)%>\r
-                                       cols="58" \r
-                                       rows="17"><%contents(more)%></textarea>\r
-                               </td></tr></table>\r
+               <form id="editform" method="post" action="bookmarklet.php" >\r
+                       <div id="tabs" class="ui-tabs ui-widget ui-widget-content ui-corner-all">\r
+                               <ul class=" ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">\r
+                                       <li class="ui-state-default ui-corner-top"><a href="#body"><%text(_BMLET_BODY)%> &gt;&gt;</a></li>\r
+                                       <li class="ui-state-default ui-corner-top"><a href="#more"><%text(_BMLET_MORE)%> &gt;&gt;</a></li>\r
+                                       <li class="ui-state-default ui-corner-top"><a href="#options"><%text(_BMLET_OPTIONS)%> &gt;&gt;</a></li>\r
+                                       <li class="ui-state-default ui-corner-top"><a href="#preview" onclick="updAllPreviews();"><%text(_BMLET_PREVIEW)%> &gt;&gt;</a></li>\r
+                               </ul>\r
+                               <input name="action" type="hidden" value="edititem" />\r
+                               <input name="itemid" type="hidden" value="<%contents(itemid)%>" />\r
+                               <input type="hidden" name="draftid" value="0" />\r
+                               <%ticket%>\r
+                               <div id="body" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
+                                       <table>\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_TITLE)%></td>\r
+                                                       <td><input <%jsinput(title)%> type="text" size="60" maxlength="160" value="<%contents(title)%>" /></td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_BODY)%> <%helplink(additem)%></td>\r
+                                                       <td>\r
+                                                               <%jsbuttonbar(media)%>\r
+                                                               <textarea <%jsinput(body)%> cols="58" rows="12"><%contents(body)%></textarea>\r
+                                                       </td>\r
+                                               </tr>\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_CATEGORY)%></td>\r
+                                                       <td><%categories%></td>\r
+                                               </tr>\r
+                                       </table>\r
+                               </div>\r
+                               <div id="more" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
+                                       <table>\r
+                                               <tr>\r
+                                                       <td><%text(_ADD_MORE)%> <%helplink(extended)%></td>\r
+                                                       <td>\r
+                                                               <%jsbuttonbar(media)%>\r
+                                                               <textarea <%jsinput(more)%> cols="58" rows="17"><%contents(more)%></textarea>\r
+                                                       </td>\r
+                                               </tr>\r
+                                       </table>\r
+                               </div>\r
+                               <div id="options" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
+                                       <table>\r
+                                               <%ifblogsetting(bcomments)%><tr>\r
+                                                       <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
+                                                       <td>\r
+                                                           <input type="radio" name="closed" value="1" id="closed_yes" <%checkedonval(1,closed)%> /><label for="closed_yes"><%text(_YES)%></label>\r
+                                                           <input type="radio" name="closed" value="0" id="closed_no" <%checkedonval(0,closed)%> /><label for="closed_no"><%text(_NO)%></label>\r
+                                                       </td>\r
+                                               </tr><%endif%>\r
+                                               <!-- The only actiontypes are 'edit', 'changedate' (no draft items can be edited) and 'delete' -->\r
+                                               <tr>\r
+                                                       <td><%text(_EDIT_SUBMIT)%></td>\r
+                                                       <td>\r
+                                                               <ul class="nobullets">\r
+                                                                       <li><input name="actiontype" value="edit" type="radio" checked="checked" id="act_edit" /><label for="act_edit"><%text(_BMLET_EDIT)%></label></li>\r
+                                                                       <li><input name="actiontype" value="delete" type="radio" id="act_delete" /><label for="act_delete"><%text(_BMLET_DELETE)%></label></li>\r
+                                                                       <%ifblogsetting(ballowpast)%><li>\r
+                                                                               <input name="actiontype" value="changedate" type="radio" id="act_changedate" tabindex="70" /><label for="act_changedate"><%text(_BMLET_CHANGEDATE)%></label> <%helplink(changedate)%>\r
+                                                                               <div class="indent">\r
+                                                                                       <input id="inputyear" name="year" tabindex="71" size="4" value="<%itemtime(year)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>\r
+                                                                                       <input id="inputmonth" name="month" tabindex="72" size="2" value="<%itemtime(mon)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>\r
+                                                                                       <input id="inputday" name="day" tabindex="73" size="2" value="<%itemtime(mday)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_DAY)%>\r
+                                                                                       <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>\r
+                                                                                       <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
+                                                                                       <br /><%text(_ITEM_ADDEDITTEMPLATE_FORMAT)%>(yyyy)<%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>(dd)<%text(_ITEM_ADDEDITTEMPLATE_DAY)%> (hh)<%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
+                                                                               </div>\r
+                                                                       </li>\r
+                                                                       <li>\r
+                                                                               <input name="actiontype" value="backtodrafts" type="radio" id="act_backtodrafts" tabindex="71" /><label for="act_backtodrafts"><%text(_BMLET_BACKTODRAFTS)%></label> <%helplink(draft)%>\r
+                                                                       </li><%endif%>\r
+                                                               </ul>\r
+                                                               <br /><input id="dosendping" name="dosendping" value="1" type="checkbox" /><label for="dosendping"><%text(_UPDATEDPING_GOSENDPING)%></label>\r
+                                                       </td>\r
+                                               </tr>\r
+                                       \r
+                                               <tr>\r
+                                                       <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
+                                                       <td><%pluginextras%></td>\r
+                                               </tr>\r
+                                               <%itemoptions%>\r
+                                       </table>\r
+                               </div>\r
+                               <div id="preview" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
+                                       <h2><%text(_ADD_PREVIEW)%></h2>\r
+                                       <b><span id="prevtitle">&#160;</span></b>\r
+                                       <br />\r
+                                       <span id="prevbody">&#160;</span>\r
+                                       <br />\r
+                                       <span id="prevmore">&#160;</span>\r
+                               </div>\r
+                               <div class="submitbuttons">\r
+                                       <input type="submit" value="<%text(_BMLET_EDIT)%>" onclick="return checkSubmit();" />\r
+                                       <%ifautosave()%><input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>" onclick="autoSaveDraft();" /><%endif%>\r
+                                       <input type="button" value="<%text(_BMLET_CANCEL)%>" onclick="window.close();" />\r
+                                       <%ifautosave()%><span class="autosavestatus">(<%text(_AUTOSAVEDRAFT)%>&nbsp;:&nbsp;<span class="lastsavedtime"><%text(_AUTOSAVEDRAFT_NOTYETSAVED)%>)</span></span><%endif%>\r
+                               </div>\r
                        </div>\r
-                       <div id="options" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-                               <table>\r
-                               <%ifblogsetting(bcomments)%>\r
-                                       <tr>\r
-                                               <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
-                                               <td>\r
-                                                   <input type="radio" name="closed" value="1" id="closed_yes" <%checkedonval(1,closed)%> /><label for="closed_yes"><%text(_YES)%></label>\r
-                                                   <input type="radio" name="closed" value="0" id="closed_no" <%checkedonval(0,closed)%> /><label for="closed_no"><%text(_NO)%></label>\r
-                                               </td>\r
-                                       </tr>\r
-                               <%endif%>\r
-                               \r
-                                       <!-- The only actiontypes are 'edit', 'changedate' (no draft items can be edited) and 'delete' -->\r
-                                       <tr>\r
-                                               <td><%text(_EDIT_SUBMIT)%></td>\r
-                                               <td>\r
-                                                       <ul class="nobullets">\r
-                                                               <li><input name="actiontype" value="edit" type="radio" checked="checked" id="act_edit" /><label for="act_edit"><%text(_BMLET_EDIT)%></label></li>\r
-                                                               <li><input name="actiontype" value="delete" type="radio" id="act_delete" /><label for="act_delete"><%text(_BMLET_DELETE)%></label></li>\r
-                                                               <%ifblogsetting(ballowpast)%>\r
-                                                               <li>\r
-                                                                       <input name="actiontype" value="changedate" type="radio" id="act_changedate" tabindex="70" /><label for="act_changedate"><%text(_BMLET_CHANGEDATE)%></label> <%helplink(changedate)%>\r
-                                                                       <div class="indent">\r
-                                                                               <input id="inputyear" name="year" tabindex="71" size="4" value="<%itemtime(year)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>\r
-                                                                               <input id="inputmonth" name="month" tabindex="72" size="2" value="<%itemtime(mon)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>\r
-                                                                               <input id="inputday" name="day" tabindex="73" size="2" value="<%itemtime(mday)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_DAY)%>\r
+               </form>\r
 \r
-                                                                               <input id="inputhour" name="hour" tabindex="74" size="2" value="<%itemtime(hours)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>\r
-                                                                               <input id="inputminutes" name="minutes" tabindex="75" size="2" value="<%itemtime(minutes)%>" onchange="document.forms[0].act_changedate.checked=true;" /><%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
-                                                                               <br /><%text(_ITEM_ADDEDITTEMPLATE_FORMAT)%>(yyyy)<%text(_ITEM_ADDEDITTEMPLATE_YEAR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MONTH)%>(dd)<%text(_ITEM_ADDEDITTEMPLATE_DAY)%> (hh)<%text(_ITEM_ADDEDITTEMPLATE_HOUR)%>(mm)<%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%>\r
-                                                                       </div>\r
-                                                               </li>\r
-                                                               <li>\r
-                                                                       <input name="actiontype" value="backtodrafts" type="radio" id="act_backtodrafts" tabindex="71" /><label for="act_backtodrafts"><%text(_BMLET_BACKTODRAFTS)%></label> <%helplink(draft)%>\r
-                                                               </li>\r
-                                                               <%endif%>\r
-                                                       </ul>\r
-                                                       <br /><input id="dosendping" name="dosendping" value="1" type="checkbox"><label for="dosendping"><%text(_UPDATEDPING_GOSENDPING)%></label>\r
-                                               </td>\r
-                                       </tr>\r
-                               \r
-                                       <tr>\r
-                                               <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
-                                               <td>\r
-                                                       <%pluginextras%>\r
-                                               </td>\r
-                                       </tr>\r
-                               \r
-                                 <%itemoptions%>\r
-                               </table>\r
-                               \r
-                       </div>\r
-                       \r
-                       <div id="preview" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-                               <h2><%text(_ADD_PREVIEW)%></h2>\r
-                               \r
-                               <b><span id="prevtitle">&#160;</span></b>\r
-                               <br />\r
-                               <span id="prevbody">&#160;</span>\r
-                               <br />\r
-                               <span id="prevmore">&#160;</span>\r
-                       </div>\r
-                       \r
-               </div></form>\r
-               </div>\r
-\r
-                       <div class="submitbuttons">\r
-                               <input type="submit" value="<%text(_BMLET_EDIT)%>" onclick="return checkSubmit();" />\r
-                               <%ifautosave()%><input tabindex="80" type="button" name="autosavenow" value="<%text(_AUTOSAVEDRAFT_NOW)%>" onclick="autoSaveDraft();" /><%endif%>\r
-                               <input type="button" value="<%text(_BMLET_CANCEL)%>" onclick="window.close();" />\r
-                               <%ifautosave()%><span class="autosavestatus">(<%text(_AUTOSAVEDRAFT)%>&nbsp;:&nbsp;<span class="lastsavedtime"><%text(_AUTOSAVEDRAFT_NOTYETSAVED)%>)</span></span><%endif%>\r
-                       </div>\r
-\r
-       <%ifautosave()%><script type="text/javascript">\r
-               var xmlhttprequest = new Array();\r
-               xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
-               xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
-               var seconds = now(); // Last AutoDraft time\r
-               var checks = 0; // Number of checks since last AutoDraft\r
-               var addform = document.getElementById('editform'); // The form id\r
-               var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
-               var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
-               var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
-               var formtype = 'edit'; // Add or edit form\r
-       </script><%endif%>\r
+               <%ifautosave()%><script type="text/javascript">\r
+                       var xmlhttprequest = new Array();\r
+                       xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
+                       xmlhttprequest[1] = createHTTPHandler(); // UpdateTicket handler\r
+                       var seconds = now(); // Last AutoDraft time\r
+                       var checks = 0; // Number of checks since last AutoDraft\r
+                       var addform = document.getElementById('editform'); // The form id\r
+                       var goal = document.getElementById('info'); // The html div id where 'Last saved: date time' must come\r
+                       var goalurl = '../action.php'; // The PHP file where the content must be posted to\r
+                       var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
+                       var formtype = 'edit'; // Add or edit form\r
+               </script><%endif%>\r
 \r
        </body>\r
-       </html>\r
-\r
+</html>\r