CHANGE:スキン変数<%newestcompare%>をpageheadからsystemoverviewへ移動

FIX:バージョンチェックの結果最新版だったときに最新版である旨表示するようにした

diff --git a/nucleus/libs/AdminActions.php b/nucleus/libs/AdminActions.php
index f09c6c6..4977d78 100644 (file)
--- a/nucleus/libs/AdminActions.php
+++ b/nucleus/libs/AdminActions.php
@@ -3564,6 +3564,10 @@ class AdminActions extends BaseActions
                        echo '<br /><a style="color:red" href="http://nucleuscms.org/upgrade.php" title="' . _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TITLE . '">';
                        echo _ADMIN_SYSTEMOVERVIEW_LATESTVERSION_TEXT . $newestVersion . '</a>';
                }
+               else
+               {
+                       echo _ADMIN_SYSTEMOVERVIEW_VERSION_LATEST;
+               }
                return;
        }
        

diff --git a/nucleus/locales/en_Latn_US.ISO-8859-1.php b/nucleus/locales/en_Latn_US.ISO-8859-1.php
index 63476f1..d2b3958 100644 (file)
--- a/nucleus/locales/en_Latn_US.ISO-8859-1.php
+++ b/nucleus/locales/en_Latn_US.ISO-8859-1.php
@@ -92,6 +92,7 @@ define('_SETTINGS_ADMINSKIN',                         'default skin for admin area');
 define('_SETTINGS_BKMKLTSKIN',                         'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 
+define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/

diff --git a/nucleus/locales/en_Latn_US.UTF-8.php b/nucleus/locales/en_Latn_US.UTF-8.php
index 63476f1..d2b3958 100644 (file)
--- a/nucleus/locales/en_Latn_US.UTF-8.php
+++ b/nucleus/locales/en_Latn_US.UTF-8.php
@@ -92,6 +92,7 @@ define('_SETTINGS_ADMINSKIN',                         'default skin for admin area');
 define('_SETTINGS_BKMKLTSKIN',                         'default skin for bookmarklet');
 define('_MEMBERS_BKMKLTSKIN',                          "bookmarklet skin");
 
+define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         'The version which is being used is latest.');
 /********************************************
  *        Start New for 3.6x                *
  ********************************************/

diff --git a/nucleus/locales/ja_Jpan_JP.EUC-JP.php b/nucleus/locales/ja_Jpan_JP.EUC-JP.php
index 5e906b9..6c02131 100644 (file)
--- a/nucleus/locales/ja_Jpan_JP.EUC-JP.php
+++ b/nucleus/locales/ja_Jpan_JP.EUC-JP.php
@@ -97,6 +97,7 @@ define('_SETTINGS_ADMINSKIN',                         '
 define('_SETTINGS_BKMKLTSKIN',                         '¥Ç¥Õ¥©¥ë¥È¤Î¥Ö¥Ã¥¯¥Þ¡¼¥¯¥ì¥Ã¥ÈÍÑ¥¹¥­¥ó');
 define('_MEMBERS_BKMKLTSKIN',                          '»ÈÍѤ¹¤ë¥Ö¥Ã¥¯¥Þ¡¼¥¯¥ì¥Ã¥ÈÍѤΥ¹¥­¥ó');
 
+define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         '»ÈÍÑÃæ¤Î¥Ð¡¼¥¸¥ç¥ó¤ÏºÇ¿·¤Ç¤¹');
 /********************************************
  *        Start New for 3.64                *
  ********************************************/

diff --git a/nucleus/locales/ja_Jpan_JP.UTF-8.php b/nucleus/locales/ja_Jpan_JP.UTF-8.php
index b353f1f..e24dae2 100644 (file)
--- a/nucleus/locales/ja_Jpan_JP.UTF-8.php
+++ b/nucleus/locales/ja_Jpan_JP.UTF-8.php
@@ -97,6 +97,7 @@ define('_SETTINGS_ADMINSKIN',                         'デフォルトの管理画面用スキン');
 define('_SETTINGS_BKMKLTSKIN',                         'デフォルトのブックマークレット用スキン');
 define('_MEMBERS_BKMKLTSKIN',                          '使用するブックマークレット用のスキン');
 
+define('_ADMIN_SYSTEMOVERVIEW_VERSION_LATEST',         '使用中のバージョンは最新です');
 /********************************************
  *        Start New for 3.64                *
  ********************************************/

diff --git a/skins/admin/default/skinbackup.xml b/skins/admin/default/skinbackup.xml
index ac2b8ee..f86153a 100644 (file)
--- a/skins/admin/default/skinbackup.xml
+++ b/skins/admin/default/skinbackup.xml
@@ -2093,7 +2093,7 @@
 <div class="loginname">\r
 <%if(loggedin)%><%text(_LOGGEDINAS)%> <%member(yourrealname)%> - <a href="<%adminurl%>index.php?action=logout"><%text(_LOGOUT)%></a><br /><a href="<%adminurl%>index.php?action=overview"><%text(_ADMINHOME)%></a> - <%else%><a href="<%adminurl%>index.php?action=showlogin" title="Log in"><%text(_NOTLOGGEDIN)%></a><br /><%endif%>\r
 <a href="<%sitevar(url)%>"><%text(_YOURSITE)%></a><br />\r
-(<%if(superadmin)%><a href="<%versioncheckurl%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>"><%version%><%codename%></a><%newestcompare%><%else%><%version%><%codename%><%endif%>)\r
+(<%if(superadmin)%><a href="<%versioncheckurl%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>"><%version%><%codename%></a><%else%><%version%><%codename%><%endif%>)\r
 </div>\r
 ]]></part>\r
 <part name="plugindelete"><![CDATA[\r
@@ -2678,6 +2678,9 @@
 <td width="50%"><%text(_ADMIN_SYSTEMOVERVIEW_NUCLEUSPATCHLEVEL)%></td>\r
 <td><%systemsettings(nucleuspatchlevel)%></td>\r
 </tr>\r
+<tr>\r
+<td colspan="2"><%newestcompare%></td>\r
+</tr>\r
 </table>\r
 <table summary="Important settings of the installation">\r
 <tr>\r

diff --git a/skins/admin/defaultimporter.skn b/skins/admin/defaultimporter.skn
index 6e57aa7..e605d89 100644 (file)
--- a/skins/admin/defaultimporter.skn
+++ b/skins/admin/defaultimporter.skn
@@ -34,7 +34,7 @@
 <a href="<%sitevar(url)%>"><%text(_YOURSITE)%></a><br />
 (
 <%if(superadmin)%>
-       <a href="<%versioncheckurl%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>"><%version%><%codename%></a><%newestcompare%>
+       <a href="<%versioncheckurl%>" title="<%text(_ADMIN_SYSTEMOVERVIEW_VERSIONCHECK_TITLE)%>"><%version%><%codename%></a>
 <%else%>
        <%version%><%codename%>
 <%endif%>