Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

firefox: fix folders not showing in toolbar

Browse source 
Fixes #4568
This commit is contained in:
0x5a4 2023-12-03 18:10:04 +01:00 committed by Robert Helgesson
parent 948703f3e7
commit ac7216918c
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/programs/firefox.nix
View file

@ -97,13 +97,14 @@ let
directoryToHTML = indentLevel: directory: '' directoryToHTML = indentLevel: directory: ''
${indent indentLevel}<DT>${ ${indent indentLevel}<DT>${
if directory.toolbar then if directory.toolbar then
''<H3 PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar'' ''
<H3 ADD_DATE="1" LAST_MODIFIED="1" PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar''
else else
"<H3>${escapeXML directory.name}" ''<H3 ADD_DATE="1" LAST_MODIFIED="1">${escapeXML directory.name}''
}</H3> }</H3>
${indent indentLevel}<DL><p> ${indent indentLevel}<DL><p>
${allItemsToHTML (indentLevel + 1) directory.bookmarks} ${allItemsToHTML (indentLevel + 1) directory.bookmarks}
${indent indentLevel}</p></DL>''; ${indent indentLevel}</DL><p>'';
itemToHTMLOrRecurse = indentLevel: item: itemToHTMLOrRecurse = indentLevel: item:
if item ? "url" then if item ? "url" then
@ -126,7 +127,7 @@ let
<H1>Bookmarks Menu</H1> <H1>Bookmarks Menu</H1>
<DL><p> <DL><p>
${bookmarkEntries} ${bookmarkEntries}
</p></DL> </DL>
''; '';
mkNoDuplicateAssertion = entities: entityKind: mkNoDuplicateAssertion = entities: entityKind:
@ -377,7 +378,11 @@ in {
toolbar = mkOption { toolbar = mkOption {
type = types.bool; type = types.bool;
default = false; default = false;
description = "If directory should be shown in toolbar."; description = ''
Make this the toolbar directory. Note, this does _not_
mean that this directory will be added to the toolbar,
this directory _is_ the toolbar.
'';
}; };
}; };
}) // { }) // {

14
tests/modules/programs/firefox/profile-settings-expected-bookmarks.html
View file

@ -6,20 +6,20 @@
<TITLE>Bookmarks</TITLE> <TITLE>Bookmarks</TITLE>
<H1>Bookmarks Menu</H1> <H1>Bookmarks Menu</H1>
<DL><p> <DL><p>
<DT><H3 PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar</H3> <DT><H3 ADD_DATE="1" LAST_MODIFIED="1" PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar</H3>
<DL><p> <DL><p>
<DT><A HREF="https://nixos.wiki/wiki/Home_Manager" ADD_DATE="1" LAST_MODIFIED="1">Home Manager</A> <DT><A HREF="https://nixos.wiki/wiki/Home_Manager" ADD_DATE="1" LAST_MODIFIED="1">Home Manager</A>
</p></DL> </DL><p>
<DT><A HREF="https://en.wikipedia.org/wiki/Special:Search?search=%s&amp;go=Go" ADD_DATE="1" LAST_MODIFIED="1" SHORTCUTURL="wiki" TAGS="wiki">wikipedia</A> <DT><A HREF="https://en.wikipedia.org/wiki/Special:Search?search=%s&amp;go=Go" ADD_DATE="1" LAST_MODIFIED="1" SHORTCUTURL="wiki" TAGS="wiki">wikipedia</A>
<DT><A HREF="https://www.kernel.org" ADD_DATE="1" LAST_MODIFIED="1">kernel.org</A> <DT><A HREF="https://www.kernel.org" ADD_DATE="1" LAST_MODIFIED="1">kernel.org</A>
<DT><H3>Nix sites</H3> <DT><H3 ADD_DATE="1" LAST_MODIFIED="1">Nix sites</H3>
<DL><p> <DL><p>
<DT><A HREF="https://nixos.org/" ADD_DATE="1" LAST_MODIFIED="1">homepage</A> <DT><A HREF="https://nixos.org/" ADD_DATE="1" LAST_MODIFIED="1">homepage</A>
<DT><A HREF="https://nixos.wiki/" ADD_DATE="1" LAST_MODIFIED="1" TAGS="wiki,nix">wiki</A> <DT><A HREF="https://nixos.wiki/" ADD_DATE="1" LAST_MODIFIED="1" TAGS="wiki,nix">wiki</A>
<DT><H3>Nix sites</H3> <DT><H3 ADD_DATE="1" LAST_MODIFIED="1">Nix sites</H3>
<DL><p> <DL><p>
<DT><A HREF="https://nixos.org/" ADD_DATE="1" LAST_MODIFIED="1">homepage</A> <DT><A HREF="https://nixos.org/" ADD_DATE="1" LAST_MODIFIED="1">homepage</A>
<DT><A HREF="https://nixos.wiki/" ADD_DATE="1" LAST_MODIFIED="1">wiki</A> <DT><A HREF="https://nixos.wiki/" ADD_DATE="1" LAST_MODIFIED="1">wiki</A>
</p></DL> </DL><p>
</p></DL> </DL><p>
</p></DL> </DL>