Skip to content

Commit

Permalink
issue EC-CUBE#131 支払方法設定・配送方法・規格管理（詳細）　非表示ボタンの追加
Browse files Browse the repository at this point in the history
  • Loading branch information
yasui05821 committed Jul 12, 2018
1 parent 9b678c4 commit 51fd9e6
Show file tree
Hide file tree
Showing 4 changed files with 138 additions and 95 deletions.
3 changes: 3 additions & 0 deletions assets/scss/component/_bootstrapOriginal.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,9 @@ Styleguide 12.2
padding: 6px 12px;
cursor:pointer;
}
.btn-ec-actionIcon.hide{
background-color: #FAF1F1;
}

.btn-ec-actionIcon:hover {
color: #54687A;
Expand Down
51 changes: 34 additions & 17 deletions assets/tmpl/moc/product/standard/detail/index.pug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,11 @@ block primaryContents
.col.d-flex.align-items-center
a(href="/product/standard/detail") 100cm
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="名前を編集"): i.fa.fa-pencil.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="削除"): i.fa.fa-close.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="名前を編集"): i.fa.fa-pencil.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="非表示"): i.fa.fa-eye.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(data-target='#standardDeleteConfirm', data-toggle='modal', data-tooltip='tooltip', data-placement='top', title='', data-original-title='削除'): i.fa.fa-close.fa-lg.text-secondary
li.list-group-item
form.form-row
.col-auto.d-flex.align-items-center
Expand All @@ -52,30 +53,46 @@ block primaryContents
.col-auto.d-flex.align-items-center
button(type="submit").btn.btn-ec-sub キャンセル
.col.text-right.justify-content-end
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="名前を編集"): i.fa.fa-pencil.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="削除"): i.fa.fa-close.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="名前を編集"): i.fa.fa-pencil.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="非表示"): i.fa.fa-eye.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(data-target='#standardDeleteConfirm', data-toggle='modal', data-tooltip='tooltip', data-placement='top', title='', data-original-title='削除'): i.fa.fa-close.fa-lg.text-secondary
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/product/standard/detail") 120cm
span （非表示）
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="名前を編集"): i.fa.fa-pencil.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="削除"): i.fa.fa-close.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="名前を編集"): i.fa.fa-pencil.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.hide.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="表示"): i.fa.fa-eye-slash.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(data-target='#standardDeleteConfirm', data-toggle='modal', data-tooltip='tooltip', data-placement='top', title='', data-original-title='削除'): i.fa.fa-close.fa-lg.text-secondary
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/product/standard/detail") 130cm
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="名前を編集"): i.fa.fa-pencil.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="削除"): i.fa.fa-close.fa-lg.text-secondary
p 項目の順番はドラッグ＆ドロップでも変更可能です。
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="名前を編集"): i.fa.fa-pencil.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="非表示"): i.fa.fa-eye.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(data-target='#standardDeleteConfirm', data-toggle='modal', data-tooltip='tooltip', data-placement='top', title='', data-original-title='削除'): i.fa.fa-close.fa-lg.text-secondary
p 項目の順番はドラッグ＆ドロップでも変更可能です。
#standardDeleteConfirm.modal.fade.show(tabindex='-1', role='dialog', aria-labelledby='confirmModal-4', aria-hidden='true')
.modal-dialog(role='document')
.modal-content
.modal-header
h5.modal-title.font-weight-bold この項目を完全に削除します
button.close(type='button', data-dismiss='modal', aria-label='Close')
span(aria-hidden='true') ×
.modal-body.text-left
p.text-left この項目を完全に削除します。これまでの販売データには影響はありませんが、この操作は取り消すことができません。削除しますか？
.modal-footer
button.btn.btn-ec-sub(type='button', data-dismiss='modal') キャンセル
a.btn.btn-ec-delete(href='', data-confirm='false', data-method='delete') 完全に削除
114 changes: 65 additions & 49 deletions assets/tmpl/moc/setting/basis/delivery/index.pug
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,68 @@ block pageTitle
block primaryContents
.card.rounded.border-0.mb-4
.card-body.p-0
.card.rounded.border-0.mb-2
ul.list-group.list-group-flush
li.list-group-item
form.form-row
.col-auto.d-flex.align-items-center
input(type="text").form-control
.col-auto.d-flex.align-items-center
button(type="submit").btn.btn-ec-regular 新規作成
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/setting/basis/delivery/edit") [配送業者A] 配送業者A
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="削除"): i.fa.fa-close.fa-lg.text-secondary
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/setting/basis/delivery/edit") [配送業者B] 配送業者B
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="削除"): i.fa.fa-close.fa-lg.text-secondary
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/setting/basis/delivery/edit") [配送業者D] 配送業者D
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="削除"): i.fa.fa-close.fa-lg.text-secondary
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/setting/basis/delivery/edit") [配送業者C] 配送業者C
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-toggle="tooltip" data-placement="top" title="削除"): i.fa.fa-close.fa-lg.text-secondary
p 項目の順番はドラッグ＆ドロップでも変更可能です。
.row.py-3.ml-1.border-bottom
.col-2
form
input.form-control(type='text')
.col-auto.pl-0
button.btn.btn-ec-regular(type="submit") 新規作成
ul.list-group.list-group-flush
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/setting/basis/delivery/edit") [配送業者A] 配送業者A
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="非表示"): i.fa.fa-eye.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(data-target='#deliveryDeleteConfirm', data-toggle='modal', data-tooltip='tooltip', data-placement='top', title='', data-original-title='削除'): i.fa.fa-close.fa-lg.text-secondary
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/setting/basis/delivery/edit") [配送業者B] 配送業者B
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="非表示"): i.fa.fa-eye.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(data-target='#deliveryDeleteConfirm', data-toggle='modal', data-tooltip='tooltip', data-placement='top', title='', data-original-title='削除'): i.fa.fa-close.fa-lg.text-secondary
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/setting/basis/delivery/edit") [配送業者D] 配送業者D
span （非表示）
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.hide.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="表示"): i.fa.fa-eye-slash.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(data-target='#deliveryDeleteConfirm', data-toggle='modal', data-tooltip='tooltip', data-placement='top', title='', data-original-title='削除'): i.fa.fa-close.fa-lg.text-secondary
li.list-group-item
.row.justify-content-around
.col-auto.d-flex.align-items-center
i.fa.fa-bars.text-ec-gray
.col.d-flex.align-items-center
a(href="/setting/basis/delivery/edit") [配送業者C] 配送業者C
.col-auto.text-right
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="上へ移動"): i.fa.fa-arrow-up.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="下へ移動"): i.fa.fa-arrow-down.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(href="" data-tooltip='tooltip' data-placement="top" title="非表示"): i.fa.fa-eye.fa-lg.text-secondary
a.btn.btn-ec-actionIcon.mr-2(data-target='#deliveryDeleteConfirm', data-toggle='modal', data-tooltip='tooltip', data-placement='top', title='', data-original-title='削除'): i.fa.fa-close.fa-lg.text-secondary
p 項目の順番はドラッグ＆ドロップでも変更可能です。
#deliveryDeleteConfirm.modal.fade.show(tabindex='-1', role='dialog', aria-labelledby='confirmModal-4', aria-hidden='true')
.modal-dialog(role='document')
.modal-content
.modal-header
h5.modal-title.font-weight-bold この項目を完全に削除します
button.close(type='button', data-dismiss='modal', aria-label='Close')
span(aria-hidden='true') ×
.modal-body.text-left
p.text-left この項目を完全に削除します。これまでの販売データには影響はありませんが、この操作は取り消すことができません。削除しますか？
.modal-footer
button.btn.btn-ec-sub(type='button', data-dismiss='modal') キャンセル
a.btn.btn-ec-delete(href='', data-confirm='false', data-method='delete') 完全に削除

0 comments on commit 51fd9e6

Please sign in to comment.