Skip to content

Commit f70db21

Browse files
committed
Revert "Update overview quicklinks with community approved design"
Merged accidentally. Did not have proper +1s/+2s. The author will resubmit. Apologies for the noise. This reverts commit 256f5b9. Change-Id: I2cc7f48565221742245613aee383541152e71096 Signed-off-by: Gunnar Mills <[email protected]>
1 parent c4844b4 commit f70db21

File tree

2 files changed

+35
-84
lines changed

2 files changed

+35
-84
lines changed

src/views/Overview/Overview.vue

+5-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<template>
22
<b-container fluid>
33
<PageTitle />
4-
<div class="quicklinks-section">
5-
<OverviewQuickLinks />
6-
</div>
74
<b-row>
8-
<b-col>
9-
<PageSection sectionTitle="Server Information">
5+
<b-col lg="8" sm="12">
6+
<PageSection sectionTitle="Server information">
107
<b-row>
118
<b-col sm="6">
129
<dl>
@@ -79,6 +76,9 @@
7976
</b-row>
8077
</PageSection>
8178
</b-col>
79+
<b-col lg="4" sm="12">
80+
<OverviewQuickLinks />
81+
</b-col>
8282
</b-row>
8383
<PageSection sectionTitle="High priority events">
8484
<OverviewEvents />
@@ -127,10 +127,3 @@ export default {
127127
}
128128
};
129129
</script>
130-
131-
<style lang="scss" scoped>
132-
.quicklinks-section {
133-
margin-bottom: $spacer * 2;
134-
margin-left: -1rem;
135-
}
136-
</style>
+30-72
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,45 @@
11
<template>
2-
<div class="quicklinks">
3-
<div>
2+
<b-list-group>
3+
<!-- TODO: add event log priority events count -->
4+
<b-list-group-item>
45
<dl>
5-
<!-- TODO: display timezone -->
66
<dt>BMC time</dt>
7-
<dd>{{ bmcTime | date('DD MMM YYYY HH:MM:SS') }}</dd>
7+
<dd>{{ bmcTime | date('MMM, DD YYYY HH:MM:SS A ZZ') }}</dd>
88
</dl>
9-
</div>
10-
<div>
9+
</b-list-group-item>
10+
<b-list-group-item>
1111
<!-- TODO: add toggle LED on/off funtionality -->
12-
<dl>
13-
<dt>Server LED</dt>
14-
<dd>
15-
<b-form-checkbox
16-
v-model="serverLEDChecked"
17-
name="check-button"
18-
switch
19-
>
20-
<span v-if="!serverLEDChecked">On</span>
21-
<span v-else>Off</span>
22-
</b-form-checkbox>
23-
</dd>
24-
</dl>
25-
</div>
26-
<div>
27-
<!-- TODO: link to network settings -->
28-
<b-button
29-
href="#"
30-
variant="secondary"
31-
class="d-flex justify-content-between align-items-center"
32-
>
33-
<span>Edit network settings</span>
34-
<IconArrowRight />
35-
</b-button>
36-
</div>
37-
<div>
12+
<b-form-checkbox v-model="serverLedChecked" name="check-button" switch>
13+
Turn
14+
<span v-if="!serverLedChecked">on</span>
15+
<span v-else>off</span> server LED
16+
</b-form-checkbox>
17+
</b-list-group-item>
18+
<b-list-group-item
19+
href="#"
20+
class="d-flex justify-content-between align-items-center"
21+
>
3822
<!-- TODO: link to SOL -->
39-
<b-button
40-
href="#"
41-
variant="secondary"
42-
class="d-flex justify-content-between align-items-center"
43-
>
44-
<span>Serial over LAN console</span>
45-
<IconArrowRight />
46-
</b-button>
47-
</div>
48-
</div>
23+
<span>Serial over LAN console</span>
24+
<ChevronRight16 />
25+
</b-list-group-item>
26+
<b-list-group-item
27+
href="#"
28+
class="d-flex justify-content-between align-items-center"
29+
>
30+
<!-- TODO: link to network settings -->
31+
<span>Edit network settings</span>
32+
<ChevronRight16 />
33+
</b-list-group-item>
34+
</b-list-group>
4935
</template>
5036

5137
<script>
52-
import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16';
53-
38+
import ChevronRight16 from '@carbon/icons-vue/es/chevron--right/16';
5439
export default {
5540
name: 'quickLinks',
5641
components: {
57-
IconArrowRight: ArrowRight16
42+
ChevronRight16
5843
},
5944
created() {
6045
this.getBmcTime();
@@ -76,30 +61,3 @@ export default {
7661
}
7762
};
7863
</script>
79-
80-
<style lang="scss" scoped>
81-
dd,
82-
dl {
83-
margin: 0;
84-
}
85-
86-
.quicklinks {
87-
background: $white;
88-
display: grid;
89-
grid-gap: 1rem;
90-
padding: 1rem;
91-
white-space: nowrap;
92-
}
93-
94-
@media screen and (min-width: 600px) {
95-
.quicklinks {
96-
grid-template-columns: 1fr 1fr;
97-
}
98-
}
99-
100-
@media screen and (min-width: 1095px) {
101-
.quicklinks {
102-
grid-template-columns: 1fr 1fr 1fr 1fr;
103-
}
104-
}
105-
</style>

0 commit comments

Comments
 (0)