Bug 881400: form.reps.mentorship is broken when using the mozilla skin

2 files changed, 7 insertions, 23 deletions

diff --git a/skins/contrib/Mozilla/global.css b/skins/contrib/Mozilla/global.css
index 10e09435b..30dedcf97 100644
--- a/skins/contrib/Mozilla/global.css
+++ b/skins/contrib/Mozilla/global.css
@@ -82,21 +82,21 @@ hr {
     padding: 0 1em 0 1em;
 }
 
-#titles #information {
+#information {
     text-align: left;
     padding-left: 2em;
 }
 
-#titles #title {
+#title {
     width: 150px;
     font-size: 120%;
 }
 
-#titles #tab {
+#moz_tab {
     width: 100px;
 }
 
-#titles #login {
+#moz_login {
     text-align: right;
     padding-right: 2em;
     color: #404040;
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index 48140f74c..62be70e94 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -255,23 +255,7 @@
         <a href="./" title="Home">[% terms.BugzillaTitle %]</a>
       </td>
       <td id="information"></td>
-      <td id="languages">
-        [% IF Bugzilla.languages.size > 1 %]
-          <ul class="links">
-            [% FOREACH lang = Bugzilla.languages.sort %]
-              <li>[% IF NOT loop.first %]<span class="separator"> | </span>[% END %]
-                [% IF lang == current_language %]
-                  <span class="lang_current">[% lang FILTER html FILTER upper %]</span>
-                [% ELSE %]
-                  <a href="#" onclick="set_language('[% lang FILTER none %]');">
-                    [%- lang FILTER html FILTER upper %]</a>
-                [% END %]
-              </li>
-            [% END %]
-          </ul>
-        [% END %]
-        </td> 
-      <td id="login">
+      <td id="moz_login">
         [% IF user.id %]
           <ul class="links">
             <li class="dropdown">
@@ -305,7 +289,7 @@
           <ul class="login-links">
             [% IF Param('createemailregexp')
                   && user.authorizer.user_can_create_account %]
-              <li id="new_account_container_top"><a href="createaccount.cgi">New&nbsp;Account</a></li>
+              <li id="moz_new_account_container_top"><a href="createaccount.cgi">New&nbsp;Account</a></li>
             [% END %]
 
             [%# Only display one login form when we're on a LOGIN_REQUIRED page. That
@@ -320,7 +304,7 @@
           </ul>
         [% END %]
       </td>
-      <td id="tab">
+      <td id="moz_tab">
         <a href="http://mozilla.org/"><img src="https://addons.cdn.mozilla.net/media/img/zamboni/mozilla-tab.png?b=4953ddb"></a>
       </td>
     </tr>