管理画面メインウィジェット更新。

diff --git a/widgets/admin_main/include/container/admin_mainTestWidgetContainer.php b/widgets/admin_main/include/container/admin_mainTestWidgetContainer.php
index da11ea6..aa38fd4 100644 (file)
--- a/widgets/admin_main/include/container/admin_mainTestWidgetContainer.php
+++ b/widgets/admin_main/include/container/admin_mainTestWidgetContainer.php
@@ -64,7 +64,7 @@ class admin_mainTestWidgetContainer extends admin_mainBaseWidgetContainer
         */
        function _setTemplate($request, &$param)
        {       
-               return 'test.tmpl.html';
+               return 'test/test.tmpl.html';
        }
        /**
         * テンプレートにデータ埋め込む

diff --git a/widgets/admin_main/include/container/test/admin_mainTest_bootstrapWidgetContainer.php b/widgets/admin_main/include/container/test/admin_mainTest_bootstrapWidgetContainer.php
index 12a7768..ef4a5a0 100644 (file)
--- a/widgets/admin_main/include/container/test/admin_mainTest_bootstrapWidgetContainer.php
+++ b/widgets/admin_main/include/container/test/admin_mainTest_bootstrapWidgetContainer.php
@@ -43,7 +43,7 @@ class admin_mainTest_bootstrapWidgetContainer extends admin_mainBaseWidgetContai
         */
        function _setTemplate($request, &$param)
        {       
-               return 'test_bootstrap.tmpl.html';
+               return 'test/test_bootstrap.tmpl.html';
        }
        /**
         * テンプレートにデータ埋め込む

diff --git a/widgets/admin_main/include/container/test/admin_mainTest_calendarWidgetContainer.php b/widgets/admin_main/include/container/test/admin_mainTest_calendarWidgetContainer.php
index 5135455..5874ad4 100644 (file)
--- a/widgets/admin_main/include/container/test/admin_mainTest_calendarWidgetContainer.php
+++ b/widgets/admin_main/include/container/test/admin_mainTest_calendarWidgetContainer.php
@@ -43,7 +43,7 @@ class admin_mainTest_calendarWidgetContainer extends admin_mainBaseWidgetContain
         */
        function _setTemplate($request, &$param)
        {       
-               return 'test_calendar.tmpl.html';
+               return 'test/test_calendar.tmpl.html';
        }
        /**
         * テンプレートにデータ埋め込む

diff --git a/widgets/admin_main/include/container/test/admin_mainTest_ckeditorWidgetContainer.php b/widgets/admin_main/include/container/test/admin_mainTest_ckeditorWidgetContainer.php
index 05228d1..2ac6220 100644 (file)
--- a/widgets/admin_main/include/container/test/admin_mainTest_ckeditorWidgetContainer.php
+++ b/widgets/admin_main/include/container/test/admin_mainTest_ckeditorWidgetContainer.php
@@ -46,7 +46,7 @@ class admin_mainTest_ckeditorWidgetContainer extends admin_mainBaseWidgetContain
         */
        function _setTemplate($request, &$param)
        {       
-               return 'test_ckeditor.tmpl.html';
+               return 'test/test_ckeditor.tmpl.html';
        }
        /**
         * テンプレートにデータ埋め込む

diff --git a/widgets/admin_main/include/container/test/admin_mainTest_inputWidgetContainer.php b/widgets/admin_main/include/container/test/admin_mainTest_inputWidgetContainer.php
index d3e2717..9ccaa05 100644 (file)
--- a/widgets/admin_main/include/container/test/admin_mainTest_inputWidgetContainer.php
+++ b/widgets/admin_main/include/container/test/admin_mainTest_inputWidgetContainer.php
@@ -43,7 +43,7 @@ class admin_mainTest_inputWidgetContainer extends admin_mainBaseWidgetContainer
         */
        function _setTemplate($request, &$param)
        {       
-               return 'test_input.tmpl.html';
+               return 'test/test_input.tmpl.html';
        }
        /**
         * テンプレートにデータ埋め込む

diff --git a/widgets/admin_main/include/container/test/admin_mainTest_navbarWidgetContainer.php b/widgets/admin_main/include/container/test/admin_mainTest_navbarWidgetContainer.php
index 5f1a296..b0e43e1 100644 (file)
--- a/widgets/admin_main/include/container/test/admin_mainTest_navbarWidgetContainer.php
+++ b/widgets/admin_main/include/container/test/admin_mainTest_navbarWidgetContainer.php
@@ -43,7 +43,7 @@ class admin_mainTest_navbarWidgetContainer extends admin_mainBaseWidgetContainer
         */
        function _setTemplate($request, &$param)
        {       
-               return 'test_navbar.tmpl.html';
+               return 'test/test_navbar.tmpl.html';
        }
        /**
         * テンプレートにデータ埋め込む

diff --git a/widgets/admin_main/include/container/test/admin_mainTest_regexWidgetContainer.php b/widgets/admin_main/include/container/test/admin_mainTest_regexWidgetContainer.php
index 9e610f7..17c0ec9 100644 (file)
--- a/widgets/admin_main/include/container/test/admin_mainTest_regexWidgetContainer.php
+++ b/widgets/admin_main/include/container/test/admin_mainTest_regexWidgetContainer.php
@@ -38,7 +38,7 @@ class admin_mainTest_regexWidgetContainer extends admin_mainBaseWidgetContainer
         */
        function _setTemplate($request, &$param)
        {       
-               return 'test_regex.tmpl.html';
+               return 'test/test_regex.tmpl.html';
        }
        /**
         * テンプレートにデータ埋め込む

diff --git a/widgets/admin_main/include/template/message.tmpl.html b/widgets/admin_main/include/template/message.tmpl.html
index 79b6e3e..0ace914 100644 (file)
--- a/widgets/admin_main/include/template/message.tmpl.html
+++ b/widgets/admin_main/include/template/message.tmpl.html
@@ -5,7 +5,7 @@
  *
  * @package    Magic3 Framework
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
- * @copyright  Copyright 2006-2014 Magic3 Project.
+ * @copyright  Copyright 2006-2018 Magic3 Project.
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
  * @version    SVN: $Id$
  * @link       http://www.magic3.org
@@ -13,6 +13,5 @@
 <patTemplate:tmpl name="_widget">
 <div class="m3config_container">
 <!-- m3:ErrorMessage -->
-<!--<h2>{MESSAGE}</h2>-->
 </div>
 </patTemplate:tmpl>

diff --git a/widgets/admin_main/include/template/test.tmpl.html b/widgets/admin_main/include/template/test/test.tmpl.html
similarity index 93%
rename from widgets/admin_main/include/template/test.tmpl.html
rename to widgets/admin_main/include/template/test/test.tmpl.html
index b3ae228..ac32de2 100644 (file)
--- a/widgets/admin_main/include/template/test.tmpl.html
+++ b/widgets/admin_main/include/template/test/test.tmpl.html
@@ -1,24 +1,24 @@
-/**\r
- * 表示データ作成用テンプレート(patTemplate)\r
- *\r
- * LICENSE: This source file is licensed under the terms of the GNU General Public License.\r
- *\r
- * @package    Magic3 Framework\r
- * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2013 Magic3 Project.\r
- * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
- * @version    SVN: $Id$\r
- * @link       http://www.magic3.org\r
- */\r
-<patTemplate:tmpl name="_widget">\r
-<script type="text/javascript">\r
-//<![CDATA[\r
-$(function(){\r
-});\r
-//]]>\r
-</script>\r
-<div align="center">\r
-<!-- m3:ErrorMessage -->\r
-</div>\r
-\r
+/**
+ * 表示データ作成用テンプレート(patTemplate)
+ *
+ * LICENSE: This source file is licensed under the terms of the GNU General Public License.
+ *
+ * @package    Magic3 Framework
+ * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
+ * @copyright  Copyright 2006-2013 Magic3 Project.
+ * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
+ * @version    SVN: $Id$
+ * @link       http://www.magic3.org
+ */
+<patTemplate:tmpl name="_widget">
+<script type="text/javascript">
+//<![CDATA[
+$(function(){
+});
+//]]>
+</script>
+<div align="center">
+<!-- m3:ErrorMessage -->
+</div>
+
 </patTemplate:tmpl>
\ No newline at end of file

diff --git a/widgets/admin_main/include/template/test_bootstrap.tmpl.html b/widgets/admin_main/include/template/test/test_bootstrap.tmpl.html
similarity index 100%
rename from widgets/admin_main/include/template/test_bootstrap.tmpl.html
rename to widgets/admin_main/include/template/test/test_bootstrap.tmpl.html

diff --git a/widgets/admin_main/include/template/test_calendar.tmpl.html b/widgets/admin_main/include/template/test/test_calendar.tmpl.html
similarity index 100%
rename from widgets/admin_main/include/template/test_calendar.tmpl.html
rename to widgets/admin_main/include/template/test/test_calendar.tmpl.html

diff --git a/widgets/admin_main/include/template/test_ckeditor.tmpl.html b/widgets/admin_main/include/template/test/test_ckeditor.tmpl.html
similarity index 100%
rename from widgets/admin_main/include/template/test_ckeditor.tmpl.html
rename to widgets/admin_main/include/template/test/test_ckeditor.tmpl.html

diff --git a/widgets/admin_main/include/template/test_input.tmpl.html b/widgets/admin_main/include/template/test/test_input.tmpl.html
similarity index 100%
rename from widgets/admin_main/include/template/test_input.tmpl.html
rename to widgets/admin_main/include/template/test/test_input.tmpl.html

diff --git a/widgets/admin_main/include/template/test_navbar.tmpl.html b/widgets/admin_main/include/template/test/test_navbar.tmpl.html
similarity index 100%
rename from widgets/admin_main/include/template/test_navbar.tmpl.html
rename to widgets/admin_main/include/template/test/test_navbar.tmpl.html

diff --git a/widgets/admin_main/include/template/test/test_php.tmpl.html b/widgets/admin_main/include/template/test/test_php.tmpl.html
new file mode 100644 (file)
index 0000000..592efa8
--- /dev/null
+++ b/widgets/admin_main/include/template/test/test_php.tmpl.html
@@ -0,0 +1,21 @@
+/**
+ * 表示データ作成用テンプレート(patTemplate)
+ *
+ * LICENSE: This source file is licensed under the terms of the GNU General Public License.
+ *
+ * @package    Magic3 Framework
+ * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>
+ * @copyright  Copyright 2006-2014 Magic3 Project.
+ * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
+ * @version    SVN: $Id$
+ * @link       http://www.magic3.org
+ */
+<patTemplate:tmpl name="_widget">
+<script type="text/javascript">
+//<![CDATA[
+$(function(){
+});
+//]]>
+</script>
+<h3>test</h3>
+</patTemplate:tmpl>
\ No newline at end of file

diff --git a/widgets/admin_main/include/template/test_regex.tmpl.html b/widgets/admin_main/include/template/test/test_regex.tmpl.html
similarity index 100%
rename from widgets/admin_main/include/template/test_regex.tmpl.html
rename to widgets/admin_main/include/template/test/test_regex.tmpl.html