* Commit tweaks to the NixOS skin.
svn path=/configurations/trunk/tud/; revision=34579
Eelco Dolstra committed
Jul 5, 2012 at 19:13 UTC
eabceba474df76612721bcf0505a16917edb3b68
4 files changed
+51
-56
wiki-skins/nixos.php
+19
-23
@@ -84,8 +84,6 @@ class NixOSTemplate extends QuickTemplate {
84
foreach ($this->data['personal_urls'] as $key => $item) {
85
$href = htmlspecialchars($item['href']);
86
$text = htmlspecialchars($item['text']);
87
- if ($key != "userpage")
88
- $text = strtolower($text);
87
$link = "<a href='$href'>$text</a>";
88
if ($key == "anonlogin" || $key == "logout" ||
89
$key == "userpage" || $key == "preferences")
@@ -94,8 +92,8 @@ class NixOSTemplate extends QuickTemplate {
92
$loginText .= " / ";
93
}
94
if (!$loginText && !$userpage) {
97
- $text = strtolower(htmlspecialchars(
98
- $this->translator->translate("userlogin")));
95
+ $text = htmlspecialchars(
96
+ $this->translator->translate("userlogin"));
97
$path = str_replace('$1', "Special:Userlogin", $wgArticlePath);
98
$loginText = "<a href='$path'>$text</a>";
99
}
@@ -104,10 +102,10 @@ class NixOSTemplate extends QuickTemplate {
102
103
foreach ($this->data['nav_urls'] as $key => $item) {
104
$href = htmlspecialchars($item['href']);
107
- $text = strtolower(htmlspecialchars(
108
- $this->translator->translate($key)));
105
+ $text = htmlspecialchars(
106
+ $this->translator->translate($key));
107
if ($key == "upload" && $isEnglish)
110
- $text = "upload files";
108
+ $text = "Upload files";
109
$link = "<a href='$href'>$text</a>";
110
if ($key == "help")
111
$helpLink = $link;
@@ -127,15 +125,13 @@ class NixOSTemplate extends QuickTemplate {
125
$href = htmlspecialchars($item['href']);
126
$text = htmlspecialchars($item['text']);
127
if ($key == "talk" && $isEnglish)
130
- $text = "discuss";
128
+ $text = "Discuss";
129
if ($key == "history" && $isEnglish)
132
- $text = "changes";
130
+ $text = "Changes";
131
if ($key == "move" && $isEnglish)
134
- $text = "rename";
132
+ $text = "Rename";
133
if ($key == "nstab-main")
134
$text = $this->data['title'];
137
- else
138
- $text = strtolower($text);
135
$link = "<a href='$href'>$text</a>";
136
if ($key == "talk")
137
$talkLink = $link;
@@ -158,21 +154,21 @@ class NixOSTemplate extends QuickTemplate {
154
if (!$pageLink)
155
$pageLink = $this->data['title'];
156
161
- $text = strtolower(htmlspecialchars(
162
- $this->translator->translate("allpages")));
157
+ $text = htmlspecialchars(
158
+ $this->translator->translate("allpages"));
159
$path = str_replace('$1', "Special:Allpages", $wgArticlePath);
160
$allLink = "<a href='$path'>$text</a>";
161
166
- $searchLabel = strtolower(htmlspecialchars(
167
- $this->translator->translate("search")));
168
- $newPageLabel = strtolower(htmlspecialchars(
169
- $this->translator->translate("newpage")));
162
+ $searchLabel = htmlspecialchars(
163
+ $this->translator->translate("search"));
164
+ $newPageLabel = htmlspecialchars(
165
+ $this->translator->translate("newpage"));
166
if ($canEdit)
171
- $moreLabel = strtolower(htmlspecialchars(
172
- $this->translator->translate("moredotdotdot")));
167
+ $moreLabel = htmlspecialchars(
168
+ $this->translator->translate("moredotdotdot"));
169
else
174
- $moreLabel = strtolower(htmlspecialchars(
175
- $this->translator->translate("qbpageoptions")));
170
+ $moreLabel = htmlspecialchars(
171
+ $this->translator->translate("qbpageoptions"));
172
$moreLabel = str_replace("...", "", $moreLabel);
173
?>
174
@@ -251,7 +247,7 @@ require_once('nixos/header.php');
247
248
<table cellpadding="0" cellspacing="0" border="0" width="100%" id="menuTable">
249
<tr valign="center">
254
-<td class="menuItem" onmouseover="showMenu('mainMenu', 'homeLink', 'left');" nowrap><a href="<?php echo $homeLink ?>" id="homeLink">wiki</a></td>
250
+<td class="menuItem" onmouseover="showMenu('mainMenu', 'homeLink', 'left');" nowrap><a href="<?php echo $homeLink ?>" id="homeLink">Wiki</a></td>
251
<td class="menuItem" nowrap><?php echo $helpLink; ?></td>
252
<td nowrap width="100%"></td>
253
<td class="menuItem" nowrap><?php echo $searchLabel; ?></td>
wiki-skins/nixos/footer.php
+1
-1
@@ -1 +1 @@
1
-<li><a href="http://nixos.org/about-us.html">About us</a></li>
1
+<li><a href="/about-us.html">About us</a></li>
wiki-skins/nixos/header.php
+7
-7
@@ -1,8 +1,8 @@
1
-<li><a href="http://nixos.org/nixos/">NixOS</a></li>
2
-<li><a href="http://nixos.org/nix/">Nix</a></li>
3
-<li><a href="http://nixos.org/nixpkgs/">Nixpkgs</a></li>
4
-<li><a href="http://nixos.org/hydra/">Hydra</a></li>
5
-<li><a href="http://nixos.org/disnix/">Disnix</a></li>
6
-<li><a href="http://nixos.org/development/">Development</a></li>
7
-<li><a href="http://wiki.nixos.org/">Wiki</a></li>
1
+<li><a href="/nixos/">NixOS</a></li>
2
+<li><a href="/nix/">Nix</a></li>
3
+<li><a href="/nixpkgs/">Nixpkgs</a></li>
4
+<li><a href="/hydra/">Hydra</a></li>
5
+<li><a href="/disnix/">Disnix</a></li>
6
+<li><a href="/development/">Development</a></li>
7
+<li><a href="/wiki">Wiki</a></li>
8
wiki-skins/nixos/main.css
+24
-25
@@ -243,10 +243,11 @@ div#logo {
243
244
#menuTable {
245
clear: both;
246
- background-color: #BBBBBB;
247
- border-bottom: 1px solid #999999;
246
+ background-color: #E0E0FF;
247
+ /* border-bottom: 1px solid #999999; */
248
padding-left: 3px;
249
padding-right: 5px;
250
+ font-weight: bold;
251
}
252
253
.menuItem {
@@ -258,7 +259,6 @@ div#logo {
259
color: black;
260
display: block;
261
text-decoration: none;
261
- background-color: #BBBBBB;
262
padding: 4px 10px 4px 10px;
263
}
264
@@ -388,18 +388,16 @@ p + .editsection + a + h3 {
388
/* Main Page Styles */
389
390
#bodyContent {
391
- margin-left: 10px;
392
- padding: 0 20px 20px 20px;
391
clear: both;
392
}
393
394
#bodyContent p {
395
line-height: 110%;
398
- margin-right: 40px;
396
+ /* margin-right: 40px; */
397
}
398
399
#bodyContent li {
402
- margin-right: 40px;
400
+ /* margin-right: 40px; */
401
margin-bottom: 3px;
402
}
403
@@ -423,16 +421,15 @@ p + .editsection + a + h3 {
421
clear: both;
422
display: block;
423
border-bottom: 1px solid #A6A6A6;
426
- margin: 23px 20px 20px 20px;
424
+ margin: 23px 0px 20px 0px;
425
padding: 0;
426
}
427
428
#pageTitle {
431
- font-size: 160%;
429
+ font-size: 180%;
430
font-weight: bold;
431
color: black;
432
padding-top: 0px;
435
- margin-left: 10px;
433
margin-right: 110px;
434
border-bottom: 0px;
435
display: block;
@@ -440,30 +437,22 @@ p + .editsection + a + h3 {
437
438
h1, h2 {
439
color: #005AA0;
443
- font-size: 180%;
440
+ font-size: 130%;
441
font-weight: bold;
442
color: #005AA0;
443
border-bottom: 1px dotted black;
447
- padding-right: 50px;
444
+ /* padding-right: 50px; */
445
display: block;
446
}
447
448
h3, h4, h5, h6 {
449
color: #005AA0;
453
- padding-right: 50px;
450
+ /* padding-right: 50px; */
451
display: block;
452
}
453
454
h3 {
458
- font-size: 150%;
459
-}
460
-
461
-h4, h5 {
462
- font-size: 140%;
463
-}
464
-
465
-h6 {
466
- font-size: 130%;
455
+ font-size: 100%;
456
}
457
458
p, ul, dl, ol, blockquote {
@@ -499,7 +488,7 @@ blockquote pre {
488
489
#toc, .toc {
490
border: 1px dotted #aaa;
502
- background-color: #EFEFEF;
491
+ background-color: #F0F0FF;
492
padding: 5px;
493
}
494
@@ -855,7 +844,7 @@ fieldset.operaprefsection {
844
top: 0px;
845
left: 0px;
846
z-index: 100;
858
- background-color: #BBBBBB;
847
+ background-color: #C0C0FF;
848
border-right: 1px solid #777777;
849
border-bottom: 1px solid #777777;
850
padding: 4px 0 4px 0;
@@ -867,7 +856,6 @@ fieldset.operaprefsection {
856
_padding: 0 10px 2px 10px;
857
display: block;
858
color: black;
870
- background-color: #BBBBBB;
859
text-decoration: none;
860
}
861
@@ -1022,3 +1010,14 @@ span.searchmatch {
1010
font-weight: bold;
1011
}
1012
1013
+/* Nix style stuff; should include nix-common.css */
1014
+
1015
+pre {
1016
+ margin-left: 1.5em;
1017
+ margin-right: 1.5em;
1018
+ border: 1px solid #6185a0;
1019
+ padding: 6px 6px;
1020
+ color: #600000;
1021
+ background: #f4f4f8;
1022
+ white-space: pre-wrap;
1023
+}