Merge pull request apolloconfig#413 from lepdou/bugfix_0919

bugfix: confirm no footer
sk163 · Sep 19, 2016 · 3fe906a · 3fe906a
2 parents 33b2d12 + 64bfccc
commit 3fe906a
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 10 deletions.
diff --git a/apollo-portal/src/main/resources/static/config.html b/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 @@ <h4 class="modal-title">发布</h4>
                                             <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>

diff --git a/apollo-portal/src/main/resources/static/config/sync.html b/apollo-portal/src/main/resources/static/config/sync.html
@@ -104,7 +104,7 @@ <h4 ng-bind="pageContext.namespaceName"></h4>
                                     <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 @@ <h3>同步失败!</h3>
 
         </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 @@ <h3>同步失败!</h3>
 <!--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>

diff --git a/apollo-portal/src/main/resources/static/img/github.png b/apollo-portal/src/main/resources/static/img/github.png
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/config/SyncConfigController.js b/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');
+
                              }]);
 
diff --git a/apollo-portal/src/main/resources/static/views/common/footer.html b/apollo-portal/src/main/resources/static/views/common/footer.html
@@ -1,8 +1,10 @@
 <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>
diff --git a/apollo-portal/src/main/resources/static/views/component/confirm-dialog.html b/apollo-portal/src/main/resources/static/views/component/confirm-dialog.html
@@ -9,7 +9,7 @@ <h4 class="modal-title">{{title}}</h4>
             <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()">