アクセスログのリンクを修正。

diff --git a/widgets/admin_main/include/template/accesslog_detail.tmpl.html b/widgets/admin_main/include/template/accesslog_detail.tmpl.html
index 2e0cfdf..de44a22 100644 (file)
--- a/widgets/admin_main/include/template/accesslog_detail.tmpl.html
+++ b/widgets/admin_main/include/template/accesslog_detail.tmpl.html
@@ -5,7 +5,7 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2014 Magic3 Project.\r
+ * @copyright  Copyright 2006-2016 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
  * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
@@ -30,11 +30,6 @@ function delItem(serialNo){
        document.main.submit();\r
        return true;\r
 }\r
-/*function cancelItem(){\r
-       document.main.task.value = 'accesslog';\r
-       document.main.submit();\r
-       return true;\r
-}*/\r
 function cancelItem(){\r
        if (document.main._backurl.value){\r
                location.href = document.main._backurl.value;\r
@@ -47,7 +42,6 @@ function cancelItem(){
 //]]>\r
 </script>\r
 <div class="m3config_container">\r
-{MENU_ITEMS}\r
 <!-- m3:ErrorMessage -->\r
 <form method="post" name="main">\r
 <input type="hidden" name="task" value="accesslog_detail" />\r

diff --git a/widgets/admin_main/include/template/loginhistory.tmpl.html b/widgets/admin_main/include/template/loginhistory.tmpl.html
index f49e8ed..b3a94ab 100644 (file)
--- a/widgets/admin_main/include/template/loginhistory.tmpl.html
+++ b/widgets/admin_main/include/template/loginhistory.tmpl.html
@@ -37,7 +37,8 @@ function cancelItem(){
        }
 }
 function showAccessLog(serial){
-       window.open("{ACCESS_LOG_URL}&serial=" + serial, "", "toolbar=no,menubar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=900,height=600");
+       //window.open("{ACCESS_LOG_URL}&serial=" + serial, "", "toolbar=no,menubar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=900,height=600");
+       m3ShowStandardWindow("{ACCESS_LOG_URL}&serial=" + serial);
        return false;
 }
 $(function(){

diff --git a/widgets/admin_main/include/template/searchwordlog.tmpl.html b/widgets/admin_main/include/template/searchwordlog.tmpl.html
index 6a94906..5b9a317 100644 (file)
--- a/widgets/admin_main/include/template/searchwordlog.tmpl.html
+++ b/widgets/admin_main/include/template/searchwordlog.tmpl.html
@@ -5,9 +5,9 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2013 Magic3 Project.\r
+ * @copyright  Copyright 2006-2016 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
- * @version    SVN: $Id: searchwordlog.tmpl.html 5802 2013-03-07 06:14:29Z fishbone $\r
+ * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
  */\r
 <patTemplate:tmpl name="_widget">\r
@@ -57,7 +57,8 @@ function selpage(page){
        return true;\r
 }\r
 function showAccessLog(serial){\r
-       window.open("{ACCESS_LOG_URL}&serial=" + serial, "", "toolbar=no,menubar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=800,height=600");\r
+       //window.open("{ACCESS_LOG_URL}&serial=" + serial, "", "toolbar=no,menubar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=800,height=600");\r
+       m3ShowStandardWindow("{ACCESS_LOG_URL}&serial=" + serial);\r
        return false;\r
 }\r
 $(function(){\r

diff --git a/widgets/admin_main/include/template/searchwordlog_detail.tmpl.html b/widgets/admin_main/include/template/searchwordlog_detail.tmpl.html
index ef6a97c..6850fa9 100644 (file)
--- a/widgets/admin_main/include/template/searchwordlog_detail.tmpl.html
+++ b/widgets/admin_main/include/template/searchwordlog_detail.tmpl.html
@@ -5,9 +5,9 @@
  *\r
  * @package    Magic3 Framework\r
  * @author     平田直毅(Naoki Hirata) <naoki@aplo.co.jp>\r
- * @copyright  Copyright 2006-2013 Magic3 Project.\r
+ * @copyright  Copyright 2006-2016 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
- * @version    SVN: $Id: searchwordlog_detail.tmpl.html 5802 2013-03-07 06:14:29Z fishbone $\r
+ * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
  */\r
 <patTemplate:tmpl name="_widget">\r
@@ -19,7 +19,8 @@ function cancelItem(){
        return true;\r
 }\r
 function showAccessLog(serial){\r
-       window.open("{ACCESS_LOG_URL}&serial=" + serial, "", "toolbar=no,menubar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=800,height=600");\r
+       //window.open("{ACCESS_LOG_URL}&serial=" + serial, "", "toolbar=no,menubar=no,location=no,status=no,scrollbars=yes,resizable=yes,width=800,height=600");\r
+       m3ShowStandardWindow("{ACCESS_LOG_URL}&serial=" + serial);\r
        return false;\r
 }\r
 function selpage(page){\r