OSDN Git Service

管理画面用スキン中の<%adminurl%>でのCSSファイルとjavascriptファイルの読み込みURLを<%skinfile()%>に変更
authorshizuki <shizuki@kinezumi.net>
Sun, 29 Apr 2012 15:30:56 +0000 (00:30 +0900)
committershizuki <shizuki@kinezumi.net>
Sun, 29 Apr 2012 15:30:56 +0000 (00:30 +0900)
showlist.phpの実行中にActionsクラスが存在しなかった場合の処理を追加

nucleus/libs/showlist.php
skins/admin/defaultadmin/skinbackup.xml

index 05b0fef..d7239ee 100644 (file)
@@ -189,6 +189,11 @@ function listplug_table($vars, $type, $templateName = '')
                        break;\r
        }\r
        $template = Template::fill($template, $data);\r
+       if ( !class_exists('Actions') )\r
+       {\r
+               global $DIR_LIBS;\r
+               include $DIR_LIBS . 'ACTIONS.php';\r
+       }\r
        $handler  = new Actions('template', $template, $data);\r
        $parser   = new PARSER(Actions::getDefinedActions(), $handler);\r
        $parser->parse($template);\r
index 8fc300c..8e17503 100644 (file)
@@ -888,8 +888,8 @@ selector();
     <part name="createitem"><![CDATA[<h2><%text(_ADD_ADDTO)%> '<%adminbloglink(defaultadmin)%>'</h2>\r
 \r
 <%init%>\r
-<script type="text/javascript" src="javascript/numbercheck.js"></script>\r
-<%ifautosave%><script type="text/javascript" src="javascript/xmlhttprequest.js"></script><%endif%>\r
+<script type="text/javascript" src="<%skinfile(/javascript/numbercheck.js)%>"></script>\r
+<%ifautosave%><script type="text/javascript" src="<%skinfile(/javascript/xmlhttprequest.js)%>"></script><%endif%>\r
 \r
 <form id="addform" method="post" action="index.php" >\r
 \r
@@ -1185,8 +1185,8 @@ selector();
     <part name="itemedit"><![CDATA[<h2><%text(_EDIT_ITEM)%></h2>\r
 \r
 <%init%>\r
-<script type="text/javascript" src="javascript/numbercheck.js"></script>\r
-<%ifautosave()%><script type="text/javascript" src="javascript/xmlhttprequest.js"></script><%endif%>\r
+<script type="text/javascript" src="<%skinfile(/javascript/numbercheck.js)%>"></script>\r
+<%ifautosave()%><script type="text/javascript" src="<%skinfile(/javascript/xmlhttprequest.js)%>"></script><%endif%>\r
 \r
 <form id="editform" method="post" action="index.php">\r
 <div>\r
@@ -1502,12 +1502,12 @@ selector();
     <head>\r
         <meta http-equiv="Content-Type" content="text/html; charset=<%charset%>" />\r
         <title><%sitevar(name)%> - Admin</title>\r
-        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%adminstyleseets%>" />\r
-        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%adminurl%>styles/addedit.css" />\r
+        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(/styles/admin_contemporary_jp.css)%>" />\r
+        <link rel="stylesheet" title="Nucleus Admin Default" type="text/css" href="<%skinfile(/styles/addedit.css)%>" />\r
 \r
-        <script type="text/javascript" src="<%adminurl%>javascript/edit.js"></script>\r
-        <script type="text/javascript" src="<%adminurl%>javascript/admin.js"></script>\r
-        <script type="text/javascript" src="<%adminurl%>javascript/compatibility.js"></script>\r
+        <script type="text/javascript" src="<%skinfile(/javascript/edit.js)%>"></script>\r
+        <script type="text/javascript" src="<%skinfile(/javascript/admin.js)%>"></script>\r
+        <script type="text/javascript" src="<%skinfile(/javascript/compatibility.js)%>"></script>\r
 \r
         <meta http-equiv='Pragma' content='no-cache' />\r
         <meta http-equiv='Cache-Control' content='no-cache, must-revalidate' />\r
@@ -2300,7 +2300,7 @@ selector();
 ]]></part>\r
     <part name="SHOWLIST_LISTPLUG_TABLE_CMNTLIST_ABAN"><![CDATA[<td style="white-space:nowrap"><a href="index.php?action=banlistnewfromitem&amp;itemid=<%itemid%>&amp;ip=<%banip%>" title="<%banhost%>"><%banbtn%></a></td>\r
 ]]></part>\r
-    <part name="SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD"><![CDATA[<th><%blognames%></th><th colspan="7"><%actionshead%></th>\r
+    <part name="SHOWLIST_LISTPLUG_TABLE_BLOGLIST_HEAD"><![CDATA[<th><%blognames%></th><th colspan="8"><%actionshead%></th>\r
 ]]></part>\r
     <part name="SHOWLIST_LISTPLUG_TABLE_BLOGLIST_BODY"><![CDATA[<td title="blogid:<%blogid%> shortname:<%shortname%>">\r
 <a href="<%blogurl%>"><img src="images/globe.gif" width="13" height="13" alt="<%iconalt%>" /></a> <%blogname%>\r