インストーラ処理時に処理中ダイアログ表示。

diff --git a/templates/_install/css/style.css b/templates/_install/css/style.css
index 5268fc5..a6ad190 100644 (file)
--- a/templates/_install/css/style.css
+++ b/templates/_install/css/style.css
@@ -5,3 +5,24 @@
 .bottom_buttons {
        text-align:right;
 }
+.modal-processing { 
+       position: fixed;
+       top: 50% !important;
+       left: 50% !important;
+       margin-top: -100px;
+       margin-left: -100px;
+       overflow: visible !important;
+}
+.modal-processing,
+.modal-processing .modal-dialog,
+.modal-processing .modal-content {
+       width: 200px;
+       height: 200px;
+}
+.modal-processing .modal-dialog,
+.modal-processing .modal-content {
+       padding: 0 !important;
+       margin: 0 !important;
+}
+.modal-processing .modal-content .icon {
+}

diff --git a/widgets/_install/include/container/_installInitdbWidgetContainer.php b/widgets/_install/include/container/_installInitdbWidgetContainer.php
index c62e3f7..a9c8873 100644 (file)
--- a/widgets/_install/include/container/_installInitdbWidgetContainer.php
+++ b/widgets/_install/include/container/_installInitdbWidgetContainer.php
@@ -19,7 +19,6 @@ require_once($gEnvManager->getCurrentWidgetDbPath() . '/_installDb.php');
 class _installInitdbWidgetContainer extends _installBaseWidgetContainer
 {
        private $db;    // DB接続オブジェクト
-//     private $sysDb; // DB接続オブジェクト
        private $createTableScripts;                    // テーブル作成スクリプト
        private $insertTableScripts;                    // データインストールスクリプト
        private $updateTableScripts;                    // テーブル更新スクリプト
@@ -30,6 +29,7 @@ class _installInitdbWidgetContainer extends _installBaseWidgetContainer
        const UPDATE_DIR = 'update';                    // 追加スクリプトディレクトリ名
        const INSTALL_INFO_CLASS = 'InstallInfo';                       // インストール情報クラス
        const DEFAULT_LANG              = 'default_lang';                                       // デフォルト言語
+       const PROCESSING_ICON_FILE = '/images/system/processing.gif';           // 処理中
        
        /**
         * コンストラクタ
@@ -41,7 +41,6 @@ class _installInitdbWidgetContainer extends _installBaseWidgetContainer
                
                // DBオブジェクト作成
                $this->db = new _installDB();
-//             $this->sysDb = $this->gInstance->getSytemDbObject();
                
                // 実行SQLスクリプトファイルの定義
 /*             $this->createTableScripts = array(      array(  'filename'              => 'create_base.sql',                                   // ファイル名
@@ -110,6 +109,7 @@ class _installInitdbWidgetContainer extends _installBaseWidgetContainer
                $localeText['label_do'] = $this->_('Do');
                $localeText['label_target'] = $this->_('Target');
                $localeText['label_table'] = $this->_('All Tables');
+               $localeText['label_processing'] = $this->_('Processing');
                $this->setLocaleText($localeText);
        }
        /**
@@ -291,6 +291,7 @@ class _installInitdbWidgetContainer extends _installBaseWidgetContainer
                // 画面の設定
                $this->tmpl->addVar("_widget", "task", $task);          // 実行処理を設定
                $this->tmpl->addVar("_widget", "message", $msg);                // ＤＢ構築
+               $this->tmpl->addVar('_widget', 'process_image', $this->getUrl($this->gEnv->getRootUrl() . self::PROCESSING_ICON_FILE)); // 処理中アイコン
        }
        /**
         * DBバージョンアップ画面作成
@@ -391,6 +392,7 @@ class _installInitdbWidgetContainer extends _installBaseWidgetContainer
                // 画面の設定
                $this->tmpl->addVar("_widget", "task", $task);          // 実行処理を設定
                $this->tmpl->addVar("_widget", "message", $this->_('Keep existing data, and update system and database.'));             // 既存データを残して、DBをバージョンアップします
+               $this->tmpl->addVar('_widget', 'process_image', $this->getUrl($this->gEnv->getRootUrl() . self::PROCESSING_ICON_FILE)); // 処理中アイコン
        }
        /**
         * DBをバージョンアップ

diff --git a/widgets/_install/include/locale/ja_JP.mo b/widgets/_install/include/locale/ja_JP.mo
index 5d7ba2a..a84e40a 100644 (file)
Binary files a/widgets/_install/include/locale/ja_JP.mo and b/widgets/_install/include/locale/ja_JP.mo differ

diff --git a/widgets/_install/include/locale/ja_JP.po b/widgets/_install/include/locale/ja_JP.po
index 25080e5..89eed08 100644 (file)
--- a/widgets/_install/include/locale/ja_JP.po
+++ b/widgets/_install/include/locale/ja_JP.po
@@ -2,8 +2,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-01-12 20:18+0900\n"
-"PO-Revision-Date: 2014-01-12 20:19+0900\n"
+"POT-Creation-Date: 2014-04-27 16:48+0900\n"
+"PO-Revision-Date: 2014-04-27 16:48+0900\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: ja_JP\n"
@@ -41,7 +41,7 @@ msgid "Clear all the data, and update system and database."
 msgstr "DBの内容をすべてクリアしてから、システムをバージョンアップします"
 
 #: container/_installCheckdbWidgetContainer.php:89
-#: container/_installInitdbWidgetContainer.php:393
+#: container/_installInitdbWidgetContainer.php:394
 msgid "Keep existing data, and update system and database."
 msgstr "DBの内容を保持したまま、システムをバージョンアップします"
 
@@ -345,30 +345,34 @@ msgstr "このシステム自体を指定しています"
 msgid "Magic3 system not selected."
 msgstr "Magic3システムを指定していません"
 
-#: container/_installInitdbWidgetContainer.php:102
+#: container/_installInitdbWidgetContainer.php:101
 msgid "Create Database"
 msgstr "ＤＢ構築"
 
-#: container/_installInitdbWidgetContainer.php:106
+#: container/_installInitdbWidgetContainer.php:105
 msgid "Update Database"
 msgstr "ＤＢバージョンアップ"
 
-#: container/_installInitdbWidgetContainer.php:109
+#: container/_installInitdbWidgetContainer.php:108
 msgid "Wait for complete of creating database after the do action."
 msgstr "実行後は処理が完了するまでしばらくお待ちください"
 
-#: container/_installInitdbWidgetContainer.php:110
+#: container/_installInitdbWidgetContainer.php:109
 msgid "Do"
 msgstr "実行"
 
-#: container/_installInitdbWidgetContainer.php:111
+#: container/_installInitdbWidgetContainer.php:110
 msgid "Target"
 msgstr "処理対象"
 
-#: container/_installInitdbWidgetContainer.php:112
+#: container/_installInitdbWidgetContainer.php:111
 msgid "All Tables"
 msgstr "全テーブル"
 
+#: container/_installInitdbWidgetContainer.php:112
+msgid "Processing"
+msgstr "処理中"
+
 #: container/_installInitdbWidgetContainer.php:186
 #, php-format
 msgid "Database created. Database Version: %s"
@@ -402,7 +406,7 @@ msgid "Failed in initializing database."
 msgstr "ＤＢ初期化に失敗しました"
 
 #: container/_installInitdbWidgetContainer.php:270
-#: container/_installInitdbWidgetContainer.php:377
+#: container/_installInitdbWidgetContainer.php:378
 msgid "Script filename"
 msgstr "スクリプト名"
 
@@ -414,26 +418,26 @@ msgstr "DBを構築します"
 msgid "Create database.<br />Clear all the existing data."
 msgstr "DBを構築します<br />既存のデータはすべて削除されます"
 
-#: container/_installInitdbWidgetContainer.php:356
+#: container/_installInitdbWidgetContainer.php:357
 #, php-format
 msgid "Database updated. Database Version: %s"
 msgstr "DB更新処理が正常に終了しました。現在のDBバージョン: %s"
 
-#: container/_installInitdbWidgetContainer.php:360
+#: container/_installInitdbWidgetContainer.php:361
 #, php-format
 msgid "Widget information updated. Database Version: %s"
 msgstr "ウィジェット情報を更新しました。DBバージョン: %s"
 
-#: container/_installInitdbWidgetContainer.php:376
+#: container/_installInitdbWidgetContainer.php:377
 msgid "Failed in updating database"
 msgstr "DB更新に失敗しました"
 
-#: container/_installInitdbWidgetContainer.php:431
+#: container/_installInitdbWidgetContainer.php:433
 #, php-format
 msgid "Database updated. Database Version: from %s to %s"
 msgstr "DBをバージョンアップしました。 DBバージョン: %sから%s"
 
-#: container/_installInitdbWidgetContainer.php:440
+#: container/_installInitdbWidgetContainer.php:442
 #, php-format
 msgid "Bad script file found in files for update. Filename: %s"
 msgstr ""

diff --git a/widgets/_install/include/template/initdb.tmpl.html b/widgets/_install/include/template/initdb.tmpl.html
index eb5149f..51cb7b6 100644 (file)
--- a/widgets/_install/include/template/initdb.tmpl.html
+++ b/widgets/_install/include/template/initdb.tmpl.html
@@ -5,7 +5,7 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2013 Magic3 Project.\r
+ * @copyright  Copyright 2006-2014 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
  * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
@@ -14,6 +14,10 @@
 <script type="text/javascript">\r
 //<![CDATA[\r
 function gonext(){\r
+       // 処理中ダイアログ表示\r
+       $('#execbutton').blur();\r
+       $('#processing-modal').modal('show');\r
+       \r
        document.main.act.value = 'done';\r
        document.main.submit();\r
        return false;\r
@@ -54,4 +58,16 @@ function gofore(){
 <button class="btn btn-success" onclick="gonext();">{_LC_LABEL_DO}</button>\r
 </p>\r
 </div>\r
+<div class="modal modal-processing fade" id="processing-modal" role="dialog" aria-hidden="true">\r
+    <div class="modal-dialog">\r
+        <div class="modal-content">\r
+            <div class="modal-body">\r
+                <div class="text-center">\r
+                    <img src="{PROCESS_IMAGE}" class="icon" />\r
+                    <h4>{_LC_LABEL_PROCESSING}</h4>\r
+                </div>\r
+            </div>\r
+        </div>\r
+    </div>\r
+</div>\r
 </patTemplate:tmpl>\r