Fixed for MT5.0b2.

diff --git a/lib/PluginManager/Command.pm b/lib/PluginManager/Command.pm
index f31cdbe..cd47dcf 100644 (file)
--- a/lib/PluginManager/Command.pm
+++ b/lib/PluginManager/Command.pm
@@ -4,7 +4,6 @@ use base qw( Class::Accessor::Fast );
 use strict;
 
 use YAML::Tiny;
-use PluginManager::Util;
 use PluginManager::Repository;
 
 sub new {
@@ -88,6 +87,7 @@ use File::Copy::Recursive qw/ rcopy /;
 use File::Find;
 use File::Path;
 use POSIX;
+use PluginManager::Util;
 
 sub usage {
        <<__EOM__;

diff --git a/lib/PluginManager/L10N/ja.pm b/lib/PluginManager/L10N/ja.pm
index 4c00b11..5350036 100644 (file)
--- a/lib/PluginManager/L10N/ja.pm
+++ b/lib/PluginManager/L10N/ja.pm
@@ -69,10 +69,10 @@ use vars qw( %Lexicon );
        'Repository\'s URL' => 'このMTで作成したリポジトリのURL',
        'Package has been imported.' => 'プラグインのパッケージがインポートされました。',
        'Distribution has been imported.' => 'ディストリビューションがインポートされました。',
-       'Import package from file.' => 'ファイルからプラグインをインポートする',
-       'Import package from URL.' => 'URLからプラグインをインポートする',
-       'Import distribution from file.' => 'ファイルからディストリビューションをインポートする',
-       'Import distribution from URL.' => 'URLからディストリビューションをインポートする',
+       'Import package from file.' => 'ファイルからプラグインをインポートする (.mpmファイル)',
+       'Import package from URL.' => 'URLからプラグインをインポートする (.mpmファイル)',
+       'Import distribution from file.' => 'ファイルからディストリビューションをインポートする (.mpdファイル)',
+       'Import distribution from URL.' => 'URLからディストリビューションをインポートする (.mpdファイル)',
        'Do Create Package' => 'パッケージを作成',
        'Do Create Distribution' => 'ディストリビューションを作成',
        'Do Create Repository' => 'リポジトリの作成',

diff --git a/lib/PluginManager/Repository.pm b/lib/PluginManager/Repository.pm
index 96a8d34..3431853 100644 (file)
--- a/lib/PluginManager/Repository.pm
+++ b/lib/PluginManager/Repository.pm
@@ -1,5 +1,8 @@
 package PluginManager::Repository;
 
+use strict;
+use warnings;
+
 sub repository_root {
        my ($create_if_not_exists) = @_;
 
@@ -60,6 +63,8 @@ sub available_components {
                mixicomment
                feedsapplite
                communityactionstreams
+               
+               pluginmanager
        );
        my $defaults_count = scalar(@defaults);
        my %comp = %MT::Components;

diff --git a/lib/PluginManager/Util.pm b/lib/PluginManager/Util.pm
index 7b2ecb6..747f71e 100644 (file)
--- a/lib/PluginManager/Util.pm
+++ b/lib/PluginManager/Util.pm
@@ -6,7 +6,7 @@ use warnings;
 use File::Temp;
 use Exporter;
 
-our @EXPORT = qw(tempdir);
+our @EXPORT = qw(tempdir tempfile);
 use base qw(Exporter);
 
 my $tmp_dir = undef;

diff --git a/tmpl/include/pm_package_list_table.tmpl b/tmpl/include/pm_package_list_table.tmpl
index b007cc5..a2f245b 100644 (file)
--- a/tmpl/include/pm_package_list_table.tmpl
+++ b/tmpl/include/pm_package_list_table.tmpl
@@ -9,6 +9,25 @@
        background-image:url(<mt:StaticWebPath />images/status_icons/draft.gif);
 }
 
+.listing th.title {
+       width: 130px;
+}
+.listing th.category {
+       width: 50px;
+}
+.listing th.author {
+       ;
+}
+.listing th.compatiblity {
+       width: 50px;
+}
+.listing th.license {
+       width: 58px;
+}
+.listing th.target {
+       width: 80px;
+}
+
 .listing td.cb {
        vertical-align: middle;
 }
@@ -157,9 +176,9 @@
                 <th class="title primary-col"><__trans phrase="Name" /></th>
                                <th class="category"><__trans phrase="Category" /></th>
                 <th class="author"><__trans phrase="Author" /></th>
-                <th class="weblog"><__trans phrase="Compatiblity" /></th>
-                <th class="datetime"><__trans phrase="License" /></th>
-                <th class="view"><__trans phrase="Target" /></th>
+                <th class="compatiblity"><__trans phrase="Compatiblity" /></th>
+                <th class="license"><__trans phrase="License" /></th>
+                <th class="target"><__trans phrase="Target" /></th>
             </tr>
         </thead>
         <tfoot>
@@ -171,9 +190,9 @@
                 <th class="title primary-col"><__trans phrase="Name" /></th>
                                <th class="category"><__trans phrase="Category" /></th>
                 <th class="author"><__trans phrase="Author" /></th>
-                <th class="weblog"><__trans phrase="Compatiblity" /></th>
-                <th class="datetime"><__trans phrase="License" /></th>
-                <th class="view"><__trans phrase="Target" /></th>
+                <th class="compatiblity"><__trans phrase="Compatiblity" /></th>
+                <th class="license"><__trans phrase="License" /></th>
+                <th class="target"><__trans phrase="Target" /></th>
             </tr>
         </tfoot>
                <tbody>
@@ -192,7 +211,7 @@
        <td class="target"> </td>
 </tr>
 <tr id="package_row_template2">
-       <td class="description" colspan="8"> </td>
+       <td class="description" colspan="7"> </td>
 </tr>
 
 </tbody>

diff --git a/tmpl/pm_export.tmpl b/tmpl/pm_export.tmpl
index 7c9b0ee..efd2483 100644 (file)
--- a/tmpl/pm_export.tmpl
+++ b/tmpl/pm_export.tmpl
@@ -32,7 +32,7 @@
 
 <div id="plugin_manager_contents">
 
-<form action="<mt:AdminCGIPath /><mt:AdminScript />" method="post">
+<form action="<mt:CGIPath /><mt:AdminScript />" method="post">
        <input type="hidden" name="__mode" value="pluginmanager" />
        <input type="hidden" name="op" value="do_export" />
 

diff --git a/tmpl/pm_import.tmpl b/tmpl/pm_import.tmpl
index 1c5244c..6fed65b 100644 (file)
--- a/tmpl/pm_import.tmpl
+++ b/tmpl/pm_import.tmpl
@@ -89,7 +89,7 @@ jQuery(function() {
 
 <div id="plugin_manager_contents">
 
-<form action="<mt:AdminCGIPath /><mt:AdminScript />" method="post" enctype="multipart/form-data">
+<form action="<mt:CGIPath /><mt:AdminScript />" method="post" enctype="multipart/form-data">
        <input type="hidden" name="__mode" value="pluginmanager" />
        <input type="hidden" name="op" value="do_import" />
        <input type="hidden" name="ftp_password" />
@@ -101,7 +101,7 @@ jQuery(function() {
        </div>
 </form>
 
-<form action="<mt:AdminCGIPath /><mt:AdminScript />" method="post" enctype="multipart/form-data">
+<form action="<mt:CGIPath /><mt:AdminScript />" method="post" enctype="multipart/form-data">
        <input type="hidden" name="__mode" value="pluginmanager" />
        <input type="hidden" name="op" value="do_import" />
        <input type="hidden" name="ftp_password" />
@@ -113,7 +113,7 @@ jQuery(function() {
        </div>
 </form>
 
-<form action="<mt:AdminCGIPath /><mt:AdminScript />" method="post" enctype="multipart/form-data">
+<form action="<mt:CGIPath /><mt:AdminScript />" method="post" enctype="multipart/form-data">
        <input type="hidden" name="__mode" value="pluginmanager" />
        <input type="hidden" name="op" value="do_import" />
        <input type="hidden" name="ftp_password" />
@@ -125,7 +125,7 @@ jQuery(function() {
        </div>
 </form>
 
-<form action="<mt:AdminCGIPath /><mt:AdminScript />" method="post" enctype="multipart/form-data">
+<form action="<mt:CGIPath /><mt:AdminScript />" method="post" enctype="multipart/form-data">
        <input type="hidden" name="__mode" value="pluginmanager" />
        <input type="hidden" name="op" value="do_import" />
        <input type="hidden" name="ftp_password" />

diff --git a/tmpl/pm_repository.tmpl b/tmpl/pm_repository.tmpl
index d83c941..4413ec2 100644 (file)
--- a/tmpl/pm_repository.tmpl
+++ b/tmpl/pm_repository.tmpl
@@ -24,7 +24,7 @@
 
 <div id="plugin_manager_contents">
 
-<form action="<mt:AdminCGIPath /><mt:AdminScript />" method="post">
+<form action="<mt:CGIPath /><mt:AdminScript />" method="post">
        <input type="hidden" name="__mode" value="pluginmanager" />
        <input type="hidden" name="op" value="create_repository" />
 

diff --git a/tmpl/pm_setting.tmpl b/tmpl/pm_setting.tmpl
index 2bfe370..5f5d95f 100644 (file)
--- a/tmpl/pm_setting.tmpl
+++ b/tmpl/pm_setting.tmpl
@@ -32,7 +32,7 @@
 
 <div id="plugin_manager_contents">
 
-<form action="<mt:AdminCGIPath /><mt:AdminScript />" method="post">
+<form action="<mt:CGIPath /><mt:AdminScript />" method="post">
        <input type="hidden" name="__mode" value="pluginmanager" />
        <input type="hidden" name="op" value="update_setting" />