Merge pull request #1777 from edx/talbs/studio-fix-tos

Studio: FIX - reinstating Terms of Service and Privacy Policy references

cms/envs/common.py

@@ -414,14 +414,7 @@ INSTALLED_APPS = (
 EDXMKTG_COOKIE_NAME = 'edxloggedin'
 MKTG_URLS = {}
 MKTG_URL_LINK_MAP = {
-    'ABOUT': 'about_edx',
-    'CONTACT': 'contact',
-    'FAQ': 'help_edx',
-    'COURSES': 'courses',
-    'ROOT': 'root',
-    'TOS': 'tos',
-    'HONOR': 'honor',
-    'PRIVACY': 'privacy_edx',
+
 }
 
 COURSES_WITH_UNSAFE_CODE = []

cms/static/sass/_variables.scss

@@ -172,6 +172,15 @@ $tmg-f3: 0.125s;
 
 // ====================
 
+// archetype UI
+$ui-action-primary-color: $blue-u2;
+$ui-action-primary-color-focus: $blue-s1;
+
+$ui-link-color: $blue-u2;
+$ui-link-color-focus: $blue-s1;
+
+// ====================
+
 // specific UI
 $ui-notification-height: ($baseline*10);
 $ui-update-color: $blue-l4;

cms/static/sass/elements/_footer.scss

@@ -23,10 +23,10 @@
     }
 
     a {
-      color: $gray;
+      color: $ui-link-color;
 
       &:hover, &:active {
-        color: $gray-d2;
+        color: $ui-link-color-focus;
       }
     }
 
@@ -37,7 +37,7 @@
 
       .nav-item {
         display: inline-block;
-        margin-right: ($baseline/2);
+        margin-right: ($baseline/4);
 
         &:last-child {
           margin-right: 0;
@@ -45,7 +45,7 @@
 
         a {
           border-radius: 2px;
-          padding: ($baseline/2) ($baseline*0.75);
+          padding: ($baseline/2) ($baseline/2);
           background: transparent;
 
           [class^="icon-"] {
@@ -54,19 +54,6 @@
             display: inline-block;
             vertical-align: middle;
             margin-right: ($baseline/4);
-            color: $gray-l1;
-          }
-
-          &:hover, &:active {
-            color: $gray-d2;
-
-            [class^="icon-"] {
-              color: $gray-d2;
-            }
-          }
-
-          &.is-active {
-            color: $gray-d2;
           }
         }
       }

cms/templates/signup.html

@@ -60,7 +60,9 @@
 
             <li class="field checkbox required" id="field-tos">
               <input id="tos" name="terms_of_service" type="checkbox" value="true" />
-              <label for="tos">${_("I agree to the Terms of Service")}</label>
+              <label for="tos">
+                ${_("I agree to the {a_start} Terms of Service {a_end}").format(a_start='<a data-rel="edx.org" href="{}">'.format(marketing_link('TOS')), a_end="</a>")}
+              </label>
             </li>
           </ol>
         </fieldset>

cms/templates/widgets/footer.html

 <%! from django.core.urlresolvers import reverse %>
 <%! from django.utils.translation import ugettext as _ %>
 
-<div class="wrapper-footer wrapper">  
+<div class="wrapper-footer wrapper">
   <footer class="primary" role="contentinfo">
     <div class="colophon">
       <p>&copy; 2013 <a href="http://www.edx.org" rel="external">edX</a>. ${ _("All rights reserved.")}</p>
     </div>
-    
+
     <nav class="nav-peripheral">
       <ol>
-        <!-- <li class="nav-item nav-peripheral-tos">
-          <a href="#">Terms of Service</a>
+        <li class="nav-item nav-peripheral-tos">
+          <a data-rel="edx.org" href="${marketing_link('TOS')}">${_("Terms of Service")}</a>
         </li>
         <li class="nav-item nav-peripheral-pp">
-          <a href="#">Privacy Policy</a>
-        </li> -->
+          <a data-rel="edx.org" href="${marketing_link('PRIVACY')}">${_("Privacy Policy")}</a>
+        </li>
         % if user.is_authenticated():
         <li class="nav-item nav-peripheral-feedback">
           <a href="http://help.edge.edx.org/discussion/new" class="show-tender" title="${_('Use our feedback tool, Tender, to share your feedback')}">${_("Contact Us")}</a>
         </li>
-        % endif    
+        % endif
       </ol>
     </nav>
   </footer>