From 0dca48e62f053d2fa725649ee2842412a9b4f476 Mon Sep 17 00:00:00 2001 From: wyu <kknd09321@nate.com> Date: 목, 06 1월 2022 11:42:18 +0900 Subject: [PATCH] Merge branch 'master' of http://192.168.0.25:9001/r/owl-kisa --- src/main/webapp/views/issue/issueDetail.html | 66 ++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/views/issue/issueDetail.html b/src/main/webapp/views/issue/issueDetail.html index e050dd6..a8621af 100644 --- a/src/main/webapp/views/issue/issueDetail.html +++ b/src/main/webapp/views/issue/issueDetail.html @@ -492,7 +492,23 @@ <!--<div class="col-md-1"> <button class="btn btn-darkgrey offset-10" ng-click="fn.addRelationIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button> </div>--> - <div class="btn-group offset-11"> + <div class="col-md-3 mt-2"> + <div class="dataTables_length"> + <label> + <select name="relPageRow" + tabindex="-1" + class="form-control form-control-sm" + ng-change="fn.changeDetailPageRowCount()" + ng-model="vm.page.selectedRelPageRowCount"> + <option value="10">10</option> + <option value="50">50</option> + <option value="100">100</option> + </select> {{vm.page.selectedRelPage}}-{{vm.responseData.relPage.totalPage}} / + {{vm.responseData.relPage.totalCount | number}}<span translate="common.few">嫄�</span> + </label> + </div> + </div> + <div class="btn-group" style="left: 975px; padding: 5px"> <button aria-expanded="false" aria-haspopup="true" tabindex="-1" class="btn btn-secondary dropdown-toggle" @@ -546,6 +562,21 @@ </button> </div> </div> + <div class="controls-below-table text-center"> + <ul uib-pagination + boundary-links-numbes="true" + items-per-page="vm.page.selectedRelPageRowCount" + total-items="vm.responseData.relPage.totalCount" + ng-model="vm.page.selectedRelPage" + max-size="10" + ng-click="fn.getIssueDetail(vm.page.selectedRelPage - 1, vm.page.selectedDownPage - 1)" + class="pagination pagination-sm" + previous-text="<" + next-text=">" + first-text="" + last-text=""> + </ul> + </div> </div> <div class="row mt-30"> @@ -561,7 +592,23 @@ <div class="col-sm-1"> <button class="btn btn-darkgrey offset-10" ng-click="fn.addDownIssueTableConfig()" type="button"><span translate="issue.settingTableDisplay">�뀒�씠釉� �몴�떆 �꽕�젙</span></button> </div>--> - <div class="btn-group offset-11"> + <div class="col-md-5 mt-2"> + <div class="dataTables_length"> + <label> + <select name="downPageRow" + tabindex="-1" + class="form-control form-control-sm" + ng-change="fn.changeDetailPageRowCount()" + ng-model="vm.page.selectedDownPageRowCount"> + <option value="10">10</option> + <option value="50">50</option> + <option value="100">100</option> + </select> {{vm.page.selectedDownPage}}-{{vm.responseData.downPage.totalPage}} / + {{vm.responseData.downPage.totalCount | number}}<span translate="common.few">嫄�</span> + </label> + </div> + </div> + <div class="btn-group" style="left: 730px; padding: 5px"> <button aria-expanded="false" aria-haspopup="true" tabindex="-1" class="btn btn-secondary dropdown-toggle" @@ -605,6 +652,21 @@ </button> </div> </div> + <div class="controls-below-table text-center"> + <ul uib-pagination + boundary-links-numbes="true" + items-per-page="vm.page.selectedDownPageRowCount" + total-items="vm.responseData.downPage.totalCount" + ng-model="vm.page.selectedDownPage" + max-size="10" + ng-click="fn.getIssueDetail(vm.page.selectedRelPage - 1, vm.page.selectedDownPage - 1)" + class="pagination pagination-sm" + previous-text="<" + next-text=">" + first-text="" + last-text=""> + </ul> + </div> </div> <h6 class="todo-content-subheader mt-30" translate="common.content">�궡�슜</h6> -- Gitblit v1.8.0