merged with default

--HG--
branch : kf-login-errors

activation_active.html

+
+<%inherit file="main.html" />
+
+<section class="activation">
+  <h1>Account already active!</h1>
+  <!-- <p>Now go <a href="/">log in</a> and try the course!</a></p> -->
+  <p> This account has already been activated. We will notify you as
+  soon as the course starts.</p>
+</section>

activation_invalid.html

@@ -2,6 +2,8 @@
 <section class="activation">
 <h1>Activation Invalid</h1>
 
-<p>Something went wrong. Did you already activate the account? Otherwise, e-mail us to
-  let us know what happened at <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a>.</p>
+<p>Something went wrong. Check to make sure the URL you went to was
+  correct -- e-mail programs will sometimes split it into two
+  lines. If you still have issues, e-mail us to let us know what happened
+  at <a href="mailto:bugs@mitx.mit.edu">bugs@mitx.mit.edu</a>.</p>
 </section>

index.html

@@ -41,9 +41,9 @@
       <p>The course web site was developed and tested primarily with
       Google Chrome. We support current versions of Mozilla Firefox as
       well. The video player is designed to work with Flash. While we
-      provide a non-Flash fallback for the video, as well as partial
-      support for Internet Explorer, other browsers, and tablets,
-      portions of the functionality will be unavailable. </p>
+      provide a partial non-Flash fallback for the video, as well as
+      partial support for Internet Explorer, other browsers, and
+      tablets, portions of the functionality will be unavailable. </p>
     </section>
 
     <section class="cta">

privacy.html

@@ -19,10 +19,9 @@ released in a manner that is inconsistent with this policy. </p>
 through the Site and does not apply to information that we may collect
 from you in other ways (for example, this policy does not apply to
 information that you may provide to us over the phone, by fax or
-through conventional mail). In addition, please note that this policy
-does not apply to your educational records -- those records are protected
-by the Family Educational Rights and Privacy Act (&quot;FERPA&quot;)
-with which we are committed to comply.</p>
+through conventional mail). In addition, please note your educational
+records are protected by the Family Educational Rights and Privacy Act
+(&quot;FERPA&quot;) to the extent FERPA applies.</p>
 
 <h2>Usernames and Postings </h2>
 
@@ -37,16 +36,17 @@ identifiable information to those forums (or other public areas).</p>
 <p>Please understand that by submitting any Personally Identifiable
 Information to us, you consent and agree that we may collect, use and
 disclose such Personally Identifiable Information in accordance with
-this Privacy Policy and our TOS, and as permitted or required by
-law. If you do not agree with these terms, then please do not provide
-any Personally Identifiable Information to us. As used herein,
-&quot;Personally Identifiable Information&quot; means your full name,
-email address and your student identification number. If you refuse,
-or if you choose not to provide us with any required Personally
-Identifiable Information, we may not be able to provide you with the
-services that can be offered on our Site.</p>
-
-<h2>What Information We Collect </h2>
+this Privacy Policy and our Terms of Service (&quot;TOS&quot;), and as
+permitted or required by law. If you do not agree with these terms,
+then please do not provide any Personally Identifiable Information to
+us. As used herein, &quot;Personally Identifiable Information&quot;
+means your full name, email address, your physical address (if you
+provide it) and your student identification number, if applicable. If
+you refuse, or if you choose not to provide us with any required
+Personally Identifiable Information, we may not be able to provide you
+with the services that can be offered on our Site.</p>
+
+<h2>Information We Collect and How We Use It </h2>
 
 <p>We collect information, including Personally Identifiable
 Information, when you sign up for a User Account, participate in
@@ -103,6 +103,14 @@ with the following:</p>
      collection. </li>
 </ul>
 
+<p> In addition to the above situations where your information may be
+shared with others, there is also the possibility that <i>MITx</i>
+will affiliate with other educational institutions and/or
+that <i>MITx</i> will become a (or part of a) nonprofit entity
+separate from MIT.  In those events, the other educational
+institutions and/or separate entity will have access to the
+information you provide, to the extent permitted by FERPA.
+
 <h2>Sharing with Third Parties</h2>
 
 <p>We may share the information we collect with third parties
@@ -125,9 +133,9 @@ otherwise, for marketing purposes, or in any other way. If we do use your postin
 we will use them without your real name and e-mail (except with explicit
 permission), but we may use your username. </p>
 
-<li>To connect you to other users of the web site. For instance, we
+<li>To connect you to other users of the Site. For instance, we
 may recommend specific study partners, or connect potential student
-mantees and mentors. In such cases, we may use all information
+mentees and mentors. In such cases, we may use all information
 collected to determine who to connect you to, but we will only connect
 you by username, and not disclose your real name or e-mail address to
 your contact. </p>
@@ -170,14 +178,13 @@ data. </p>
 <h2>Changing Our Privacy Policy</h2>
 
 <p>Please note that we review our privacy practices from time to time,
-and that these practices are subject to change. Any change, update, or
-modification will be effective immediately upon posting on our
-Site. We will notify you of any material change to this Privacy Policy
-by posting a notice on our Site's homepage for a reasonable period of
-time following such update, and by changing the effective date
-(located at the bottom of this page). Be sure to return to this page
-periodically to ensure familiarity with the most current version of
-this Privacy Policy. </p>
+and that these practices are subject to change. We will publish notice
+of any such modifications online on this page for a reasonable period
+of time following such modifications, and by changing the effective
+date of this Privacy Policy. By continuing to access the Site after
+such changes have been posted, you signify your agreement to be bound
+by them. Be sure to return to this page periodically to ensure
+familiarity with the most current version of this Privacy Policy. </p>
 
 <h2>Privacy Concerns</h2>
 
@@ -185,6 +192,7 @@ this Privacy Policy. </p>
 prefer to keep private, please contact us
 at <a href="mailto:privacy@mitx.mit.edu">privacy@mitx.mit.edu</a>. </p>
 
+<p> Effective Date: February 6, 2012
 
   </div>
 </section>

sass/_discussion-answers.scss

@@ -44,7 +44,7 @@ div.answer-block {
   }
 
   div.answered-by-owner {
-    color: darken($mit-red, 10%);
+    color: darken($mit-red, 20%);
   }
 }
 

sass/_question-view.scss

@@ -213,14 +213,29 @@ div.question-header {
             }
 
             div.comment-votes {
-                @include transform(rotate(-90deg));
                 width: 16px;
 
               a.upvote {
+                background: url(../images/askbot/comment-vote-up.png) no-repeat 2px;
                 cursor: pointer;
-                font-size: 25px;
+                color: green;
+                display: block;
+                margin-bottom: 6px;
+                margin-top: 5px;
+                overflow: hidden;
                 text-decoration: none;
+                text-indent: -9999px; 
+                width: 20px;
+              }
+
+              a.upvoted {
+                @include border-radius(3px);
+                background: #D1E3A8;
                 color: green;
+                font-weight: bold;
+                margin-top: 10px;
+                padding: 2px;
+                text-indent: 0px;
               }
             }
 

tos.html

@@ -8,7 +8,7 @@
 <p>Welcome to <i>MITx</i>. You must read and agree to these Terms of Service
 (&quot;TOS&quot;), <i>MITx</i>&rsquo;s <a href="/t/privacy.html">Privacy
 Policy</a>, and <a href="/t/honor.html">Honor Code</a> prior to
-registering for this Site or using any portion of this site
+registering for this site or using any portion of this site
 (&ldquo;Site&rdquo;), including accessing any course materials, chat
 room, mailing list, or other electronic service. These TOS, the
 Privacy Policy and the Honor Code are agreements (the
@@ -17,13 +17,14 @@ of Technology (&ldquo;MIT&rdquo;). If you do not understand or do not
 agree to be bound by the terms of the Agreements, please immediately
 exit this site. </p>
 
-<p><i>MITx</i> reserves the right to modify these TOS at any time and will
-publish notice of any such modifications online on the
-Site <a href="/t/tos.html">Terms of Service page</a> for a reasonable
-period of time following such modifications, and by changing the
-effective date of these TOS. By continuing to access the Site
-after notice of such modifications has been published, you signify
-your agreement to be bound by them. </p>
+<p><i>MITx</i> reserves the right to modify these TOS at any time and
+will publish notice of any such modifications online on this page for
+a reasonable period of time following such modifications, and by
+changing the effective date of these TOS. By continuing to access the
+Site after notice of such changes have been posted, you signify your
+agreement to be bound by them. Be sure to return to this page
+periodically to ensure familiarity with the most current version of
+these TOS.  </p>
 
 <h2>Description of <i>MITx</i> </h2>
 
@@ -98,10 +99,10 @@ name. You understand and agree that all information provided by you is
 accurate and current. You agree to maintain and update your
 information to keep it accurate and current. </p>
 
-<p>We consider the confidentiality and security of your information to
-be of the utmost importance.  Please see
-our <a href="/t/privacy.html">Privacy Policy</a> for more information
-about what information about you <i>MITx</i> collects and how <i>MITx</i> uses that
+<p>We care about the confidentiality and security of your personal
+information.  Please see our <a href="/t/privacy.html">Privacy
+Policy</a> for more information about what information about
+you <i>MITx</i> collects and how <i>MITx</i> uses that
 information.</p>
 
 <h2>Your Right to Use Content on the Site</h2>
@@ -121,20 +122,22 @@ and use of that information is subject to certain rules and
 conditions, which will be posted along with the information. By using
 this Site you agree to abide by all such rules and conditions. Due to
 privacy concerns, User Postings shall be licensed to <i>MITx</i> with
-the terms discussed below. </p>
+the terms discussed below. Please
+see <a href="/t/copyright.html"><i>MITx's Copyright Page</i></a> for
+more information.</p>
 
 <h2>User Postings</h2>
 
 <p><strong>User Postings Representations and Warranties.</strong> By
-creating your User Postings, you affirm, represent, and warrant that
-you are the creator and owner of or have the necessary licenses,
-rights, consents, and permissions to reproduce and publish the posted
-information, and to authorize MIT and <i>MITx</i>'s Users to
-reproduce, modify, publish, and otherwise use that infomation and
-distribute your User Postings as necessary to exercise the licenses
-granted by you below. You, and not <i>MITx</i>, are solely responsible
-for your User Postings and the consequences of posting or publishing
-them.</p>
+submitting or distributing your User Postings, you affirm, represent,
+and warrant that you are the creator and owner of or have the
+necessary licenses, rights, consents, and permissions to reproduce and
+publish the posted information, and to authorize MIT and <i>MITx</i>'s
+Users to reproduce, modify, publish, and otherwise use that infomation
+and distribute your User Postings as necessary to exercise the
+licenses granted by you below. You, and not <i>MITx</i>, are solely
+responsible for your User Postings and the consequences of posting or
+publishing them.</p>
 
 <p><strong>Limited License Grant to MIT.</strong> By submitting or
 distributing User Postings to the Site, you hereby grant to MIT a
@@ -169,17 +172,35 @@ are the property of their respective owners.  Nothing contained
 on the Site should be construed as granting, by implication, estoppel,
 or otherwise, any license or right to use any such Trademark displayed
 on the Site without the written permission of the third party that may
-own the applicable Trademark.
-name="id.7dd2c542f51d"></a>
+own the applicable Trademark.</a>
 
 
 <h2>Digital Millennium Copyright Act</h2>
 
-<p>It is MIT&rsquo;s policy to respond to notices of alleged copyright
-infringement that comply with the Digital Millennium Copyright
-Act. For more information, please go to MIT&rsquo;s DMCA Notification
-Guidelines <a href="http://web.mit.edu/copyright/dmca-notices.html">http://web.mit.edu/copyright/dmca-notices.html</a>,
-incorporated herein by reference.</p>
+<p> Copyright owners who believe their material has been infringed on
+the Site should contact MITx's designated copyright agent at
+dcma-agent@mit.edu or at 77 Massachusetts Avenue, Cambridge, MA
+02138-4307 Attention: MIT DCMA Agent, W92-263A.  
+
+<p> Notification must
+include:
+<ul>
+<li> Identification of the copyrighted work, or, in the case of
+multiple works at the same location, a representative list of such
+works at that site.
+<li> Identification of the material that is claimed to be infringing
+or to be the subject of infringing activity. You must include
+sufficient information for us to locate the material (e.g., url, ip
+address, computer name).
+<li> Information for us to be able to contact the complaining party
+(e.g., email address, phone number).
+<li> A statement that the complaining party believes that the use of
+the material has not been authorized by the copyright owner or an
+authorized agent.
+<li> A statement that the information in the notification is accurate
+and that the complaining party is authorized to act on behalf of the
+copyright owner.
+</ul>
 
 <h2>Disclaimer of Warranty / Indemnification/Limitation of Liabilities</h2>
 
@@ -280,6 +301,6 @@ consent to the personal jurisdiction of and exclusive venue in the
 federal and state courts located in and serving Boston, Massachusetts
 as the legal forum for any such dispute.</p>
 
-<p><strong>Effective Date:</strong> January 30, 2012</p><div>
+<p><strong>Effective Date:</strong> February 6, 2012</p><div>
 </div>
 </section>