Fix navigation active tab issue
hiromipaw commited on 2017-01-12 12:53:37
Zeige 2 geänderte Dateien mit 7 Einfügungen und 3 Löschungen.
- .gitignore fa0eba603..71fe665bf
- include/head.wmi faf8dd110..091fda804
| ... | ... |
@@ -8,9 +8,11 @@ about/corepeople.html.en |
| 8 | 8 |
about/financials.html.en |
| 9 | 9 |
about/gsoc.html.en |
| 10 | 10 |
about/jobs-browserhacker.html.en |
| 11 |
+about/jobs-comm-director.html.en |
|
| 11 | 12 |
about/jobs-controller.html.en |
| 12 | 13 |
about/jobs-coredev.html.en |
| 13 | 14 |
about/jobs-dircomms.html.en |
| 15 |
+about/jobs-execadmin.html.en |
|
| 14 | 16 |
about/jobs-extdev.html.en |
| 15 | 17 |
about/jobs-lead-automation.html.en |
| 16 | 18 |
about/jobs-pluggabletransport.html.en |
| ... | ... |
@@ -65,10 +65,12 @@ |
| 65 | 65 |
for my $key (@keys) {
|
| 66 | 66 |
my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; |
| 67 | 67 |
|
| 68 |
- # in directory of active link, set class active |
|
| 68 |
+ # in directory of active link, set class active. This rule should be improved with proper structuring of the links. |
|
| 69 | 69 |
my $class; |
| 70 |
- if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) {
|
|
| 71 |
- $class = 'class="active"'; |
|
| 70 |
+ if ((index($page, 'contact') ne -1) and (index($base, 'overview') ne -1)) {
|
|
| 71 |
+ $class = ''; |
|
| 72 |
+ } elsif ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) and (index($key, 'contact') eq -1) or ($WML_SRC_BASENAME eq $base)) {
|
|
| 73 |
+ $class = 'class="active '.$base.' '.$page.'"'; |
|
| 72 | 74 |
} else {
|
| 73 | 75 |
$class = ''; |
| 74 | 76 |
} |
| 75 | 77 |