Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/314034
Change subject: noc: Clean up index.html and use HiDPI logo
......................................................................
noc: Clean up index.html and use HiDPI logo
* Add missing /static symlink (similar to other docroots)
* Clean up and simplify <head> HTML.
* Remove redundant HTML boilerplate that was copied from Vector
and BugZilla but is not actually visible.
- #p-personal
- .visualClear (was a no-op, since it wasn't defined in css
and this layout doesn't need a clear here anyway)
* Remove undefined CSS classes from HTML.
* Remove unused CSS rules with no matches anywhere in /noc.
- "bz"-prefix
- "attachment"-prefix
- "#noview"
- ".uneditable_textarea"
* Load logo from /static instead of upload.wikimedia.org.
* Use HiDPI 2x logo (similar to wikimediafoundation.org config).
Change-Id: Ia1b0a6bd673c633d8bcf8a7adfd8da0aeec9a40a
---
M docroot/noc/conf/index.php
M docroot/noc/css/IE-fixes.css
M docroot/noc/css/global.css
M docroot/noc/css/index.css
M docroot/noc/css/vector.css
M docroot/noc/db.php
M docroot/noc/index.html
A docroot/noc/static
8 files changed, 43 insertions(+), 294 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/34/314034/1
diff --git a/docroot/noc/conf/index.php b/docroot/noc/conf/index.php
index b34726a..fa84a46 100644
--- a/docroot/noc/conf/index.php
+++ b/docroot/noc/conf/index.php
@@ -23,7 +23,7 @@
?><!DOCTYPE html>
<html lang="en">
<head>
- <meta charset="UTF-8" />
+ <meta charset="UTF-8">
<title>Wikimedia configuration files</title>
<link rel="shortcut icon"
href="//www.wikimedia.org/static/favicon/wmf.ico">
<link rel="stylesheet" href="../css/base.css">
diff --git a/docroot/noc/css/IE-fixes.css b/docroot/noc/css/IE-fixes.css
index bfd525b..b0f3414 100644
--- a/docroot/noc/css/IE-fixes.css
+++ b/docroot/noc/css/IE-fixes.css
@@ -13,11 +13,6 @@
* Contributor(s): Marc Schumann <[email protected]>
*/
-.bz_comment_text, .uneditable_textarea {
- white-space: pre;
- word-wrap: break-word;
-}
-
#footer #useful-links li {
padding-bottom: 0.8ex;
}
diff --git a/docroot/noc/css/global.css b/docroot/noc/css/global.css
index efb1a81..e3c614a 100644
--- a/docroot/noc/css/global.css
+++ b/docroot/noc/css/global.css
@@ -35,19 +35,6 @@
color: green;
}
- form.mini_login input.bz_login {
- width: 10em;
- }
- form.mini_login input.bz_password {
- width: 6em;
- }
- form.mini_login input.bz_remember {
- margin: 0;
- }
- .bz_mini_login_help {
- color: #777;
- }
-
/* header (end) */
@@ -140,93 +127,6 @@
margin: 0;
}
-.bz_obsolete {
- text-decoration: line-through;
-}
-.bz_inactive {
- text-decoration: line-through;
-}
-.bz_closed,
-.bz_CLOSED td {
- text-decoration: line-through;
-}
-.bz_private {
- color: darkred;
- background: #f3eeee;
-}
-.bz_disabled {
- color: #a0a0a0;
-}
-
-/************/
-/* Comments */
-/************/
-
-.bz_comment {
- margin-bottom: 2em;
-}
-
-/* The rules for these classes make international text wrap correctly,
- even for languages like Japanese that have no spaces. */
-.bz_comment_text, .uneditable_textarea {
- font-family: monospace;
- /* Note that these must all be on separate lines or they stop
- working in Konqueror. */
- white-space: pre-wrap; /* CSS 3 & 2.1 */
- white-space: -moz-pre-wrap; /* Gecko */
- white-space: -pre-wrap; /* Opera 4-6 */
- white-space: -o-pre-wrap; /* Opera 7 */
-}
-
-.bz_comment_text {
- width: 50em;
-}
-
-.bz_comment_user, .bz_comment_time, .bz_comment_number,
-.bz_private_checkbox, .bz_comment_actions
-{
- margin: 0 .5em;
-}
-
-.bz_comment_actions, .bz_comment_number, .bz_private_checkbox {
- float: right;
-}
-
-.bz_collapse_comment {
- text-decoration: none;
-}
-
-.bz_private_checkbox input {
- margin: 0;
- vertical-align: middle;
-}
-
-.bz_comment_head, .bz_first_comment_head {
- padding-top: .1em;
- padding-bottom: .1em;
- padding-left: .5em;
- background-color: #e0e0e0;
-}
-
-.bz_comment_user_images img {
- vertical-align: bottom;
-}
-
-.bz_comment_hilite pre {
- background-color: lightgreen;
- margin: 0;
- padding: 1em 0;
-}
-
-/** End Comments **/
-
-.bz_default_hidden, .bz_tui_hidden, .bz_hidden_field, .bz_hidden_option {
- /* We have !important because we want elements with these classes to always
- * be hidden, even if there is some CSS that overrides it (we use these
- * classes inside JavaScript to hide things). */
- display: none !important;
-}
-
span.quote {
color: #65379c;
/* Make quoted text not wrap. */
@@ -267,60 +167,6 @@
#admin_table th {
white-space: normal !important;
-}
-
-/* Style of the attachment table and time tracking table */
-#attachment_table {
- border-collapse: collapse;
- border: 1px solid silver !important;
- width: 52em;
-}
-
-table.bz_time_tracking_table {
- padding: 0.3em 0.3em 0.3em 0.5em;
-}
-#attachment_table th, .bz_attach_footer, .bz_time_tracking_table th {
- background-color: #E0E0E0;
- color: black;
-}
-
-#attachment_table td, .bz_time_tracking_table th, .bz_time_tracking_table td {
- border: 1px solid #333333;
-}
-
-.bz_attach_extra_info {
- font-size: smaller;
-}
-
-.bz_attach_flags, .bz_attach_footer {
- white-space: nowrap;
-}
-
-.bz_attach_view_hide {
- float: right;
- padding-left: 1em;
-}
-
-table.attachment_info th {
- text-align: right;
- vertical-align: top;
-}
-
-table.attachment_info td {
- text-align: left;
- vertical-align: top;
-}
-
-/* Text displayed when the attachment is not viewable by the web browser */
-#noview {
- text-align: left;
- vertical-align: middle;
-}
-
-/* For bug fields */
-.uneditable_textarea {
- width: 30em;
- font-size: medium;
}
div.user_match {
@@ -417,7 +263,4 @@
#down_button {
background-image: url(images/global/down.png);
-}
-.bz_emailprefs tr.bz_row_odd {
- background-color: #f0f0f0;
}
diff --git a/docroot/noc/css/index.css b/docroot/noc/css/index.css
index c160f4e..11a6e33 100644
--- a/docroot/noc/css/index.css
+++ b/docroot/noc/css/index.css
@@ -49,27 +49,6 @@
{
font-weight: bold;
}
-
- .bz_common_actions {
- display: block;
- height: 190px;
- width: 195px;
- float: left;
- margin: 0 3ex 3em 0;
- text-align: center;
- }
- .bz_common_actions span {
- position: relative;
- top: 95%;
- font-weight: bold;
- }
-
- .bz_common_actions,
- .bz_common_actions:visited,
- .bz_common_actions:hover
- {
- text-decoration: none;
- }
#enter_bug { background: url(images/index/bug.gif) no-repeat; }
#query { background: url(images/index/search.gif) no-repeat; }
@@ -120,11 +99,6 @@
ul.additional_links li
{
display: inline;
- }
-
- ul.additional_links li.bz_default_hidden
- {
- display: none;
}
input.quicksearch_help_text
diff --git a/docroot/noc/css/vector.css b/docroot/noc/css/vector.css
index d09cfd3..af9617d 100644
--- a/docroot/noc/css/vector.css
+++ b/docroot/noc/css/vector.css
@@ -141,20 +141,6 @@
#simpleSearch > button#searchButton {
height: 100%;
}
-
- form.mini_login input.bz_login {
- width: 10em;
- }
- form.mini_login input.bz_password {
- width: 6em;
- }
- form.mini_login input.bz_remember {
- margin: 0;
- }
- .bz_default_hidden {
- display: none !important;
- }
-
/* Panel */
#panel {
diff --git a/docroot/noc/db.php b/docroot/noc/db.php
index ad010db..48b5962 100644
--- a/docroot/noc/db.php
+++ b/docroot/noc/db.php
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
+ <meta charset="UTF-8">
<title>Wikimedia databases configuration</title>
<script
src="https://www.mediawiki.org/w/load.php?modules=startup&only=scripts";></script>
<style>body { font-family: sans-serif; }</style>
diff --git a/docroot/noc/index.html b/docroot/noc/index.html
index 4033a94..ce82553 100644
--- a/docroot/noc/index.html
+++ b/docroot/noc/index.html
@@ -1,41 +1,26 @@
<!DOCTYPE html>
-<html>
+<html dir="ltr">
<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <link rel="stylesheet" href="css/vector.css" media="screen" />
-
- <meta name="robots" content="index,follow">
+ <meta charset="UTF-8">
<title>Wikimedia NOC</title>
-
- <link href="css/global.css" rel="stylesheet" type="text/css">
-<!--[if lte IE 7]>
-
- <link href="css/IE-fixes.css"
- rel="stylesheet"
- type="text/css">
-<![endif]-->
- <link rel="stylesheet" href="css/index.css" media="screen" />
- <style type="text/css">
- dd {margin-bottom: 1em;}
- </style>
+ <link rel="stylesheet" href="css/vector.css">
+ <link rel="stylesheet" href="css/global.css">
+ <!--[if lte IE 7]>
+ <link rel="stylesheet" href="css/IE-fixes.css">
+ <![endif]-->
+ <link rel="stylesheet" href="css/index.css">
+ <meta name="robots" content="index,follow">
+ <style>dd { margin-bottom: 1em; }</style>
</head>
-
-<body class="skin-vector bugzilla-wikimedia-org" dir="ltr" onload="" >
-
- <div id="page-base" class="noprint"></div>
- <div id="head-base" class="noprint"></div>
- <!-- content -->
+<body>
+ <div id="page-base"></div>
+ <div id="head-base"></div>
<div id="content-container" >
<a id="top"></a>
- <!-- bodyContent -->
-
<div id="bodyContent">
-
-
-<div id="page-index">
-
- <h2 style="border-bottom:solid 1px silver;">Wikimedia NOC</h2>
- <dl style="margin-bottom:3em;">
+ <div id="page-index">
+ <h2 style="border-bottom: solid 1px silver;">Wikimedia NOC</h2>
+ <dl style="margin-bottom: 3em;">
<dt><a href="./conf/">Server configuration</a></dt>
<dd>Config files of Wikimedia's MediaWiki installation</dd>
<dt><a
href="https://config-master.wikimedia.org/conftool/";>Conftool
configuration</a></dt>
@@ -54,7 +39,7 @@
<dt><a
href="https://blog.wikimedia.org/c/technology/";>Blog</a></dt>
<dd>Blog of the operators of Wikimedia's servers</dd>
</dl>
- <h2 style="border-bottom:solid 1px silver;">Other Wikimedia
Resources</h2>
+ <h2 style="border-bottom: solid 1px silver;">Other Wikimedia
Resources</h2>
<dl>
<dt><a href="https://gerrit.wikimedia.org/";>Wikimedia Git
repository</a></dt>
<dd>Revision control system for MediaWiki and other
Wikimedia projects, managed via Gerrit code review</dd>
@@ -65,68 +50,32 @@
<dt><a href="http://dumps.wikimedia.org/";>Wikimedia
Downloads</a></dt>
<dd>Software and data downloads</dd>
</dl>
-
-
- <div style="clear:both;"></div>
-
-
-
- <div class="outro"></div>
-</div>
-<div class="visualClear"></div>
+ <div style="clear: both;"></div>
+ <div class="outro"></div>
</div>
- <!-- /bodyContent -->
</div>
- <!-- /content -->
-
- <!-- header -->
- <div id="head" class="noprint">
- <!-- personal -->
- <div id="p-personal" class="">
- <h5>Personal tools</h5>
-
- <ul >
+ </div>
+ <div id="panel">
+ <div id="p-logo"><a style="background-image:
url(./static/images/project-logos/foundationwiki-2x.png);
+ background-size: 135px auto;" href="./" title="Visit the main
page"></a></div>
+ <div class="portal">
+ <h5>Links</h5>
+ <div class="body">
+ <ul><li><a
href="https://www.wikimedia.org/";>Wikimedia</a></li>
+ <li><a
href="https://www.mediawiki.org/";>MediaWiki</a></li>
</ul>
</div>
-
- <!-- /personal -->
</div>
- <!-- /header -->
- <!-- panel -->
- <div id="panel" class="noprint">
- <!-- logo -->
- <div id="p-logo"><a style="background-image:
url(https://upload.wikimedia.org/wikipedia/foundation/b/bc/Wiki.png);"
href="./" title="Visit the main page"></a></div>
- <!-- /logo -->
- <!-- toolbox -->
- <div class="portal">
- <h5>Links</h5>
- <div class="body">
-
- <ul><li><a
href="https://www.wikimedia.org/";>Wikimedia</a></li>
- <li><a
href="https://www.mediawiki.org/";>MediaWiki</a></li>
-
- </ul>
- </div>
- </div>
-
- <!-- /toolbox -->
- </div>
- <!-- /panel -->
-
- <!-- footer -->
- <div id="footer" >
-
- <ul id="footer-places">
- <li><a
href="https://wikimediafoundation.org/wiki/Privacy_policy";
title="wikimedia:Privacy policy">Privacy policy</a></li>
- <li><a
href="https://www.mediawiki.org/wiki/Project:About"; title="Project:About">About
MediaWiki.org</a></li>
- <li><a
href="https://www.mediawiki.org/wiki/Project:General_disclaimer";
title="Project:General disclaimer">Disclaimers</a></li>
- </ul>
- <ul id="footer-icons" class="noprint">
- <!-- <li id="footer-icon-poweredby"><a
href="https://www.bugzilla.org/";><img
src="skins/custom/images/bugzilla-badge.png" height="31" width="88"
alt="Powered by Bugzilla" /></a></li> -->
-
- </ul>
- <div style="clear:both"></div>
- </div>
- <!-- /footer -->
- </body>
+ </div>
+ <div id="footer" >
+ <ul id="footer-places">
+ <li><a
href="https://wikimediafoundation.org/wiki/Privacy_policy";
title="wikimedia:Privacy policy">Privacy policy</a></li>
+ <li><a
href="https://www.mediawiki.org/wiki/Project:About"; title="Project:About">About
MediaWiki.org</a></li>
+ <li><a
href="https://www.mediawiki.org/wiki/Project:General_disclaimer";
title="Project:General disclaimer">Disclaimers</a></li>
+ </ul>
+ <ul id="footer-icons">
+ </ul>
+ <div style="clear: both;"></div>
+ </div>
+</body>
</html>
diff --git a/docroot/noc/static b/docroot/noc/static
new file mode 120000
index 0000000..8e9b74c
--- /dev/null
+++ b/docroot/noc/static
@@ -0,0 +1 @@
+../../static
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/314034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1b0a6bd673c633d8bcf8a7adfd8da0aeec9a40a
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
