#49772 ファイル構成修正

.vscode/launch.json

@@ -8,7 +8,7 @@
       "name": "ABookCheck WEB",
       "name": "ABookCheck WEB",
       "type": "chrome",
       "type": "chrome",
       "request": "launch",
       "request": "launch",
-      "url":"http://127.0.0.1:5500/abvw/html/login.html",
+      "url":"http://127.0.0.1:5500/abweb/html/login.html",
       "webRoot": "${workspaceFolder}"
       "webRoot": "${workspaceFolder}"
     }
     }
     ]
     ]

abvw/common/confirm-modal.html → abweb/common/confirm-modal.html

-<div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog">
-    <div class="modal-dialog modal-dialog-centered" role="document">
-      <div class="modal-content">
-        <div class="modal-header bg-dark10">
-            <h5 class="modal-title lang" lang="confirmation"></h5>
-            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-              <span aria-hidden="true">&times;</span>
-            </button>
-        </div>
-        <div class="modal-body" id="msgModel">
-        </div>
-        <div class="modal-footer">
-            <button type="button" class="btn btn-primary lang" lang="confirmYes"></button>
-            <button type="button" class="btn btn-tertiary lang" lang="confirmNo" data-dismiss="modal"></button>
-        </div>
-      </div>
-    </div>
+<div class="modal fade" id="confirm-modal" tabindex="-1" role="dialog">
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header bg-dark10">
+            <h5 class="modal-title lang" lang="confirmation"></h5>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+              <span aria-hidden="true">&times;</span>
+            </button>
+        </div>
+        <div class="modal-body" id="msgModel">
+        </div>
+        <div class="modal-footer">
+            <button type="button" class="btn btn-primary lang" lang="confirmYes"></button>
+            <button type="button" class="btn btn-tertiary lang" lang="confirmNo" data-dismiss="modal"></button>
+        </div>
+      </div>
+    </div>
   </div>
   </div>
\ No newline at end of file

abvw/common/css/newdash/fontawesome_relative_path.css → abweb/common/css/newdash/fontawesome_relative_path.css

-@font-face{
-    font-family:"Font Awesome 5 Brands";
-    font-style:normal;
-    font-weight:400;
-    font-display:block;
-    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot);
-    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot) 
-        format("embedded-opentype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2) 
-        format("woff2"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff) 
-        format("woff"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf) 
-        format("truetype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.svg#fontawesome) 
-        format("svg")}.fab{font-family:"Font Awesome 5 Brands"}
-    
-@font-face{
-    font-family:"Font Awesome 5 Free";
-    font-style:normal;
-    font-weight:400;
-    font-display:block;
-    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.eot);
-    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.eot) 
-        format("embedded-opentype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2) 
-        format("woff2"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff) 
-        format("woff"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf) 
-        format("truetype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.svg#fontawesome) 
-        format("svg")}.fab,.far{font-weight:400}
-    
-@font-face{
-    font-family:"Font Awesome 5 Free";
-    font-style:normal;
-    font-weight:900;
-    font-display:block;
-    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.eot);
-    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.eot) 
-        format("embedded-opentype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2) 
-        format("woff2"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff) 
-        format("woff"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf) 
-        format("truetype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.svg#fontawesome) 
+@font-face{
+    font-family:"Font Awesome 5 Brands";
+    font-style:normal;
+    font-weight:400;
+    font-display:block;
+    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot);
+    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot) 
+        format("embedded-opentype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff2) 
+        format("woff2"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.woff) 
+        format("woff"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.ttf) 
+        format("truetype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.svg#fontawesome) 
+        format("svg")}.fab{font-family:"Font Awesome 5 Brands"}
+    
+@font-face{
+    font-family:"Font Awesome 5 Free";
+    font-style:normal;
+    font-weight:400;
+    font-display:block;
+    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.eot);
+    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.eot) 
+        format("embedded-opentype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff2) 
+        format("woff2"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.woff) 
+        format("woff"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.ttf) 
+        format("truetype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-regular-400.svg#fontawesome) 
+        format("svg")}.fab,.far{font-weight:400}
+    
+@font-face{
+    font-family:"Font Awesome 5 Free";
+    font-style:normal;
+    font-weight:900;
+    font-display:block;
+    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.eot);
+    src:url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.eot) 
+        format("embedded-opentype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff2) 
+        format("woff2"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.woff) 
+        format("woff"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.ttf) 
+        format("truetype"),url(../fonts/vendor/@fortawesome/fontawesome-free/webfa-solid-900.svg#fontawesome) 
         format("svg")}.fa,.far,.fas{font-family:"Font Awesome 5 Free"}.fa,.fas{font-weight:900}
         format("svg")}.fa,.far,.fas{font-family:"Font Awesome 5 Free"}.fa,.fas{font-weight:900}
\ No newline at end of file

abvw/common/css/newdash/header.css → abweb/common/css/newdash/header.css

-@charset "UTF-8";
-header .navbar-brand img{
-    height: 35px!important;    
-}
-header .nav-link img {
-    height: 28px!important;
-}
-
-@media (max-width: 575px) {
-    header .nav-link img {
-        height: 24px!important;
-    }
-}
-
-header nav a,header nav a:hover{
-    color: #69707A;
-}
-
-header li.active.nav-link a{
-    color: var(--primary);
-}
-header li.active.nav-link img {
-    filter: brightness(0) saturate(100%) invert(17%) sepia(94%) saturate(4792%) hue-rotate(219deg) brightness(98%) contrast(100%);
-}
+@charset "UTF-8";
+header .navbar-brand img{
+    height: 35px!important;    
+}
+header .nav-link img {
+    height: 28px!important;
+}
+
+@media (max-width: 575px) {
+    header .nav-link img {
+        height: 24px!important;
+    }
+}
+
+header nav a,header nav a:hover{
+    color: #69707A;
+}
+
+header li.active.nav-link a{
+    color: var(--primary);
+}
+header li.active.nav-link img {
+    filter: brightness(0) saturate(100%) invert(17%) sepia(94%) saturate(4792%) hue-rotate(219deg) brightness(98%) contrast(100%);
+}

abvw/common/css/newdash/login.css → abweb/common/css/newdash/login.css

-html,
-body {
-  height: 100%;
-  background-color: #EBF4FB;
-}
-body {
-    display: -ms-flexbox;
-    display: flex;
-    -ms-flex-align: center;
-    align-items: center;
-  }
-.form-login {
-    width: 100%;
-    max-width: 420px;
-    padding: 25px 30px;
-    margin: auto;
+html,
+body {
+  height: 100%;
+  background-color: #EBF4FB;
+}
+body {
+    display: -ms-flexbox;
+    display: flex;
+    -ms-flex-align: center;
+    align-items: center;
+  }
+.form-login {
+    width: 100%;
+    max-width: 420px;
+    padding: 25px 30px;
+    margin: auto;
   }
   }
\ No newline at end of file

abvw/common/css/newdash/style.css → abweb/common/css/newdash/style.css

-@charset "UTF-8";
-/* no image */
-.not-found-img{
-  max-width: 100px;
-}
-
-/* dashboard */
-ul.dashboard-menu li:hover{
-  background-color: #f8f9fa;
-}
-ul.dashboard-menu li img{
-  width: 50px;
-}
-@media screen and (max-width: 575px) {
-  ul.dashboard-menu li img{
-    width: 40px;
-  } 
-}
-
-/* dashboard setting */
-.setting-table-wrap table {
-    width: 100%;
-}
-.setting-table-wrap th {
-    padding: 0.8rem;
-}
-.setting-table-wrap td {
-    width: 80px;
-    padding: 0.8rem;
-}
-
-/* message list */
-ul.message-list li.unread{
-  font-weight: bold;
-}
-ul.message-list li.read{
-  background-color: #f8f9fa;
-}
-
-/* task list */
-.task-list li a > div:nth-of-type(2){
-  min-height: 45px;
-}
-.view-block {
-  display: grid;
-  grid-template-columns: repeat(3,1fr);
-  column-gap: 10px;
-}
-@media screen and (max-width: 767px) {
-  .view-block {
-      grid-template-columns: repeat(2,1fr);
-  }
-}
+@charset "UTF-8";
+/* no image */
+.not-found-img{
+  max-width: 100px;
+}
+
+/* dashboard */
+ul.dashboard-menu li:hover{
+  background-color: #f8f9fa;
+}
+ul.dashboard-menu li img{
+  width: 50px;
+}
+@media screen and (max-width: 575px) {
+  ul.dashboard-menu li img{
+    width: 40px;
+  } 
+}
+
+/* dashboard setting */
+.setting-table-wrap table {
+    width: 100%;
+}
+.setting-table-wrap th {
+    padding: 0.8rem;
+}
+.setting-table-wrap td {
+    width: 80px;
+    padding: 0.8rem;
+}
+
+/* message list */
+ul.message-list li.unread{
+  font-weight: bold;
+}
+ul.message-list li.read{
+  background-color: #f8f9fa;
+}
+
+/* task list */
+.task-list li a > div:nth-of-type(2){
+  min-height: 45px;
+}
+.view-block {
+  display: grid;
+  grid-template-columns: repeat(3,1fr);
+  column-gap: 10px;
+}
+@media screen and (max-width: 767px) {
+  .view-block {
+      grid-template-columns: repeat(2,1fr);
+  }
+}

abvw/common/css/newdash/style_202104_.css → abweb/common/css/newdash/style_202104_.css

-@charset "UTF-8";
-
-.tb-wrap {
-  border-radius: 4px;
-  border: 3px solid #EBF4FB;
-}
-.ad-area{
-  top: 0;
-  right: 20px;
-}
-canvas {
-  width: 80%;
-  height: 200px;
-}
-
-.tb-item {
-  counter-increment: item;
-  margin-bottom: 10px;
-}
-.tb-item:not(:last-child) {
-    padding-bottom: 20px;
-    border-bottom: 3px solid #EBF4FB;
-}
-.tb-item .num:after,
-.tb-item label:after {
-  content: counters(item,"");
-}
-
-/* 工程一覧 */
-#process-list h1{
-  font-size: 20px;
-}
-#process-list .ar-box{
-  min-height: 50px;
-  font-weight: normal;
-}
-#process-list .sp-down img{
-  width: 35px;
-}
-
-/* フォーム開閉ボタン */
-.ac-tb-form{
-  display: block;
-  padding: 5px 0 5px 35px;
-  text-align: center;
-  color: #0053f0!important;
-  font-weight: 600;
-  text-decoration: none!important;
-  border-radius: 5px;
-  font-size: 14px;
-}
-
-.ac-tb-form:after {
-  content: "";
-  position: absolute;
-  left: 15px;
-  transition: all .2s ease-in-out;
-  display: block;
-  width: 8px;
-  height: 8px;
-  border-top: 2px solid #0053f0;
-  border-right: 2px solid #0053f0;
-  transform: rotate(-45deg);
-  top: 45%;
-}
-.ac-tb-form.hide:after {
-  transform: rotate(135deg);
-  top: 32%;
-}
-.tb-item.visually-hidden {
-  transition: 0.5s;
-}
-.visually-hidden {
-  position: fixed !important;
-  top: 0px !important;
-  left: 0px !important;
-  width: 0px !important;
-  height: 0px !important;
-  opacity: 0 !important;
-  overflow: hidden !important;
-  border: none !important;
-  margin: 0 !important;
-  padding: 0 !important;
-  display: block !important;
-  visibility: visible !important;
-}
-.num {
-  font-weight: 600;
-}
-i.fa-minus, i.fa-plus {
-  color: #212529;
-}
-
-.fa-plus:active{
-  transform: rotate(180deg);
-  transition: .5s;
-}
-
-#top nav.search {
-  margin-bottom: 1rem;
-}
-.form-group {
-  margin-bottom: 0;
-}
-
-/* アイコン */
-.icon{
-  width: 22px;
-  max-height: 22px;
-}
-
-.duration-area {
-  padding-left: 0;
-}
-
-/* pdf出力ボタン */
-.pdf-output-btn .icon{
-  width: 22px;
-  height: 22px;
-  background: url("../img/icon_pdf_blue.svg") no-repeat;
-}
-.pdf-output-btn:hover .icon{
-  background: url("../img/icon_pdf.svg") no-repeat;
-}
-
-/* 表の開閉 */
-.fold-area {
-  height: 30px;
-  position: relative;
-  margin: 0 10px;
-}
-.fold-area.hide{
-  display: none;
-}
-.fold-area span:nth-child(1) {
-  width: calc( 100% - 20px );
-  height: 3px;
-  background-color: #ebf4fb;
-  position: absolute;
-  top: 0;
-  right: 0;
-}
-.fold-area span:nth-child(2) {
-  width: 95%;
-  height: 3px;
-  background-color: #ebf4fb;
-  position: absolute;
-  top: 10px;
-  right: 0;
-}
-.fold-area span:nth-child(2) {
-  width: calc( 100% - 10px );
-  height: 3px;
-  background-color: #ebf4fb;
-  position: absolute;
-  top: 10px;
-  right: 0;
-}
-.fold-area span:nth-child(2):before {
-  content: '';
-  width: 3px;
-  height: 10px;
-  border-left: 3px solid #ebf4fb;
-  position: absolute;
-  top: -10px;
-}
-.fold-area span:nth-child(3) {
-  width: 100%;
-  height: 3px;
-  background-color: #ebf4fb;
-  position: absolute;
-  top: 20px;
-  right: 0;
-}
-.fold-area span:nth-child(3):before {
-  content: '';
-  width: 3px;
-  height: 10px;
-  border-left: 3px solid #ebf4fb;
-  position: absolute;
-  top: -10px;
-}
-
-@media (min-width: 768px) {
-  .del-btn,.sv-btn,.sb-btn{
-    min-width: 150px;
-  }
-}
-
-/* タブ */
-.side-navi ul li a {
-  color: #212529;
-}
-.side-navi ul li.active.done a{
-  color: #212529;
-}
-.side-navi ul li.doing a {
-  color: #0053f0;
-}
-.side-navi ul li.yet a{
-  color: #ccc;
-}
-
-/* 作業未更新 */
-#top tr.update {
-  background: #fffaf7;
-}
-#top tr.update a:before {
-  content: '\f2f9';
-  font-family: "Font Awesome 5 Free";
-  color: #0053f0;
-  font-weight: 600;
-  margin-right: 5px;
-}
-
-@media(max-width: 991.98px){
-  .side-navi ul li.active {
-    background: #ebf4fb!important;
-    z-index: 9999;
-    margin-bottom: -1px;
-    border-bottom: 1px solid #ebf4fb;
-  }
-  .side-navi ul li.active a{
-    color: #0053f0;
-  }
-  .p-form {
-    border-top: 1px solid #dadee3;
-    margin-top: -1px;
-  }
-  .side-navi ul li.done {
-    background: #C4C4C4;
-  }
-  .side-navi ul li.done a{
-    color: #fff;
-  }
-  .side-navi ul li.active.yet a{
-    color: #212529;
-  }
-}
-
-@media screen and (max-width:768px){
-  #top tr.update a:before {
-    font-size: 13px;
-  }
+@charset "UTF-8";
+
+.tb-wrap {
+  border-radius: 4px;
+  border: 3px solid #EBF4FB;
+}
+.ad-area{
+  top: 0;
+  right: 20px;
+}
+canvas {
+  width: 80%;
+  height: 200px;
+}
+
+.tb-item {
+  counter-increment: item;
+  margin-bottom: 10px;
+}
+.tb-item:not(:last-child) {
+    padding-bottom: 20px;
+    border-bottom: 3px solid #EBF4FB;
+}
+.tb-item .num:after,
+.tb-item label:after {
+  content: counters(item,"");
+}
+
+/* 工程一覧 */
+#process-list h1{
+  font-size: 20px;
+}
+#process-list .ar-box{
+  min-height: 50px;
+  font-weight: normal;
+}
+#process-list .sp-down img{
+  width: 35px;
+}
+
+/* フォーム開閉ボタン */
+.ac-tb-form{
+  display: block;
+  padding: 5px 0 5px 35px;
+  text-align: center;
+  color: #0053f0!important;
+  font-weight: 600;
+  text-decoration: none!important;
+  border-radius: 5px;
+  font-size: 14px;
+}
+
+.ac-tb-form:after {
+  content: "";
+  position: absolute;
+  left: 15px;
+  transition: all .2s ease-in-out;
+  display: block;
+  width: 8px;
+  height: 8px;
+  border-top: 2px solid #0053f0;
+  border-right: 2px solid #0053f0;
+  transform: rotate(-45deg);
+  top: 45%;
+}
+.ac-tb-form.hide:after {
+  transform: rotate(135deg);
+  top: 32%;
+}
+.tb-item.visually-hidden {
+  transition: 0.5s;
+}
+.visually-hidden {
+  position: fixed !important;
+  top: 0px !important;
+  left: 0px !important;
+  width: 0px !important;
+  height: 0px !important;
+  opacity: 0 !important;
+  overflow: hidden !important;
+  border: none !important;
+  margin: 0 !important;
+  padding: 0 !important;
+  display: block !important;
+  visibility: visible !important;
+}
+.num {
+  font-weight: 600;
+}
+i.fa-minus, i.fa-plus {
+  color: #212529;
+}
+
+.fa-plus:active{
+  transform: rotate(180deg);
+  transition: .5s;
+}
+
+#top nav.search {
+  margin-bottom: 1rem;
+}
+.form-group {
+  margin-bottom: 0;
+}
+
+/* アイコン */
+.icon{
+  width: 22px;
+  max-height: 22px;
+}
+
+.duration-area {
+  padding-left: 0;
+}
+
+/* pdf出力ボタン */
+.pdf-output-btn .icon{
+  width: 22px;
+  height: 22px;
+  background: url("../img/icon_pdf_blue.svg") no-repeat;
+}
+.pdf-output-btn:hover .icon{
+  background: url("../img/icon_pdf.svg") no-repeat;
+}
+
+/* 表の開閉 */
+.fold-area {
+  height: 30px;
+  position: relative;
+  margin: 0 10px;
+}
+.fold-area.hide{
+  display: none;
+}
+.fold-area span:nth-child(1) {
+  width: calc( 100% - 20px );
+  height: 3px;
+  background-color: #ebf4fb;
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+.fold-area span:nth-child(2) {
+  width: 95%;
+  height: 3px;
+  background-color: #ebf4fb;
+  position: absolute;
+  top: 10px;
+  right: 0;
+}
+.fold-area span:nth-child(2) {
+  width: calc( 100% - 10px );
+  height: 3px;
+  background-color: #ebf4fb;
+  position: absolute;
+  top: 10px;
+  right: 0;
+}
+.fold-area span:nth-child(2):before {
+  content: '';
+  width: 3px;
+  height: 10px;
+  border-left: 3px solid #ebf4fb;
+  position: absolute;
+  top: -10px;
+}
+.fold-area span:nth-child(3) {
+  width: 100%;
+  height: 3px;
+  background-color: #ebf4fb;
+  position: absolute;
+  top: 20px;
+  right: 0;
+}
+.fold-area span:nth-child(3):before {
+  content: '';
+  width: 3px;
+  height: 10px;
+  border-left: 3px solid #ebf4fb;
+  position: absolute;
+  top: -10px;
+}
+
+@media (min-width: 768px) {
+  .del-btn,.sv-btn,.sb-btn{
+    min-width: 150px;
+  }
+}
+
+/* タブ */
+.side-navi ul li a {
+  color: #212529;
+}
+.side-navi ul li.active.done a{
+  color: #212529;
+}
+.side-navi ul li.doing a {
+  color: #0053f0;
+}
+.side-navi ul li.yet a{
+  color: #ccc;
+}
+
+/* 作業未更新 */
+#top tr.update {
+  background: #fffaf7;
+}
+#top tr.update a:before {
+  content: '\f2f9';
+  font-family: "Font Awesome 5 Free";
+  color: #0053f0;
+  font-weight: 600;
+  margin-right: 5px;
+}
+
+@media(max-width: 991.98px){
+  .side-navi ul li.active {
+    background: #ebf4fb!important;
+    z-index: 9999;
+    margin-bottom: -1px;
+    border-bottom: 1px solid #ebf4fb;
+  }
+  .side-navi ul li.active a{
+    color: #0053f0;
+  }
+  .p-form {
+    border-top: 1px solid #dadee3;
+    margin-top: -1px;
+  }
+  .side-navi ul li.done {
+    background: #C4C4C4;
+  }
+  .side-navi ul li.done a{
+    color: #fff;
+  }
+  .side-navi ul li.active.yet a{
+    color: #212529;
+  }
+}
+
+@media screen and (max-width:768px){
+  #top tr.update a:before {
+    font-size: 13px;
+  }
 }
 }
\ No newline at end of file

abvw/common/header.html → abweb/common/header.html

-<header>
-    <nav class="navbar navbar-dark shadow-sm px-sm-auto px-0">
-        <div class="container">
-            <a href="dashboard.html" class="navbar-brand">
-                <img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
-            </a>
-            <ul class="mr-sm-auto ml-sm-0 ml-auto mb-0 pl-0 d-flex">
-                <li class="active nav-link">
-                  <a href="dashboard.html" class="d-block text-center text-decoration-none">
-                      <img src="../common/img/nav_icon_dashboard.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="dashboard">
-                      <div class="fs-7 d-sm-block d-none lang" lang="dashboard"></div>
-                  </a>
-                </li>
-                <li class="nav-link">
-                  <a href="task-list.html" class="d-block text-center text-decoration-none">
-                      <img src="../common/img/nav_icon_task.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="workList">
-                      <div class="fs-7 d-sm-block d-none lang" lang="workList"></div>
-                  </a>
-                </li>
-            </ul>
-            <div class="dropdown">
-                <a href="#" class="nav-link text-center" id="dropdown-profile" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                    <img src="../common/img/nav_icon_profile.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid profile-img lang" lang="profile">
-                    <div class="fs-7 d-sm-block d-none lang" lang="profile"></div>
-                </a>
-                <div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
-                  <h6 class="dropdown-header lang" lang="dspLogin" ></h6>
-                  <a class="dropdown-item " href="account-setting.html" >
-                    <img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting">
-                    <span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
-                    </a>
-                  <a class="dropdown-item "  href="#"  data-toggle="modal" data-target="#confirm-modal">
-                    <img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout">
-                    <span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
-                    </a>
-                </div>
-            </div>
-        </div>
-    </nav>
-</header>
+<header>
+    <nav class="navbar navbar-dark shadow-sm px-sm-auto px-0">
+        <div class="container">
+            <a href="dashboard.html" class="navbar-brand">
+                <img src="../common/img/logo.svg" type="image" alt="" class="img-fluid lang" lang="logo">
+            </a>
+            <ul class="mr-sm-auto ml-sm-0 ml-auto mb-0 pl-0 d-flex">
+                <li class="active nav-link">
+                  <a href="dashboard.html" class="d-block text-center text-decoration-none">
+                      <img src="../common/img/nav_icon_dashboard.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="dashboard">
+                      <div class="fs-7 d-sm-block d-none lang" lang="dashboard"></div>
+                  </a>
+                </li>
+                <li class="nav-link">
+                  <a href="task-list.html" class="d-block text-center text-decoration-none">
+                      <img src="../common/img/nav_icon_task.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid lang" lang="workList">
+                      <div class="fs-7 d-sm-block d-none lang" lang="workList"></div>
+                  </a>
+                </li>
+            </ul>
+            <div class="dropdown">
+                <a href="#" class="nav-link text-center" id="dropdown-profile" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                    <img src="../common/img/nav_icon_profile.svg" type="image" alt="" class="p-sm-1 p-0 img-fluid profile-img lang" lang="profile">
+                    <div class="fs-7 d-sm-block d-none lang" lang="profile"></div>
+                </a>
+                <div class="dropdown-menu dropdown-menu-right" data-animation="true" aria-labelledby="dropdown-profile">
+                  <h6 class="dropdown-header lang" lang="dspLogin" ></h6>
+                  <a class="dropdown-item " href="account-setting.html" >
+                    <img src="../common/img/menu_icon_account_setting.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="account_setting">
+                    <span class="lang" style=" color: #6c757d;" lang="account_setting"></span>
+                    </a>
+                  <a class="dropdown-item "  href="#"  data-toggle="modal" data-target="#confirm-modal">
+                    <img src="../common/img/menu_icon_logout.svg" type="image" alt="" class="navbar-dropdown-icon lang" lang="dspLogout">
+                    <span class="lang" style=" color: #6c757d;" lang="dspLogout"></span>
+                    </a>
+                </div>
+            </div>
+        </div>
+    </nav>
+</header>

abvw/common/js/newdash/common.js → abweb/common/js/newdash/common.js

-$(function(){
-  hide_del_btn();
-});
-/** Handle press the Add button */
-$('.add').on('click',function(){
-  var base = $(this).parent().parent().parent('.tb-item');
-  base.find('.del').show();
-  // clone input form
-  base.clone(true).insertAfter(base);
-
-  // Scroll to added element
-  $("html,body").animate({scrollTop:base.next().offset().top});
-
-  // Input form accordion display
-  base.parent().parent('.tb').find('.ac-tb-form').show();
-});
-/** Handle press the Delete button */
-$('.del').on('click',function(){
-  var base = $(this).parent().parent().parent('.tb-item');
-  var tbwrap = base.parent('.tb-wrap');
-  var tb = tbwrap.parent('.tb');
-
-  // Delete area
-  base.remove();
-  // Hidden delete button
-  hide_del_btn();
-  // Form area display switch
-  tbWrapClear(tbwrap);
-
-  // Hide collapse icon  
-  if(tb.find('.ac-tb-form').is(':hidden')){
-    tb.find('.fold-area').addClass('hide');
-  }
-});
-
-/** handle Press the close button */
-$('.close-window').on('click',function(){
-  window.close();
-});
-
-/** Hide delete button when there is only one tablespace form */
-function hide_del_btn(){
-  $('.tb-wrap').each(function(i, elem){
-      var len = $(elem).find('.tb-item').length;
-      // When there is one item in the table
-      if(len <= 1){
-         $(elem).find('.del').hide();
-         $(this).children('.tb-item').removeClass('visually-hidden');
-         // Input form accordion hidden
-         $(this).parent().find('.ac-tb-form').hide();
-      }
-    });
-}
-/** Handle when deleting while closing the accordion */
-function tbWrapClear(tbwrap){
-  // If you delete the form while closing the accordion
-  // Hide parent element if all child elements are hidden
-  if(tbwrap.children(':not(.visually-hidden)').length == 0){
-    tbwrap.addClass("visually-hidden");
-  }
-  else {
-    tbwrap.removeClass("visually-hidden");
-  }
-}
-
-/** input form accordion */
-$('.ac-tb-form').on('click',function(){
-  var tb = $(this).parent().parent().parent('.tb');
-  var elems = tb.find('.tb-wrap').find('.tb-item');
-  var tbwrap = tb.find('.tb-wrap');
-  if(!$(this).hasClass('hide')){
-    elems.each(function(i) {
-      i = i + 1;
-      if( i != elems.size()){
-        $(this).addClass('visually-hidden');
-      }
-    });
-    $(this).text('開く');
-
-    // Form area display switch
-    tbWrapClear(tbwrap);
-
-    // Collapse icon view
-    tb.find('.fold-area').removeClass('hide');
-
-  }else{
-    elems.removeClass('visually-hidden');
-    $(this).text('閉じる');
-    
-    // Form area display switch
-    tbWrapClear(tbwrap);
-
-    // Hide collapse icon
-    tb.find('.fold-area').addClass('hide');
-
-  }
-  // opening and closing
-  $(this).toggleClass("hide");
-});
-
-/** toggle switch */
-$(".toggle").on("click", function() {
-  $(this).toggleClass("checked");
-  if(!$('input[name="check"]').prop("checked")) {
-    $(".toggle input").prop("checked", true);
-  } else {
-    $(".toggle input").prop("checked", false);
-  }
-});
-
-
-/** Menu display */
-$('.c-dropdown-trigger').on("click",function(){
-  $('[data-target="' + $(this).attr('id') + '"]').toggleClass('show');
-  $('.mask').removeClass('hide');
-});
-
-/** Close menu */
-$('.mask').on("click",function(){
-  $('.mask').addClass('hide');
-  $('.c-dropdown-menu').removeClass('show');
-});
-
-/** Select card list */
-$('.select-card-list .card .select-label').on("click",function(){
-  $(this).closest('.select-card-list').find('.card').removeClass('selected');
-  $(this).closest('.card').addClass('selected');
-});
-
-/** List display switching (list display) */
-$('.view-menu .view-list-btn').on("click",function(){
-  $('.view-block-btn').removeClass('active');
-  $('.view-list-btn').addClass('active');
-  $('.view-content').removeClass('view-block');
-  $('.view-content').addClass('view-list');
-});
-
-/** List display switching (grid display) */
-$('.view-menu .view-block-btn').on("click",function(){
-  $('.view-list-btn').removeClass('active');
-  $('.view-block-btn').addClass('active');
-  $('.view-content').removeClass('view-list');
-  $('.view-content').addClass('view-block');
-});
-
-/** loading */
-$(function(){
-  function e() {
-    setTimeout(function(){
-      $.LoadingOverlay("hide");
-    }, 2000);
-  }
-  $(".search-form-btn").on('click', function(){
-    $.LoadingOverlay("show", {
-      image       : "img/loading.gif"
-    });
-    e();
-  });
-});
+$(function(){
+  hide_del_btn();
+});
+/** Handle press the Add button */
+$('.add').on('click',function(){
+  var base = $(this).parent().parent().parent('.tb-item');
+  base.find('.del').show();
+  // clone input form
+  base.clone(true).insertAfter(base);
+
+  // Scroll to added element
+  $("html,body").animate({scrollTop:base.next().offset().top});
+
+  // Input form accordion display
+  base.parent().parent('.tb').find('.ac-tb-form').show();
+});
+/** Handle press the Delete button */
+$('.del').on('click',function(){
+  var base = $(this).parent().parent().parent('.tb-item');
+  var tbwrap = base.parent('.tb-wrap');
+  var tb = tbwrap.parent('.tb');
+
+  // Delete area
+  base.remove();
+  // Hidden delete button
+  hide_del_btn();
+  // Form area display switch
+  tbWrapClear(tbwrap);
+
+  // Hide collapse icon  
+  if(tb.find('.ac-tb-form').is(':hidden')){
+    tb.find('.fold-area').addClass('hide');
+  }
+});
+
+/** handle Press the close button */
+$('.close-window').on('click',function(){
+  window.close();
+});
+
+/** Hide delete button when there is only one tablespace form */
+function hide_del_btn(){
+  $('.tb-wrap').each(function(i, elem){
+      var len = $(elem).find('.tb-item').length;
+      // When there is one item in the table
+      if(len <= 1){
+         $(elem).find('.del').hide();
+         $(this).children('.tb-item').removeClass('visually-hidden');
+         // Input form accordion hidden
+         $(this).parent().find('.ac-tb-form').hide();
+      }
+    });
+}
+/** Handle when deleting while closing the accordion */
+function tbWrapClear(tbwrap){
+  // If you delete the form while closing the accordion
+  // Hide parent element if all child elements are hidden
+  if(tbwrap.children(':not(.visually-hidden)').length == 0){
+    tbwrap.addClass("visually-hidden");
+  }
+  else {
+    tbwrap.removeClass("visually-hidden");
+  }
+}
+
+/** input form accordion */
+$('.ac-tb-form').on('click',function(){
+  var tb = $(this).parent().parent().parent('.tb');
+  var elems = tb.find('.tb-wrap').find('.tb-item');
+  var tbwrap = tb.find('.tb-wrap');
+  if(!$(this).hasClass('hide')){
+    elems.each(function(i) {
+      i = i + 1;
+      if( i != elems.size()){
+        $(this).addClass('visually-hidden');
+      }
+    });
+    $(this).text('開く');
+
+    // Form area display switch
+    tbWrapClear(tbwrap);
+
+    // Collapse icon view
+    tb.find('.fold-area').removeClass('hide');
+
+  }else{
+    elems.removeClass('visually-hidden');
+    $(this).text('閉じる');
+    
+    // Form area display switch
+    tbWrapClear(tbwrap);
+
+    // Hide collapse icon
+    tb.find('.fold-area').addClass('hide');
+
+  }
+  // opening and closing
+  $(this).toggleClass("hide");
+});
+
+/** toggle switch */
+$(".toggle").on("click", function() {
+  $(this).toggleClass("checked");
+  if(!$('input[name="check"]').prop("checked")) {
+    $(".toggle input").prop("checked", true);
+  } else {
+    $(".toggle input").prop("checked", false);
+  }
+});
+
+
+/** Menu display */
+$('.c-dropdown-trigger').on("click",function(){
+  $('[data-target="' + $(this).attr('id') + '"]').toggleClass('show');
+  $('.mask').removeClass('hide');
+});
+
+/** Close menu */
+$('.mask').on("click",function(){
+  $('.mask').addClass('hide');
+  $('.c-dropdown-menu').removeClass('show');
+});
+
+/** Select card list */
+$('.select-card-list .card .select-label').on("click",function(){
+  $(this).closest('.select-card-list').find('.card').removeClass('selected');
+  $(this).closest('.card').addClass('selected');
+});
+
+/** List display switching (list display) */
+$('.view-menu .view-list-btn').on("click",function(){
+  $('.view-block-btn').removeClass('active');
+  $('.view-list-btn').addClass('active');
+  $('.view-content').removeClass('view-block');
+  $('.view-content').addClass('view-list');
+});
+
+/** List display switching (grid display) */
+$('.view-menu .view-block-btn').on("click",function(){
+  $('.view-list-btn').removeClass('active');
+  $('.view-block-btn').addClass('active');
+  $('.view-content').removeClass('view-list');
+  $('.view-content').addClass('view-block');
+});
+
+/** loading */
+$(function(){
+  function e() {
+    setTimeout(function(){
+      $.LoadingOverlay("hide");
+    }, 2000);
+  }
+  $(".search-form-btn").on('click', function(){
+    $.LoadingOverlay("show", {
+      image       : "img/loading.gif"
+    });
+    e();
+  });
+});