Bug 1259322 - Legal compliance / adding link to footer

diff --git a/extensions/BMO/template/en/default/hook/global/footer-end.html.tmpl b/extensions/BMO/template/en/default/hook/global/footer-outro.html.tmpl
similarity index 53%
rename from extensions/BMO/template/en/default/hook/global/footer-end.html.tmpl
rename to extensions/BMO/template/en/default/hook/global/footer-outro.html.tmpl
index f14b34acb2cef876457a1374da385d9b33d9b111..6b451bd17a6bbed0faa7f7b2f1281c0281756472 100644 (file)
--- a/extensions/BMO/template/en/default/hook/global/footer-end.html.tmpl
+++ b/extensions/BMO/template/en/default/hook/global/footer-outro.html.tmpl
@@ -6,6 +6,13 @@
   # defined by the Mozilla Public License, v. 2.0.
   #%]
 
-<div id="privacy-policy">
-  <a href="https://www.mozilla.org/privacy/websites/" target="_blank">Privacy Policy</a>
+<div id="policy_links">
+  <ul>
+    <li id="privacy_notice">
+      <a href="https://www.mozilla.org/privacy/websites/" target="_blank">Privacy Notice</a> |
+    </li>
+    <li id="legal_terms">
+      <a href="https://www.mozilla.org/about/legal/terms/mozilla" target="_blank">Legal Terms</a>
+    </li>
+  <ul>
 </div>

diff --git a/skins/custom/global.css b/skins/custom/global.css
index b4220663d3412c15a3943ce6eda115662f90ef72..61743d62ae5ae9d86f0716913fa64843830dce75 100644 (file)
--- a/skins/custom/global.css
+++ b/skins/custom/global.css
@@ -1,3 +1,10 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this file,
+ * You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This Source Code Form is "Incompatible With Secondary Licenses", as
+ * defined by the Mozilla Public License, v. 2.0. */
+
 /* 
  * Custom rules for skins/standard/global.css.
  * The rules you put here override rules in that stylesheet.
@@ -53,12 +60,6 @@ a.controller {
     padding: 3px;
 }
 
-#footer .outro {
-    text-align:left;
-    padding-left:1ex;
-    padding-bottom:1ex;
-}
-
 .group_secure > th > a {
     background-image: url("../../images/padlock.png");
     background-position: center left;
@@ -66,12 +67,15 @@ a.controller {
     padding-left: 18px;
 }
 
-#privacy-policy {
-    font-size: x-small;
-    width: 100%;
+#policy_links {
+    padding-right: 5px;
     text-align: right;
 }
 
+#policy_links li {
+    display: inline;
+}
+
 .highlighted {
     background: lightyellow;
 }

diff --git a/skins/standard/mobile.css b/skins/standard/mobile.css
index 61179e93df4029544be47defe525c89e2d24daf6..c5e47b8a53a883fc68665581b0c19146090ab55d 100644 (file)
--- a/skins/standard/mobile.css
+++ b/skins/standard/mobile.css
@@ -52,7 +52,7 @@ only screen and (-o-min-device-pixel-ratio: 2/1),
 only screen and (min-device-pixel-ratio: 2),
 only screen and (min-resolution: 192dpi),
 only screen and (min-resolution: 2dppx) {
-    #privacy_policy {
+    #policy_links {
         font-size: small;
     }