merged 3.2 code

git-svn-id: https://svn.sourceforge.jp/svnroot/nucleus-jp/nucleus-jp/trunk@45 1ca29b6e-896d-4ea0-84a5-967f57386b96

diff --git a/utf8/nucleus/styles/admin.css b/utf8/nucleus/styles/admin.css
index b6df6c1..98823cd 100755 (executable)
--- a/utf8/nucleus/styles/admin.css
+++ b/utf8/nucleus/styles/admin.css
@@ -1,3 +1,10 @@
+/*\r
+       admin area style\r
+       \r
+       $Id: admin.css,v 1.3 2005-03-15 08:09:22 kimitake Exp $\r
+       $NucleusJP$\r
+*/\r
+\r
 body {\r
        background: #ffffff; \r
 }\r
@@ -27,6 +34,7 @@ textarea.skinedit, textarea.templateedit
 img                    { border: none; }\r
 .skip          { display: none; }\r
 label          { cursor: pointer; }\r
+.error                 { color: red; font-size: 1.2em; }\r
 \r
 /* header */\r
 h1 {\r
@@ -87,51 +95,59 @@ h1 {
        border-width: 1px;\r
        border-style: solid;\r
        border-color: black;\r
-   background: #ffffff url(quickb.jpg) top left fixed repeat-y; \r
+\r
+       background: #ffffff url(quickb.jpg) top left fixed repeat-y; \r
 }\r
 \r
 #quickmenu ul {\r
        list-style-type: none;\r
-}\r
-#quickmenu p, #quickmenu ul {\r
-       margin: 3px;\r
-       padding: 0px;\r
+       margin: 0;\r
+       padding: 0;\r
 }\r
 #quickmenu p {\r
+       padding: 5px;\r
+       margin: 0px;\r
        text-align: justify;\r
 }\r
 #quickmenu li {\r
-       height: 2em;\r
-       padding: 5px;   \r
+       padding: 0;\r
+       margin: 0;\r
        text-align: center;\r
        border-bottom: 1px solid #ccc;\r
 }\r
 #quickmenu a {\r
+       display: block;\r
+       padding: 5px;\r
+       font-size: 1em;\r
+       line-height: 1.5em;\r
+       text-decoration: none;\r
        font-family: verdana, lucida, arial, helvetica, sans-serif;\r
 }\r
 *>#quickmenu a {\r
        font-family: "Trebuchet MS", "Bitstream Vera Sans", verdana, lucida, arial, helvetica, sans-serif;\r
 }\r
-#quickmenu li:hover {\r
-       background-color: #DEE6F6;\r
+#quickmenu a:hover {\r
+       background: #ffffff url(quickb-hover.jpg) top left fixed repeat-y; \r
+       color: #000;\r
+       letter-spacing: 1px;\r
 }\r
+\r
 #quickmenu h2 {\r
        font-size: small;\r
        text-align: center;\r
        padding: 1px 0px 1px 0px;\r
        margin: 0px;\r
-       border-bottom: 1px solid #bbb;\r
-       border-top: 1px solid #bbb;     \r
+       border-bottom: 1px solid #bbb;  \r
        background-color: #ddd;\r
        color: #000;\r
 }\r
 #quickmenu form {\r
-       margin: 0px;\r
-       padding: 2px;\r
+       margin: 0;\r
+       padding: 5px;\r
        text-align: center;\r
 }\r
 #quickmenu option {\r
-       font-size: small;\r
+       font-size: 0.9em;\r
 }\r
 \r
 .loginname {\r

diff --git a/utf8/nucleus/upgrades/index.php b/utf8/nucleus/upgrades/index.php
index 5b7cf24..ddac150 100755 (executable)
--- a/utf8/nucleus/upgrades/index.php
+++ b/utf8/nucleus/upgrades/index.php
@@ -1,7 +1,7 @@
 <?php\r
 /**\r
   * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) \r
-  * Copyright (C) 2002-2004 The Nucleus Group\r
+  * Copyright (C) 2002-2005 The Nucleus Group\r
   *\r
   * This program is free software; you can redistribute it and/or\r
   * modify it under the terms of the GNU General Public License\r
@@ -9,7 +9,7 @@
   * of the License, or (at your option) any later version.\r
   * (see nucleus/documentation/index.html#license for more info)\r
   *\r
-  * $Id: index.php,v 1.1.1.1 2005-02-28 07:15:03 kimitake Exp $\r
+  * $Id: index.php,v 1.2 2005-03-15 08:11:33 kimitake Exp $\r
   */\r
 \r
 include('upgrade.functions.php'); \r
@@ -54,7 +54,7 @@ When upgrading from an older Nucleus version, upgrades to the database tables ar
       <p class="ok">No automatic upgrades required! The database tables have already been updated to the latest version of Nucleus.</p>\r
     <?php  } else {\r
     ?>\r
-      <p class="warning"><a href="upgrade.php?from=<?php echo $current?>">Click here to upgrade the database to Nucleus v3.1+</a></p>\r
+      <p class="warning"><a href="upgrade.php?from=<?php echo $current?>">Click here to upgrade the database to Nucleus v3.2</a></p>\r
     <?php  }\r
 ?>\r
 \r

diff --git a/utf8/nucleus/upgrades/upgrade.functions.php b/utf8/nucleus/upgrades/upgrade.functions.php
index 19b894e..4edd0b7 100755 (executable)
--- a/utf8/nucleus/upgrades/upgrade.functions.php
+++ b/utf8/nucleus/upgrades/upgrade.functions.php
@@ -2,7 +2,7 @@
 \r
        /**\r
          * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) \r
-         * Copyright (C) 2002-2004 The Nucleus Group\r
+         * Copyright (C) 2002-2005 The Nucleus Group\r
          *\r
          * This program is free software; you can redistribute it and/or\r
          * modify it under the terms of the GNU General Public License\r
@@ -12,7 +12,7 @@
          *     \r
          * Some functions common to all upgrade scripts\r
          *\r
-         * $Id: upgrade.functions.php,v 1.1.1.1 2005-02-28 07:15:03 kimitake Exp $\r
+         * $Id: upgrade.functions.php,v 1.2 2005-03-15 08:11:16 kimitake Exp $\r
          */\r
 \r
        include('../../config.php');\r

diff --git a/utf8/nucleus/upgrades/upgrade.php b/utf8/nucleus/upgrades/upgrade.php
index 1809889..a2a5496 100755 (executable)
--- a/utf8/nucleus/upgrades/upgrade.php
+++ b/utf8/nucleus/upgrades/upgrade.php
@@ -1,7 +1,7 @@
 <?php\r
 /**\r
   * Nucleus: PHP/MySQL Weblog CMS (http://nucleuscms.org/) \r
-  * Copyright (C) 2002-2004 The Nucleus Group\r
+  * Copyright (C) 2002-2005 The Nucleus Group\r
   *\r
   * This program is free software; you can redistribute it and/or\r
   * modify it under the terms of the GNU General Public License\r
@@ -9,7 +9,7 @@
   * of the License, or (at your option) any later version.\r
   * (see nucleus/documentation/index.html#license for more info)\r
   *\r
-  * $Id: upgrade.php,v 1.1.1.1 2005-02-28 07:15:03 kimitake Exp $\r
+  * $Id: upgrade.php,v 1.2 2005-03-15 08:10:59 kimitake Exp $\r
   */\r
 \r
 include('upgrade.functions.php'); \r

diff --git a/utf8/nucleus/upgrades/upgrade3.2.php b/utf8/nucleus/upgrades/upgrade3.2.php
index 02aef1d..0e99042 100755 (executable)
--- a/utf8/nucleus/upgrades/upgrade3.2.php
+++ b/utf8/nucleus/upgrades/upgrade3.2.php
@@ -30,8 +30,8 @@ function upgrade_do32() {
 \r
        // 3.1 -> 3.1+\r
        // update database version  \r
-//     $query = 'UPDATE ' . sql_table('config') . ' set value=\'320\' where name=\'DatabaseVersion\'';\r
-//     upgrade_query('Updating DatabaseVersion in config table to 320', $query);\r
+       $query = 'UPDATE ' . sql_table('config') . ' set value=\'320\' where name=\'DatabaseVersion\'';\r
+       upgrade_query('Updating DatabaseVersion in config table to 320', $query);\r
        \r
        // nothing!\r
 }\r