Fossil SCM

Fix the default header files so that they correctly apply the $home prefix only for URLs that begin with /.

drh 2021-01-26 23:31 new-main-menu
Commit cc675c0a9aa04c83f279ae8a78ea4a1c2c5dd8fb1a4218bf2f9c70273a1e6ccd
Parent bb8bf2320575134…
12 files changed +2 -1 +2 -1 +2 -1 +2 -1 +2 -1 +6 -4 +2 -1 +2 -1 +2 -1 +1 +2 -1 +2 -1
~ skins/ardoise/header.txt ~ skins/black_and_white/header.txt ~ skins/blitz/header.txt ~ skins/blitz_no_logo/header.txt ~ skins/bootstrap/header.txt ~ skins/default/header.txt ~ skins/eagle/header.txt ~ skins/enhanced1/header.txt ~ skins/khaki/header.txt ~ skins/original/header.txt ~ skins/plain_gray/header.txt ~ skins/rounded1/header.txt
M skins/ardoise/header.txt
+2 -1
--- skins/ardoise/header.txt
+++ skins/ardoise/header.txt
@@ -32,11 +32,12 @@
3232
 html "<li class='active'>"
3333
 set once 0
3434
 } else {
3535
 html "<li>"
3636
 }
37
- html "<a href='$home$url'>$name</a></li>\n"
37
+ if {[string match /* $url]} {set url $home$url}
38
+ html "<a href='$url'>$name</a></li>\n"
3839
 }
3940
 </th1></ul>
4041
 </div> <!-- end div mainmenu -->
4142
 <div id="hbdrop"></div>
4243
 </div> <!-- end div container -->
4344
--- skins/ardoise/header.txt
+++ skins/ardoise/header.txt
@@ -32,11 +32,12 @@
32 html "<li class='active'>"
33 set once 0
34 } else {
35 html "<li>"
36 }
37 html "<a href='$home$url'>$name</a></li>\n"
 
38 }
39 </th1></ul>
40 </div> <!-- end div mainmenu -->
41 <div id="hbdrop"></div>
42 </div> <!-- end div container -->
43
--- skins/ardoise/header.txt
+++ skins/ardoise/header.txt
@@ -32,11 +32,12 @@
32 html "<li class='active'>"
33 set once 0
34 } else {
35 html "<li>"
36 }
37 if {[string match /* $url]} {set url $home$url}
38 html "<a href='$url'>$name</a></li>\n"
39 }
40 </th1></ul>
41 </div> <!-- end div mainmenu -->
42 <div id="hbdrop"></div>
43 </div> <!-- end div container -->
44
M skins/black_and_white/header.txt
+2 -1
--- skins/black_and_white/header.txt
+++ skins/black_and_white/header.txt
@@ -14,11 +14,12 @@
1414
 </div>
1515
 <div class="mainmenu">
1616
 <th1>
1717
 foreach {name url expr class} $mainmenu {
1818
 if {![capexpr $expr]} continue
19
- html "<a href='$home$url'>$name</a><br/>\n"
19
+ if {[string match /* $url]} {set url $home$url}
20
+ html "<a href='$url'>$name</a><br/>\n"
2021
 }
2122
 if {[info exists login]} {
2223
 html "<a href='$home/login'>Logout</a>\n"
2324
 } else {
2425
 html "<a href='$home/login'>Login</a>\n"
2526
--- skins/black_and_white/header.txt
+++ skins/black_and_white/header.txt
@@ -14,11 +14,12 @@
14 </div>
15 <div class="mainmenu">
16 <th1>
17 foreach {name url expr class} $mainmenu {
18 if {![capexpr $expr]} continue
19 html "<a href='$home$url'>$name</a><br/>\n"
 
20 }
21 if {[info exists login]} {
22 html "<a href='$home/login'>Logout</a>\n"
23 } else {
24 html "<a href='$home/login'>Login</a>\n"
25
--- skins/black_and_white/header.txt
+++ skins/black_and_white/header.txt
@@ -14,11 +14,12 @@
14 </div>
15 <div class="mainmenu">
16 <th1>
17 foreach {name url expr class} $mainmenu {
18 if {![capexpr $expr]} continue
19 if {[string match /* $url]} {set url $home$url}
20 html "<a href='$url'>$name</a><br/>\n"
21 }
22 if {[info exists login]} {
23 html "<a href='$home/login'>Logout</a>\n"
24 } else {
25 html "<a href='$home/login'>Login</a>\n"
26
M skins/blitz/header.txt
+2 -1
--- skins/blitz/header.txt
+++ skins/blitz/header.txt
@@ -33,11 +33,12 @@
3333
 html "<li class='active'>"
3434
 set once 0
3535
 } else {
3636
 html "<li>"
3737
 }
38
- html "<a href='$home$url'>$name</a></li>\n"
38
+ if {[string match /* $url]} {set url $home$url}
39
+ html "<a href='$url'>$name</a></li>\n"
3940
 }
4041
 </th1></ul>
4142
 </div> <!-- end div mainmenu -->
4243
 </div> <!-- end div container -->
4344
 </div> <!-- end div header -->
4445
--- skins/blitz/header.txt
+++ skins/blitz/header.txt
@@ -33,11 +33,12 @@
33 html "<li class='active'>"
34 set once 0
35 } else {
36 html "<li>"
37 }
38 html "<a href='$home$url'>$name</a></li>\n"
 
39 }
40 </th1></ul>
41 </div> <!-- end div mainmenu -->
42 </div> <!-- end div container -->
43 </div> <!-- end div header -->
44
--- skins/blitz/header.txt
+++ skins/blitz/header.txt
@@ -33,11 +33,12 @@
33 html "<li class='active'>"
34 set once 0
35 } else {
36 html "<li>"
37 }
38 if {[string match /* $url]} {set url $home$url}
39 html "<a href='$url'>$name</a></li>\n"
40 }
41 </th1></ul>
42 </div> <!-- end div mainmenu -->
43 </div> <!-- end div container -->
44 </div> <!-- end div header -->
45
M skins/blitz_no_logo/header.txt
+2 -1
--- skins/blitz_no_logo/header.txt
+++ skins/blitz_no_logo/header.txt
@@ -30,11 +30,12 @@
3030
 html "<li class='active'>"
3131
 set once 0
3232
 } else {
3333
 html "<li>"
3434
 }
35
- html "<a href='$home$url'>$name</a></li>\n"
35
+ if {[string match /* $url]} {set url $home$url}
36
+ html "<a href='$url'>$name</a></li>\n"
3637
 }
3738
 </th1></ul>
3839
 </div> <!-- end div mainmenu -->
3940
 </div> <!-- end div container -->
4041
 </div> <!-- end div header -->
4142
--- skins/blitz_no_logo/header.txt
+++ skins/blitz_no_logo/header.txt
@@ -30,11 +30,12 @@
30 html "<li class='active'>"
31 set once 0
32 } else {
33 html "<li>"
34 }
35 html "<a href='$home$url'>$name</a></li>\n"
 
36 }
37 </th1></ul>
38 </div> <!-- end div mainmenu -->
39 </div> <!-- end div container -->
40 </div> <!-- end div header -->
41
--- skins/blitz_no_logo/header.txt
+++ skins/blitz_no_logo/header.txt
@@ -30,11 +30,12 @@
30 html "<li class='active'>"
31 set once 0
32 } else {
33 html "<li>"
34 }
35 if {[string match /* $url]} {set url $home$url}
36 html "<a href='$url'>$name</a></li>\n"
37 }
38 </th1></ul>
39 </div> <!-- end div mainmenu -->
40 </div> <!-- end div container -->
41 </div> <!-- end div header -->
42
M skins/bootstrap/header.txt
+2 -1
--- skins/bootstrap/header.txt
+++ skins/bootstrap/header.txt
@@ -50,11 +50,12 @@
5050
 html "<li class='active'>"
5151
 set once 0
5252
 } else {
5353
 html "<li>"
5454
 }
55
- html "<a href='$home$url'>$name</a></li>\n"
55
+ if {[string match /* $url]} {set url $home$url}
56
+ html "<a href='$url'>$name</a></li>\n"
5657
 }
5758
 </th1></ul>
5859
 </div><!--/.nav-collapse -->
5960
 </div>
6061
 </div>
6162
--- skins/bootstrap/header.txt
+++ skins/bootstrap/header.txt
@@ -50,11 +50,12 @@
50 html "<li class='active'>"
51 set once 0
52 } else {
53 html "<li>"
54 }
55 html "<a href='$home$url'>$name</a></li>\n"
 
56 }
57 </th1></ul>
58 </div><!--/.nav-collapse -->
59 </div>
60 </div>
61
--- skins/bootstrap/header.txt
+++ skins/bootstrap/header.txt
@@ -50,11 +50,12 @@
50 html "<li class='active'>"
51 set once 0
52 } else {
53 html "<li>"
54 }
55 if {[string match /* $url]} {set url $home$url}
56 html "<a href='$url'>$name</a></li>\n"
57 }
58 </th1></ul>
59 </div><!--/.nav-collapse -->
60 </div>
61 </div>
62
M skins/default/header.txt
+6 -4
--- skins/default/header.txt
+++ skins/default/header.txt
@@ -12,13 +12,15 @@
1212
 <th1>
1313
 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
1414
 builtin_request_js hbmenu.js
1515
 foreach {name url expr class} $mainmenu {
1616
 if {![capexpr $expr]} continue
17
- if {[string range $url 0 [string length $current_page]] eq "/$current_page"} {
18
- html "<a href='$home$url' class='active $class'>$name</a>\n"
19
- } else {
20
- html "<a href='$home$url' class='$class'>$name</a>\n"
17
+ if {[string match /* $url]} {
18
+ if {[string match /$current_page* $url]} {
19
+ set class "active $class"
20
+ }
21
+ set url $home$url
2122
 }
23
+ html "<a href='$url' class='$class'>$name</a>\n"
2224
 }
2325
 </th1></div>
2426
 <div id='hbdrop'></div>
2527
--- skins/default/header.txt
+++ skins/default/header.txt
@@ -12,13 +12,15 @@
12 <th1>
13 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
14 builtin_request_js hbmenu.js
15 foreach {name url expr class} $mainmenu {
16 if {![capexpr $expr]} continue
17 if {[string range $url 0 [string length $current_page]] eq "/$current_page"} {
18 html "<a href='$home$url' class='active $class'>$name</a>\n"
19 } else {
20 html "<a href='$home$url' class='$class'>$name</a>\n"
 
21 }
 
22 }
23 </th1></div>
24 <div id='hbdrop'></div>
25
--- skins/default/header.txt
+++ skins/default/header.txt
@@ -12,13 +12,15 @@
12 <th1>
13 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
14 builtin_request_js hbmenu.js
15 foreach {name url expr class} $mainmenu {
16 if {![capexpr $expr]} continue
17 if {[string match /* $url]} {
18 if {[string match /$current_page* $url]} {
19 set class "active $class"
20 }
21 set url $home$url
22 }
23 html "<a href='$url' class='$class'>$name</a>\n"
24 }
25 </th1></div>
26 <div id='hbdrop'></div>
27
M skins/eagle/header.txt
+2 -1
--- skins/eagle/header.txt
+++ skins/eagle/header.txt
@@ -92,11 +92,12 @@
9292
 updateClock();
9393
 </script>
9494
 <div class="mainmenu"><th1>
9595
 foreach {name url expr class} $mainmenu {
9696
 if {![capexpr $expr]} continue
97
- html "<a href='$home$url'>$name</a>\n"
97
+ if {[string match /* $url]} {set url $home$url}
98
+ html "<a href='$url'>$name</a>\n"
9899
 }
99100
 if {[info exists login]} {
100101
 html "<a href='$home/logout'>Logout</a>\n"
101102
 } else {
102103
 html "<a href='$home/login'>Login</a>\n"
103104
--- skins/eagle/header.txt
+++ skins/eagle/header.txt
@@ -92,11 +92,12 @@
92 updateClock();
93 </script>
94 <div class="mainmenu"><th1>
95 foreach {name url expr class} $mainmenu {
96 if {![capexpr $expr]} continue
97 html "<a href='$home$url'>$name</a>\n"
 
98 }
99 if {[info exists login]} {
100 html "<a href='$home/logout'>Logout</a>\n"
101 } else {
102 html "<a href='$home/login'>Login</a>\n"
103
--- skins/eagle/header.txt
+++ skins/eagle/header.txt
@@ -92,11 +92,12 @@
92 updateClock();
93 </script>
94 <div class="mainmenu"><th1>
95 foreach {name url expr class} $mainmenu {
96 if {![capexpr $expr]} continue
97 if {[string match /* $url]} {set url $home$url}
98 html "<a href='$url'>$name</a>\n"
99 }
100 if {[info exists login]} {
101 html "<a href='$home/logout'>Logout</a>\n"
102 } else {
103 html "<a href='$home/login'>Login</a>\n"
104
M skins/enhanced1/header.txt
+2 -1
--- skins/enhanced1/header.txt
+++ skins/enhanced1/header.txt
@@ -92,11 +92,12 @@
9292
 updateClock();
9393
 </script>
9494
 <div class="mainmenu"><th1>
9595
 foreach {name url expr class} $mainmenu {
9696
 if {![capexpr $expr]} continue
97
- html "<a href='$home$url'>$name</a>\n"
97
+ if {[string match /* $url]} {set url $home$url}
98
+ html "<a href='$url'>$name</a>\n"
9899
 }
99100
 if {[info exists login]} {
100101
 html "<a href='$home/logout'>Logout</a>\n"
101102
 } else {
102103
 html "<a href='$home/login'>Login</a>\n"
103104
--- skins/enhanced1/header.txt
+++ skins/enhanced1/header.txt
@@ -92,11 +92,12 @@
92 updateClock();
93 </script>
94 <div class="mainmenu"><th1>
95 foreach {name url expr class} $mainmenu {
96 if {![capexpr $expr]} continue
97 html "<a href='$home$url'>$name</a>\n"
 
98 }
99 if {[info exists login]} {
100 html "<a href='$home/logout'>Logout</a>\n"
101 } else {
102 html "<a href='$home/login'>Login</a>\n"
103
--- skins/enhanced1/header.txt
+++ skins/enhanced1/header.txt
@@ -92,11 +92,12 @@
92 updateClock();
93 </script>
94 <div class="mainmenu"><th1>
95 foreach {name url expr class} $mainmenu {
96 if {![capexpr $expr]} continue
97 if {[string match /* $url]} {set url $home$url}
98 html "<a href='$url'>$name</a>\n"
99 }
100 if {[info exists login]} {
101 html "<a href='$home/logout'>Logout</a>\n"
102 } else {
103 html "<a href='$home/login'>Login</a>\n"
104
M skins/khaki/header.txt
+2 -1
--- skins/khaki/header.txt
+++ skins/khaki/header.txt
@@ -11,11 +11,12 @@
1111
 </th1></div>
1212
 </div>
1313
 <div class="mainmenu"><th1>
1414
 foreach {name url expr class} $mainmenu {
1515
 if {![capexpr $expr]} continue
16
- html "<a href='$home$url'>$name</a>\n"
16
+ if {[string match /* $url]} {set url $home$url}
17
+ html "<a href='$url'>$name</a>\n"
1718
 }
1819
 if {[info exists login]} {
1920
 html "<a href='/logout'>Logout</a>\n"
2021
 } else {
2122
 html "<a href='/login'>Login</a>\n"
2223
--- skins/khaki/header.txt
+++ skins/khaki/header.txt
@@ -11,11 +11,12 @@
11 </th1></div>
12 </div>
13 <div class="mainmenu"><th1>
14 foreach {name url expr class} $mainmenu {
15 if {![capexpr $expr]} continue
16 html "<a href='$home$url'>$name</a>\n"
 
17 }
18 if {[info exists login]} {
19 html "<a href='/logout'>Logout</a>\n"
20 } else {
21 html "<a href='/login'>Login</a>\n"
22
--- skins/khaki/header.txt
+++ skins/khaki/header.txt
@@ -11,11 +11,12 @@
11 </th1></div>
12 </div>
13 <div class="mainmenu"><th1>
14 foreach {name url expr class} $mainmenu {
15 if {![capexpr $expr]} continue
16 if {[string match /* $url]} {set url $home$url}
17 html "<a href='$url'>$name</a>\n"
18 }
19 if {[info exists login]} {
20 html "<a href='/logout'>Logout</a>\n"
21 } else {
22 html "<a href='/login'>Login</a>\n"
23
M skins/original/header.txt
+1
--- skins/original/header.txt
+++ skins/original/header.txt
@@ -12,10 +12,11 @@
1212
 </th1></div>
1313
 </div>
1414
 <div class="mainmenu"><th1>
1515
 foreach {name url expr class} $mainmenu {
1616
 if {![capexpr $expr]} continue
17
+ if {[string match /* $url]} {set url $home$url}
1718
 html "<a href='$home$url'>$name</a>\n"
1819
 }
1920
 if {[info exists login]} {
2021
 html "<a href='$home/logout'>Logout</a>\n"
2122
 } else {
2223
--- skins/original/header.txt
+++ skins/original/header.txt
@@ -12,10 +12,11 @@
12 </th1></div>
13 </div>
14 <div class="mainmenu"><th1>
15 foreach {name url expr class} $mainmenu {
16 if {![capexpr $expr]} continue
 
17 html "<a href='$home$url'>$name</a>\n"
18 }
19 if {[info exists login]} {
20 html "<a href='$home/logout'>Logout</a>\n"
21 } else {
22
--- skins/original/header.txt
+++ skins/original/header.txt
@@ -12,10 +12,11 @@
12 </th1></div>
13 </div>
14 <div class="mainmenu"><th1>
15 foreach {name url expr class} $mainmenu {
16 if {![capexpr $expr]} continue
17 if {[string match /* $url]} {set url $home$url}
18 html "<a href='$home$url'>$name</a>\n"
19 }
20 if {[info exists login]} {
21 html "<a href='$home/logout'>Logout</a>\n"
22 } else {
23
M skins/plain_gray/header.txt
+2 -1
--- skins/plain_gray/header.txt
+++ skins/plain_gray/header.txt
@@ -5,11 +5,12 @@
55
 <th1>
66
 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
77
 builtin_request_js hbmenu.js
88
 foreach {name url expr class} $mainmenu {
99
 if {![capexpr $expr]} continue
10
- html "<a href='$home$url'>$name</a>\n"
10
+ if {[string match /* $url]} {set url $home$url}
11
+ html "<a href='$url'>$name</a>\n"
1112
 }
1213
 if {[info exists login]} {
1314
 html "<a href='$home/logout'>Logout</a>\n"
1415
 } else {
1516
 html "<a href='$home/login'>Login</a>\n"
1617
--- skins/plain_gray/header.txt
+++ skins/plain_gray/header.txt
@@ -5,11 +5,12 @@
5 <th1>
6 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
7 builtin_request_js hbmenu.js
8 foreach {name url expr class} $mainmenu {
9 if {![capexpr $expr]} continue
10 html "<a href='$home$url'>$name</a>\n"
 
11 }
12 if {[info exists login]} {
13 html "<a href='$home/logout'>Logout</a>\n"
14 } else {
15 html "<a href='$home/login'>Login</a>\n"
16
--- skins/plain_gray/header.txt
+++ skins/plain_gray/header.txt
@@ -5,11 +5,12 @@
5 <th1>
6 html "<a id='hbbtn' href='$home/sitemap' aria-label='Site Map'>&#9776;</a>"
7 builtin_request_js hbmenu.js
8 foreach {name url expr class} $mainmenu {
9 if {![capexpr $expr]} continue
10 if {[string match /* $url]} {set url $home$url}
11 html "<a href='$url'>$name</a>\n"
12 }
13 if {[info exists login]} {
14 html "<a href='$home/logout'>Logout</a>\n"
15 } else {
16 html "<a href='$home/login'>Login</a>\n"
17
M skins/rounded1/header.txt
+2 -1
--- skins/rounded1/header.txt
+++ skins/rounded1/header.txt
@@ -13,11 +13,12 @@
1313
 </th1></div>
1414
 </div>
1515
 <div class="mainmenu"><th1>
1616
 foreach {name url expr class} $mainmenu {
1717
 if {![capexpr $expr]} continue
18
- html "<a href='$home$url'>$name</a>\n"
18
+ if {[string match /* $url]} {set url $home$url}
19
+ html "<a href='$url'>$name</a>\n"
1920
 }
2021
 if {[info exists login]} {
2122
 html "<a href='$home/logout'>Logout</a>\n"
2223
 } else {
2324
 html "<a href='$home/login'>Login</a>\n"
2425
--- skins/rounded1/header.txt
+++ skins/rounded1/header.txt
@@ -13,11 +13,12 @@
13 </th1></div>
14 </div>
15 <div class="mainmenu"><th1>
16 foreach {name url expr class} $mainmenu {
17 if {![capexpr $expr]} continue
18 html "<a href='$home$url'>$name</a>\n"
 
19 }
20 if {[info exists login]} {
21 html "<a href='$home/logout'>Logout</a>\n"
22 } else {
23 html "<a href='$home/login'>Login</a>\n"
24
--- skins/rounded1/header.txt
+++ skins/rounded1/header.txt
@@ -13,11 +13,12 @@
13 </th1></div>
14 </div>
15 <div class="mainmenu"><th1>
16 foreach {name url expr class} $mainmenu {
17 if {![capexpr $expr]} continue
18 if {[string match /* $url]} {set url $home$url}
19 html "<a href='$url'>$name</a>\n"
20 }
21 if {[info exists login]} {
22 html "<a href='$home/logout'>Logout</a>\n"
23 } else {
24 html "<a href='$home/login'>Login</a>\n"
25

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button