Fossil SCM
Further simplifications to the header generating script in the etienne1 skin.
Commit
64d3a61efcefbb45eaf0fc8533b710453a9ad0a9
Parent
c9db8c79586fc2b…
2 files changed
+1
-1
+11
-12
+1
-1
| --- skins/etienne1/css.txt | ||
| +++ skins/etienne1/css.txt | ||
| @@ -13,11 +13,11 @@ | ||
| 13 | 13 | color: #4183C4; |
| 14 | 14 | text-decoration: underline; |
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | hr { |
| 18 | - border: 0px; | |
| 18 | + color: #eee; | |
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | .title { |
| 22 | 22 | color: #4183C4; |
| 23 | 23 | float:left; |
| 24 | 24 |
| --- skins/etienne1/css.txt | |
| +++ skins/etienne1/css.txt | |
| @@ -13,11 +13,11 @@ | |
| 13 | color: #4183C4; |
| 14 | text-decoration: underline; |
| 15 | } |
| 16 | |
| 17 | hr { |
| 18 | border: 0px; |
| 19 | } |
| 20 | |
| 21 | .title { |
| 22 | color: #4183C4; |
| 23 | float:left; |
| 24 |
| --- skins/etienne1/css.txt | |
| +++ skins/etienne1/css.txt | |
| @@ -13,11 +13,11 @@ | |
| 13 | color: #4183C4; |
| 14 | text-decoration: underline; |
| 15 | } |
| 16 | |
| 17 | hr { |
| 18 | color: #eee; |
| 19 | } |
| 20 | |
| 21 | .title { |
| 22 | color: #4183C4; |
| 23 | float:left; |
| 24 |
+11
-12
| --- skins/etienne1/header.txt | ||
| +++ skins/etienne1/header.txt | ||
| @@ -20,38 +20,37 @@ | ||
| 20 | 20 | </th1></div> |
| 21 | 21 | </div> |
| 22 | 22 | |
| 23 | 23 | <div class="mainmenu"> |
| 24 | 24 | <th1> |
| 25 | -proc menulink {re url name} { | |
| 25 | +proc menulink {url name} { | |
| 26 | 26 | upvar current_page current |
| 27 | 27 | upvar home home |
| 28 | - if {($re eq "" && $url eq "/$current") | |
| 29 | - || ($re ne "" && [regexp $re /$current])} { | |
| 28 | + if {$url eq "/$current"} { | |
| 30 | 29 | html "<a href='$home$url' class='active'>$name</a>\n" |
| 31 | 30 | } else { |
| 32 | 31 | html "<a href='$home$url'>$name</a>\n" |
| 33 | 32 | } |
| 34 | 33 | } |
| 35 | -menulink "" $index_page Home | |
| 34 | +menulink $index_page Home | |
| 36 | 35 | if {[anycap jor]} { |
| 37 | - menulink "" "/timeline" Timeline | |
| 36 | + menulink /timeline Timeline | |
| 38 | 37 | } |
| 39 | 38 | if {[hascap oh]} { |
| 40 | - menulink "^/dir.*" "/dir?ci=tip" Files | |
| 39 | + menulink /dir?ci=tip Files | |
| 41 | 40 | } |
| 42 | 41 | if {[hascap o]} { |
| 43 | - menulink "" "/brlist" Branches | |
| 44 | - menulink "" "/taglist" Tags | |
| 42 | + menulink /brlist Branches | |
| 43 | + menulink /taglist Tags | |
| 45 | 44 | } |
| 46 | 45 | if {[hascap r]} { |
| 47 | - menulink "" "/ticket" Tickets | |
| 46 | + menulink /ticket Tickets | |
| 48 | 47 | } |
| 49 | 48 | if {[hascap j]} { |
| 50 | - menulink "" "/wiki" Wiki | |
| 49 | + menulink /wiki Wiki | |
| 51 | 50 | } |
| 52 | 51 | if {[hascap s]} { |
| 53 | - menulink "" "/setup" Admin | |
| 52 | + menulink /setup Admin | |
| 54 | 53 | } elseif {[hascap a]} { |
| 55 | - menulink "" "/setup_ulist" Users | |
| 54 | + menulink /setup_ulist Users | |
| 56 | 55 | } |
| 57 | 56 | </th1></div> |
| 58 | 57 |
| --- skins/etienne1/header.txt | |
| +++ skins/etienne1/header.txt | |
| @@ -20,38 +20,37 @@ | |
| 20 | </th1></div> |
| 21 | </div> |
| 22 | |
| 23 | <div class="mainmenu"> |
| 24 | <th1> |
| 25 | proc menulink {re url name} { |
| 26 | upvar current_page current |
| 27 | upvar home home |
| 28 | if {($re eq "" && $url eq "/$current") |
| 29 | || ($re ne "" && [regexp $re /$current])} { |
| 30 | html "<a href='$home$url' class='active'>$name</a>\n" |
| 31 | } else { |
| 32 | html "<a href='$home$url'>$name</a>\n" |
| 33 | } |
| 34 | } |
| 35 | menulink "" $index_page Home |
| 36 | if {[anycap jor]} { |
| 37 | menulink "" "/timeline" Timeline |
| 38 | } |
| 39 | if {[hascap oh]} { |
| 40 | menulink "^/dir.*" "/dir?ci=tip" Files |
| 41 | } |
| 42 | if {[hascap o]} { |
| 43 | menulink "" "/brlist" Branches |
| 44 | menulink "" "/taglist" Tags |
| 45 | } |
| 46 | if {[hascap r]} { |
| 47 | menulink "" "/ticket" Tickets |
| 48 | } |
| 49 | if {[hascap j]} { |
| 50 | menulink "" "/wiki" Wiki |
| 51 | } |
| 52 | if {[hascap s]} { |
| 53 | menulink "" "/setup" Admin |
| 54 | } elseif {[hascap a]} { |
| 55 | menulink "" "/setup_ulist" Users |
| 56 | } |
| 57 | </th1></div> |
| 58 |
| --- skins/etienne1/header.txt | |
| +++ skins/etienne1/header.txt | |
| @@ -20,38 +20,37 @@ | |
| 20 | </th1></div> |
| 21 | </div> |
| 22 | |
| 23 | <div class="mainmenu"> |
| 24 | <th1> |
| 25 | proc menulink {url name} { |
| 26 | upvar current_page current |
| 27 | upvar home home |
| 28 | if {$url eq "/$current"} { |
| 29 | html "<a href='$home$url' class='active'>$name</a>\n" |
| 30 | } else { |
| 31 | html "<a href='$home$url'>$name</a>\n" |
| 32 | } |
| 33 | } |
| 34 | menulink $index_page Home |
| 35 | if {[anycap jor]} { |
| 36 | menulink /timeline Timeline |
| 37 | } |
| 38 | if {[hascap oh]} { |
| 39 | menulink /dir?ci=tip Files |
| 40 | } |
| 41 | if {[hascap o]} { |
| 42 | menulink /brlist Branches |
| 43 | menulink /taglist Tags |
| 44 | } |
| 45 | if {[hascap r]} { |
| 46 | menulink /ticket Tickets |
| 47 | } |
| 48 | if {[hascap j]} { |
| 49 | menulink /wiki Wiki |
| 50 | } |
| 51 | if {[hascap s]} { |
| 52 | menulink /setup Admin |
| 53 | } elseif {[hascap a]} { |
| 54 | menulink /setup_ulist Users |
| 55 | } |
| 56 | </th1></div> |
| 57 |