Bug 1234762 - Terms and privacy links should only be displayed when a…

… user is logged in. r=ferjmoreno, a=jocheng
mozilla-b2g · Jan 21, 2016 · b7fd1e3 · b7fd1e3
1 parent 184523b
commit b7fd1e3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/tv_apps/browser/index.html b/tv_apps/browser/index.html
@@ -747,9 +747,9 @@ <h2 id="private-browsing-subtitle" data-l10n-id="WB_LT_PRIVATE_BROWSING_1"></h2>
                   <span data-l10n-id="fxsync-collections-history"></span>
                 </li>
               </ul>
+              <p class="fine-print"><a id="fxsync-tos" data-l10n-id="fxsync-tos"></a></p>
+              <p class="fine-print"><a id="fxsync-privacy" data-l10n-id="fxsync-privacy"></a></p>
             </div>
-            <p class="fine-print"><a id="fxsync-tos" data-l10n-id="fxsync-tos"></a></p>
-            <p class="fine-print"><a id="fxsync-privacy" data-l10n-id="fxsync-privacy"></a></p>
           </div>
         </div>
 ENDIF_FIREFOX_SYNC-->

diff --git a/tv_apps/browser/js/sync/settings.js b/tv_apps/browser/js/sync/settings.js
@@ -61,12 +61,12 @@
     listener: 'onhistorychecked',
     init: 'onhistorychange'
   }, {
-    screen: [DISABLED, ENABLED],
+    screen: ENABLED,
     selector: '#fxsync-tos',
     event: 'click',
     listener: 'openTos'
   }, {
-    screen: [DISABLED, ENABLED],
+    screen: ENABLED,
     selector: '#fxsync-privacy',
     event: 'click',
     listener: 'openPrivacy'

diff --git a/tv_apps/browser/style/settings.css b/tv_apps/browser/style/settings.css
@@ -248,6 +248,10 @@ p.fine-print {
   justify-content: space-between;
 }
 
+#fxsync-enabled > p {
+  width: 100%;
+}
+
 #fxsync-enabled[hidden] {
   display: none;
 }
@@ -269,6 +273,7 @@ p.fine-print {
   width: 100%;
   margin-top: 2rem;
   margin-left: 1rem;
+  margin-bottom: 2rem;
 }
 
 .settings-horizontal-list-item {