diff --git a/app/src/App.css b/app/src/App.css
index eb5ae988..a72f0a58 100644
--- a/app/src/App.css
+++ b/app/src/App.css
@@ -337,30 +337,13 @@ textarea.otp {
}
/*
- * A table that truncates to the width it has, rather than growing past it.
+ * A table that truncates to the width it has rather than growing past it: the columns divide
+ * the table's width, and `column-ellipsis` gives up what it cannot show. A column that must
+ * fit something exact states a width on its header cell; the rest is the ellipsis column's.
*
- * `table-layout: fixed` is what makes the truncation possible at all. Under the default
- * `auto` layout a table is as wide as its columns want to be and the container simply
- * overflows -- on a 540px phone the downloads tables came out 676px and 727px, so Completed
- * At and Control sat off the right edge and the buttons could not be reached without
- * scrolling sideways. Fixed layout inverts that: the columns get the table's width divided
- * between them, and the one marked `column-ellipsis` gives up what it cannot show.
- *
- * The old rule tried to do this with `max-width: 0` and `min-width: 25em`. The max-width was
- * the usual trick for forcing an ellipsis under `auto` layout; the min-width was there so the
- * text column stayed readable -- but 25em is 385px, and a floor wider than the screen is what
- * made the overflow certain. Under fixed layout neither is needed: the column width comes
- * from the header, and every other column is sized to its content so the ellipsis column
- * keeps the remainder.
- *
- * Columns that must fit something exact -- a checkbox, a group of buttons -- state a width on
- * their header cell. Any column that does not is sized by what is left over.
- */
-/*
- * `table.` rather than the class alone: Mantine sets `table-layout` on its own
- * `.mantine-Table-table`, which is the same specificity and comes later in the cascade, so
- * the bare class silently lost and the table stayed `auto` -- with every other property here
- * applying, which made it look like the rule had worked.
+ * `table.`, not the bare class: Mantine sets `table-layout` on its own `.mantine-Table-table`
+ * at the same specificity and later in the cascade, so the bare class loses -- silently, with
+ * every other property here still applying.
*/
table.table-ellipsis {
width: 100%;
@@ -374,38 +357,94 @@ table.table-ellipsis {
}
/*
- * The one column width that has to change with the screen.
+ * Column widths for the downloads tables. Phone first, and the phone is 375px: below the
+ * breakpoint each column is cut to what it must hold -- its header's longest word, the label
+ * wrapping, or its buttons -- and the URL takes what is left, which is little. Above it the
+ * labels get their own line back and the URL gets the rest.
*
- * Most headers here are sized to hold their own label on one line at any width -- a wrapped
- * label is a fallback, not a layout. "Download Frequency" is the exception: 11.7em on one
- * line, which a phone cannot spare when four other columns need room, and it is one of five
- * columns rather than one of four. So it wraps below the tablet breakpoint and gets its line
- * back above it, where the width costs nothing.
- *
- * 700px is the app's `tablet` breakpoint (see `AppMedia` in contexts.js).
+ * 700px is the app's `tablet` breakpoint (`AppMedia` in contexts.js). `em` here is the
+ * table's own font (~15.4px), not the root's.
*/
+/*
+ * A header too long for a phone carries both forms and shows one. The short word is what the
+ * mobile column widths below are sized for; the full words return at the breakpoint.
+ */
+.table-ellipsis th .label-long {
+ display: none;
+}
+
+@media (min-width: 700px) {
+ .table-ellipsis th .label-long {
+ display: inline;
+ }
+
+ .table-ellipsis th .label-short {
+ display: none;
+ }
+}
+
+.table-ellipsis th.col-select {
+ /* 22px of checkbox plus 11px of cell padding either side. */
+ width: 3em;
+}
+
.table-ellipsis th.col-frequency {
- width: 7em;
+ width: 4.2em;
+}
+
+.table-ellipsis th.col-completed {
+ width: 5.5em;
+}
+
+.table-ellipsis th.col-completed-plain {
+ width: 4.2em;
+}
+
+.table-ellipsis th.col-next {
+ width: 3.9em;
+}
+
+/* A `ButtonGroup` cannot wrap -- its buttons are joined -- so this holds all three of them
+ (delete, edit, retry on a failed download) at every width. */
+.table-ellipsis th.col-control-group {
+ width: 9.5em;
+}
+
+/* A `.wrolpi-button-row` wraps, so on a phone this holds one button and the second drops
+ beneath it. It is sized by the word "Control" rather than by the button, which is wider. */
+.table-ellipsis th.col-control-row {
+ width: 5.2em;
}
@media (min-width: 700px) {
.table-ellipsis th.col-frequency {
width: 12em;
}
+
+ .table-ellipsis th.col-completed {
+ width: 9.5em;
+ }
+
+ .table-ellipsis th.col-completed-plain {
+ width: 8.5em;
+ }
+
+ .table-ellipsis th.col-next {
+ width: 4em;
+ }
+
+ .table-ellipsis th.col-control-row {
+ width: 7.5em;
+ }
}
/*
- * A header wraps instead of running into the next column.
+ * A header wraps instead of running into the next column: `.wrolpi-th-sort` is nowrap, which a
+ * fixed column cannot widen for, so a long label printed over its neighbour.
*
- * `.wrolpi-th-sort` is `white-space: nowrap` so a sortable label never splits from its arrow.
- * That is right under `auto` layout, where the column widens to fit; under fixed layout the
- * column does not widen, so "Completed At" overran its cell and printed on top of "Control".
- * Wrapping to two lines is the only thing a fixed column can do with a label too long for it.
- *
- * `min-width: 0` as well as the wrap: the button is a flex container, and its text is an
- * anonymous flex item whose automatic minimum is its longest word. Without this the label
- * still refuses to go below "Completed" and still overruns. A column narrower than its
- * longest word is a width to fix at the call site, not something CSS can hide.
+ * `min-width: 0` as well as the wrap -- the label is an anonymous flex item whose automatic
+ * minimum is its longest word, and without this it still refuses to go below that word. A
+ * column narrower than its longest word is a width to fix at the call site.
*/
.table-ellipsis th .wrolpi-th-sort {
display: flex;
@@ -415,13 +454,15 @@ table.table-ellipsis {
}
/*
- * Grouped buttons keep their size in a fixed column.
- *
- * `ButtonGroup` is a nowrap flex row whose children may shrink, and in a column too narrow
- * for them they did: the Stop button on a pending download was squeezed to 23px against its
- * neighbour's 40px, a target too small to hit and visibly clipped. The column is sized for
- * the widest group it has to hold (three buttons), so the buttons themselves should not give.
+ * A header is clipped rather than painted over its neighbour. Wrapping cannot save a
+ * single-word label in the elastic column, which may be narrower than the word itself.
*/
+.table-ellipsis th {
+ overflow: hidden;
+}
+
+/* `ButtonGroup` is a nowrap flex row whose children shrink; `col-control-group` is sized for
+ the whole group, so the buttons in it must not. */
.table-ellipsis td .mantine-ButtonGroup-group > * {
flex-shrink: 0;
}
diff --git a/app/src/Tags.js b/app/src/Tags.js
index abcd0517..5ebc6d1f 100644
--- a/app/src/Tags.js
+++ b/app/src/Tags.js
@@ -337,19 +337,19 @@ function EditTagsModal() {
}
const tableHeaders = [
- {key: 'delete', text: 'Delete', sortBy: null, width: 1},
- {key: 'edit', text: 'Edit', sortBy: null, width: 1},
- {key: 'name', text: 'Name', sortBy: 'name', width: 4},
- {key: 'files', text: 'Files', sortBy: 'file_group_count', width: 2},
- {key: 'zims', text: 'Zims', sortBy: 'zim_entry_count', width: 2},
- {key: 'channels', text: 'Channels', sortBy: 'channel_count', width: 2},
- {key: 'domains', text: 'Domains', sortBy: 'domain_count', width: 2},
+ {key: 'delete', text: 'Delete', sortBy: null},
+ {key: 'edit', text: 'Edit', sortBy: null},
+ {key: 'name', text: 'Name', sortBy: 'name'},
+ {key: 'files', text: 'Files', sortBy: 'file_group_count'},
+ {key: 'zims', text: 'Zims', sortBy: 'zim_entry_count'},
+ {key: 'channels', text: 'Channels', sortBy: 'channel_count'},
+ {key: 'domains', text: 'Domains', sortBy: 'domain_count'},
];
const mobileTableHeaders = [
- {key: 'delete', text: 'Delete', sortBy: null, width: 2},
- {key: 'edit', text: 'Edit', sortBy: null, width: 2},
- {key: 'name', text: 'Name', sortBy: 'name', width: 8},
- {key: 'count', text: 'Count', sortBy: i => i['file_group_count'] + i['zim_entry_count'] + i['channel_count'] + i['domain_count'], width: 4},
+ {key: 'delete', text: 'Delete', sortBy: null},
+ {key: 'edit', text: 'Edit', sortBy: null},
+ {key: 'name', text: 'Name', sortBy: 'name'},
+ {key: 'count', text: 'Count', sortBy: i => i['file_group_count'] + i['zim_entry_count'] + i['channel_count'] + i['domain_count']},
];
return <>
diff --git a/app/src/components/SortableTable.js b/app/src/components/SortableTable.js
index 5c10fdb0..f744958c 100644
--- a/app/src/components/SortableTable.js
+++ b/app/src/components/SortableTable.js
@@ -44,24 +44,22 @@ export class SortableTable extends React.Component {
const data = this.props['data'] ? this.sortData(this.props['data']) : null;
const tableHeader = (spec) => {
- // `width` is how a column that must fit something exact -- a checkbox, a group of
- // buttons -- states its size. Under `table-layout: fixed` (see `.table-ellipsis`)
- // the header cell is where a column's width is declared; columns that name none
- // divide what is left, which is what the truncating column wants.
- const {key, text, sortBy, width} = spec;
- const style = width ? {width} : undefined;
+ // Under `table-layout: fixed` the header cell is where a column's width is
+ // declared; a column that names none divides what is left. `className` rather
+ // than a width so the value can change at a breakpoint.
+ const {key, text, sortBy, className} = spec;
if (sortBy) {
const active = sortColumn === key;
return
this.changeSort(key)}
>
{text}
;
} else {
- return {text}
+ return {text}
}
}
diff --git a/app/src/components/Zim.js b/app/src/components/Zim.js
index e7030d4d..587bd1a9 100644
--- a/app/src/components/Zim.js
+++ b/app/src/components/Zim.js
@@ -440,9 +440,9 @@ class ManageZim extends React.Component {
const {zims, catalog, iso_639_codes, subscriptions} = this.state;
const zimFilesHeaders = [
- {key: 'path', text: 'Path', sortBy: 'path', width: 14},
- {key: 'size', text: 'Size', sortBy: 'size', width: 2},
- {key: 'search', text: 'Search', sortBy: 'auto_search', width: 2},
+ {key: 'path', text: 'Path', sortBy: 'path'},
+ {key: 'size', text: 'Size', sortBy: 'size'},
+ {key: 'search', text: 'Search', sortBy: 'auto_search'},
];
let zimFilesBody = ;
if (zims && zims.length >= 1) {
@@ -464,11 +464,11 @@ class ManageZim extends React.Component {
{
key: 'name', text: 'Name', 'sortBy': [i => {
return i['name'].toLowerCase()
- }], width: 8
+ }]
},
- {key: 'language', text: 'Language', 'sortBy': null, width: 4},
- {key: 'subscription', text: 'Subscription', 'sortBy': null, width: 2},
- {key: 'size', text: 'Maximum Size', sortBy: 'size', width: 2},
+ {key: 'language', text: 'Language', 'sortBy': null},
+ {key: 'subscription', text: 'Subscription', 'sortBy': null},
+ {key: 'size', text: 'Maximum Size', sortBy: 'size'},
];
let kiwixCatalog = ;
if (catalog && catalog.length > 0) {
diff --git a/app/src/components/admin/Downloads.js b/app/src/components/admin/Downloads.js
index 0b267b68..198f2862 100644
--- a/app/src/components/admin/Downloads.js
+++ b/app/src/components/admin/Downloads.js
@@ -52,16 +52,26 @@ import {
import {Downloaders} from "../Vars";
import {SortableTable} from "../SortableTable";
+// A header too long for a phone. Both forms are rendered and `.label-*` in App.css shows
+// one; the mobile column widths are sized for the short word.
+const shortHeader = (short, full) => <>
+ {short}
+ {full}
+>;
+
function DownloadProgressModal({progress, url}) {
const [open, setOpen] = React.useState(false);
const [navColor] = useLocalStorage('nav_color', 'violet');
const speedText = humanBandwidth(progress.speed);
const etaText = progress.eta || '...';
- const buttonLabel = `${speedText} / ${etaText}`;
+ // A percent: this button sits in a column sized for its header, and speed-and-ETA does not
+ // fit there. The modal it opens carries the detail, and `title` the full text.
+ const buttonLabel = Number.isFinite(progress.percent) ? `${Math.round(progress.percent)}%` : '...';
return <>
-