Bug 375138: The UI of index.cgi is broken

Patch By Max Kanat-Alexander <mkanat@bugzilla.org> r=justdave, a=LpSolit

4 files changed, 18 insertions, 19 deletions

diff --git a/skins/standard/index.css b/skins/standard/index.css
index 36b90f01f..2b021f349 100644
--- a/skins/standard/index.css
+++ b/skins/standard/index.css
@@ -48,18 +48,11 @@
         width: 250px;
         height: 200px;
 
+        margin-top: 2.3em;
         margin-right: 2.3em;
         float: right;
         background: transparent no-repeat url(index/front.png);
     }
-    div.contribute {
-        position: relative;
-        top: 200px;
-        margin: .5em;
-        padding: .5em;
-        border: 1px dotted black;
-        font-size: small;
-    }
 
     #page-index #report
     {
diff --git a/skins/standard/params.css b/skins/standard/params.css
index 0390c50e3..8d34d0e05 100644
--- a/skins/standard/params.css
+++ b/skins/standard/params.css
@@ -47,3 +47,9 @@ dt {
 dd {
   margin-bottom: 1.5em;
 }
+
+.contribute {
+    border: 1px dotted black;
+    padding: .5em;
+    font-size: small;
+}
diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl
index ce5442b3a..2a9b785a6 100644
--- a/template/en/default/admin/params/editparams.html.tmpl
+++ b/template/en/default/admin/params/editparams.html.tmpl
@@ -89,11 +89,21 @@
       [% IF curpanel == -1 %]
         [% PROCESS admin/params/index.html.tmpl panels = panels %]
       [% ELSE %]
+
+        <div class="contribute"><strong>Note:</strong>
+          [%+ terms.Bugzilla %] is developed entirely by volunteers. The
+          best way to give back to the [% terms.Bugzilla %] project is
+          to <a href="http://www.bugzilla.org/contribute/">contribute</a>
+          yourself! You don't have to be a programmer to contribute, there are
+          lots of things that we need.
+        </div>
+
         <p>
           This lets you edit the basic operating parameters of [% terms.Bugzilla %].
           Be careful!<br>
           Any item you check "Reset" on will get reset to its default value.
         </p>
+
         [%# CONTENT PANEL %]
         <form method="post" action="editparams.cgi">
           [% PROCESS admin/params/common.html.tmpl panel = current_panel %]
diff --git a/template/en/default/index.html.tmpl b/template/en/default/index.html.tmpl
index 9205fba17..a96f2b15e 100644
--- a/template/en/default/index.html.tmpl
+++ b/template/en/default/index.html.tmpl
@@ -93,17 +93,7 @@ function addSidebar() {
 [% END %]
 
 <div id="page-index">
-  <div class="intro">
-  [% IF user.in_group('admin') %]
-    <div class="contribute"><strong>Administrator:</strong>
-      [%+ terms.Bugzilla %] is developed entirely by
-      volunteers. The best way to give back to the [% terms.Bugzilla %] project
-      is to <a href="http://www.bugzilla.org/contribute/">contribute</a>
-      yourself! You don't have to be a programmer to contribute, there are
-      lots of things that we need.
-    </div>
-  [% END %]
-  </div>
+  <div class="intro"></div>
 
   <p>Welcome to [% terms.Bugzilla %]. To see what's new in this version
     of [% terms.Bugzilla %], see the