From f63c280fbbb8475578ffba97cd1a67b759be8ca0 Mon Sep 17 00:00:00 2001
From: naoki hirata <naoki@magic3.org>
Date: Mon, 29 Aug 2016 13:38:23 +0900
Subject: [PATCH] =?utf8?q?=E7=AE=A1=E7=90=86=E7=94=BB=E9=9D=A2=E3=82=AB?=
 =?utf8?q?=E3=82=B9=E3=82=BF=E3=83=A0=E3=82=A6=E3=82=A3=E3=82=B6=E3=83=BC?=
 =?utf8?q?=E3=83=89=E4=BF=AE=E6=AD=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 templates/_admin4/css/style.css                                  | 9 ++++-----
 widgets/admin_main/include/template/initwizard.tmpl.html         | 5 +----
 .../admin_main/include/template/initwizard_accesspoint.tmpl.html | 5 +----
 widgets/admin_main/include/template/initwizard_admin.tmpl.html   | 5 +----
 widgets/admin_main/include/template/initwizard_content.tmpl.html | 4 +---
 widgets/admin_main/include/template/initwizard_menu.tmpl.html    | 5 +----
 widgets/admin_main/include/template/initwizard_page1.tmpl.html   | 5 +----
 widgets/admin_main/include/template/initwizard_page2.tmpl.html   | 5 +----
 widgets/admin_main/include/template/initwizard_site.tmpl.html    | 5 +----
 9 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/templates/_admin4/css/style.css b/templates/_admin4/css/style.css
index a56d832e..80e3766d 100644
--- a/templates/_admin4/css/style.css
+++ b/templates/_admin4/css/style.css
@@ -943,12 +943,11 @@ nav.secondlevel .btn.navbar-btn:focus {
 	padding-left:100px;
 }
 
-/*** ナビゲーションボタン追加 ***/
-.centered-pills { text-align:center; }
-.centered-pills ul.nav.nav-pills, .centered-pills ul.nav.nav-tabs { display:inline-block; }
-.centered-pills ul.nav.nav-pills li, .centered-pills ul.nav.nav-tabs li { display:inline; }
-
 /*** ウィザードスタイルのナビゲーションタブ用 ***/
+.m3wizard_nav {
+	margin-top: 20px;
+	margin-bottom: 50px;
+}
 .nav-wizard > li {
 	float: left;
 }
diff --git a/widgets/admin_main/include/template/initwizard.tmpl.html b/widgets/admin_main/include/template/initwizard.tmpl.html
index 54c9c843..d31077dc 100644
--- a/widgets/admin_main/include/template/initwizard.tmpl.html
+++ b/widgets/admin_main/include/template/initwizard.tmpl.html
@@ -12,11 +12,8 @@
  */
 <patTemplate:tmpl name="_widget">
 <div class="col-sm-offset-1 col-sm-10">
-<div class="centered-pills">{MENU_ITEMS}</div>
+<div class="m3wizard_nav">{MENU_ITEMS}</div>
 <!-- m3:ErrorMessage -->
-<div class="page-header">
-<h2>{TITLE}</h2>
-</div>
 <p class="lead text-center">{MESSAGE}</p>
 </div>
 </patTemplate:tmpl>
diff --git a/widgets/admin_main/include/template/initwizard_accesspoint.tmpl.html b/widgets/admin_main/include/template/initwizard_accesspoint.tmpl.html
index 5bb80c20..56688760 100644
--- a/widgets/admin_main/include/template/initwizard_accesspoint.tmpl.html
+++ b/widgets/admin_main/include/template/initwizard_accesspoint.tmpl.html
@@ -37,11 +37,8 @@ $(function(){
 //]]>
 </script>
 <div class="col-sm-offset-1 col-sm-10">
-<div class="centered-pills">{MENU_ITEMS}</div>
+<div class="m3wizard_nav">{MENU_ITEMS}</div>
 <!-- m3:ErrorMessage -->
-<div class="page-header">
-<!--<h1>サイト情報</h1>-->
-</div>
 <div class="row">
 <form method="post" name="main" role="form" class="form-horizontal">
 <input type="hidden" name="task" value="initwizard_accesspoint" />
diff --git a/widgets/admin_main/include/template/initwizard_admin.tmpl.html b/widgets/admin_main/include/template/initwizard_admin.tmpl.html
index a58a0796..dedeed55 100644
--- a/widgets/admin_main/include/template/initwizard_admin.tmpl.html
+++ b/widgets/admin_main/include/template/initwizard_admin.tmpl.html
@@ -43,11 +43,8 @@ $(function(){
 //]]>
 </script>
 <div class="col-sm-offset-1 col-sm-10">
-<div class="centered-pills">{MENU_ITEMS}</div>
+<div class="m3wizard_nav">{MENU_ITEMS}</div>
 <!-- m3:ErrorMessage -->
-<div class="page-header">
-<!--<h1>管理者</h1>-->
-</div>
 <div class="row">
 <form method="post" name="main" role="form" class="form-horizontal" autocomplete="off">
 <input type="hidden" name="task" value="initwizard_admin" />
diff --git a/widgets/admin_main/include/template/initwizard_content.tmpl.html b/widgets/admin_main/include/template/initwizard_content.tmpl.html
index 3a601232..60087b67 100644
--- a/widgets/admin_main/include/template/initwizard_content.tmpl.html
+++ b/widgets/admin_main/include/template/initwizard_content.tmpl.html
@@ -37,10 +37,8 @@ $(function(){
 //]]>
 </script>
 <div class="col-sm-offset-1 col-sm-10">
-<div class="centered-pills">{MENU_ITEMS}</div>
+<div class="m3wizard_nav">{MENU_ITEMS}</div>
 <!-- m3:ErrorMessage -->
-<div class="page-header">
-</div>
 <div class="row">
 <form method="post" name="main" role="form" class="form-horizontal">
 <input type="hidden" name="task" value="initwizard_content" />
diff --git a/widgets/admin_main/include/template/initwizard_menu.tmpl.html b/widgets/admin_main/include/template/initwizard_menu.tmpl.html
index 41aaf600..3788ed2d 100644
--- a/widgets/admin_main/include/template/initwizard_menu.tmpl.html
+++ b/widgets/admin_main/include/template/initwizard_menu.tmpl.html
@@ -37,11 +37,8 @@ $(function(){
 //]]>
 </script>
 <div class="col-sm-offset-1 col-sm-10">
-<div class="centered-pills">{MENU_ITEMS}</div>
+<div class="m3wizard_nav">{MENU_ITEMS}</div>
 <!-- m3:ErrorMessage -->
-<div class="page-header">
-<!--<h1>サイト情報</h1>-->
-</div>
 <div class="row">
 <form method="post" name="main" role="form" class="form-horizontal">
 <input type="hidden" name="task" value="initwizard_menu" />
diff --git a/widgets/admin_main/include/template/initwizard_page1.tmpl.html b/widgets/admin_main/include/template/initwizard_page1.tmpl.html
index 2a8c0ca7..776e0fc2 100644
--- a/widgets/admin_main/include/template/initwizard_page1.tmpl.html
+++ b/widgets/admin_main/include/template/initwizard_page1.tmpl.html
@@ -37,11 +37,8 @@ $(function(){
 //]]>
 </script>
 <div class="col-sm-offset-1 col-sm-10">
-<div class="centered-pills">{MENU_ITEMS}</div>
+<div class="m3wizard_nav">{MENU_ITEMS}</div>
 <div class="text-center"><!-- m3:ErrorMessage --></div>
-<div class="page-header">
-<!--<h1>ページ</h1>-->
-</div>
 <div class="row">
 <form method="post" name="main" role="form" class="form-horizontal">
 <input type="hidden" name="task" value="initwizard_page1" />
diff --git a/widgets/admin_main/include/template/initwizard_page2.tmpl.html b/widgets/admin_main/include/template/initwizard_page2.tmpl.html
index a1297ae1..b4ada88a 100644
--- a/widgets/admin_main/include/template/initwizard_page2.tmpl.html
+++ b/widgets/admin_main/include/template/initwizard_page2.tmpl.html
@@ -37,11 +37,8 @@ $(function(){
 //]]>
 </script>
 <div class="col-sm-offset-1 col-sm-10">
-<div class="centered-pills">{MENU_ITEMS}</div>
+<div class="m3wizard_nav">{MENU_ITEMS}</div>
 <!-- m3:ErrorMessage -->
-<div class="page-header">
-<!--<h1>サイト情報</h1>-->
-</div>
 <div class="row">
 <form method="post" name="main" role="form" class="form-horizontal">
 <input type="hidden" name="task" value="initwizard_page2" />
diff --git a/widgets/admin_main/include/template/initwizard_site.tmpl.html b/widgets/admin_main/include/template/initwizard_site.tmpl.html
index dd878e11..4eb31586 100644
--- a/widgets/admin_main/include/template/initwizard_site.tmpl.html
+++ b/widgets/admin_main/include/template/initwizard_site.tmpl.html
@@ -37,11 +37,8 @@ $(function(){
 //]]>
 </script>
 <div class="col-sm-offset-1 col-sm-10">
-<div class="centered-pills">{MENU_ITEMS}</div>
+<div class="m3wizard_nav">{MENU_ITEMS}</div>
 <!-- m3:ErrorMessage -->
-<div class="page-header">
-<!--<h1>サイト情報</h1>-->
-</div>
 <div class="row">
 <form method="post" name="main" role="form" class="form-horizontal">
 <input type="hidden" name="task" value="initwizard_site" />
-- 
2.11.0