管理画面モバイル対応。

diff --git a/include/sql/update/2016073101_to_2016090701.sql b/include/sql/update/2016073101_to_2016090701.sql
new file mode 100644 (file)
index 0000000..059a167
--- /dev/null
+++ b/include/sql/update/2016073101_to_2016090701.sql
@@ -0,0 +1,39 @@
+-- *
+-- * バージョンアップ用スクリプト
+-- *
+-- * PHP versions 5
+-- *
+-- * 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-2016 Magic3 Project.
+-- * @license    http://www.gnu.org/copyleft/gpl.html  GPL License
+-- * @version    SVN: $Id$
+-- * @link       http://www.magic3.org
+-- *
+-- --------------------------------------------------------------------------------------------------
+-- バージョンアップ用スクリプト
+-- --------------------------------------------------------------------------------------------------
+
+-- *** システムベーステーブル ***
+-- 多言語対応文字列マスター
+DELETE FROM _language_string WHERE ls_type = 0 AND ls_id = 'msg_admin_popup_login' AND ls_language_id = 'ja';
+INSERT INTO _language_string
+(ls_type, ls_id,                           ls_language_id, ls_value,                             ls_name) VALUES
+(0,       'msg_admin_popup_login',               'ja',           '', 'ログイン時管理者向けポップアップメッセージ');
+
+-- システム設定マスター
+DELETE FROM _system_config WHERE sc_id = 'admin_default_theme';
+DELETE FROM _system_config WHERE sc_id = 'default_theme';
+INSERT INTO _system_config 
+(sc_id,                 sc_value,         sc_name) VALUES
+('admin_default_theme', 'smoothness',     '管理画面用jQueryUIテーマ'),
+('default_theme',       'smoothness',     'フロント画面用jQueryUIテーマ');
+
+INSERT INTO _system_config 
+(sc_id,                          sc_value, sc_name) VALUES
+('multi_device_optimized_admin', '0',      'マルチデバイス最適化管理画面');
+
+-- *** システム標準テーブル ***
+

diff --git a/templates/_admin4/css/style.css b/templates/_admin4/css/style.css
index 43152bc..8729c19 100644 (file)
--- a/templates/_admin4/css/style.css
+++ b/templates/_admin4/css/style.css
@@ -568,9 +568,17 @@ span[rel="m3help"] { cursor: default; }
 .m3config_container {
        display: table;
        margin: 10px auto 20px;
-       min-width: 950px;
+       width:100%;
+}
+@media (min-width: 992px) {
+.m3config_container {
+       display: table;
+       margin: 10px auto 20px;
+       /*min-width: 950px;*/
+       width:950px;
        max-width: 90%;
 }
+}
 .m3config_tabs {/* 削除予定 */
        width:95%;
        margin: 10px auto;
@@ -591,7 +599,14 @@ span[rel="m3help"] { cursor: default; }
 /* テーブル */
 .m3config_table {
        margin: 0 auto 15px auto;
+       width:100%;
+}
+@media (min-width: 992px) {
+.m3config_table {
+       margin: 0 auto 15px auto;
        width: 950px;
+       max-width:100%;
+}
 }
 .m3config_table th {
        width: 150px;

diff --git a/templates/_admin4/index.php b/templates/_admin4/index.php
index dea8f8a..a462ad3 100644 (file)
--- a/templates/_admin4/index.php
+++ b/templates/_admin4/index.php
@@ -31,7 +31,7 @@ $templateUrl = $document->baseurl . '/templates/' . $document->template;
 <div class="container">
 <?php if ($document->countModules('left') || $document->countModules('right')): ?><div class="row"><?php endif; ?>
 <?php if ($document->countModules('left')): ?>
-    <div class="col-lg-3 m3sideblock"><jdoc:include type="modules" name="left" style="none" /></div>
+    <div class="col-lg-3 m3sideblock visible-lg"><jdoc:include type="modules" name="left" style="none" /></div>
 <?php endif; ?>
 <?php if ($document->countModules('left') && $document->countModules('right')): ?>
     <div class="col-lg-6 m3centerblock"><jdoc:include type="component" style="none" /></div>

diff --git a/widgets/admin/analytics/include/template/index.tmpl.html b/widgets/admin/analytics/include/template/index.tmpl.html
index a5680c8..f19dc54 100644 (file)
--- a/widgets/admin/analytics/include/template/index.tmpl.html
+++ b/widgets/admin/analytics/include/template/index.tmpl.html
@@ -66,7 +66,7 @@ $(function(){
 <input type="button" class="button" onclick="updateItem();" value="集計" />\r
 </div></div>\r
 <div style="width:100%;">\r
-<patTemplate:tmpl name="show_graph"><div class="jqPlot" id="chart1" style="height:{GRAPH_HEIGHT}px; width:{GRAPH_WIDTH}px; margin:0 auto;"></div></patTemplate:tmpl>\r
+<patTemplate:tmpl name="show_graph"><div class="jqPlot" id="chart1" style="height:{GRAPH_HEIGHT}px; width:{GRAPH_WIDTH}px; max-width:100%;margin:0 auto;"></div></patTemplate:tmpl>\r
 </div>\r
 \r
 </form>\r

diff --git a/widgets/admin/loginuser/include/template/index.tmpl.html b/widgets/admin/loginuser/include/template/index.tmpl.html
index 7d988ce..451260a 100644 (file)
--- a/widgets/admin/loginuser/include/template/index.tmpl.html
+++ b/widgets/admin/loginuser/include/template/index.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-2017 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
  * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r

diff --git a/widgets/admin/opelog/include/template/index.tmpl.html b/widgets/admin/opelog/include/template/index.tmpl.html
index dbaada8..8730926 100644 (file)
--- a/widgets/admin/opelog/include/template/index.tmpl.html
+++ b/widgets/admin/opelog/include/template/index.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-2017 Magic3 Project.\r
  * @license    http://www.gnu.org/copyleft/gpl.html  GPL License\r
  * @version    SVN: $Id$\r
  * @link       http://www.magic3.org\r
@@ -24,7 +24,6 @@ $(function(){
 </script>\r
 <!-- m3:ErrorMessage -->\r
 <h3 class="m3config_h">運用ログ</h3> <a href="?task=opelog" class="btn btn-sm btn-warning m3config_h_side_small_button" role="button" rel="m3help" data-container="body" title="詳細"><i class="glyphicon glyphicon-hand-right"></i></a>\r
-<!--<table id="loglist" class="simple-table" style="width:100%;">-->\r
 <table id="loglist">\r
     <thead>\r
     <tr>\r