管理画面カスタムウィザード修正。

diff --git a/templates/_admin4/css/style.css b/templates/_admin4/css/style.css
index a56d832..80e3766 100644 (file)
--- 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 54c9c84..d31077d 100644 (file)
--- 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 5bb80c2..5668876 100644 (file)
--- 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 a58a079..dedeed5 100644 (file)
--- 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 3a60123..60087b6 100644 (file)
--- 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 41aaf60..3788ed2 100644 (file)
--- 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 2a8c0ca..776e0fc 100644 (file)
--- 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 a1297ae..b4ada88 100644 (file)
--- 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 dd878e1..4eb3158 100644 (file)
--- 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" />