Skip to content

Commit bdb5bfb

Browse files
committed
properly support smaller buttons
1 parent ccea6c6 commit bdb5bfb

File tree

16 files changed

+29
-33
lines changed

16 files changed

+29
-33
lines changed

saltgui/static/scripts/DropDown.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class DropDownMenu {
2222

2323
// Creates an empty dropdown menu
2424
// The visual clue for the menu is added to the given element
25-
constructor (pParentElement) {
25+
constructor (pParentElement, pIsSmall) {
2626

2727
// allow reduced code on the caller side
2828
if (pParentElement.tagName === "TR") {
@@ -43,6 +43,9 @@ export class DropDownMenu {
4343
this.menuButton = Utils.createDiv("", Character.CH_HAMBURGER);
4444
}
4545
this.menuButton.classList.add("small-button");
46+
if (pIsSmall) {
47+
this.menuButton.classList.add("small-small-button");
48+
}
4649
this.menuButton.classList.add("small-button-for-hover");
4750
this.menuButton.classList.add("menu-dropdown");
4851
this.menuButton.addEventListener("click", (pClickEvent) => {

saltgui/static/scripts/Utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ export class Utils {
203203

204204
const menuAndFieldDiv = Utils.createDiv("search-menu-and-field", "");
205205

206-
const searchOptionsMenu = new DropDownMenu(menuAndFieldDiv);
206+
const searchOptionsMenu = new DropDownMenu(menuAndFieldDiv, true);
207207

208208
const input = document.createElement("input");
209209
input.type = "text";

saltgui/static/scripts/panels/Beacons.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export class BeaconsPanel extends Panel {
9292

9393
// preliminary dropdown menu
9494
const minionTr = this.table.querySelector("#" + Utils.getIdFromMinionId(minionId));
95-
const menu = new DropDownMenu(minionTr);
95+
const menu = new DropDownMenu(minionTr, true);
9696
this._addMenuItemShowBeacons(menu, minionId);
9797

9898
minionTr.addEventListener("click", () => {
@@ -141,7 +141,7 @@ export class BeaconsPanel extends Panel {
141141
minionTr.appendChild(beaconInfoTd);
142142
}
143143

144-
const menu = new DropDownMenu(minionTr);
144+
const menu = new DropDownMenu(minionTr, true);
145145
this._addMenuItemShowBeacons(menu, pMinionId);
146146
}
147147

saltgui/static/scripts/panels/BeaconsMinion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export class BeaconsMinionPanel extends Panel {
145145
delete beacon.enabled;
146146
}
147147

148-
const beaconMenu = new DropDownMenu(tr);
148+
const beaconMenu = new DropDownMenu(tr, true);
149149
this._addMenuItemBeaconsDisableBeaconWhenNeeded(beaconMenu, pMinionId, beaconName, beacon);
150150
this._addMenuItemBeaconsEnableBeaconWhenNeeded(beaconMenu, pMinionId, beaconName, beacon);
151151
this._addMenuItemBeaconsDelete(beaconMenu, pMinionId, beaconName);

saltgui/static/scripts/panels/Grains.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ export class GrainsPanel extends Panel {
7979

8080
// preliminary dropdown menu
8181
const minionTr = this.table.querySelector("#" + Utils.getIdFromMinionId(minionId));
82-
const menu = new DropDownMenu(minionTr);
82+
const menu = new DropDownMenu(minionTr, true);
8383
this._addMenuItemShowGrains(menu, minionId);
8484

8585
for (let i = 0; i < this.previewGrains.length; i++) {
@@ -130,7 +130,7 @@ export class GrainsPanel extends Panel {
130130
minionTr.appendChild(grainInfoTd);
131131
}
132132

133-
const menu = new DropDownMenu(minionTr);
133+
const menu = new DropDownMenu(minionTr, true);
134134
this._addMenuItemShowGrains(menu, pMinionId);
135135

136136
// add the preview columns

saltgui/static/scripts/panels/GrainsMinion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export class GrainsMinionPanel extends Panel {
6464

6565
const grainValue = Output.formatObject(grains[grainName]);
6666

67-
const grainMenu = new DropDownMenu(grainTr);
67+
const grainMenu = new DropDownMenu(grainTr, true);
6868
this._addMenuItemGrainsSetValUpdate(grainMenu, pMinionId, grainName, grains);
6969
this._addMenuItemGrainsAppendWhenNeeded(grainMenu, pMinionId, grainName, grainValue);
7070
this._addMenuItemGrainsDelKey(grainMenu, pMinionId, grainName, grains[grainName]);

saltgui/static/scripts/panels/Job.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ export class JobPanel extends Panel {
460460
// show that this minion is still active on the request
461461
noResponseSpan.innerText = "(active) ";
462462

463-
const menu = new DropDownMenu(noResponseSpan);
463+
const menu = new DropDownMenu(noResponseSpan, true);
464464
menu.addMenuItem("Show process info...", (pClickEvent) => {
465465
this.runFullCommand(pClickEvent, "list", minionId, "ps.proc_info " + pid);
466466
});

saltgui/static/scripts/panels/JobsDetails.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ export class JobsDetailsPanel extends JobsPanel {
308308
const startTimeText = Output.dateTimeStr(job.StartTime);
309309
tr.appendChild(Utils.createTd("starttime", startTimeText));
310310

311-
const menu = new DropDownMenu(tr);
311+
const menu = new DropDownMenu(tr, true);
312312
this._addJobsMenuItemShowDetails(menu, job);
313313
this._addMenuItemJobsRerunJob(menu, job, argumentsText);
314314

saltgui/static/scripts/panels/JobsSummary.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export class JobsSummaryPanel extends JobsPanel {
6060

6161
tr.appendChild(td);
6262

63-
const menu = new DropDownMenu(tr);
63+
const menu = new DropDownMenu(tr, true);
6464
this._addMenuItemShowDetails(menu, job);
6565
this._addMenuItemUpdateStatus(menu, statusSpan);
6666

saltgui/static/scripts/panels/Keys.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ export class KeysPanel extends Panel {
379379

380380
_addDropDownMenu (pMinionTr, pMinionId) {
381381
// final dropdownmenu
382-
const menu = new DropDownMenu(pMinionTr);
382+
const menu = new DropDownMenu(pMinionTr, true);
383383
this._addMenuItemWheelKeyAccept1(menu, pMinionId, pMinionTr);
384384
this._addMenuItemWheelKeyReject(menu, pMinionId, pMinionTr);
385385
this._addMenuItemWheelKeyDelete(menu, pMinionId, pMinionTr);

0 commit comments

Comments
 (0)