Skip to content

A
apollo
Commit 3fe906ae by Jason Song Committed by GitHub
Options

Merge pull request #413 from lepdou/bugfix_0919

bugfix: confirm no footer
parents 33b2d125 64bfccc2
Showing with 42 additions and 10 deletions
apollo-portal/src/main/resources/static/config.html
......@@ -147,6 +147,7 @@
apollo-detail="'确定要回滚吗?'"
apollo-show-cancel-btn="true" apollo-confirm="rollback"></apolloconfirmdialog>
<div class="modal fade" id="showText" tabindex="-1" role="dialog">
<div class="modal-dialog" style="width: 960px;">
<div class="modal-content no-radius">
......@@ -227,16 +228,13 @@
<td width="20%" title="{{config.item.key}}">
<span class="label label-danger"
ng-show="config.isDeleted">deleted</span>
<span ng-bind="config.item.key | limitTo: 250"></span>
<span ng-bind="config.item.key.length > 250 ? '...' :''"></span>
<span ng-bind="config.item.key"></span>
</td>
<td width="25%" title="{{config.oldValue}}">
<span ng-bind="config.oldValue | limitTo: 250"></span>
<span ng-bind="config.oldValue.length > 250 ? '...': ''"></span>
<span ng-bind="config.oldValue"></span>
</td>
<td width="25%" title="{{config.newValue}}">
<span ng-bind="config.newValue | limitTo: 250"></span>
<span ng-bind="config.newValue.length > 250 ? '...': ''"></span>
<span ng-bind="config.newValue"></span>
</td>
<td width="15%" ng-bind="config.item.dataChangeLastModifiedBy">
</td>
......
apollo-portal/src/main/resources/static/config/sync.html
......@@ -104,7 +104,7 @@
<span ng-bind="item.key | limitTo: 250"></span>
<span ng-bind="item.key.length > 250 ? '...' : ''"></span>
</td>
<td width="40%">
<td class="cursor-pointer" width="40%" ng-click="showText(item.value)">
<span ng-bind="item.value | limitTo: 250"></span>
<span ng-bind="item.value.length > 250 ? '...' : ''"></span>
</td>
......@@ -196,8 +196,29 @@
</div>
</section>
<div class="modal fade" id="showText" tabindex="-1" role="dialog">
<div class="modal-dialog" style="width: 960px;">
<div class="modal-content no-radius">
<div class="modal-header panel-primary">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
aria-hidden="true">&times;</span></button>
<button class="btn close clipboard" data-clipboard-text="{{text}}" data-tooltip="tooltip"
data-placement="bottom" title="复制">
<img class="i-20" src="../img/clippy.svg" style="margin-right: 5px;margin-top: -2px;">
</button>
<h4 class="modal-title">查看</h4>
</div>
<pre id="watchText" class="modal-body no-radius" style="margin-bottom: 0" ng-bind="text"></pre>
</div>
</div>
</div>
</div>
<div ng-include="'../views/common/footer.html'"></div>
<!-- jquery.js -->
......@@ -217,6 +238,7 @@
<!--nicescroll-->
<script src="../vendor/jquery.nicescroll.min.js"></script>
<script src="../vendor/clipboard.min.js" type="text/javascript"></script>
<!--biz-->
<script type="application/javascript" src="../scripts/app.js"></script>
<script type="application/javascript" src="../scripts/services/AppService.js"></script>
......
apollo-portal/src/main/resources/static/scripts/controller/config/SyncConfigController.js
......@@ -26,6 +26,8 @@ sync_item_module.controller("SyncItemController",
$scope.filter = filter;
$scope.resetFilter = resetFilter;
$scope.showText = showText;
init();
......@@ -222,5 +224,13 @@ sync_item_module.controller("SyncItemController",
filter();
}
function showText(text) {
$scope.text = text;
$('#showText').modal('show');
}
new Clipboard('.clipboard');
}]);
apollo-portal/src/main/resources/static/views/common/footer.html
<div class="footer">
<hr>
<p class="text-center">
<span class="glyphicon glyphicon-copyright-mark" aria-hidden="true"></span>携程 框架研发部<br>
<a href="http://conf.ctripcorp.com/display/FRAM/Apollo" target="_blank">wiki</a>
<span class="glyphicon glyphicon-copyright-mark" aria-hidden="true"></span>携程 框架研发部
<a href="https://github.com/ctripcorp/apollo" target="_blank">
<img src="../../img/github.png" style="width: 50px; height: 20px;">
</a>
</p>
</div>
<iframe src="/sso_heartbeat" class="hide"></iframe>
apollo-portal/src/main/resources/static/views/component/confirm-dialog.html
......@@ -9,7 +9,7 @@
<div class="modal-body">
{{detail}}
</div>
<div class="modal-footer" ng-show="showFooter">
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal" ng-show="showCancelBtn">取消</button>
<button type="button" class="btn btn-danger" data-dismiss="modal"
ng-click="confirm()">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment