github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

feat(storidge): update 8 - UI refactors + cluster availability

storidge-standalone
baron_l 2019-04-27 13:16:56 +02:00
parent 83868a63d3
commit 2bc8b6bed1
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html
View File

@ -61,6 +61,13 @@
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Status' && $ctrl.state.reverseOrder"></i> <i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Status' && $ctrl.state.reverseOrder"></i>
</a> </a>
</th> </th>
<th>
<a ng-click="$ctrl.changeOrderBy('Availability')">
Availability
<i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Availability' && !$ctrl.state.reverseOrder"></i>
<i class="fa fa-sort-alpha-up" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'Availability' && $ctrl.state.reverseOrder"></i>
</a>
</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -74,6 +81,10 @@
<i class="fa fa-heartbeat space-right {{ item.Status | storidgeNodeStatusBadge }}"></i> <i class="fa fa-heartbeat space-right {{ item.Status | storidgeNodeStatusBadge }}"></i>
{{ item.Status }} {{ item.Status }}
</td> </td>
<td>
<!-- <i class="fa fa-heartbeat space-right {{ item.Availability | storidgeNodeStatusBadge }}"></i> -->
{{ item.Availability }}
</td>
</tr> </tr>
<tr ng-if="!$ctrl.dataset"> <tr ng-if="!$ctrl.dataset">
<td colspan="4" class="text-center text-muted">Loading...</td> <td colspan="4" class="text-center text-muted">Loading...</td>

1
app/extensions/storidge/models/node.js
View File

@ -3,6 +3,7 @@ export function StoridgeNodeModel(name, data) {
this.IP = data.ip; this.IP = data.ip;
this.Role = data.role; this.Role = data.role;
this.Status = data.status; this.Status = data.status;
this.Availability = data.availability;
} }
export function StoridgeNodeDetailedModel(name, properties) { export function StoridgeNodeDetailedModel(name, properties) {

2
app/extensions/storidge/views/nodes/inspect/node.html
View File

@ -46,7 +46,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Cluster condition</td> <td>Operating condition</td>
<td> <td>
<i class="fa fa-heartbeat space-right {{ node.Condition | storidgeClusterConditionBadge }}"></i> <i class="fa fa-heartbeat space-right {{ node.Condition | storidgeClusterConditionBadge }}"></i>
{{ node.Condition }} {{ node.Condition }}

2
app/portainer/views/sidebar/sidebar.html
View File

@ -25,7 +25,7 @@
offline-mode="endpointState.OfflineMode" offline-mode="endpointState.OfflineMode"
></docker-sidebar-content> ></docker-sidebar-content>
<li class="sidebar-title" ng-if="applicationState.endpoint.mode && applicationState.endpoint.extensions.length > 0"> <li class="sidebar-title" ng-if="applicationState.endpoint.mode && applicationState.endpoint.extensions.length > 0">
<span>Extensions</span> <span>Integrations</span>
</li> </li>
<li class="sidebar-list" ng-if="applicationState.endpoint.mode && applicationState.endpoint.extensions.indexOf('storidge') !== -1 && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && applicationState.endpoint.mode.role === 'MANAGER'"> <li class="sidebar-list" ng-if="applicationState.endpoint.mode && applicationState.endpoint.extensions.indexOf('storidge') !== -1 && applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && applicationState.endpoint.mode.role === 'MANAGER'">
<a ui-sref="storidge.cluster" ui-sref-active="active">Storidge <span class="menu-icon fa fa-bolt fa-fw"></span></a> <a ui-sref="storidge.cluster" ui-sref-active="active">Storidge <span class="menu-icon fa fa-bolt fa-fw"></span></a>