resolve conflicts again ...
authorec2-user <ec2-user@sleepless.com>
Sun, 20 Nov 2011 04:15:20 +0000 (04:15 +0000)
committerec2-user <ec2-user@sleepless.com>
Sun, 20 Nov 2011 04:15:20 +0000 (04:15 +0000)
1  2 
public/index.html

diff --combined public/index.html
index 385171c0fc8075bd690f8ba283f2db9113a2cc2d,d2e188391706a86b6879f524e5a389140825b798..40e4236df01dd046d8c90ed21d21cd65816d2f64
@@@ -6,7 -6,6 +6,6 @@@
                <link rel="stylesheet" href="/assets/css/include.css" type="text/css" media="screen" />
                <script type="text/javascript" src="/assets/js/modernizr.custom.js"></script>
                <script type="text/javascript" src="/assets/js/load.js"></script>
                <script type="text/javascript" src="http://use.typekit.com/cbx6gxx.js"></script>
                <script type="text/javascript">try{Typekit.load();}catch(e){}</script>
  
                        <div class="container-12 highlight">
                                        <div class="grid-3">
                                                <a id="logo" href="/">
 -                                                      <img src="assets/img/logo-light.png" alt="FinalsClub" />
 +                                                      <img src="/assets/img/logo-light.png" alt="FinalsClub" />
                                                </a>
                                        </div>
                                        <div class="grid-9">
 -<div id="login_status" style="display:none;">Currently logged in as <span class="username"></span></div>
                                                <nav id="user-nav" class="small">
                                                        <ul>
 -                                                              <li>Hi, <span class="username"></span></li>
 -                                                              <li><a href="#">Logout</a></li>
 +                                                              <li><span class="username"></span></li>
 +                                                              <li><a id=login_link href="/login"></a></li>
                                                        </ul>
                                                </nav>
                                                <nav id="main-nav" class="small">
@@@ -41,7 -41,8 +40,7 @@@
                                                                <li><a href="/press"><em class="icon"></em>Press</a></li>
                                                                <li id=register_link><a href="/register"><em class="icon"></em>Register</a></li>
                                                                <li id=profile_link><a href="/profile"><em class="icon"></em>Profile</a></li>
 -                                                              <li id=login_link><a href="/login"><em class="icon"></em>Profile</a></li>
 -                                                              <li><a href="#" class="donate"><em class="icon"></em><em class="lc yellow">Donate</em></a></li>
 +                                                              <!-- li><a href="#" class="donate"><em class="icon"></em><em class="lc yellow">Donate</em></a></li -->
                                                        </ul>
                                                </nav>
                                        </div>
                <div id="topofcontent"></div>
                <div id="messages" class="page"><span id="PROTO_message" class="__type__">__msg__</span></div>
                <div class="content">
 -                      <div class="container-12">
 -
 -              <div id="messages" class="page">
 -                      <div id="PROTO_message" class="__type__">__msg__</div>
 -              </div>
 -
 -                      <!--
 -                      ***********************************************************
 -                              <div class="grid-12">
 -                                      <div class="padded-loose">
 -                                              <h1 class="large-huge spaced centered">Welcome to FinalsClub! <span class="small">Collaborate. Learn. Share.</span></h1>
 -                                      </div>
 -                              </div>
 -                              <div class="grid-10 grid-centered">
 -                                      <div class="padded-loose">
 -                                              <p class="no-top-margin">
 -                                                      Thank you for visiting FinalsClub.org, a 501(c)(3) non-profit open education
 -                                                      project dedicated to helping college students share knowledge freely online.  While you learn better, faster, and smarter by using FinalsClub with your classmates,
 -                                                      we also encourage you to share your scholarship to benefit curious minds everywhere.
 -                                              </p>
 -                                              <p>
 -                                                      Getting started is easy.  Just register with your school email address and confirm
 -                                                      your account.  Then find your courses or add a new ones.  You can also browse our
 -                                                      Library to learn something new.  Thank you for helping us improve access to education,
 -                                                      one lecture at a time.
 -                                              </p>
 -                                      </div>
 -                              </div>
 -                              <div class="grid-12">
 -                                      <div class="button-set vertical half-width centered-rt-parent half-width-buttons">
 -                                              <button class="green">Sign Up</button>
 -                                              <button class="blue">Learn Something</button>
 -                                      </div>
 -                              </div>
 -                      </div>
 -                      <div class="container-12 spacer">
 -                        <hr class="stripes spacer" />
 -
 -                              <div class="grid-6">
 -                                      <h3 class="heading">Check out our Screencasts</h3>
 -                                      <div class="video-wrapper">
 -                                              <iframe src="http://player.vimeo.com/video/30647271?title=0&amp;byline=0&amp;portrait=0&amp;color=367da9" width="460" height="259" frameborder="0" webkitAllowFullScreen allowFullScreen></iframe>              </div>
 -                                      </div>
 -                              <div class="grid-6">
 -                                      <h3 class="heading">We currently support the following schools</h3>
 -                                      <div class="schools">
 -                                              <ul>
 -                                                      <li><em class="sprite-school brown">Brown Logo</em></li>
 -                                                      <li><em class="sprite-school columbia">Columbia Logo</em></li>
 -                                                      <li><em class="sprite-school cornell">Cornell Logo</em></li>
 -                                                      <li><em class="sprite-school dartmouth">Dartmouth Logo</em></li>
 -                                                      <li><em class="sprite-school shield">School Logo</em></li>
 -                                                      <li><em class="sprite-school mit">MIT Logo</em></li>
 -                                                      <li><em class="sprite-school lock_haven">Lock Haven Logo</em></li>
 -                                                      <li><em class="sprite-school cal">Cal Tech Logo</em></li>
 -                                                      <li><em class="sprite-school texas">University of Texas Logo</em></li>
 -                                                      <li><em class="sprite-school yale">Yale Logo</em></li>
 -                                                      <li><em class="sprite-school penn">Penn Logo</em></li>
 -                                                      <li><em class="sprite-school harvard">Harvad Logo</em></li>
 -                                              </ul>
 -                                      </div>
 -                              </div>
 -                      </div>
 -                      ***********************************************************
 -                      -->
  
                        <style>
                                /* The is here is because it's related less to "styling" and more to UI "behavior" */
                                .page { display: none; }
                        </style>
  
 -      <noscript>
 -        This site requires JavaScript to properly function. Please enable JavaScript or use a modern browser such as <a href="http://google.com/chrome">Google Chrome</a> or <a href="http://firefox.com">Firefox</a>.
 -      </noscript>
 +                      <noscript>
 +                              This site requires JavaScript to properly function.
 +                              Please enable JavaScript or use a modern browser such as
 +                              <a href="http://google.com/chrome">Google Chrome</a>
 +                              or
 +                              <a href="http://firefox.com">Firefox</a>.
 +                      </noscript>
  
  
                        <div class=page id=pg_home>
  
 -
 -
 -
 -
 -
                                <div class="grid-12">
                                        <div class="padded-loose">
                                                <h1 class="large-huge spaced centered">Welcome to FinalsClub! <span class="small">Collaborate. Learn. Share.</span></h1>
                                        <div class="grid-6">
                                                <h3 class="heading">Check out our Screencasts</h3>
                                                <div class="video-wrapper">
-                                                                       </div>
+                                                       <iframe src="http://player.vimeo.com/video/30647271?title=0&amp;byline=0&amp;portrait=0&amp;color=367da9" width="460" height="259" frameborder="0" webkitAllowFullScreen allowFullScreen></iframe>              </div>
                                                </div>
                                        <div class="grid-6">
                                                <h3 class="heading">We currently support the following schools</h3>
                                        Department: __department__<br>
                                </div>
                                <div class="proto lectures_instructor" id=PROTO_lectures_instructor>
 -                                      Instructor: __name__ <span class="instructor_email">(__email__)</span>
 +          Instructor: __name__ <span class="instructor_email">(__email__)</span><br>
                                </div>
                                <div class="proto lecture" id=PROTO_lecture>
                                        <div class=name>
 -                                              <a href="/lecture/___id__">__name__</a>
 -                                      </div>
 -                                      <div class=created>
 -                                              Created: __date__
 +                                              <a href="/lecture/___id__">__name__</a><br>
 +                                              Created: __date__<br>
                                        </div>
                                </div>
          <div>
                                </div>
                                <div class="proto note" id=PROTO_note>
                                        <div class=name>
 -                                              <a href="/note/___id__">__name__</a><br>
 -                                      </div>
 -                                      <div class=visits>
 -                                              Visits: __visits__
 +                                              <a href="/note/___id__">__name__</a> Visits: __visits__
                                        </div>
                                </div>
          <div>
                                <div class="grid-12">
                                        <nav id="footer-nav">
                                                <ul>
 -                                                      <li><a href="#">Code of Conduct</a></li>
 -                                                      <li><a href="#">About</a></li>
 -                                                      <li><a href="#">Contact</a></li>
 -                                                      <li><a href="#">Legal</a></li>
 -                                                      <li><a href="#">Team</a></li>
 +                                                      <li><a href="/conduct">Code of Conduct</a></li>
 +                                                      <li><a href="http://blog.finalsclub.org/about.html">About</a></li>
 +                                                      <li><a href="http://blog.finalsclub.org/contact.html">Contact</a></li>
 +                                                      <li><a href="http://blog.finalsclub.org/legal.html">Legal</a></li>
 +                                                      <li><a href="http://blog.finalsclub.org/team.html">Team</a></li>
                                                </ul>
                                        </nav>
                                        <p>Copyright 2011 Finals Club.  All rights reserved.</p>