Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
apollo
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
apollo
Commits
06c6cf63
Commit
06c6cf63
authored
Sep 19, 2016
by
zhangle
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bugfix: confirm dialog no footer
parent
33c59a5b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
39 additions
and
9 deletions
+39
-9
apollo-portal/src/main/resources/static/config.html
apollo-portal/src/main/resources/static/config.html
+4
-6
apollo-portal/src/main/resources/static/config/sync.html
apollo-portal/src/main/resources/static/config/sync.html
+23
-1
apollo-portal/src/main/resources/static/scripts/controller/config/SyncConfigController.js
.../static/scripts/controller/config/SyncConfigController.js
+10
-0
apollo-portal/src/main/resources/static/views/common/footer.html
...portal/src/main/resources/static/views/common/footer.html
+1
-1
apollo-portal/src/main/resources/static/views/component/confirm-dialog.html
...main/resources/static/views/component/confirm-dialog.html
+1
-1
No files found.
apollo-portal/src/main/resources/static/config.html
View file @
06c6cf63
...
...
@@ -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
View file @
06c6cf63
...
...
@@ -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"
>
×
</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
View file @
06c6cf63
...
...
@@ -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
View file @
06c6cf63
...
...
@@ -2,7 +2,7 @@
<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>
<a
href=
"http
s://github.com/ctripcorp/apollo"
target=
"_blank"
>
github
</a>
</p>
</div>
<iframe
src=
"/sso_heartbeat"
class=
"hide"
></iframe>
apollo-portal/src/main/resources/static/views/component/confirm-dialog.html
View file @
06c6cf63
...
...
@@ -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()"
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment