Skip to content

Commit fd7d010

Browse files
jhuckabyjhuckaby
committed
Server List: Add architecture as sortable column.
1 parent 0e69ca9 commit fd7d010

2 files changed

Lines changed: 20 additions & 13 deletions

File tree

‎htdocs/css/responsive.css‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@
9393
.data_grid.group_grid { grid-template-columns: min-content auto 0px auto auto auto auto auto !important; }
9494
.data_grid.group_grid > ul > div:nth-child(3) { visibility: hidden; }
9595

96-
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
97-
.data_grid.server_grid { grid-template-columns: auto auto auto auto auto auto 0px 0px auto auto !important; }
98-
.data_grid.server_grid > ul > div:nth-child(7) { visibility: hidden; }
96+
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'Arch', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
97+
.data_grid.server_grid { grid-template-columns: auto auto auto auto auto auto auto 0px 0px auto auto !important; }
9998
.data_grid.server_grid > ul > div:nth-child(8) { visibility: hidden; }
99+
.data_grid.server_grid > ul > div:nth-child(9) { visibility: hidden; }
100100
}
101101

102102
@media only screen and (min-width: 1025px) and (max-width: 1280px) {
@@ -317,11 +317,12 @@
317317
.data_grid.job_history_grid { grid-template-columns: auto auto auto auto 0px auto auto !important; }
318318
.data_grid.job_history_grid > ul > div:nth-child(5) { visibility: hidden; }
319319

320-
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
321-
.data_grid.server_grid { grid-template-columns: auto auto auto auto auto 0px 0px 0px auto auto !important; }
320+
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'Arch', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
321+
.data_grid.server_grid { grid-template-columns: auto auto auto auto auto 0px 0px 0px 0px auto auto !important; }
322322
.data_grid.server_grid > ul > div:nth-child(6) { visibility: hidden; }
323323
.data_grid.server_grid > ul > div:nth-child(7) { visibility: hidden; }
324324
.data_grid.server_grid > ul > div:nth-child(8) { visibility: hidden; }
325+
.data_grid.server_grid > ul > div:nth-child(9) { visibility: hidden; }
325326

326327
/* 'Hostname', 'IP Address', 'Group', '# CPUs', 'RAM', 'OS', 'Created', 'Modified' */
327328
.data_grid.server_search_grid { grid-template-columns: auto auto auto auto auto 0px auto auto !important; }
@@ -748,13 +749,14 @@
748749
.data_grid.job_history_grid > ul > div:nth-child(4) { visibility: hidden; }
749750
.data_grid.job_history_grid > ul > div:nth-child(5) { visibility: hidden; }
750751

751-
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
752-
.data_grid.server_grid { grid-template-columns: auto auto auto 0px 0px 0px 0px 0px auto auto !important; }
752+
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'Arch', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
753+
.data_grid.server_grid { grid-template-columns: auto auto auto 0px 0px 0px 0px 0px 0px auto auto !important; }
753754
.data_grid.server_grid > ul > div:nth-child(4) { visibility: hidden; }
754755
.data_grid.server_grid > ul > div:nth-child(5) { visibility: hidden; }
755756
.data_grid.server_grid > ul > div:nth-child(6) { visibility: hidden; }
756757
.data_grid.server_grid > ul > div:nth-child(7) { visibility: hidden; }
757758
.data_grid.server_grid > ul > div:nth-child(8) { visibility: hidden; }
759+
.data_grid.server_grid > ul > div:nth-child(9) { visibility: hidden; }
758760

759761
/* 'Hostname', 'IP Address', 'Group', '# CPUs', 'RAM', 'OS', 'Created', 'Modified' */
760762
.data_grid.server_search_grid { grid-template-columns: auto auto auto 0px 0px 0px auto auto !important; }
@@ -1336,13 +1338,15 @@
13361338
.data_grid.job_history_grid > ul > div:nth-child(5) { visibility: hidden; }
13371339
.data_grid.job_history_grid > ul > div:nth-child(6) { visibility: hidden; }
13381340

1339-
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
1340-
.data_grid.server_grid { grid-template-columns: auto auto auto 0px 0px 0px 0px 0px auto auto !important; }
1341+
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'Arch', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
1342+
.data_grid.server_grid { grid-template-columns: auto auto 0px 0px 0px 0px 0px 0px 0px auto auto !important; }
1343+
.data_grid.server_grid > ul > div:nth-child(3) { visibility: hidden; }
13411344
.data_grid.server_grid > ul > div:nth-child(4) { visibility: hidden; }
13421345
.data_grid.server_grid > ul > div:nth-child(5) { visibility: hidden; }
13431346
.data_grid.server_grid > ul > div:nth-child(6) { visibility: hidden; }
13441347
.data_grid.server_grid > ul > div:nth-child(7) { visibility: hidden; }
13451348
.data_grid.server_grid > ul > div:nth-child(8) { visibility: hidden; }
1349+
.data_grid.server_grid > ul > div:nth-child(9) { visibility: hidden; }
13461350

13471351
/* 'Hostname', 'IP Address', 'Group', '# CPUs', 'RAM', 'OS', 'Created', 'Modified' */
13481352
.data_grid.server_search_grid { grid-template-columns: auto auto auto 0px 0px 0px 0px 0px !important; }
@@ -1823,8 +1827,8 @@
18231827
.data_grid.job_history_grid > ul > div:nth-child(5) { visibility: hidden; }
18241828
.data_grid.job_history_grid > ul > div:nth-child(6) { visibility: hidden; }
18251829

1826-
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
1827-
.data_grid.server_grid { grid-template-columns: auto auto 0px 0px 0px 0px 0px 0px 0px 0px !important; }
1830+
/* 'Server', 'IP Address', 'Groups', '# CPUs', 'RAM', 'Arch', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts' */
1831+
.data_grid.server_grid { grid-template-columns: auto auto 0px 0px 0px 0px 0px 0px 0px 0px 0px !important; }
18281832
.data_grid.server_grid > ul > div:nth-child(3) { visibility: hidden; }
18291833
.data_grid.server_grid > ul > div:nth-child(4) { visibility: hidden; }
18301834
.data_grid.server_grid > ul > div:nth-child(5) { visibility: hidden; }
@@ -1833,6 +1837,7 @@
18331837
.data_grid.server_grid > ul > div:nth-child(8) { visibility: hidden; }
18341838
.data_grid.server_grid > ul > div:nth-child(9) { visibility: hidden; }
18351839
.data_grid.server_grid > ul > div:nth-child(10) { visibility: hidden; }
1840+
.data_grid.server_grid > ul > div:nth-child(11) { visibility: hidden; }
18361841

18371842
/* 'Hostname', 'IP Address', 'Group', '# CPUs', 'RAM', 'OS', 'Created', 'Modified' */
18381843
.data_grid.server_search_grid { grid-template-columns: auto auto 0px 0px 0px 0px 0px 0px !important; }

‎htdocs/js/pages/Servers.class.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ Page.Servers = class Servers extends Page.ServerUtils {
128128
mem_total: item.info.memory.total || 0,
129129
os: item.info.os,
130130
os_label: item.info.os.distro + ' ' + item.info.os.release, // for sorting
131+
arch_label: item.info.arch, // for sorting
131132
sat_ver: get_int_version( item.info.satellite || '0.0.0' ),
132133
uptime: item.info.booted ? (now - item.info.booted) : 0,
133134
num_jobs: find_objects( app.activeJobs, { server: item.id } ).length,
@@ -142,8 +143,8 @@ Page.Servers = class Servers extends Page.ServerUtils {
142143
sort_by: 'label',
143144
sort_dir: 1,
144145
filter: this.isRowVisible.bind(this),
145-
column_ids: ['label', 'ip', 'grp_labels', 'cpu_cores', 'mem_total', 'os_label', 'sat_ver', 'uptime', 'num_jobs', 'num_alerts' ],
146-
column_labels: ['Label', 'IP Address', 'Groups', '# CPUs', 'RAM', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts']
146+
column_ids: ['label', 'ip', 'grp_labels', 'cpu_cores', 'mem_total', 'arch_label', 'os_label', 'sat_ver', 'uptime', 'num_jobs', 'num_alerts' ],
147+
column_labels: ['Label', 'IP Address', 'Groups', '# CPUs', 'RAM', 'Arch', 'OS', 'xySat', 'Uptime', '# Jobs', '# Alerts']
147148
};
148149

149150
html += '<div class="box">';
@@ -181,6 +182,7 @@ Page.Servers = class Servers extends Page.ServerUtils {
181182
self.getNiceGroupList(item.groups),
182183
'<i class="mdi mdi-chip">&nbsp;</i>' + (item.info.cpu.cores || 0),
183184
'<i class="mdi mdi-memory">&nbsp;</i>' + get_text_from_bytes(item.info.memory.total || 0),
185+
self.getNiceArch(item.info.arch),
184186
self.getNiceShortOS(item.info.os),
185187
'<i class="mdi mdi-tag-text-outline">&nbsp;</i>v' + (item.info.satellite || '0.0.0'),
186188
item.info.booted ? self.getNiceUptime( now - item.info.booted ) : 'n/a',

0 commit comments

Comments
 (0)