Fossil SCM
Triumphant return of the logo in the title area, lost in the transition from "original" to the trunk default skin.
Commit
45b055016078ca9ae9033513360c86aa5df4f5174fb76596d3bb1f6181f7dd2f
Parent
1b205333681b169…
2 files changed
+8
+34
| --- skins/default/css.txt | ||
| +++ skins/default/css.txt | ||
| @@ -34,10 +34,18 @@ | ||
| 34 | 34 | } |
| 35 | 35 | .status { |
| 36 | 36 | float: right; |
| 37 | 37 | font-size: 0.8em; |
| 38 | 38 | } |
| 39 | +div.logo { | |
| 40 | + float: left; | |
| 41 | + padding-top: 10px; | |
| 42 | + padding-right: 10px; | |
| 43 | +} | |
| 44 | +div.logo img { | |
| 45 | + max-height: 2em; /* smaller than title to keep it above the baseline */ | |
| 46 | +} | |
| 39 | 47 | |
| 40 | 48 | |
| 41 | 49 | /* Main menu and optional sub-menu */ |
| 42 | 50 | |
| 43 | 51 | .mainmenu { |
| 44 | 52 |
| --- skins/default/css.txt | |
| +++ skins/default/css.txt | |
| @@ -34,10 +34,18 @@ | |
| 34 | } |
| 35 | .status { |
| 36 | float: right; |
| 37 | font-size: 0.8em; |
| 38 | } |
| 39 | |
| 40 | |
| 41 | /* Main menu and optional sub-menu */ |
| 42 | |
| 43 | .mainmenu { |
| 44 |
| --- skins/default/css.txt | |
| +++ skins/default/css.txt | |
| @@ -34,10 +34,18 @@ | |
| 34 | } |
| 35 | .status { |
| 36 | float: right; |
| 37 | font-size: 0.8em; |
| 38 | } |
| 39 | div.logo { |
| 40 | float: left; |
| 41 | padding-top: 10px; |
| 42 | padding-right: 10px; |
| 43 | } |
| 44 | div.logo img { |
| 45 | max-height: 2em; /* smaller than title to keep it above the baseline */ |
| 46 | } |
| 47 | |
| 48 | |
| 49 | /* Main menu and optional sub-menu */ |
| 50 | |
| 51 | .mainmenu { |
| 52 |
+34
| --- skins/default/header.txt | ||
| +++ skins/default/header.txt | ||
| @@ -1,6 +1,40 @@ | ||
| 1 | 1 | <div class="header"> |
| 2 | + <div class="logo"> | |
| 3 | + <th1> | |
| 4 | + ## See skins/original/header.txt for commentary; not repeated here. | |
| 5 | + proc getLogoUrl { baseurl } { | |
| 6 | + set idx(first) [string first // $baseurl] | |
| 7 | + if {$idx(first) != -1} { | |
| 8 | + set idx(first+1) [expr {$idx(first) + 2}] | |
| 9 | + set idx(nextRange) [string range $baseurl $idx(first+1) end] | |
| 10 | + set idx(next) [string first / $idx(nextRange)] | |
| 11 | + if {$idx(next) != -1} { | |
| 12 | + set idx(next) [expr {$idx(next) + $idx(first+1)}] | |
| 13 | + set idx(next-1) [expr {$idx(next) - 1}] | |
| 14 | + set scheme [string range $baseurl 0 $idx(first)] | |
| 15 | + set host [string range $baseurl $idx(first+1) $idx(next-1)] | |
| 16 | + if {[string compare $scheme http:/] == 0} { | |
| 17 | + set scheme http:// | |
| 18 | + } else { | |
| 19 | + set scheme https:// | |
| 20 | + } | |
| 21 | + set logourl $scheme$host/ | |
| 22 | + } else { | |
| 23 | + set logourl $baseurl | |
| 24 | + } | |
| 25 | + } else { | |
| 26 | + set logourl $baseurl | |
| 27 | + } | |
| 28 | + return $logourl | |
| 29 | + } | |
| 30 | + set logourl [getLogoUrl $baseurl] | |
| 31 | + </th1> | |
| 32 | + <a href="$logourl"> | |
| 33 | + <img src="$logo_image_url" border="0" alt="$project_name"> | |
| 34 | + </a> | |
| 35 | + </div> | |
| 2 | 36 | <div class="title"><h1>$<project_name></h1>$<title></div> |
| 3 | 37 | <div class="status"><th1> |
| 4 | 38 | if {[info exists login]} { |
| 5 | 39 | html "<a href='$home/login'>$login</a>\n" |
| 6 | 40 | } else { |
| 7 | 41 |
| --- skins/default/header.txt | |
| +++ skins/default/header.txt | |
| @@ -1,6 +1,40 @@ | |
| 1 | <div class="header"> |
| 2 | <div class="title"><h1>$<project_name></h1>$<title></div> |
| 3 | <div class="status"><th1> |
| 4 | if {[info exists login]} { |
| 5 | html "<a href='$home/login'>$login</a>\n" |
| 6 | } else { |
| 7 |
| --- skins/default/header.txt | |
| +++ skins/default/header.txt | |
| @@ -1,6 +1,40 @@ | |
| 1 | <div class="header"> |
| 2 | <div class="logo"> |
| 3 | <th1> |
| 4 | ## See skins/original/header.txt for commentary; not repeated here. |
| 5 | proc getLogoUrl { baseurl } { |
| 6 | set idx(first) [string first // $baseurl] |
| 7 | if {$idx(first) != -1} { |
| 8 | set idx(first+1) [expr {$idx(first) + 2}] |
| 9 | set idx(nextRange) [string range $baseurl $idx(first+1) end] |
| 10 | set idx(next) [string first / $idx(nextRange)] |
| 11 | if {$idx(next) != -1} { |
| 12 | set idx(next) [expr {$idx(next) + $idx(first+1)}] |
| 13 | set idx(next-1) [expr {$idx(next) - 1}] |
| 14 | set scheme [string range $baseurl 0 $idx(first)] |
| 15 | set host [string range $baseurl $idx(first+1) $idx(next-1)] |
| 16 | if {[string compare $scheme http:/] == 0} { |
| 17 | set scheme http:// |
| 18 | } else { |
| 19 | set scheme https:// |
| 20 | } |
| 21 | set logourl $scheme$host/ |
| 22 | } else { |
| 23 | set logourl $baseurl |
| 24 | } |
| 25 | } else { |
| 26 | set logourl $baseurl |
| 27 | } |
| 28 | return $logourl |
| 29 | } |
| 30 | set logourl [getLogoUrl $baseurl] |
| 31 | </th1> |
| 32 | <a href="$logourl"> |
| 33 | <img src="$logo_image_url" border="0" alt="$project_name"> |
| 34 | </a> |
| 35 | </div> |
| 36 | <div class="title"><h1>$<project_name></h1>$<title></div> |
| 37 | <div class="status"><th1> |
| 38 | if {[info exists login]} { |
| 39 | html "<a href='$home/login'>$login</a>\n" |
| 40 | } else { |
| 41 |