OSDN Git Service

(root) / magic3 / magic3.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0689ff2)
ウィジェット管理画面のCSS修正。 v2.8.1
authornaoki hirata <naoki@magic3.org>
Thu, 16 Jan 2014 12:10:32 +0000 (21:10 +0900)
committernaoki hirata <naoki@magic3.org>
Thu, 16 Jan 2014 12:10:32 +0000 (21:10 +0900)
include/manager/pageManager.php patch | blob | history
templates/_admin4/css/widget.css [new file with mode: 0644] patch | blob

diff --git a/include/manager/pageManager.php b/include/manager/pageManager.php
index ceea9f2..b3d0cce 100644 (file)
--- a/include/manager/pageManager.php
+++ b/include/manager/pageManager.php
@@ -2198,6 +2198,7 @@ class PageManager extends Core
                        $curTemplateUrl = $templatesUrl . '/' . $gEnvManager->getCurrentTemplateId();
                        if ($this->isHtml5){
                                echo '<link rel="stylesheet" href="' . $curTemplateUrl . '/css/style.css" media="screen">' . M3_NL;
+                               echo '<link rel="stylesheet" href="' . $curTemplateUrl . '/css/widget.css" media="screen">' . M3_NL;            // ウィジェット設定画面用CSS
                        echo '<!--[if IE]><link rel="stylesheet" href="' . $curTemplateUrl . '/css/iestyles.css" media="screen"><![endif]-->' . M3_NL;
                                echo '<!--[if lt IE 9]><script src="' . $curTemplateUrl . '/html5shiv.js"></script><![endif]-->' . M3_NL;
                        } else {
@@ -2266,6 +2267,8 @@ class PageManager extends Core
                } else {
                        echo '<body>' . M3_NL;
                }
+               // Bootstrap用のタグ出力
+               if ($this->useBootstrap) echo '<div class="container">' . M3_NL;
                
                // 別ウィンドウで表示のときは、「閉じる」ボタンを表示
                if ($cmd == M3_REQUEST_CMD_SHOW_WIDGET ||               // ウィジェットの単体表示のとき
@@ -2336,6 +2339,9 @@ class PageManager extends Core
                        echo '</script>' . M3_NL;
                }
                
+               // Bootstrap用のタグ出力
+               if ($this->useBootstrap) echo '</div>' . M3_NL;
+               
                echo '</body>' . M3_NL;
                echo '</html>' . M3_NL;
        }
diff --git a/templates/_admin4/css/widget.css b/templates/_admin4/css/widget.css
new file mode 100644 (file)
index 0000000..f87ccc0
--- /dev/null
+++ b/templates/_admin4/css/widget.css
@@ -0,0 +1,5 @@
+/* ウィジェット設定画面用CSS */
+body {
+       padding-top: 20px;
+}
+
Cloud computing platform
About OSDN
Find Software
Develop Software
Help