summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--extensions/BMO/template/en/default/global/common-links.html.tmpl29
-rw-r--r--extensions/BMO/template/en/default/global/header.html.tmpl9
-rw-r--r--skins/contrib/Mozilla/global.css12
3 files changed, 29 insertions, 21 deletions
diff --git a/extensions/BMO/template/en/default/global/common-links.html.tmpl b/extensions/BMO/template/en/default/global/common-links.html.tmpl
index f743a8b91..c72c958a1 100644
--- a/extensions/BMO/template/en/default/global/common-links.html.tmpl
+++ b/extensions/BMO/template/en/default/global/common-links.html.tmpl
@@ -28,10 +28,9 @@
<li><span class="separator">| </span><a href="describecomponents.cgi">Browse</a></li>
<li><span class="separator">| </span><a href="query.cgi">Search</a></li>
- [% IF user.settings.skin.value != 'Mozilla' %]
- <li class="form">
- <span class="separator">| </span>
- <form action="buglist.cgi" method="get"
+ <li class="form">
+ <span class="separator">| </span>
+ <form action="buglist.cgi" method="get"
onsubmit="if (this.quicksearch.value == '')
{ alert('Please enter one or more search terms first.');
return false; } return true;">
@@ -39,11 +38,13 @@
title="Quick Search" value="[% quicksearch FILTER html %]">
<input class="btn" type="submit" value="Search"
id="find[% qs_suffix FILTER html %]">
- [%-# Work around FF bug: keep this on one line %]</form>
- <a href="page.cgi?id=quicksearch.html" title="Quicksearch Help">[?]</a></li>
-
- <li><span class="separator">| </span><a href="report.cgi">Reports</a></li>
-
+ [%-# Work around FF bug: keep this on one line %]</form>
+ <a href="page.cgi?id=quicksearch.html" title="Quicksearch Help">[?]</a>
+ </li>
+
+ <li><span class="separator">| </span><a href="report.cgi">Reports</a></li>
+
+ [% IF user.settings.skin.value != 'Mozilla' %]
<li>
[% IF Param('shutdownhtml') || Bugzilla.has_flags %]
<span class="separator">| </span>
@@ -69,9 +70,9 @@
|| user.get_products_by_permission("editcomponents").size %]
<li><span class="separator">| </span><a href="admin.cgi">Administration</a></li>
[% END %]
-
+
[% PROCESS link_to_documentation %]
-
+
<li>
<span class="separator">| </span>
[% IF user.authorizer.can_logout %]
@@ -88,9 +89,9 @@
[% END %]
[%-# Work around FF bug: keep this on one line %]</li>
[% ELSE %]
-
+
[% PROCESS link_to_documentation %]
-
+
[% IF Param('createemailregexp')
&& user.authorizer.user_can_create_account %]
<li id="new_account_container[% qs_suffix FILTER html %]">
@@ -98,7 +99,7 @@
<a href="createaccount.cgi">New&nbsp;Account</a>
</li>
[% END %]
-
+
[%# Only display one login form when we're on a LOGIN_REQUIRED page. That
# way, we're guaranteed that the user will use the form that has
# hidden_fields in it (the center form) instead of this one. Also, it's
diff --git a/extensions/BMO/template/en/default/global/header.html.tmpl b/extensions/BMO/template/en/default/global/header.html.tmpl
index e3d9c9158..36014fbcd 100644
--- a/extensions/BMO/template/en/default/global/header.html.tmpl
+++ b/extensions/BMO/template/en/default/global/header.html.tmpl
@@ -339,7 +339,11 @@
</tr>
</table>
- <ul class="links">
+ [% PROCESS "global/common-links.html.tmpl" qs_suffix = "_top" %]
+
+ </div>
+
+<!--<ul class="links">
<li><a href="enter_bug.cgi">New</a></li>
<li><a href="describecomponents.cgi">Browse</a></li>
<li><a href="query.cgi">Search</a></li>
@@ -353,8 +357,7 @@
</li>
<li><a href="https://bugzilla-stage-tip.mozilla.org/page.cgi?id=frontpage.html">Front Page</a></li>
<li><a href="page.cgi?id=browse.html">Product Browser</a></li>
- </ul>
- </div>
+ </ul> -->
[% ELSE %]
diff --git a/skins/contrib/Mozilla/global.css b/skins/contrib/Mozilla/global.css
index 405ee424e..8a771f764 100644
--- a/skins/contrib/Mozilla/global.css
+++ b/skins/contrib/Mozilla/global.css
@@ -129,6 +129,10 @@ hr {
font-weight: bold;
}
+.links .separator {
+ display: none;
+}
+
#quicksearch_top, #quicksearch_main {
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
@@ -140,6 +144,10 @@ hr {
width: 200px;
}
+#footer .links .form {
+ display: none;
+}
+
#find_top {
display: none !important;
}
@@ -235,10 +243,6 @@ hr {
width: auto;
}
-#quicksearch_main {
- padding-left: 5px;
-}
-
#quicksearch_links {
margin-top: 10px;
}