Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
O
origin-web-common
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
Java-于龙
origin-web-common
Commits
8f2f49b8
Commit
8f2f49b8
authored
Oct 03, 2017
by
Robb Hamilton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improving display of binding status message
parent
605a7144
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
244 additions
and
120 deletions
+244
-120
_bind-service.less
dist/less/_bind-service.less
+39
-10
origin-web-common-ui.js
dist/origin-web-common-ui.js
+30
-23
origin-web-common.css
dist/origin-web-common.css
+46
-8
origin-web-common.js
dist/origin-web-common.js
+30
-23
origin-web-common.min.js
dist/origin-web-common.min.js
+0
-0
templates.js
dist/scripts/templates.js
+30
-23
bindResults.html
src/components/binding/bindResults.html
+30
-23
_bind-service.less
src/styles/_bind-service.less
+39
-10
No files found.
dist/less/_bind-service.less
View file @
8f2f49b8
...
@@ -52,23 +52,52 @@
...
@@ -52,23 +52,52 @@
}
}
.results-message {
.results-message {
line-height: 1.4;
flex: 1 1 0%; // IE
margin-top: 0;
padding-left: 10px;
padding-left: 10px;
strong
{
@media(min-width: @screen-sm-min)
{
.word-break()
;
padding-left: 15px
;
}
}
h3,
.h3 {
font-size: 15px;
line-height: 1.4;
margin-bottom: 0;
margin-top: 0;
@media(min-width: @screen-sm-min) {
font-size: 20px;
font-weight: 300;
}
strong {
font-weight: 600;
.word-break();
}
}
.results-status-unknown & {
padding-left: 0;
}
}
.results-message-details {
font-style: italic;
margin-bottom: 0;
}
}
.results-status {
.results-status {
align-items: center;
display: flex;
display: flex;
font-size: 16px;
margin-bottom: 15px;
.fa,
.pficon {
.pficon {
margin-top: 3px;
font-size: 24px;
@media(min-width: @screen-sm-min) {
font-size: 32px;
}
}
}
.spinner.spinner-sm {
// make fa-clock-o slightly bigger so it matches pficon-ok, pficon-error-circle-o
height: 16px;
.fa-clock-o {
margin: 3px 0 0;
font-size: 30px;
width: 16px;
@media(min-width: @screen-sm-min) {
font-size: 36px;
}
}
}
}
}
dist/origin-web-common-ui.js
View file @
8f2f49b8
...
@@ -93,32 +93,37 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
...
@@ -93,32 +93,37 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
$templateCache
.
put
(
'src/components/binding/bindResults.html'
,
$templateCache
.
put
(
'src/components/binding/bindResults.html'
,
"<div ng-if=
\"
!ctrl.error && !(ctrl.binding | isBindingFailed)
\"
>
\
n"
+
"<div ng-if=
\"
!ctrl.error && !(ctrl.binding | isBindingFailed)
\"
>
\
n"
+
" <div ng-if=
\"
ctrl.binding && !(ctrl.binding | isBindingReady)
\"
class=
\"
results-status
\"
>
\
n"
+
" <div ng-if=
\"
ctrl.binding && !(ctrl.binding | isBindingReady)
\"
class=
\"
results-status
\"
>
\
n"
+
" <span class=
\"
spinner spinner-sm
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
fa fa-clock-o text-muted
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
sr-only
\"
>Pending</span>
\
n"
+
" <span class=
\"
sr-only
\"
>Pending</span>
\
n"
+
" <h3 class=
\"
results-message
\"
>
\
n"
+
" <div class=
\"
results-message
\"
>
\
n"
+
" The binding is being created.
\
n"
+
" <h3>
\
n"
+
" </h3>
\
n"
+
" The binding is being created.
\
n"
+
" </h3>
\
n"
+
" <p class=
\"
results-message-details
\"
>This may take several minutes.</p>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" <div ng-if=
\"
(ctrl.binding | isBindingReady)
\"
>
\
n"
+
" <div ng-if=
\"
(ctrl.binding | isBindingReady)
\"
>
\
n"
+
" <div class=
\"
results-status
\"
>
\
n"
+
" <div class=
\"
results-status
\"
>
\
n"
+
" <span class=
\"
pficon pficon-ok
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
pficon pficon-ok
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
sr-only
\"
>Success</span>
\
n"
+
" <span class=
\"
sr-only
\"
>Success</span>
\
n"
+
" <h3 class=
\"
results-message
\"
>
\
n"
+
" <div class=
\"
results-message
\"
>
\
n"
+
" <span ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <h3>
\
n"
+
" <strong>{{ctrl.serviceToBind}}</strong> has been bound to
\
n"
+
" <span ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <strong>{{ctrl.applicationToBind}}</strong> successfully.
\
n"
+
" <strong>{{ctrl.serviceToBind}}</strong> has been bound to
\
n"
+
" </span>
\
n"
+
" <strong>{{ctrl.applicationToBind}}</strong> successfully.
\
n"
+
" <span ng-if=
\"
ctrl.bindType !== 'application'
\"
>
\
n"
+
" </span>
\
n"
+
" <strong>{{ctrl.serviceToBind}}</strong> binding created successfully.
\
n"
+
" <span ng-if=
\"
ctrl.bindType !== 'application'
\"
>
\
n"
+
" </span>
\
n"
+
" The binding <strong>{{ctrl.serviceToBind}}</strong> has been created successfully.
\
n"
+
" </h3>
\
n"
+
" </span>
\
n"
+
" </div>
\
n"
+
" </h3>
\
n"
+
" <div class=
\"
sub-title
\"
>
\
n"
+
" <p class=
\"
results-message-details
\"
>
\
n"
+
" The binding operation created the secret
\
n"
+
" The binding operation created the secret
\
n"
+
" <a ng-if=
\"
ctrl.secretHref
\"
ng-href=
\"
{{ctrl.secretHref}}
\"
>{{ctrl.binding.spec.secretName}}</a>
\
n"
+
" <a ng-if=
\"
ctrl.secretHref
\"
ng-href=
\"
{{ctrl.secretHref}}
\"
>{{ctrl.binding.spec.secretName}}</a>
\
n"
+
" <span ng-if=
\"
!ctrl.secretHref
\"
>{{ctrl.binding.spec.secretName}}</span>
\
n"
+
" <span ng-if=
\"
!ctrl.secretHref
\"
>{{ctrl.binding.spec.secretName}}</span>
\
n"
+
" that you may need to reference in your application.
\
n"
+
" that you may need to reference in your application.
\
n"
+
" <span ng-if=
\"
ctrl.showPodPresets
\"
>Its data will be available to your application as environment variables.</span>
\
n"
+
" <span ng-if=
\"
ctrl.showPodPresets
\"
>Its data will be available to your application as environment variables.</span>
\
n"
+
" </p>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" <div class=
\"
alert alert-info results-info
\"
ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <div class=
\"
alert alert-info results-info
\"
ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <span class=
\"
pficon pficon-info
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
pficon pficon-info
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
...
@@ -131,9 +136,11 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
...
@@ -131,9 +136,11 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" <div class=
\"
results-status
\"
>
\
n"
+
" <div class=
\"
results-status
\"
>
\
n"
+
" <span class=
\"
pficon pficon-error-circle-o text-danger
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
pficon pficon-error-circle-o text-danger
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
sr-only
\"
>Error</span>
\
n"
+
" <span class=
\"
sr-only
\"
>Error</span>
\
n"
+
" <h3 class=
\"
results-message
\"
>
\
n"
+
" <div class=
\"
results-message
\"
>
\
n"
+
" The binding could not be created.
\
n"
+
" <h3>
\
n"
+
" </h3>
\
n"
+
" The binding could not be created.
\
n"
+
" </h3>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" <div ng-if=
\"
ctrl.error
\"
class=
\"
sub-title
\"
>
\
n"
+
" <div ng-if=
\"
ctrl.error
\"
class=
\"
sub-title
\"
>
\
n"
+
" <span ng-if=
\"
ctrl.error.data.message
\"
>
\
n"
+
" <span ng-if=
\"
ctrl.error.data.message
\"
>
\
n"
+
...
...
dist/origin-web-common.css
View file @
8f2f49b8
...
@@ -63,27 +63,65 @@
...
@@ -63,27 +63,65 @@
margin-top
:
30px
;
margin-top
:
30px
;
}
}
.results-message
{
.results-message
{
flex
:
1
1
0%
;
padding-left
:
10px
;
}
@media
(
min-width
:
768px
)
{
.results-message
{
padding-left
:
15px
;
}
}
.results-message
h3
,
.results-message
.h3
{
font-size
:
15px
;
line-height
:
1.4
;
line-height
:
1.4
;
margin-bottom
:
0
;
margin-top
:
0
;
margin-top
:
0
;
padding-left
:
10px
;
}
}
.results-message
strong
{
@media
(
min-width
:
768px
)
{
.results-message
h3
,
.results-message
.h3
{
font-size
:
20px
;
font-weight
:
300
;
}
}
.results-message
h3
strong
,
.results-message
.h3
strong
{
font-weight
:
600
;
word-wrap
:
break-word
;
word-wrap
:
break-word
;
word-break
:
break-word
;
word-break
:
break-word
;
overflow-wrap
:
break-word
;
overflow-wrap
:
break-word
;
min-width
:
0
;
min-width
:
0
;
}
}
.results-status-unknown
.results-message
{
padding-left
:
0
;
}
.results-message-details
{
font-style
:
italic
;
margin-bottom
:
0
;
}
.results-status
{
.results-status
{
align-items
:
center
;
display
:
flex
;
display
:
flex
;
font-size
:
16
px
;
margin-bottom
:
15
px
;
}
}
.results-status
.fa
,
.results-status
.pficon
{
.results-status
.pficon
{
margin-top
:
3
px
;
font-size
:
24
px
;
}
}
.results-status
.spinner.spinner-sm
{
@media
(
min-width
:
768px
)
{
height
:
16px
;
.results-status
.fa
,
margin
:
3px
0
0
;
.results-status
.pficon
{
width
:
16px
;
font-size
:
32px
;
}
}
.results-status
.fa-clock-o
{
font-size
:
30px
;
}
@media
(
min-width
:
768px
)
{
.results-status
.fa-clock-o
{
font-size
:
36px
;
}
}
}
.delete-resource-modal
{
.delete-resource-modal
{
background-color
:
#f1f1f1
;
background-color
:
#f1f1f1
;
...
...
dist/origin-web-common.js
View file @
8f2f49b8
...
@@ -264,32 +264,37 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
...
@@ -264,32 +264,37 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
$templateCache
.
put
(
'src/components/binding/bindResults.html'
,
$templateCache
.
put
(
'src/components/binding/bindResults.html'
,
"<div ng-if=
\"
!ctrl.error && !(ctrl.binding | isBindingFailed)
\"
>
\
n"
+
"<div ng-if=
\"
!ctrl.error && !(ctrl.binding | isBindingFailed)
\"
>
\
n"
+
" <div ng-if=
\"
ctrl.binding && !(ctrl.binding | isBindingReady)
\"
class=
\"
results-status
\"
>
\
n"
+
" <div ng-if=
\"
ctrl.binding && !(ctrl.binding | isBindingReady)
\"
class=
\"
results-status
\"
>
\
n"
+
" <span class=
\"
spinner spinner-sm
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
fa fa-clock-o text-muted
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
sr-only
\"
>Pending</span>
\
n"
+
" <span class=
\"
sr-only
\"
>Pending</span>
\
n"
+
" <h3 class=
\"
results-message
\"
>
\
n"
+
" <div class=
\"
results-message
\"
>
\
n"
+
" The binding is being created.
\
n"
+
" <h3>
\
n"
+
" </h3>
\
n"
+
" The binding is being created.
\
n"
+
" </h3>
\
n"
+
" <p class=
\"
results-message-details
\"
>This may take several minutes.</p>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" <div ng-if=
\"
(ctrl.binding | isBindingReady)
\"
>
\
n"
+
" <div ng-if=
\"
(ctrl.binding | isBindingReady)
\"
>
\
n"
+
" <div class=
\"
results-status
\"
>
\
n"
+
" <div class=
\"
results-status
\"
>
\
n"
+
" <span class=
\"
pficon pficon-ok
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
pficon pficon-ok
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
sr-only
\"
>Success</span>
\
n"
+
" <span class=
\"
sr-only
\"
>Success</span>
\
n"
+
" <h3 class=
\"
results-message
\"
>
\
n"
+
" <div class=
\"
results-message
\"
>
\
n"
+
" <span ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <h3>
\
n"
+
" <strong>{{ctrl.serviceToBind}}</strong> has been bound to
\
n"
+
" <span ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <strong>{{ctrl.applicationToBind}}</strong> successfully.
\
n"
+
" <strong>{{ctrl.serviceToBind}}</strong> has been bound to
\
n"
+
" </span>
\
n"
+
" <strong>{{ctrl.applicationToBind}}</strong> successfully.
\
n"
+
" <span ng-if=
\"
ctrl.bindType !== 'application'
\"
>
\
n"
+
" </span>
\
n"
+
" <strong>{{ctrl.serviceToBind}}</strong> binding created successfully.
\
n"
+
" <span ng-if=
\"
ctrl.bindType !== 'application'
\"
>
\
n"
+
" </span>
\
n"
+
" The binding <strong>{{ctrl.serviceToBind}}</strong> has been created successfully.
\
n"
+
" </h3>
\
n"
+
" </span>
\
n"
+
" </div>
\
n"
+
" </h3>
\
n"
+
" <div class=
\"
sub-title
\"
>
\
n"
+
" <p class=
\"
results-message-details
\"
>
\
n"
+
" The binding operation created the secret
\
n"
+
" The binding operation created the secret
\
n"
+
" <a ng-if=
\"
ctrl.secretHref
\"
ng-href=
\"
{{ctrl.secretHref}}
\"
>{{ctrl.binding.spec.secretName}}</a>
\
n"
+
" <a ng-if=
\"
ctrl.secretHref
\"
ng-href=
\"
{{ctrl.secretHref}}
\"
>{{ctrl.binding.spec.secretName}}</a>
\
n"
+
" <span ng-if=
\"
!ctrl.secretHref
\"
>{{ctrl.binding.spec.secretName}}</span>
\
n"
+
" <span ng-if=
\"
!ctrl.secretHref
\"
>{{ctrl.binding.spec.secretName}}</span>
\
n"
+
" that you may need to reference in your application.
\
n"
+
" that you may need to reference in your application.
\
n"
+
" <span ng-if=
\"
ctrl.showPodPresets
\"
>Its data will be available to your application as environment variables.</span>
\
n"
+
" <span ng-if=
\"
ctrl.showPodPresets
\"
>Its data will be available to your application as environment variables.</span>
\
n"
+
" </p>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" <div class=
\"
alert alert-info results-info
\"
ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <div class=
\"
alert alert-info results-info
\"
ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <span class=
\"
pficon pficon-info
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
pficon pficon-info
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
...
@@ -302,9 +307,11 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
...
@@ -302,9 +307,11 @@ hawtioPluginLoader.addModule('openshiftCommonUI');
" <div class=
\"
results-status
\"
>
\
n"
+
" <div class=
\"
results-status
\"
>
\
n"
+
" <span class=
\"
pficon pficon-error-circle-o text-danger
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
pficon pficon-error-circle-o text-danger
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
sr-only
\"
>Error</span>
\
n"
+
" <span class=
\"
sr-only
\"
>Error</span>
\
n"
+
" <h3 class=
\"
results-message
\"
>
\
n"
+
" <div class=
\"
results-message
\"
>
\
n"
+
" The binding could not be created.
\
n"
+
" <h3>
\
n"
+
" </h3>
\
n"
+
" The binding could not be created.
\
n"
+
" </h3>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" <div ng-if=
\"
ctrl.error
\"
class=
\"
sub-title
\"
>
\
n"
+
" <div ng-if=
\"
ctrl.error
\"
class=
\"
sub-title
\"
>
\
n"
+
" <span ng-if=
\"
ctrl.error.data.message
\"
>
\
n"
+
" <span ng-if=
\"
ctrl.error.data.message
\"
>
\
n"
+
...
...
dist/origin-web-common.min.js
View file @
8f2f49b8
This diff is collapsed.
Click to expand it.
dist/scripts/templates.js
View file @
8f2f49b8
...
@@ -64,32 +64,37 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
...
@@ -64,32 +64,37 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
$templateCache
.
put
(
'src/components/binding/bindResults.html'
,
$templateCache
.
put
(
'src/components/binding/bindResults.html'
,
"<div ng-if=
\"
!ctrl.error && !(ctrl.binding | isBindingFailed)
\"
>
\
n"
+
"<div ng-if=
\"
!ctrl.error && !(ctrl.binding | isBindingFailed)
\"
>
\
n"
+
" <div ng-if=
\"
ctrl.binding && !(ctrl.binding | isBindingReady)
\"
class=
\"
results-status
\"
>
\
n"
+
" <div ng-if=
\"
ctrl.binding && !(ctrl.binding | isBindingReady)
\"
class=
\"
results-status
\"
>
\
n"
+
" <span class=
\"
spinner spinner-sm
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
fa fa-clock-o text-muted
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
sr-only
\"
>Pending</span>
\
n"
+
" <span class=
\"
sr-only
\"
>Pending</span>
\
n"
+
" <h3 class=
\"
results-message
\"
>
\
n"
+
" <div class=
\"
results-message
\"
>
\
n"
+
" The binding is being created.
\
n"
+
" <h3>
\
n"
+
" </h3>
\
n"
+
" The binding is being created.
\
n"
+
" </h3>
\
n"
+
" <p class=
\"
results-message-details
\"
>This may take several minutes.</p>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" <div ng-if=
\"
(ctrl.binding | isBindingReady)
\"
>
\
n"
+
" <div ng-if=
\"
(ctrl.binding | isBindingReady)
\"
>
\
n"
+
" <div class=
\"
results-status
\"
>
\
n"
+
" <div class=
\"
results-status
\"
>
\
n"
+
" <span class=
\"
pficon pficon-ok
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
pficon pficon-ok
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
sr-only
\"
>Success</span>
\
n"
+
" <span class=
\"
sr-only
\"
>Success</span>
\
n"
+
" <h3 class=
\"
results-message
\"
>
\
n"
+
" <div class=
\"
results-message
\"
>
\
n"
+
" <span ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <h3>
\
n"
+
" <strong>{{ctrl.serviceToBind}}</strong> has been bound to
\
n"
+
" <span ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <strong>{{ctrl.applicationToBind}}</strong> successfully.
\
n"
+
" <strong>{{ctrl.serviceToBind}}</strong> has been bound to
\
n"
+
" </span>
\
n"
+
" <strong>{{ctrl.applicationToBind}}</strong> successfully.
\
n"
+
" <span ng-if=
\"
ctrl.bindType !== 'application'
\"
>
\
n"
+
" </span>
\
n"
+
" <strong>{{ctrl.serviceToBind}}</strong> binding created successfully.
\
n"
+
" <span ng-if=
\"
ctrl.bindType !== 'application'
\"
>
\
n"
+
" </span>
\
n"
+
" The binding <strong>{{ctrl.serviceToBind}}</strong> has been created successfully.
\
n"
+
" </h3>
\
n"
+
" </span>
\
n"
+
" </div>
\
n"
+
" </h3>
\
n"
+
" <div class=
\"
sub-title
\"
>
\
n"
+
" <p class=
\"
results-message-details
\"
>
\
n"
+
" The binding operation created the secret
\
n"
+
" The binding operation created the secret
\
n"
+
" <a ng-if=
\"
ctrl.secretHref
\"
ng-href=
\"
{{ctrl.secretHref}}
\"
>{{ctrl.binding.spec.secretName}}</a>
\
n"
+
" <a ng-if=
\"
ctrl.secretHref
\"
ng-href=
\"
{{ctrl.secretHref}}
\"
>{{ctrl.binding.spec.secretName}}</a>
\
n"
+
" <span ng-if=
\"
!ctrl.secretHref
\"
>{{ctrl.binding.spec.secretName}}</span>
\
n"
+
" <span ng-if=
\"
!ctrl.secretHref
\"
>{{ctrl.binding.spec.secretName}}</span>
\
n"
+
" that you may need to reference in your application.
\
n"
+
" that you may need to reference in your application.
\
n"
+
" <span ng-if=
\"
ctrl.showPodPresets
\"
>Its data will be available to your application as environment variables.</span>
\
n"
+
" <span ng-if=
\"
ctrl.showPodPresets
\"
>Its data will be available to your application as environment variables.</span>
\
n"
+
" </p>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" <div class=
\"
alert alert-info results-info
\"
ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <div class=
\"
alert alert-info results-info
\"
ng-if=
\"
ctrl.bindType === 'application'
\"
>
\
n"
+
" <span class=
\"
pficon pficon-info
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
pficon pficon-info
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
...
@@ -102,9 +107,11 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
...
@@ -102,9 +107,11 @@ angular.module('openshiftCommonUI').run(['$templateCache', function($templateCac
" <div class=
\"
results-status
\"
>
\
n"
+
" <div class=
\"
results-status
\"
>
\
n"
+
" <span class=
\"
pficon pficon-error-circle-o text-danger
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
pficon pficon-error-circle-o text-danger
\"
aria-hidden=
\"
true
\"
></span>
\
n"
+
" <span class=
\"
sr-only
\"
>Error</span>
\
n"
+
" <span class=
\"
sr-only
\"
>Error</span>
\
n"
+
" <h3 class=
\"
results-message
\"
>
\
n"
+
" <div class=
\"
results-message
\"
>
\
n"
+
" The binding could not be created.
\
n"
+
" <h3>
\
n"
+
" </h3>
\
n"
+
" The binding could not be created.
\
n"
+
" </h3>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" </div>
\
n"
+
" <div ng-if=
\"
ctrl.error
\"
class=
\"
sub-title
\"
>
\
n"
+
" <div ng-if=
\"
ctrl.error
\"
class=
\"
sub-title
\"
>
\
n"
+
" <span ng-if=
\"
ctrl.error.data.message
\"
>
\
n"
+
" <span ng-if=
\"
ctrl.error.data.message
\"
>
\
n"
+
...
...
src/components/binding/bindResults.html
View file @
8f2f49b8
<div
ng-if=
"!ctrl.error && !(ctrl.binding | isBindingFailed)"
>
<div
ng-if=
"!ctrl.error && !(ctrl.binding | isBindingFailed)"
>
<div
ng-if=
"ctrl.binding && !(ctrl.binding | isBindingReady)"
class=
"results-status"
>
<div
ng-if=
"ctrl.binding && !(ctrl.binding | isBindingReady)"
class=
"results-status"
>
<span
class=
"
spinner spinner-sm
"
aria-hidden=
"true"
></span>
<span
class=
"
fa fa-clock-o text-muted
"
aria-hidden=
"true"
></span>
<span
class=
"sr-only"
>
Pending
</span>
<span
class=
"sr-only"
>
Pending
</span>
<h3
class=
"results-message"
>
<div
class=
"results-message"
>
The binding is being created.
<h3>
</h3>
The binding is being created.
</h3>
<p
class=
"results-message-details"
>
This may take several minutes.
</p>
</div>
</div>
</div>
<div
ng-if=
"(ctrl.binding | isBindingReady)"
>
<div
ng-if=
"(ctrl.binding | isBindingReady)"
>
<div
class=
"results-status"
>
<div
class=
"results-status"
>
<span
class=
"pficon pficon-ok"
aria-hidden=
"true"
></span>
<span
class=
"pficon pficon-ok"
aria-hidden=
"true"
></span>
<span
class=
"sr-only"
>
Success
</span>
<span
class=
"sr-only"
>
Success
</span>
<h3
class=
"results-message"
>
<div
class=
"results-message"
>
<span
ng-if=
"ctrl.bindType === 'application'"
>
<h3>
<strong>
{{ctrl.serviceToBind}}
</strong>
has been bound to
<span
ng-if=
"ctrl.bindType === 'application'"
>
<strong>
{{ctrl.applicationToBind}}
</strong>
successfully.
<strong>
{{ctrl.serviceToBind}}
</strong>
has been bound to
</span>
<strong>
{{ctrl.applicationToBind}}
</strong>
successfully.
<span
ng-if=
"ctrl.bindType !== 'application'"
>
</span>
<strong>
{{ctrl.serviceToBind}}
</strong>
binding created successfully.
<span
ng-if=
"ctrl.bindType !== 'application'"
>
</span>
The binding
<strong>
{{ctrl.serviceToBind}}
</strong>
has been created successfully.
</h3>
</span>
</div>
</h3>
<div
class=
"sub-title"
>
<p
class=
"results-message-details"
>
The binding operation created the secret
The binding operation created the secret
<a
ng-if=
"ctrl.secretHref"
ng-href=
"{{ctrl.secretHref}}"
>
{{ctrl.binding.spec.secretName}}
</a>
<a
ng-if=
"ctrl.secretHref"
ng-href=
"{{ctrl.secretHref}}"
>
{{ctrl.binding.spec.secretName}}
</a>
<span
ng-if=
"!ctrl.secretHref"
>
{{ctrl.binding.spec.secretName}}
</span>
<span
ng-if=
"!ctrl.secretHref"
>
{{ctrl.binding.spec.secretName}}
</span>
that you may need to reference in your application.
that you may need to reference in your application.
<span
ng-if=
"ctrl.showPodPresets"
>
Its data will be available to your application as environment variables.
</span>
<span
ng-if=
"ctrl.showPodPresets"
>
Its data will be available to your application as environment variables.
</span>
</p>
</div>
</div>
</div>
<div
class=
"alert alert-info results-info"
ng-if=
"ctrl.bindType === 'application'"
>
<div
class=
"alert alert-info results-info"
ng-if=
"ctrl.bindType === 'application'"
>
<span
class=
"pficon pficon-info"
aria-hidden=
"true"
></span>
<span
class=
"pficon pficon-info"
aria-hidden=
"true"
></span>
...
@@ -38,9 +43,11 @@
...
@@ -38,9 +43,11 @@
<div
class=
"results-status"
>
<div
class=
"results-status"
>
<span
class=
"pficon pficon-error-circle-o text-danger"
aria-hidden=
"true"
></span>
<span
class=
"pficon pficon-error-circle-o text-danger"
aria-hidden=
"true"
></span>
<span
class=
"sr-only"
>
Error
</span>
<span
class=
"sr-only"
>
Error
</span>
<h3
class=
"results-message"
>
<div
class=
"results-message"
>
The binding could not be created.
<h3>
</h3>
The binding could not be created.
</h3>
</div>
</div>
</div>
<div
ng-if=
"ctrl.error"
class=
"sub-title"
>
<div
ng-if=
"ctrl.error"
class=
"sub-title"
>
<span
ng-if=
"ctrl.error.data.message"
>
<span
ng-if=
"ctrl.error.data.message"
>
...
...
src/styles/_bind-service.less
View file @
8f2f49b8
...
@@ -52,23 +52,52 @@
...
@@ -52,23 +52,52 @@
}
}
.results-message {
.results-message {
line-height: 1.4;
flex: 1 1 0%; // IE
margin-top: 0;
padding-left: 10px;
padding-left: 10px;
strong
{
@media(min-width: @screen-sm-min)
{
.word-break()
;
padding-left: 15px
;
}
}
h3,
.h3 {
font-size: 15px;
line-height: 1.4;
margin-bottom: 0;
margin-top: 0;
@media(min-width: @screen-sm-min) {
font-size: 20px;
font-weight: 300;
}
strong {
font-weight: 600;
.word-break();
}
}
.results-status-unknown & {
padding-left: 0;
}
}
.results-message-details {
font-style: italic;
margin-bottom: 0;
}
}
.results-status {
.results-status {
align-items: center;
display: flex;
display: flex;
font-size: 16px;
margin-bottom: 15px;
.fa,
.pficon {
.pficon {
margin-top: 3px;
font-size: 24px;
@media(min-width: @screen-sm-min) {
font-size: 32px;
}
}
}
.spinner.spinner-sm {
// make fa-clock-o slightly bigger so it matches pficon-ok, pficon-error-circle-o
height: 16px;
.fa-clock-o {
margin: 3px 0 0;
font-size: 30px;
width: 16px;
@media(min-width: @screen-sm-min) {
font-size: 36px;
}
}
}
}
}
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