Are not visible in the automated "filetoc" bar unless we click the red "x" to "Remove" (hide) the reuse-links.

That may not hold true anymore, per T425153.

Change #1306091 had a related patch set uploaded (by Simon04; author: Simon04):

[mediawiki/core@master] ImagePage: Integrate the file TOC into the page table of contents

https://gerrit.wikimedia.org/r/1306091

Change #1306092 had a related patch set uploaded (by Simon04; author: Simon04):

[mediawiki/core@master] ImagePage: Include foreign-repo description headings in the file TOC

https://gerrit.wikimedia.org/r/1306092

@simon04 Just to check (I assume "yes"!), will these patches also work for
(A) Users (or wikis) with non-English language settings -- IIUC, this is already handled automagically.
(B) All other skins? -- I.e. Minerva, Monobook, Timeless, Vector (legacy); but also generic 3rd-party skins?
It might be good to add screenshots for those examples, to prove that the changes are suitable & tested for all easily-predictable situations.
P.s. Thank you immensely for working on this bug!

Yes, all skins should be supported (thanks to @Samwilson's review on gerrit).

Yes, all languages should be supported.

Here are some more screenshots:

The existing MinervaNeue file ToC looks like this:

But with this patch it'll disappear completely on screens less than 640px:

And show a collapsed ToC on wider screens:

Is that all good? I guess mobile users are used to not having ToCs. (Personally I think it's an improvement.)

There are quite a few usages of #filetoc in user scripts etc., some using it as a way to determine where to inject things I think, so those might break. Would it be worth putting an empty <div id=filetoc> in place, with perhaps a console warning of deprecation?

This is a historic artifact that once introduced has never seen any proper evaluation. Its inconsistent and has long since bothered me, especially as logged in editors hardly even see this thing due to the stockphoto gadget and not a single person has ever complained about that, so it can't be very important to most editors I guess.

In T332644#12074312, @Samwilson wrote:

I guess mobile users are used to not having ToCs. (Personally I think it's an improvement.)

I don't think it will be a huge problem, but it is something that I think would require a follow up ticket so that we make this consistent.

There are quite a few usages of #filetoc in user scripts etc., some using it as a way to determine where to inject things I think, so those might break. Would it be worth putting an empty <div id=filetoc> in place, with perhaps a console warning of deprecation?

I think that's imperative. We could add a MutationObserver to emit a JS warning I guess. That won't fix everything of course, as some scripts might only use this as a positional anchor, without writing to it. We don't really have ways to deal with deprecations like this, other than doing a lot of outreach.

Proposal: Next week the table of contents at the top of File pages, will be consolidated with the table of content of the page.

@TheDJ can we be specific about which week? Is it this week (week of 27 July) or next week (Week of 3 August)? Please see a modified draft below:

Next week, the table of contents on Wikimedia Commons file pages will be improved by consolidating the file page table of contents with the page table of contents. This will make it easier to understand a file page’s structure, navigate to specific sections, and share links to individual sections.

In T332644#12156803, @TheDJ wrote:

Proposal: Next week the table of contents at the top of File pages, will be consolidated with the table of content of the page.

In T332644#12072880, @simon04 wrote:

These make the image itself go out of view, which is IMO a regression. The previous #filetoc was designed to cover as little of the file as possible. Would it be possible to keep the current behavior on skins that include the table of contents in the main body (i.e. all but Vector 2022)? Or to include the table of contents below the image and just provide a skin link (similar to the current #filetoc) above it?

In T332644#12172417, @STei-WMF wrote:

@TheDJ can we be specific about which week? Is it this week (week of 27 July) or next week (Week of 3 August)?

Apparently, neither – the branch cut for the week of 3 August has happened (T430833#12181545), but the changes haven’t been merged yet.

Change #1321675 had a related patch set uploaded (by Samwilson; author: Samwilson):

[mediawiki/extensions/ProofreadPage@master] Put index page link into a paragraph

https://gerrit.wikimedia.org/r/1321675

Change #1306091 merged by jenkins-bot:

[mediawiki/core@master] ImagePage: Integrate the file TOC into the page table of contents

https://gerrit.wikimedia.org/r/1306091

Change #1321675 merged by jenkins-bot:

[mediawiki/extensions/ProofreadPage@master] Put index page link into a paragraph

https://gerrit.wikimedia.org/r/1321675

@Samwilson I’m a bit disappointed this was merged without even reacting to the points I raised two days ago. Before +2’ing, it’s always useful to also look at the attached task(s), not only at the Gerrit comments.

I'm really sorry. I did look at the task but I've had the tab open for too many days and your comment wasn't there (I should've reloaded of course), although I did see the email so that's no excuse. I didn't mean to ignore the points you've raised!

This change is mainly aimed at improving Vector-2022, unfortunately.

I think moving the ToC to be below the image makes lots of sense. And also perhaps getting rid of the 'File' entry, as it's the only one that doesn't equate to an actual heading. If the file stays at the top, there's no point in being able to link to it from the top (considering also that #top still works there).

In T332644#12181820, @Tacsipacsi wrote:

These make the image itself go out of view, which is IMO a regression. The previous #filetoc was designed to cover as little of the file as possible. Would it be possible to keep the current behavior on skins that include the table of contents in the main body (i.e. all but Vector 2022)? Or to include the table of contents below the image and just provide a skin link (similar to the current #filetoc) above it?

Those screenshots do not represent the latest patch version. Here is one based on mediawiki 2b278482dfef04559dfb2e912857d32575b4441d:

In T332644#12194274, @simon04 wrote:

Those screenshots do not represent the latest patch version. Here is one based on mediawiki

are we sure ? labs seems to indicate otherwise:

In T332644#12194337, @TheDJ wrote:

are we sure ? labs seems to indicate otherwise:

Did take having a local file and doing a purge of the page to show up. I think this is an issue. It's going to cause backlash

Err, I was testing a file via Instant Commons, not a local file. You're right.

What's the strategy for non-Vector-2022 skins? Move the TOC below the image? Hide the TOC?

Let's revert for now, until it's clearer what to do.

In T332644#12194522, @Samwilson wrote:

Let's revert for now, until it's clearer what to do.

Hm, in my opinion the change is very beneficial for the Vector-2022 skin (which is default). If we find (and decide on) a decent solution for the other skins, we're good.

Change #1322683 had a related patch set uploaded (by Simon04; author: Simon04):

[mediawiki/core@master] ImagePage: move TOC element below file link

https://gerrit.wikimedia.org/r/1322683

In T332644#12194553, @gerritbot wrote:

Change #1322683 had a related patch set uploaded (by Simon04; author: Simon04):

[mediawiki/core@master] ImagePage: move TOC element below file link

https://gerrit.wikimedia.org/r/1322683

Vector-2022 isn't default for all wikis nor all users. But yeah, perhaps moving the ToC below the file is best. But if that can't be done by the next train, then this might (as TheDJ says) perhaps make people annoyed.

In T332644#12190328, @Samwilson wrote:

I didn't mean to ignore the points you've raised!

Of course. I was sure this was an oversight on your part rather than anything intentional.

This change is mainly aimed at improving Vector-2022, unfortunately.

Yes, and the changes look good there – but only there.

In T332644#12194567, @simon04 wrote:

In T332644#12194553, @gerritbot wrote:

Change #1322683 had a related patch set uploaded (by Simon04; author: Simon04):

[mediawiki/core@master] ImagePage: move TOC element below file link

https://gerrit.wikimedia.org/r/1322683

In T332644#12181820, @Tacsipacsi wrote:

Or to include the table of contents below the image and just provide a skin link (similar to the current #filetoc) above it?

I think the jump link above the image would be important. The “below file link” can easily go out of view. Example screenshot showing how https://commons.wikimedia.org/wiki/File:No_photo.svg?useskin=vector&uselang=en would look like (I reflected the changes manually, I hope I got them right):

Do you see the table of contents? With a portrait image, and SDC, it’s below the cut. On a smaller viewport (mine is 1088px high, which I’d call rather large even in today’s standards), not even SDC is needed for the table of contents to go out of view.

There's a grand Commons file page improvements - Google Docs with many ideas.

I (we) cannot improve everything for everybody on everyskin at the same time. I'm happy to work on self-contained tasks (like this is not? :/ ...) and make gradual progress.

This ticket actually predates that design document. Regardless. I think it's a good idea overall. Just needs some clean ups for non-default skins. It could be even some css added to the skin's repo.