OSDN Git Service

スキンblogselectbox/insertpluginoptionsの削除
authorsakamocchi <o-takashi@sakamocchi.jp>
Thu, 10 May 2012 20:17:36 +0000 (05:17 +0900)
committersakamocchi <o-takashi@sakamocchi.jp>
Thu, 10 May 2012 20:17:36 +0000 (05:17 +0900)
以下のメールメッセージを参照のこと
http://sourceforge.jp/projects/nucleus-jp/lists/archive/developers/2012-May/000955.html

nucleus/libs/ADMIN.php
nucleus/libs/AdminActions.php
nucleus/locales/en_Latn_US.ISO-8859-1.php
nucleus/locales/en_Latn_US.UTF-8.php
nucleus/locales/ja_Jpan_JP.EUC-JP.php
nucleus/locales/ja_Jpan_JP.UTF-8.php
skins/admin/default/skinbackup.xml

index 3c8dfce..821c29d 100644 (file)
@@ -632,93 +632,6 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::selectBlogCategory()\r
-        * Inserts a HTML select element with choices for all categories to which the current\r
-        * member has access\r
-        *\r
-        * @see function selectBlog\r
-        * @param       string  $name                           name of weblod\r
-        * @param       integer $selected                       \r
-        * @param       integer $tabindex                       \r
-        * @param       integer $showNewCat                     \r
-        * @param       integer $iForcedBlogInclude     ID for weblog always included\r
-        * @return      void\r
-        *\r
-        * NOTE: callback from AdminAction\r
-        */\r
-       static public function selectBlogCategory($name, $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)\r
-       {\r
-               Admin::selectBlog($name, 'category', $selected, $tabindex, $showNewCat, $iForcedBlogInclude);\r
-               return;\r
-       }\r
-       \r
-       /**\r
-        * Admin::selectBlog()\r
-        * Inserts a HTML select element with choices for all blogs to which the user has access\r
-        *      mode = 'blog' => shows blognames and values are blogids\r
-        *      mode = 'category' => show category names and values are catids\r
-        *\r
-        * @param       string  $name                           name of weblod\r
-        * @param       string  $mode                           \r
-        * @param       integer $selected                       \r
-        * @param       integer $tabindex                       \r
-        * @param       integer $showNewCat                     \r
-        * @param       integer $iForcedBlogInclude     ID for weblog always included\r
-        * @param $iForcedBlogInclude\r
-        *      ID of a blog that always needs to be included, without checking if the\r
-        *      member is on the blog team (-1 = none)\r
-        * @return      void\r
-        */\r
-       static public function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)\r
-       {\r
-               global $member, $CONF;\r
-               \r
-               // 0. get IDs of blogs to which member can post items (+ forced blog)\r
-               $aBlogIds = array();\r
-               if ( $iForcedBlogInclude != -1 )\r
-               {\r
-                       $aBlogIds[] = intval($iForcedBlogInclude);\r
-               }\r
-               \r
-               if ( $member->isAdmin() && array_key_exists('ShowAllBlogs', $CONF) && $CONF['ShowAllBlogs'] )\r
-               {\r
-                       $query =  "SELECT bnumber FROM %s ORDER BY bname;";\r
-                       $query = sprintf($query, sql_table('blog'));\r
-               }\r
-               else\r
-               {\r
-                       $query =  "SELECT bnumber FROM %s, %s WHERE tblog=bnumber AND tmember=%d;";\r
-                       $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());\r
-               }\r
-               \r
-               $rblogids = DB::getResult($query);\r
-               foreach ( $rblogids as $row )\r
-               {\r
-                       if ( $row['bnumber'] != $iForcedBlogInclude )\r
-                       {\r
-                               $aBlogIds[] = intval($row['bnumber']);\r
-                       }\r
-               }\r
-               \r
-               if ( count($aBlogIds) == 0 )\r
-               {\r
-                       return;\r
-               }\r
-               \r
-               /* TODO: we should consider to use the other way instead of this */\r
-               $_REQUEST['selectData'] = array(\r
-                       'name'                  => $name,\r
-                       'tabindex'              => $tabindex,\r
-                       'mode'                  => $mode,\r
-                       'selected'              => $selected,\r
-                       'showNewCat'    => $showNewCat,\r
-                       'aBlogIds'              => $aBlogIds,\r
-               );\r
-               self::$skin->parse('blogselectbox');\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Admin::action_browseownitems()\r
         * \r
         * @param       void\r
@@ -5511,56 +5424,6 @@ class Admin
        }\r
        \r
        /**\r
-        * Admin::insertPluginOptions()\r
-        * \r
-        * Output plugin option field\r
-        * \r
-        * @access      public\r
-        * @param string        $context        plugin option context\r
-        * @param integer       $contextid      plugin option context id\r
-        * @return      void\r
-        */\r
-       static public function insertPluginOptions($context, $contextid = 0)\r
-       {\r
-               global $manager;\r
-               \r
-               /* get current registered plugin option list in this context even if it's not used */\r
-               $query = "SELECT * FROM %s AS plugins, %s AS options LEFT OUTER JOIN %s AS added "\r
-                      . "ON ( options.oid=added.oid AND options.ocontext=%s  AND added.ocontextid=%d) "\r
-                      . "WHERE plugins.pid=options.opid "\r
-                      . "ORDER BY options.oid ASC;";\r
-               $query = sprintf($query, sql_table('plugin'), sql_table('plugin_option_desc'), sql_table('plugin_option'), DB::quoteValue($context), DB::quoteValue($contextid));\r
-               \r
-               $res = DB::getResult($query);\r
-               \r
-               $options = array();\r
-               foreach ( $res as $row )\r
-               {\r
-                       /* NOTE: to include translation file */\r
-                       $manager->getPlugin($row['pfile']);\r
-                       \r
-                       $options[] = array(\r
-                               'pid'           => $row['pid'],\r
-                               'pfile'         => $row['pfile'],\r
-                               'oid'           => $row['oid'],\r
-                               'value'         => ( !$row['ovalue'] ) ? $row['odef'] : $row['ovalue'],\r
-                               'name'          => $row['oname'],\r
-                               'description' => $row['odesc'],\r
-                               'type'          => $row['otype'],\r
-                               'typeinfo'      => $row['oextra'],\r
-                               'contextid'     => $contextid,\r
-                               'extra'         => ''\r
-                       );\r
-               }\r
-               \r
-               $manager->notify('PrePluginOptionsEdit',array('context' => $context, 'contextid' => $contextid, 'options'=>&$options));\r
-               \r
-               self::$aOptions = $options;\r
-               self::$skin->parse('insertpluginoptions');\r
-               return;\r
-       }\r
-       \r
-       /**\r
         * Admin::action_parseSpecialskin()\r
         * \r
         * @param       void\r
index 2e2667f..6b45db6 100644 (file)
@@ -35,7 +35,6 @@ class AdminActions extends BaseActions
                'batchmovetype',
                'blogcatlist',
                'blognotifysetting',
-               'blogselectbox',
                'blogsetting',
                'blogsettingyesno',
                'blogteamlist',
@@ -82,7 +81,6 @@ class AdminActions extends BaseActions
                'importskininfo',
                'inputyesno',
                'insertpluginfo',
-               'insertpluginoptions',
                'insplugoptcontent',
                'iprangeinput',
                'itemnavlist',
@@ -185,7 +183,6 @@ class AdminActions extends BaseActions
                'batchmovecat'                  => _ADM_SKPRT_BATCHMOVECAT,
                'batchteam'                             => _ADM_SKPRT_BATCHTEAM,
                'blogcommentlist'               => _ADM_SKPRT_BLOGCOMMENTLIST,
-               'blogselectbox'                 => _ADM_SKPRT_BLOGSELECTBOX,
                'blogsettings'                  => _ADM_SKPRT_BLOGSETTINGS,
                'bookmarklet'                   => _ADM_SKPRT_BOOKMARKLET,
                'browseowncomments'             => _ADM_SKPRT_BROWSEOWNCOMMENTS,
@@ -198,7 +195,6 @@ class AdminActions extends BaseActions
                'createnewlog'                  => _ADM_SKPRT_CREATENEWLOG,
                'deleteblog'                    => _ADM_SKPRT_DELETEBLOG,
                'editmembersettings'    => _ADM_SKPRT_EDITMEMBERSETTINGS,
-               'insertpluginoptions'   => _ADM_SKPRT_INSERTPLUGINO,
                'itemcommentlist'               => _ADM_SKPRT_ITEMCOMMENTLIST,
                'itemdelete'                    => _ADM_SKPRT_ITEMDELETE,
                'itemedit'                              => _ADM_SKPRT_ITEMEDIT,
@@ -472,11 +468,6 @@ class AdminActions extends BaseActions
                                        'adminbatchlist',
                                );
                                break;
-                       case 'blogselectbox':
-                               $extra_actions = array(
-                                       'blogselectbox',
-                               );
-                               break;
                        case 'blogsettings':
                                $extra_actions = array(
                                        'adminbloglink',
@@ -564,11 +555,6 @@ class AdminActions extends BaseActions
                                        'pluginoptions',
                                );
                                break;
-                       case 'insertpluginoptions':
-                               $extra_actions = array(
-                                       'insertpluginoptions',
-                               );
-                               break;
                        case 'itemcommentlist':
                                $extra_actions = array(
                                        'requestblogid',
@@ -1689,99 +1675,6 @@ class AdminActions extends BaseActions
        }
        
        /**
-        * AdminActions::parse_blogselectbox()
-        * Parse skinvar blogselectbox
-        * 
-        * @param       void
-        * @return      void
-        */
-       public function parse_blogselectbox()
-       {
-               global $member;
-               
-               $selectData     = requestVar('selectData');
-               $mode           = $selectData['mode'];
-               $name           = Entity::hsc($selectData['name']);
-               $tabindex       = Entity::hsc($selectData['tabindex']);
-               $aBlogIds       = array_map('intval', $selectData['aBlogIds']);
-               $showNewCat     = intval($selectData['showNewCat']);
-               $selected       = intval($selectData['selected']);
-               
-               echo "<select name=\"{$name}\" tabindex=\"{$tabindex}\">\n";
-               
-               // 1. select blogs (we'll create optiongroups)
-               // (only select those blogs that have the user on the team)
-               $queryBlogs = "SELECT bnumber, bname FROM %s WHERE bnumber in (%s) ORDER BY bname;";
-               $queryBlogs = sprintf($queryBlogs, sql_table('blog'), implode(',', $aBlogIds));
-               $blogs = DB::getResult($queryBlogs);
-               
-               if ( $mode == 'category' )
-               {
-                       if ( $blogs->rowCount() > 1 )
-                       {
-                               $multipleBlogs = 1;
-                       }
-                       foreach ( $blogs as $rBlog )
-                       {
-                               if ( isset($multipleBlogs) && !empty($multipleBlogs) )
-                               {
-                                       echo '<optgroup label="' . Entity::hsc($rBlog['bname']) . "\">\n";
-                               }
-                               
-                               // show selection to create new category when allowed/wanted
-                               if ( $showNewCat )
-                               {
-                                       // check if allowed to do so
-                                       if ( $member->blogAdminRights($rBlog['bnumber']) )
-                                       {
-                                               echo '<option value="newcat-' . $rBlog['bnumber'] . '">' . _ADD_NEWCAT . "</option>\n";
-                                       }
-                               }
-                               
-                               // 2. for each category in that blog
-                               $catQuery = "SELECT cname, catid FROM %s WHERE cblog=%d ORDER BY cname ASC;";
-                               $catQuery = sprintf($catQuery, sql_table('category'), (integer) $rBlog['bnumber']);
-                               $categories = DB::getResult($catQuery);
-                               foreach ( $categories as $rCat )
-                               {
-                                       if ( $rCat['catid'] == $selected )
-                                       {
-                                               $selectText = ' selected="selected" ';
-                                       }
-                                       else
-                                       {
-                                               $selectText = '';
-                                       }
-                                       echo '<option value="' . $rCat['catid'] . '" ' . $selectText . '>' . Entity::hsc($rCat['cname']) . "</option>\n";
-                               }
-                               
-                               if ( isset($multipleBlogs) && !empty($multipleBlogs) )
-                               {
-                                       echo '</optgroup>';
-                               }
-                       }
-               }
-               else
-               {
-                       // blog mode
-                       foreach ( $blogs as $rBlog )
-                       {
-                               echo '<option value="' . $rBlog['bnumber'] . '"';
-                               if ( $rBlog['bnumber'] == $selected )
-                               {
-                                       echo '<option value="' . $rBlog['bnumber'] . '" selected="selected">' . Entity::hsc($rBlog['bname']) . "</option>\n";
-                               }
-                               else
-                               {
-                                       echo '<option value="' . $rBlog['bnumber'] . '">' . Entity::hsc($rBlog['bname']) . "</option>\n";
-                               }
-                       }
-               }
-               echo "</select>\n";
-               return;
-       }
-       
-       /**
         * AdminActions::parse_blogsetting()
         * Parse skinvar blogsetting
         * 
@@ -1984,7 +1877,7 @@ class AdminActions extends BaseActions
                        $catid = $contents['catid'];
                }
                
-               Admin::selectBlogCategory('catid', $catid, $startidx, 1, $blog->getID());
+               $this->selectBlog('catid', 'category', $catid, $startidx, 1, $blog->getID());
                
                return;
        }
@@ -3684,72 +3577,6 @@ class AdminActions extends BaseActions
        }
        
        /**
-        * AdminActions::parse_insertpluginoptions()
-        * Parse skinvar insertpluginoptions
-        * 
-        * @param       string  $templateName   name of template
-        * @return      void
-        */
-       public function parse_insertpluginoptions($templateName = '')
-       {
-               $options        = Admin::getAdminaOption();
-               $template       = array();
-               $templats       = array();
-               
-               if ( $templateName )
-               {
-                       $templates = Template::read($templateName);
-               }
-               
-               if ( !array_key_exists('INSERT_PLUGOPTION_TITLE', $templates) || empty($templates['INSERT_PLUGOPTION_TITLE']) )
-               {
-                       $template['title'] = "<tr>"
-                                          . "<th colspan=\"2\"><%sprinttext(_PLUGIN_OPTIONS_TITLE, <|%insertpluginfo(name)%|>)%></th>"
-                                          . "</tr>\n";
-               }
-               else
-               {
-                       $template['title'] = $templates['INSERT_PLUGOPTION_TITLE'];
-               }
-               
-               if ( !array_key_exists('INSERT_PLUGOPTION_BODY', $templates) || empty($templates['INSERT_PLUGOPTION_BODY']) )
-               {
-                       $template['body'] = "<tr>"
-                                         . "<%listplugplugoptionrow%>"
-                                         . "</tr>\n";
-               }
-               else
-               {
-                       $template['body'] = $templates['INSERT_PLUGOPTION_BODY'];
-               }
-               
-               $prevPid = -1;
-               
-               include_libs('ACTIONS.php');
-               $handler = new Actions($this->skintype);
-               $parser = new PARSER($handler);
-                       
-               foreach ( $options as $option )
-               {
-                       
-                       // new plugin?
-                       if ( $prevPid != $option['pid'] )
-                       {
-                               $prevPid  = $option['pid'];
-                               $parser->parse($template['title']);
-                       }
-                       
-                       $meta = NucleusPlugin::getOptionMeta($option['typeinfo']);
-                       
-                       if ( @$meta['access'] != 'hidden' )
-                       {
-                               $parsed = $parser->parse($template['body']);
-                       }
-               }
-               return;
-       }
-       
-       /**
         * AdminActions::parse_insplugoptcontent()
         * Parse skinvar insplugoptcontent
         * 
@@ -4069,10 +3896,10 @@ class AdminActions extends BaseActions
                switch ( $actionType )
                {
                        case 'batchitem':
-                               Admin::selectBlogCategory('destcatid');
+                               $this->selectBlog('destcatid', 'category');
                                break;
                        case 'batchcategory':
-                               Admin::selectBlog('destblogid');
+                               $this->selectBlog('destblogid');
                                break;
                        default:
                                if ( $this->skintype == 'itemmove' )
@@ -4080,7 +3907,7 @@ class AdminActions extends BaseActions
                                        $query  = "SELECT icat as result FROM %s WHERE inumber=%d;";
                                        $query = sprintf($query, sql_table('item'), intRequestVar('itemid'));
                                        $catid  = DB::getValue(sprintf($query, intRequestVar('itemid')));
-                                       Admin::selectBlogCategory('catid', $catid, 10, 1);
+                                       $this->selectBlog('catid', 'category', $catid, 10, 1);
                                }
                                break;
                }
@@ -4312,7 +4139,7 @@ class AdminActions extends BaseActions
         * @param       string  $type   type of plugin option
         * @return      void
         */
-       public function parse_pluginoptions($context='global')
+       public function parse_pluginoptions($context='global', $templateName='')
        {
                global $itemid, $manager;
                
@@ -4380,8 +4207,55 @@ class AdminActions extends BaseActions
                );
                $manager->notify('PrePluginOptionsEdit', $data);
                
-               $content = $this->parser->skin->getContentFromDB('insertpluginoptions');
-               $this->parser->parse($content);
+               $template = array();
+               if ( $templateName )
+               {
+                       $templates = Template::read($templateName);
+                       if ( !array_key_exists('INSERT_PLUGOPTION_TITLE', $templates) || empty($templates['INSERT_PLUGOPTION_TITLE']) )
+                       {
+                               $template['title'] = "<tr>"
+                                                  . "<th colspan=\"2\"><%sprinttext(_PLUGIN_OPTIONS_TITLE, <|%insertpluginfo(name)%|>)%></th>"
+                                                  . "</tr>\n";
+                       }
+                       else
+                       {
+                               $template['title'] = $templates['INSERT_PLUGOPTION_TITLE'];
+                       }
+                       
+                       if ( !array_key_exists('INSERT_PLUGOPTION_BODY', $templates) || empty($templates['INSERT_PLUGOPTION_BODY']) )
+                       {
+                               $template['body'] = "<tr>"
+                                                 . "<%listplugplugoptionrow%>"
+                                                 . "</tr>\n";
+                       }
+                       else
+                       {
+                               $template['body'] = $templates['INSERT_PLUGOPTION_BODY'];
+                       }
+               }
+               
+               $prevPid = -1;
+               
+               include_libs('ACTIONS.php');
+               $handler = new Actions($this->skintype);
+               $parser = new PARSER($handler);
+                       
+               foreach ( $options as $option )
+               {
+                       // new plugin?
+                       if ( $prevPid != $option['pid'] )
+                       {
+                               $prevPid  = $option['pid'];
+                               $parser->parse($template['title']);
+                       }
+                       
+                       $meta = NucleusPlugin::getOptionMeta($option['typeinfo']);
+                       
+                       if ( @$meta['access'] != 'hidden' )
+                       {
+                               $parsed = $parser->parse($template['body']);
+                       }
+               }
                
                return;
        }
@@ -6023,4 +5897,129 @@ class AdminActions extends BaseActions
                
                return;
        }
+       /**
+        * AdminActions::selectBlog()
+        * Inserts a HTML select element with choices for all blogs to which the user has access
+        *      mode = 'blog' => shows blognames and values are blogids
+        *      mode = 'category' => show category names and values are catids
+        *
+        * @param       string  $name                           
+        * @param       string  $mode                           
+        * @param       integer $selected                       
+        * @param       integer $tabindex                       
+        * @param       integer $showNewCat                     
+        * @param       integer $iForcedBlogInclude     ID for weblog always included
+        * @param $iForcedBlogInclude
+        *      ID of a blog that always needs to be included, without checking if the
+        *      member is on the blog team (-1 = none)
+        * @return      void
+        */
+       private function selectBlog($name, $mode='blog', $selected = 0, $tabindex = 0, $showNewCat = 0, $iForcedBlogInclude = -1)
+       {
+               global $member, $CONF;
+               
+               // 0. get IDs of blogs to which member can post items (+ forced blog)
+               $aBlogIds = array();
+               if ( $iForcedBlogInclude != -1 )
+               {
+                       $aBlogIds[] = intval($iForcedBlogInclude);
+               }
+               
+               if ( $member->isAdmin() && array_key_exists('ShowAllBlogs', $CONF) && $CONF['ShowAllBlogs'] )
+               {
+                       $query =  "SELECT bnumber FROM %s ORDER BY bname;";
+                       $query = sprintf($query, sql_table('blog'));
+               }
+               else
+               {
+                       $query =  "SELECT bnumber FROM %s, %s WHERE tblog=bnumber AND tmember=%d;";
+                       $query = sprintf($query, sql_table('blog'), sql_table('team'), (integer) $member->getID());
+               }
+               
+               $rblogids = DB::getResult($query);
+               foreach ( $rblogids as $row )
+               {
+                       if ( $row['bnumber'] != $iForcedBlogInclude )
+                       {
+                               $aBlogIds[] = intval($row['bnumber']);
+                       }
+               }
+               
+               if ( count($aBlogIds) == 0 )
+               {
+                       return;
+               }
+               
+               echo "<select name=\"{$name}\" tabindex=\"{$tabindex}\">\n";
+               
+               // 1. select blogs (we'll create optiongroups)
+               // (only select those blogs that have the user on the team)
+               $queryBlogs = "SELECT bnumber, bname FROM %s WHERE bnumber in (%s) ORDER BY bname;";
+               $queryBlogs = sprintf($queryBlogs, sql_table('blog'), implode(',', $aBlogIds));
+               $blogs = DB::getResult($queryBlogs);
+               
+               if ( $mode == 'category' )
+               {
+                       if ( $blogs->rowCount() > 1 )
+                       {
+                               $multipleBlogs = 1;
+                       }
+                       foreach ( $blogs as $rBlog )
+                       {
+                               if ( isset($multipleBlogs) && !empty($multipleBlogs) )
+                               {
+                                       echo '<optgroup label="' . Entity::hsc($rBlog['bname']) . "\">\n";
+                               }
+                               
+                               // show selection to create new category when allowed/wanted
+                               if ( $showNewCat )
+                               {
+                                       // check if allowed to do so
+                                       if ( $member->blogAdminRights($rBlog['bnumber']) )
+                                       {
+                                               echo '<option value="newcat-' . $rBlog['bnumber'] . '">' . _ADD_NEWCAT . "</option>\n";
+                                       }
+                               }
+                               
+                               // 2. for each category in that blog
+                               $catQuery = "SELECT cname, catid FROM %s WHERE cblog=%d ORDER BY cname ASC;";
+                               $catQuery = sprintf($catQuery, sql_table('category'), (integer) $rBlog['bnumber']);
+                               $categories = DB::getResult($catQuery);
+                               foreach ( $categories as $rCat )
+                               {
+                                       if ( $rCat['catid'] == $selected )
+                                       {
+                                               $selectText = ' selected="selected" ';
+                                       }
+                                       else
+                                       {
+                                               $selectText = '';
+                                       }
+                                       echo '<option value="' . $rCat['catid'] . '" ' . $selectText . '>' . Entity::hsc($rCat['cname']) . "</option>\n";
+                               }
+                               
+                               if ( isset($multipleBlogs) && !empty($multipleBlogs) )
+                               {
+                                       echo '</optgroup>';
+                               }
+                       }
+               }
+               else
+               {
+                       foreach ( $blogs as $rBlog )
+                       {
+                               echo '<option value="' . $rBlog['bnumber'] . '"';
+                               if ( $rBlog['bnumber'] == $selected )
+                               {
+                                       echo '<option value="' . $rBlog['bnumber'] . '" selected="selected">' . Entity::hsc($rBlog['bname']) . "</option>\n";
+                               }
+                               else
+                               {
+                                       echo '<option value="' . $rBlog['bnumber'] . '">' . Entity::hsc($rBlog['bname']) . "</option>\n";
+                               }
+                       }
+               }
+               echo "</select>\n";
+               return;
+       }
 }
index 156edbb..661a719 100644 (file)
@@ -1306,9 +1306,6 @@ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',      'Template for option-meta-da
 define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',          "ADMIN-Area's skin");
 define('_SKINABLEADMIN_MEMBERS_USESITESKIN',        'use site setting');
 
-// ADMIN-skin skin types
-define('_ADM_SKPRT_BLOGSELECTBOX',                  'Select blog pulldown when new item');
-
 //
 include_once('adminskintypes.php');
 
index 159c9cc..81c0b10 100644 (file)
@@ -1305,9 +1305,6 @@ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',      'Template for option-meta-da
 define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',          "ADMIN-Area's skin");
 define('_SKINABLEADMIN_MEMBERS_USESITESKIN',        'use site setting');
 
-// ADMIN-skin skin types
-define('_ADM_SKPRT_BLOGSELECTBOX',                  'Select blog pulldown when new item');
-
 //
 include_once('adminskintypes.php');
 
index 3ae2372..1836a31 100644 (file)
@@ -33,7 +33,9 @@
 define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
 define('_LISTS_AUTHOR', 'Ãø¼Ô');
 define('_OVERVIEW_OTHER_DRAFTS', '¤½¤Î¾¤Î¥É¥é¥Õ¥È');
+define('_ERROR_BADADMINSKINNAME', '´ÉÍý²èÌÌÍÑ¥¹¥­¥ó̾¤ÏÀèƬ¤¬¡Öadmin/¡×¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£');
+define('_ERROR_BADADMINTEMPLATENAME', '´ÉÍý²èÌÌÍÑ¥¹¥­¥ó¤Î¥Æ¥ó¥×¥ì¡¼¥È̾¤ÏÀèƬ¤¬¡Öadmin/¡×¤Ç»Ï¤Þ¤Ã¤Æ¤¤¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£');
+
 /********************************************
  *        Start New for 3.64                *
  ********************************************/
@@ -1326,9 +1328,6 @@ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',      '
 define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',          '»ÈÍѤ¹¤ë´ÉÍýÎΰè¤Î¥¹¥­¥ó');
 define('_SKINABLEADMIN_MEMBERS_USESITESKIN',        '¥µ¥¤¥È¤ÎÀßÄê¤ò»ÈÍѤ¹¤ë');
 
-// ADMIN-skin skin types
-define('_ADM_SKPRT_BLOGSELECTBOX',                  '¿·µ¬Åê¹Æ»þ¤Î¥Ö¥í¥°¤Î¥»¥ì¥¯¥È¥Ü¥Ã¥¯¥¹');
-
 //
 include_once('adminskinTypes.php');
 
index e4a64ae..bbdafa5 100644 (file)
  /********************************************
  *        Start New for 4.0                *
  ********************************************/
-define('_ERROR_BADADMINSKINNAME', '管理画面用スキン名は先頭が「admin/」で始まっている必要があります。');
-define('_ERROR_BADADMINTEMPLATENAME', '管理画面用スキンのテンプレート名は先頭が「admin/」で始まっている必要があります。');
 define('_SKINIE_INVALID_NAMES_DETECTED', 'Invalid skin or templates names detected. Valid names consist of only a-z, A-Z, 0-9, -, and _'); 
 define('_LISTS_AUTHOR', '著者');
 define('_OVERVIEW_OTHER_DRAFTS', 'その他のドラフト');
+define('_ERROR_BADADMINSKINNAME', '管理画面用スキン名は先頭が「admin/」で始まっている必要があります。');
+define('_ERROR_BADADMINTEMPLATENAME', '管理画面用スキンのテンプレート名は先頭が「admin/」で始まっている必要があります。');
+
 /********************************************
  *        Start New for 3.64                *
  ********************************************/
@@ -1328,9 +1328,6 @@ define('_SKINABLEADMIN_PLUGIN_PLGOPT_OPTMETA',      'オプション・メタデ
 define('_SKINABLEADMIN_MEMBERS_ADMINSKIN',          '使用する管理領域のスキン');
 define('_SKINABLEADMIN_MEMBERS_USESITESKIN',        'サイトの設定を使用する');
 
-// ADMIN-skin skin types
-define('_ADM_SKPRT_BLOGSELECTBOX',                  '新規投稿時のブログのセレクトボックス');
-
 //
 include_once('adminskinTypes.php');
 
index bcba9e3..e9512da 100644 (file)
@@ -663,7 +663,6 @@ selector();
     <part name="blogcommentlist"><![CDATA[<%pagehead%><p>(<a href="<%adminurl%>index.php?action=overview"><%text(_BACKHOME)%></a>)</p>
         <h2><%text(_COMMENTS_BLOG)%> <%adminbloglink(admin/default)%></h2>
         <%commentnavlist(admin/default)%><%pagefoot%>]]></part>
-    <part name="blogselectbox"><![CDATA[<%blogselectbox%>]]></part>
     <part name="blogsettings"><![CDATA[<%pagehead%><p><a href="<%adminurl%>index.php?action=overview">(<%text(_BACKHOME)%>)</a></p>
         <h2><%text(_EBLOG_TITLE)%>: '<%adminbloglink(admin/default)%>'</h2>
 
@@ -1294,7 +1293,6 @@ selector();
             </form>
             <h3><%text(_PLUGINS_EXTRA)%></h3>
             <%pluginextras(member)%><%pagefoot%>]]></part>
-    <part name="insertpluginoptions"><![CDATA[<%insertpluginoptions(admin/default)%>]]></part>
     <part name="itemcommentlist"><![CDATA[<%pagehead%><p>(<a href="<%adminurl%>index.php?action=itemlist&amp;blogid=<%requestblogid%>"><%text(_BACKTOOVERVIEW)%></a>)</p>
         <h2><%text(_COMMENTS)%></h2>
         <%commentnavlist(admin/default)%><%pagefoot%>]]></part>