From: shizuki Date: Wed, 25 Feb 2009 05:18:48 +0000 (+0000) Subject: ブックマークレットの不具合修正 X-Git-Tag: release-3-50~71 X-Git-Url: http://git.sourceforge.jp/view?p=nucleus-jp%2Fnucleus-jp-ancient.git;a=commitdiff_plain;h=4e71b86bf81cb4cd5f1a977a5e945327a241e552 ブックマークレットの不具合修正 IE6のデザインくずれ修正 編集ブックマークレットで｢ヘルプ｣アイコンが表示されていなかったのを修正 help.htmlへのリンクをフルURLに修正 git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@955 1ca29b6e-896d-4ea0-84a5-967f57386b96 --- diff --git a/utf8/nucleus/libs/PAGEFACTORY.php b/utf8/nucleus/libs/PAGEFACTORY.php index 41235b4..4d8c98c 100755 --- a/utf8/nucleus/libs/PAGEFACTORY.php +++ b/utf8/nucleus/libs/PAGEFACTORY.php @@ -80,7 +80,8 @@ class PAGEFACTORY extends BaseActions { 'ticket', 'autosave', 'autosaveinfo', - 'ifautosave' + 'ifautosave', + 'xmldeclaration' ); // TODO: maybe add 'skin' later on? @@ -173,6 +174,13 @@ class PAGEFACTORY extends BaseActions { ADMIN::selectBlogCategory('catid',$catid,$startidx,1,$this->blog->getID()); } + function parse_xmldeclaration() { + $ua = serverVar('HTTP_USER_AGENT'); + if (!(ereg("Windows", $ua) && ereg("MSIE", $ua)) || ereg("MSIE 7", $ua)) { + echo '<' . '?xml version="1.0" encoding="' . _CHARSET .'"?' . '>' . "\n"; + } + } + function parse_blogid() { echo $this->blog->getID(); } diff --git a/utf8/nucleus/libs/globalfunctions.php b/utf8/nucleus/libs/globalfunctions.php index 93deb47..37f2114 100755 --- a/utf8/nucleus/libs/globalfunctions.php +++ b/utf8/nucleus/libs/globalfunctions.php @@ -1203,11 +1203,13 @@ function help($id) { } function helpHtml($id) { - return helplink($id) . '' . _HELP_TT . ''; + global $CONF; + return helplink($id) . '' . _HELP_TT . ''; } function helplink($id) { - return ''; + global $CONF; + return ''; } function getMailFooter() { diff --git a/utf8/nucleus/libs/include/bookmarklet-add.template b/utf8/nucleus/libs/include/bookmarklet-add.template index b6a513f..0a02a89 100755 --- a/utf8/nucleus/libs/include/bookmarklet-add.template +++ b/utf8/nucleus/libs/include/bookmarklet-add.template @@ -1,5 +1,4 @@ -"?> - +<%xmldeclaration%> > @@ -112,22 +111,26 @@ <%text(_ADD_DRAFTNFUTURE)%> - -
- <%helplink(future)%> -
- <%text(_ADD_PLACE_ON)%> - <%text(_ITEM_ADDEDITTEMPLATE_YEAR)%> - <%text(_ITEM_ADDEDITTEMPLATE_MONTH)%> - <%text(_ITEM_ADDEDITTEMPLATE_DAY)%> - <%text(_ITEM_ADDEDITTEMPLATE_HOUR)%> - <%text(_ITEM_ADDEDITTEMPLATE_MINUTE)%> -
- <%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)%> - <%ifblogsetting(ballowpast,0)%>
<%text(_ADD_NOPASTDATES)%><%endif%> -
- <%helplink(draft)%>
- + diff --git a/utf8/nucleus/libs/include/bookmarklet-edit.template b/utf8/nucleus/libs/include/bookmarklet-edit.template index b87e6d9..fb33659 100755 --- a/utf8/nucleus/libs/include/bookmarklet-edit.template +++ b/utf8/nucleus/libs/include/bookmarklet-edit.template @@ -1,5 +1,4 @@ -"?> - +<%xmldeclaration%> > @@ -71,7 +70,7 @@ <%ticket%>
- +
@@ -90,7 +89,7 @@
<%text(_ADD_TITLE)%> type="text" size="60" maxlength="160" value="<%contents(title)%>" />
- +
<%text(_ADD_MORE)%> <%helplink(extended)%> @@ -101,7 +100,7 @@
- +
<%ifblogsetting(bcomments)%> - @@ -144,21 +142,20 @@

<%text(_ADD_PREVIEW)%>

-   +  
 
 
-
- - <%ifautosave()%><%endif%> - - <%ifautosave()%>(<%text(_AUTOSAVEDRAFT)%> : <%text(_AUTOSAVEDRAFT_NOTYETSAVED)%>)<%endif%> -
+ +
+ + <%ifautosave()%><%endif%> + + <%ifautosave()%>(<%text(_AUTOSAVEDRAFT)%> : <%text(_AUTOSAVEDRAFT_NOTYETSAVED)%>)<%endif%>
- <%ifautosave()%><%endif%> -
<%text(_ADD_DISABLE_COMMENTS)%> @@ -130,11 +129,10 @@
  • <%helplink(draft)%>
    • <%endif%> +
    • -
    <%text(_ADD_PLUGIN_EXTRAS)%> <%pluginextras%>