Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
itminedu
okeanos-LoD
Commits
1a8eab2b
Commit
1a8eab2b
authored
Nov 09, 2015
by
efikalti
Browse files
added x icon on delete buttons,set the same order of buttons in every status
parent
36b44adb
Changes
6
Hide whitespace changes
Inline
Side-by-side
webapp/frontend/app/templates/components/delete-lambda-app.hbs
deleted
100644 → 0
View file @
36b44adb
<div>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-xs"
{{
action
"delete"
lambdaApp
on
=
"click"
}}
>
Delete
</button>
</div>
webapp/frontend/app/templates/components/delete-lambda-instance.hbs
deleted
100644 → 0
View file @
36b44adb
{{#if
(
compare
lambdaInstance
.
status_message
'==='
"DESTROYED"
)
}}
<div>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-xs disabled"
disabled
>
Delete
</button>
</div>
{{else
if
(
compare
lambdaInstance
.
status_message
'==='
"CLUSTER_FAILED"
)
}}
<div>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-xs disabled"
disabled
>
Delete
</button>
</div>
{{else}}
<div>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-xs"
{{
action
"delete"
lambdaInstance
on
=
"click"
}}
>
Delete
</button>
</div>
{{/if}}
webapp/frontend/app/templates/lambda-app.hbs
View file @
1a8eab2b
...
...
@@ -50,7 +50,7 @@
actions you may take depending on the
<i>
status
</i>
of the Application.
</div>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-primary pull-right"
{{
action
"delete_app"
model
.
application
.
id
}}
>
Delete
</button>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-primary pull-right"
{{
action
"delete_app"
model
.
application
.
id
}}
>
<i
class=
"fa fa-times"
></i>
Delete
</button>
{{#if
(
compare
model
.
application
.
status_code
'=='
'0'
)
}}
{{#
link-to
'deploy-app-1'
model
.
application
.
id
}}
<button
class=
"btn btn-primary pull-right"
...
...
webapp/frontend/app/templates/lambda-apps/index.hbs
View file @
1a8eab2b
...
...
@@ -109,7 +109,7 @@
<td>
{{
lower-case
lambda-application
.
app_type
}}
</td>
<td>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-xs"
{{
action
"delete_app"
lambda-application
.
id
}}
>
Delete
</button>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-xs"
{{
action
"delete_app"
lambda-application
.
id
}}
>
<i
class=
"fa fa-times"
></i>
Delete
</button>
</td>
<td>
{{#
link-to
'lambda-app'
lambda-application
.
id
}}
...
...
webapp/frontend/app/templates/lambda-instance.hbs
View file @
1a8eab2b
...
...
@@ -58,7 +58,7 @@
</div>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-primary pull-right"
{{
action
"delete_instance"
model
.
instance
.
id
}}
>
Delete
</button>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-primary pull-right"
{{
action
"delete_instance"
model
.
instance
.
id
}}
>
<i
class=
"fa fa-times"
></i>
Delete
</button>
{{#if
(
compare
model
.
instance
.
status_code
'=='
'0'
)
}}
{{#
link-to
'deploy-app-2'
model
.
instance
.
id
}}
<button
class=
"btn btn-primary pull-right"
...
...
@@ -78,14 +78,14 @@
{{/if}}
{{#
tool-tip
}}
{{#if
(
compare
model
.
instance
.
status_code
'=='
'0'
)
}}
{{
instance-action
start
=
true
disabled
=
true
status_message
=
model
.
instance
.
status_message
}}
{{
instance-action
apps
=
model
.
apps
check_apps
=
true
stop
=
true
instance
=
model
.
instance_action
failure
=
failure
instance-id
=
model
.
instance
.
id
request
=
request
message
=
message
action
=
"start_stop"
}}
{{
instance-action
start
=
true
disabled
=
true
status_message
=
model
.
instance
.
status_message
}}
{{else
if
(
compare
model
.
instance
.
status_code
'=='
'1'
)
}}
{{
instance-action
stop
=
true
disabled
=
true
status_message
=
model
.
instance
.
status_message
}}
{{
instance-action
start
=
true
instance
=
model
.
instance_action
instance-id
=
model
.
instance
.
id
failure
=
failure
request
=
request
message
=
message
action
=
"start_stop"
}}
{{else}}
{{
instance-action
start
=
true
disabled
=
true
status_message
=
model
.
instance
.
status_message
}}
{{
instance-action
stop
=
true
disabled
=
true
status_message
=
model
.
instance
.
status_message
}}
{{
instance-action
start
=
true
disabled
=
true
status_message
=
model
.
instance
.
status_message
}}
{{/if}}
{{/
tool-tip
}}
</div>
...
...
webapp/frontend/app/templates/lambda-instances/index.hbs
View file @
1a8eab2b
...
...
@@ -128,17 +128,17 @@
{{/
link-to
}}
</td>
<td>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-xs"
{{
action
"delete_instance"
lambda-instance
.
id
}}
>
Delete
</button>
<button
name=
"del-btn"
id=
"del-btn"
class=
"btn btn-danger btn-xs"
{{
action
"delete_instance"
lambda-instance
.
id
}}
>
<i
class=
"fa fa-times"
></i>
Delete
</button>
</td>
{{#if
(
compare
lambda-instance
.
status_code
'=='
'0'
)
}}
<td>
{{
instance-action
apps
=
apps
xs
=
true
stop
=
true
check_apps
=
false
started_app
=
lambda-instance
.
running_app
instance
=
instance_action
failure
=
failure
instance-id
=
lambda-instance
.
id
request
=
request
message
=
message
action
=
"start_stop"
}}
</td>
{{#
tool-tip
}}
<td>
{{
instance-action
start
=
true
xs
=
true
disabled
=
true
status_message
=
lambda-instance
.
status_message
}}
</td>
{{/
tool-tip
}}
<td>
{{
instance-action
apps
=
apps
xs
=
true
stop
=
true
check_apps
=
false
started_app
=
lambda-instance
.
running_app
instance
=
instance_action
failure
=
failure
instance-id
=
lambda-instance
.
id
request
=
request
message
=
message
action
=
"start_stop"
}}
</td>
<td>
{{#
link-to
"deploy-app-2"
lambda-instance
.
id
}}
<button
class=
"btn btn-primary btn-xs"
...
...
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