OSDN Git Service

(root) / nucleus-jp / nucleus-jp-ancient.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dd7efa8)
ブックマークレットの不具合修正
authorshizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Wed, 25 Feb 2009 05:18:48 +0000 (05:18 +0000)
committershizuki <shizuki@1ca29b6e-896d-4ea0-84a5-967f57386b96>
Wed, 25 Feb 2009 05:18:48 +0000 (05:18 +0000)
IE6のデザインくずれ修正
編集ブックマークレットで｢ヘルプ｣アイコンが表示されていなかったのを修正
help.htmlへのリンクをフルURLに修正

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

nucleus/libs/PAGEFACTORY.php patch | blob | history
nucleus/libs/globalfunctions.php patch | blob | history
nucleus/libs/include/bookmarklet-add.template patch | blob | history
nucleus/libs/include/bookmarklet-edit.template patch | blob | history

diff --git a/nucleus/libs/PAGEFACTORY.php b/nucleus/libs/PAGEFACTORY.php
index 41235b4..4d8c98c 100755 (executable)
--- a/nucleus/libs/PAGEFACTORY.php
+++ b/nucleus/libs/PAGEFACTORY.php
@@ -80,7 +80,8 @@ class PAGEFACTORY extends BaseActions {
                        'ticket',\r
                        'autosave',\r
                        'autosaveinfo',\r
                        'ticket',\r
                        'autosave',\r
                        'autosaveinfo',\r
-                       'ifautosave'\r
+                       'ifautosave',\r
+                       'xmldeclaration'\r
                );\r
 \r
                // TODO: maybe add 'skin' later on?\r
                );\r
 \r
                // TODO: maybe add 'skin' later on?\r
@@ -173,6 +174,13 @@ class PAGEFACTORY extends BaseActions {
                        ADMIN::selectBlogCategory('catid',$catid,$startidx,1,$this->blog->getID());\r
        }\r
 \r
                        ADMIN::selectBlogCategory('catid',$catid,$startidx,1,$this->blog->getID());\r
        }\r
 \r
+       function parse_xmldeclaration() {\r
+               $ua = serverVar('HTTP_USER_AGENT');\r
+               if (!(ereg("Windows", $ua) && ereg("MSIE", $ua)) || ereg("MSIE 7", $ua)) {\r
+                       echo '<' . '?xml version="1.0" encoding="' . _CHARSET .'"?' . '>' . "\n";\r
+               }\r
+       }\r
+\r
        function parse_blogid() {\r
                echo $this->blog->getID();\r
        }\r
        function parse_blogid() {\r
                echo $this->blog->getID();\r
        }\r
diff --git a/nucleus/libs/globalfunctions.php b/nucleus/libs/globalfunctions.php
index 93deb47..37f2114 100755 (executable)
--- a/nucleus/libs/globalfunctions.php
+++ b/nucleus/libs/globalfunctions.php
@@ -1203,11 +1203,13 @@ function help($id) {
 }\r
 \r
 function helpHtml($id) {\r
 }\r
 \r
 function helpHtml($id) {\r
-       return helplink($id) . '<img src="documentation/icon-help.gif" width="15" height="15" alt="' . _HELP_TT . '" /></a>';\r
+       global $CONF;\r
+       return helplink($id) . '<img src="' . $CONF['AdminURL'] . 'documentation/icon-help.gif" width="15" height="15" alt="' . _HELP_TT . '" /></a>';\r
 }\r
 \r
 function helplink($id) {\r
 }\r
 \r
 function helplink($id) {\r
-       return '<a href="documentation/help.html#'. $id . '" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);">';\r
+       global $CONF;\r
+       return '<a href="' . $CONF['AdminURL'] . 'documentation/help.html#'. $id . '" onclick="if (event &amp;&amp; event.preventDefault) event.preventDefault(); return help(this.href);">';\r
 }\r
 \r
 function getMailFooter() {\r
 }\r
 \r
 function getMailFooter() {\r
diff --git a/nucleus/libs/include/bookmarklet-add.template b/nucleus/libs/include/bookmarklet-add.template
index b6a513f..0a02a89 100755 (executable)
--- a/nucleus/libs/include/bookmarklet-add.template
+++ b/nucleus/libs/include/bookmarklet-add.template
@@ -1,5 +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
+<%xmldeclaration%><!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
                <meta http-equiv="Content-Type" content="text/html; charset=<%text(_CHARSET)%>" />\r
        <html <%text(_HTML_XML_NAME_SPACE_AND_LANG_CODE)%>>\r
        <head>\r
                <meta http-equiv="Content-Type" content="text/html; charset=<%text(_CHARSET)%>" />\r
@@ -112,22 +111,26 @@
                                                <tr>\r
                                                        <td><%text(_ADD_DRAFTNFUTURE)%></td>\r
                                                        <td>\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
+                                                               <ul class="nobullets">\r
+                                                                       <li><input name="actiontype" value="addnow" type="radio" checked='checked' id="act_now" /><label for="act_now"><%text(_ADD_ADDNOW)%></label></li>\r
+                                                                       <li><input name="actiontype" value="addfuture" type="radio" id="act_future" /><label for="act_future"><%text(_ADD_ADDLATER)%></label> <%helplink(future)%></li>\r
+                                                                       <li>\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 /><%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
+                                                                       </li>\r
+                                                                       <li>\r
+                                                                               <input name="actiontype" value="adddraft" type="radio" id="act_draft" /><label for="act_draft"><%text(_ADD_ADDDRAFT)%></label> <%helplink(draft)%>\r
+                                                                       </li>\r
+                                                                       <li><input id="dosendping" name="dosendping" value="1" type="checkbox" checked="checked" /><label for="dosendping"><%text(_UPDATEDPING_GOSENDPING)%></label></li>\r
+                                                               </ul>\r
                                                        </td>\r
                                                </tr>\r
                                                <tr>\r
                                                        </td>\r
                                                </tr>\r
                                                <tr>\r
diff --git a/nucleus/libs/include/bookmarklet-edit.template b/nucleus/libs/include/bookmarklet-edit.template
index b87e6d9..fb33659 100755 (executable)
--- a/nucleus/libs/include/bookmarklet-edit.template
+++ b/nucleus/libs/include/bookmarklet-edit.template
@@ -1,5 +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
+<%xmldeclaration%><!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
                <meta http-equiv="Content-Type" content="text/html; charset=<%text(_CHARSET)%>" />\r
        <html <%text(_HTML_XML_NAME_SPACE_AND_LANG_CODE)%>>\r
        <head>\r
                <meta http-equiv="Content-Type" content="text/html; charset=<%text(_CHARSET)%>" />\r
@@ -71,7 +70,7 @@
                                <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
                                <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
+                                       <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
                                                        <td><%text(_ADD_TITLE)%></td>\r
                                                        <td><input <%jsinput(title)%> type="text" size="60" maxlength="160" value="<%contents(title)%>" /></td>\r
@@ -90,7 +89,7 @@
                                        </table>\r
                                </div>\r
                                <div id="more" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
                                        </table>\r
                                </div>\r
                                <div id="more" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-                                       <table>\r
+                                       <table summary="item more">\r
                                                <tr>\r
                                                        <td><%text(_ADD_MORE)%> <%helplink(extended)%></td>\r
                                                        <td>\r
                                                <tr>\r
                                                        <td><%text(_ADD_MORE)%> <%helplink(extended)%></td>\r
                                                        <td>\r
@@ -101,7 +100,7 @@
                                        </table>\r
                                </div>\r
                                <div id="options" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
                                        </table>\r
                                </div>\r
                                <div id="options" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
-                                       <table>\r
+                                       <table summary="item options">\r
                                                <%ifblogsetting(bcomments)%><tr>\r
                                                        <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
                                                        <td>\r
                                                <%ifblogsetting(bcomments)%><tr>\r
                                                        <td><%text(_ADD_DISABLE_COMMENTS)%></td>\r
                                                        <td>\r
@@ -130,11 +129,10 @@
                                                                        <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
                                                                        <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
+                                                                       <li><input id="dosendping" name="dosendping" value="1" type="checkbox" /><label for="dosendping"><%text(_UPDATEDPING_GOSENDPING)%></label></li>\r
                                                                </ul>\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
                                                        </td>\r
                                                </tr>\r
-                                       \r
                                                <tr>\r
                                                        <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
                                                        <td><%pluginextras%></td>\r
                                                <tr>\r
                                                        <td><%text(_ADD_PLUGIN_EXTRAS)%></td>\r
                                                        <td><%pluginextras%></td>\r
@@ -144,21 +142,20 @@
                                </div>\r
                                <div id="preview" class="contentblock ui-tabs-panel ui-widget-content ui-corner-bottom">\r
                                        <h2><%text(_ADD_PREVIEW)%></h2>\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
+                                       <strong><span id="prevtitle">&#160;</span></strong>\r
                                        <br />\r
                                        <span id="prevbody">&#160;</span>\r
                                        <br />\r
                                        <span id="prevmore">&#160;</span>\r
                                </div>\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 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
                </form>\r
                        </div>\r
                </form>\r
-\r
                <%ifautosave()%><script type="text/javascript">\r
                        var xmlhttprequest = new Array();\r
                        xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
                <%ifautosave()%><script type="text/javascript">\r
                        var xmlhttprequest = new Array();\r
                        xmlhttprequest[0] = createHTTPHandler(); // AutoDraft handler\r
@@ -171,6 +168,5 @@
                        var lastsavedtext = '<%text(_AUTOSAVEDRAFT_LASTSAVED)%>'; // The language variable for 'Last saved'\r
                        var formtype = 'edit'; // Add or edit form\r
                </script><%endif%>\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
        </body>\r
 </html>\r
Nucleus CMS日本語版SVNをgit-svnしたもの。リポジトリの変換作業用
About OSDN
Find Software
Develop Software
Help