Skip to content

K
k3s
Commit c4b20672 authored by Brian Grant's avatar Brian Grant
Browse files
Options

Merge pull request #8302 from bcbroussard/web-ui-links

Fix misdirected links in Web UI from pod conversion
parents 9df413e0 78936435
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
pkg/ui/datafile.go
View file @ c4b20672
This source diff could not be displayed because it is too large. You can view the blob instead.
www/app/components/dashboard/views/listPodsCards.html
View file @ c4b20672
......@@ -43,7 +43,7 @@
<md-grid-tile-footer>
<div class="pod-host">{{pod.currentState.host}}</div>
<div><a ng-href="/#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
<div><a ng-href="#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
</md-grid-tile-footer>
</md-grid-tile>
......
www/app/components/dashboard/views/listPodsVisualizer.html
View file @ c4b20672
......@@ -6,7 +6,7 @@
<div>
<md-button class="md-primary" ng-click="serverView = false">By Name</md-button> |
<md-button class="md-primary" ng-click="serverView = true">By Server</md-button>
<div style="float:right;"><md-button class="md-primary" ng-href="/#/dashboard/pods">View Pod Listing</md-button></div>
<div style="float:right;"><md-button class="md-primary" ng-href="#/dashboard/pods">View Pod Listing</md-button></div>
</div>
<div class="pod-group" ng-show="!serverView" ng-include="'components/dashboard/views/partials/podTilesByName.html'"></div>
<div class="pod-group" ng-show="serverView" ng-include="'components/dashboard/views/partials/podTilesByServer.html'"></div>
......
www/app/components/dashboard/views/partials/groupItem.html
View file @ c4b20672
......@@ -18,9 +18,9 @@
<!-- title -->
<div ng-switch on='item.labels["type"]'>
<div class="group-name">
<a ng-switch-when='pod' ng-href="/#/dashboard/pods/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='service' ng-href="/#/dashboard/services/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='replicationController' ng-href="/#/dashboard/replicationcontrollers/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='pod' ng-href="#/dashboard/pods/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='service' ng-href="#/dashboard/services/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='replicationController' ng-href="#/dashboard/replicationcontrollers/{{ item.id }}">{{ item.id }}</a>
<div ng-switch-default>{{item.id}}</div>
</div>
</div>
......
www/app/components/dashboard/views/partials/podTilesByName.html
View file @ c4b20672
......@@ -27,7 +27,7 @@
<md-grid-tile-footer>
<div class="pod-host">{{pod.currentState.host}}</div>
<div><a ng-href="/#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
<div><a ng-href="#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
</md-grid-tile-footer>
</md-grid-tile>
......
www/app/components/dashboard/views/partials/podTilesByServer.html
View file @ c4b20672
......@@ -26,7 +26,7 @@
<md-grid-tile-footer>
<div class="pod-host">{{pod.labels.name}}</div>
<div><a ng-href="/#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
<div><a ng-href="#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
</md-grid-tile-footer>
</md-grid-tile>
......
www/app/components/dashboard/views/pod.html
View file @ c4b20672
......@@ -21,7 +21,7 @@
<tr>
<td class="name">Status</td>
<td class="value">
{{pod.currentState.status}} on <a ng-href="/#/dashboard/groups/host/selector/host={{pod.currentState.host}}">{{pod.currentState.host}}</a>
{{pod.currentState.status}} on <a ng-href="#/dashboard/groups/host/selector/host={{pod.currentState.host}}">{{pod.currentState.host}}</a>
</td>
</tr>
......
www/app/components/dashboard/views/replication.html
View file @ c4b20672
......@@ -5,7 +5,7 @@
<div class="detail">
<div class="back">
<md-button class="md-default-theme" ng-href="/#/dashboard/replicationcontrollers">‹ BACK</md-button>
<md-button class="md-default-theme" ng-href="#/dashboard/replicationcontrollers">‹ BACK</md-button>
</div>
<div class="heading">
......@@ -50,7 +50,7 @@
<td class="name">Related Pods</td>
<td class="value">
<div ng-repeat="(label, value) in replicationController.desiredState.replicaSelector">
<a ng-href="/#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
</div>
</td>
</tr>
......@@ -60,7 +60,7 @@
<td class="name">Related Services</td>
<td class="value">
<div ng-repeat="(label, value) in replicationController.desiredState.replicaSelector">
<a ng-href="/#/dashboard/groups/type/selector/{{label}}={{value}},type=service">{{label}}: {{value}}</a>
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=service">{{label}}: {{value}}</a>
</div>
</td>
</tr>
......
www/app/components/dashboard/views/service.html
View file @ c4b20672
......@@ -5,7 +5,7 @@
<div class="detail">
<div class="back">
<md-button class="md-default-theme" ng-href="/#/dashboard/services">‹ BACK</md-button>
<md-button class="md-default-theme" ng-href="#/dashboard/services">‹ BACK</md-button>
</div>
<div class="heading">
......@@ -71,7 +71,7 @@
<td class="name">Related Pods</td>
<td class="value">
<div ng-repeat="(label, value) in service.selector">
<a ng-href="/#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
</div>
</td>
</tr>
......@@ -80,7 +80,7 @@
<td class="name">Related Replication Controllers</td>
<td class="value">
<div ng-repeat="(label, value) in service.selector">
<a ng-href="/#/dashboard/groups/type/selector/{{label}}={{value}},type=replicationController">{{label}}: {{value}}</a>
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=replicationController">{{label}}: {{value}}</a>
</div>
</td>
</tr>
......
www/app/index.html
View file @ c4b20672
......@@ -19,7 +19,7 @@
md-closed>
<md-toolbar>
<h1 class="md-toolbar-tools">
<a ng-href="/" layout="row" flex>
<a ng-href="#/dashboard" layout="row" flex>
<span class="kubernetes-ui-logo"></span>
<div style="line-height:40px; text-indent: 15px;">Kubernetes</div>
</a>
......@@ -34,7 +34,7 @@
<md-toolbar>
<div class="md-toolbar-tools">
<h1 class="md-toolbar-tools">
<a ng-href="/" layout="row" flex>
<a ng-href="#/dashboard" layout="row" flex>
<span class="kubernetes-ui-logo"></span>
<div style="line-height:40px; text-indent: 15px;">Kubernetes</div>
</a>
......
www/master/components/dashboard/views/listPodsCards.html
View file @ c4b20672
......@@ -43,7 +43,7 @@
<md-grid-tile-footer>
<div class="pod-host">{{pod.currentState.host}}</div>
<div><a ng-href="/#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
<div><a ng-href="#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
</md-grid-tile-footer>
</md-grid-tile>
......
www/master/components/dashboard/views/listPodsVisualizer.html
View file @ c4b20672
......@@ -6,7 +6,7 @@
<div>
<md-button class="md-primary" ng-click="serverView = false">By Name</md-button> |
<md-button class="md-primary" ng-click="serverView = true">By Server</md-button>
<div style="float:right;"><md-button class="md-primary" ng-href="/#/dashboard/pods">View Pod Listing</md-button></div>
<div style="float:right;"><md-button class="md-primary" ng-href="#/dashboard/pods">View Pod Listing</md-button></div>
</div>
<div class="pod-group" ng-show="!serverView" ng-include="'components/dashboard/views/partials/podTilesByName.html'"></div>
<div class="pod-group" ng-show="serverView" ng-include="'components/dashboard/views/partials/podTilesByServer.html'"></div>
......
www/master/components/dashboard/views/partials/groupItem.html
View file @ c4b20672
......@@ -18,9 +18,9 @@
<!-- title -->
<div ng-switch on='item.labels["type"]'>
<div class="group-name">
<a ng-switch-when='pod' ng-href="/#/dashboard/pods/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='service' ng-href="/#/dashboard/services/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='replicationController' ng-href="/#/dashboard/replicationcontrollers/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='pod' ng-href="#/dashboard/pods/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='service' ng-href="#/dashboard/services/{{ item.id }}">{{ item.id }}</a>
<a ng-switch-when='replicationController' ng-href="#/dashboard/replicationcontrollers/{{ item.id }}">{{ item.id }}</a>
<div ng-switch-default>{{item.id}}</div>
</div>
</div>
......
www/master/components/dashboard/views/partials/podTilesByName.html
View file @ c4b20672
......@@ -27,7 +27,7 @@
<md-grid-tile-footer>
<div class="pod-host">{{pod.currentState.host}}</div>
<div><a ng-href="/#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
<div><a ng-href="#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
</md-grid-tile-footer>
</md-grid-tile>
......
www/master/components/dashboard/views/partials/podTilesByServer.html
View file @ c4b20672
......@@ -26,7 +26,7 @@
<md-grid-tile-footer>
<div class="pod-host">{{pod.labels.name}}</div>
<div><a ng-href="/#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
<div><a ng-href="#/dashboard/pods/{{ pod.id }}"><h3>{{ pod.id }}</h3></a></div>
</md-grid-tile-footer>
</md-grid-tile>
......
www/master/components/dashboard/views/pod.html
View file @ c4b20672
......@@ -21,7 +21,7 @@
<tr>
<td class="name">Status</td>
<td class="value">
{{pod.currentState.status}} on <a ng-href="/#/dashboard/groups/host/selector/host={{pod.currentState.host}}">{{pod.currentState.host}}</a>
{{pod.currentState.status}} on <a ng-href="#/dashboard/groups/host/selector/host={{pod.currentState.host}}">{{pod.currentState.host}}</a>
</td>
</tr>
......
www/master/components/dashboard/views/replication.html
View file @ c4b20672
......@@ -5,7 +5,7 @@
<div class="detail">
<div class="back">
<md-button class="md-default-theme" ng-href="/#/dashboard/replicationcontrollers">‹ BACK</md-button>
<md-button class="md-default-theme" ng-href="#/dashboard/replicationcontrollers">‹ BACK</md-button>
</div>
<div class="heading">
......@@ -50,7 +50,7 @@
<td class="name">Related Pods</td>
<td class="value">
<div ng-repeat="(label, value) in replicationController.desiredState.replicaSelector">
<a ng-href="/#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
</div>
</td>
</tr>
......@@ -60,7 +60,7 @@
<td class="name">Related Services</td>
<td class="value">
<div ng-repeat="(label, value) in replicationController.desiredState.replicaSelector">
<a ng-href="/#/dashboard/groups/type/selector/{{label}}={{value}},type=service">{{label}}: {{value}}</a>
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=service">{{label}}: {{value}}</a>
</div>
</td>
</tr>
......
www/master/components/dashboard/views/service.html
View file @ c4b20672
......@@ -5,7 +5,7 @@
<div class="detail">
<div class="back">
<md-button class="md-default-theme" ng-href="/#/dashboard/services">‹ BACK</md-button>
<md-button class="md-default-theme" ng-href="#/dashboard/services">‹ BACK</md-button>
</div>
<div class="heading">
......@@ -71,7 +71,7 @@
<td class="name">Related Pods</td>
<td class="value">
<div ng-repeat="(label, value) in service.selector">
<a ng-href="/#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=pod">{{label}}: {{value}}</a>
</div>
</td>
</tr>
......@@ -80,7 +80,7 @@
<td class="name">Related Replication Controllers</td>
<td class="value">
<div ng-repeat="(label, value) in service.selector">
<a ng-href="/#/dashboard/groups/type/selector/{{label}}={{value}},type=replicationController">{{label}}: {{value}}</a>
<a ng-href="#/dashboard/groups/type/selector/{{label}}={{value}},type=replicationController">{{label}}: {{value}}</a>
</div>
</td>
</tr>
......
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