Commit 8803b26a authored by Ioannis Tsafaras's avatar Ioannis Tsafaras
Browse files

Changed button order, to be consistent across the site

parent 65befc8c
......@@ -208,16 +208,16 @@
{{#if (compare li.status_code '==' '0')}}
{{#if li.started_app}}
<td>
{{#tool-tip}}
{{app-action stop=true app=model.app request=request application-id=model.application.id instance-id=li.id failure=failure message=message action="start_stop"}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action start=true disabled=true
tool-tip-message="it is started!"}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action stop=true app=model.app request=request application-id=model.application.id instance-id=li.id failure=failure message=message action="start_stop"}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action withdraw=true disabled=true
......@@ -227,14 +227,14 @@
{{else}}
<td>
{{#tool-tip}}
{{app-action stop=true disabled=true
tool-tip-message="it is already stopped!"}}
{{app-action start=true app=model.app request=request application-id=model.application.id instance-id=li.id failure=failure message=message action="start_stop"}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action start=true app=model.app request=request application-id=model.application.id instance-id=li.id failure=failure message=message action="start_stop"}}
{{/tool-tip}}
{{#tool-tip}}
{{app-action stop=true disabled=true
tool-tip-message="it is already stopped!"}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
......@@ -245,17 +245,17 @@
{{else}}
<td>
{{#tool-tip}}
{{app-action stop=true disabled=true
{{app-action start=true disabled=true
tool-tip-message=(concat "the lambda instance's status
is " (lower-case li.status_message))}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action start=true disabled=true
tool-tip-message=(concat "the lambda instance's status
{{#tool-tip}}
{{app-action stop=true disabled=true
tool-tip-message=(concat "the lambda instance's status
is " (lower-case li.status_message))}}
{{/tool-tip}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
......
......@@ -87,16 +87,7 @@
</tr>
</thead>
<tbody>
<!-- <tr>
<td>1</td>
<td>My Application</td>
<td>
<a class="btn btn-social-icon btn-bitbucket" title="View Details" alt="View Details"><i class="fa fa-file-code-o"></i></a>
<a class="btn btn-social-icon btn-google" title="Delete" alt="Delete"><i class="fa fa-close"></i></a>
</td>
</tr> -->
{{#each pagedContent as |lambda-application|}}
<tr>
<td>
......@@ -108,9 +99,7 @@
<td>{{lambda-application.status_detail}}</td>
<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}}><i class="fa fa-times"></i> Delete</button>
</td>
<td>
{{#link-to 'lambda-app' lambda-application.id}}
<button class="btn btn-info btn-xs"><i class="fa fa-file-code-o"></i> Details</button>
......@@ -135,6 +124,9 @@
{{/tool-tip}}
{{/if}}
</td>
<td>
<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>
</tr>
{{/each}}
......
......@@ -341,13 +341,13 @@
{{#if application.started}}
<td>
{{#tool-tip}}
{{app-action stop=true app=model.app application-id=application.id instance-id=model.instance.id request=app_request failure=app_failure message=message action="start_stop"}}
{{/tool-tip}}
{{app-action start=true disabled=true
tool-tip-message="it is started!"}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action start=true disabled=true
tool-tip-message="it is started!"}}
{{app-action stop=true app=model.app application-id=application.id instance-id=model.instance.id request=app_request failure=app_failure message=message action="start_stop"}}
{{/tool-tip}}
</td>
<td>
......@@ -357,17 +357,17 @@
{{/tool-tip}}
</td>
{{else}}
<td>
{{#tool-tip}}
{{app-action stop=true disabled=true
tool-tip-message="it is already stopped!"}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action start=true app=model.app application-id=application.id instance-id=model.instance.id request=app_request failure=app_failure message=message action="start_stop"}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action stop=true disabled=true
tool-tip-message="it is already stopped!"}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action withdraw=true app=model.app application-id=application.id instance-id=model.instance.id request=app_request failure=app_failure message=message action="withdraw"}}
......@@ -376,21 +376,19 @@
{{/if}}
{{else}}
<td>
{{#tool-tip}}
{{app-action stop=true disabled=true
{{#tool-tip}}
{{app-action start=true disabled=true
tool-tip-message=(concat "the lambda instance's status
is " (lower-case model.instance.status_message))}}
{{/tool-tip}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action start=true disabled=true
tool-tip-message=(concat "the lambda instance's status
{{app-action stop=true disabled=true
tool-tip-message=(concat "the lambda instance's status
is " (lower-case model.instance.status_message))}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{app-action withdraw=true disabled=true
......
......@@ -100,16 +100,7 @@
</tr>
</thead>
<tbody>
<!-- <tr>
<td>1</td>
<td>My Lambda Instance</td>
<td>
<a class="btn btn-social-icon btn-bitbucket" title="View Details" alt="View Details"><i class="fa fa-file-code-o"></i></a>
<a class="btn btn-social-icon btn-google" title="Delete" alt="Delete"><i class="fa fa-close"></i></a>
</td>
</tr> -->
{{#each pagedContent as |lambda-instance|}}
<tr>
<td>
......@@ -127,18 +118,17 @@
<a class="btn btn-info btn-xs" title="View Details" alt="View Details"><i class="fa fa-file-code-o"></i> Details</a>
{{/link-to}}
</td>
<td>
<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"}}
{{#tool-tip}}
{{instance-action start=true xs=true disabled=true status_message=lambda-instance.status_message}}
{{/tool-tip}}
</td>
{{#tool-tip}}
<td>
{{instance-action start=true xs=true disabled=true status_message=lambda-instance.status_message}}
{{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>
{{#link-to "deploy-app-2" lambda-instance.id}}
<button class="btn btn-primary btn-xs"
......@@ -148,14 +138,14 @@
{{/link-to}}
</td>
{{else if (compare lambda-instance.status_code '==' '1')}}
{{#tool-tip}}
<td>
{{instance-action stop=true xs=true disabled=true status_message=lambda-instance.status_message}}
</td>
{{/tool-tip}}
<td>
{{instance-action start=true xs=true instance=instance_action instance-id=lambda-instance.id failure=failure request=request message=message action="start_stop"}}
</td>
<td>
{{#tool-tip}}
{{instance-action stop=true xs=true disabled=true status_message=lambda-instance.status_message}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
<button class="btn btn-primary btn-xs disabled has-tooltip"
......@@ -168,13 +158,13 @@
</td>
{{else}}
<td>
{{#tool-tip}}
{{instance-action stop=true xs=true disabled=true status_message=lambda-instance.status_message}}
{{/tool-tip}}
{{#tool-tip}}
{{instance-action start=true xs=true disabled=true status_message=lambda-instance.status_message}}
{{/tool-tip}}
</td>
<td>
{{#tool-tip}}
{{instance-action start=true xs=true disabled=true status_message=lambda-instance.status_message}}
{{#tool-tip}}
{{instance-action stop=true xs=true disabled=true status_message=lambda-instance.status_message}}
{{/tool-tip}}
</td>
<td>
......@@ -188,6 +178,9 @@
{{/tool-tip}}
</td>
{{/if}}
<td>
<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>
</tbody>
</table>
</td>
......
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