resolve conflict 1page
authorec2-user <ec2-user@sleepless.com>
Sun, 20 Nov 2011 03:47:09 +0000 (03:47 +0000)
committerec2-user <ec2-user@sleepless.com>
Sun, 20 Nov 2011 03:47:09 +0000 (03:47 +0000)
1  2 
public/index.html

index fe7412e319b20deca9071bd3c861f8ae41d8306b,5b0fc3416a3c714ae53df95694059b16e0c5c5b2..d2e188391706a86b6879f524e5a389140825b798
mode 100644,100755..100755
        </head>
  
        <body>
-               <div class="masthead">
-                       <div class="logbar">
-         <div class="loginstatus"><div id="login_status" style="display:none;">Currently logged in as <span class="username"></span></div></div>
-                       </div>
-                       <div class="navbar">
-                               <table>
-                                       <tr>
-                                               <td>
-                                                       <a href="/"><img src="/images/finals-club-wht.png" class="logo"/></a>
-                                               </td>
-                                               <td class="menu">
-                                                       <a href="/schools">Start Here!</a>
-                                                       <a href="http://blog.finalsclub.org">Blog</a>
-                                                       <a href="/archive">Archive</a>
-                                                       <a href="/press">Press</a>
-                                                       <a href="/register" id="register_link">Create an Account</a>
-                                                       <a href="/profile" id="profile_link" style="display:none;">Profile</a>
-                                                       <a href="/login" id="login_link" class="special">Login</a>
-                                               </td>
-                                       </tr>
-                               </table>
+               <div class="header">
+                       <div class="container-12 highlight">
+                                       <div class="grid-3">
+                                               <a id="logo" href="/">
+                                                       <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>
+                                                       </ul>
+                                               </nav>
+                                               <nav id="main-nav" class="small">
+                                                       <ul>
+                                                               <li><a href="/schools" class="active"><em class="icon"></em>Courses</a></li>
+                                                               <li><a href="http://blog.finalsclub.org"><em class="icon"></em>Blog</a></li>
+                                                               <li><a href="/archive"><em class="icon"></em>Library</a></li>
+                                                               <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>
+                                                       </ul>
+                                               </nav>
+                                       </div>
                        </div>
-                       <div class="logbar">&nbsp;</div>
                </div>
+               <hr class="stripes" />
                <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="content">
+                       <!--
+                       ***********************************************************
+                               <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; }