Added a popup window for login

7 files changed, 57 insertions, 170 deletions

diff --git a/about.html b/about.html
index 0c3bbf4..f9a0dcb 100644
--- a/about.html
+++ b/about.html
@@ -86,7 +86,7 @@
 
     <main id = 'solutions-main'>
         <section class = 'search container'>
-
+            <!-- Contributor Details -->
             <section class="abt-content">
                 <h3 class="">About Us</h3>
                 <p class="about-p">
@@ -109,13 +109,9 @@
                     <p>Department: CS</p>
                     <p>Email: placeholder@gmail.com</p>
             </section>
-
             </section>
-
-
     </main>
 
-
     <footer>
 
         <div class="navbar navbar-default navbar-fixed-bottom">
@@ -163,6 +159,5 @@
         });
     </script>
 
-
 </body>
 </html>
\ No newline at end of file
diff --git a/assets/css/creative.css b/assets/css/creative.css
index 2f45025..f36128c 100644
--- a/assets/css/creative.css
+++ b/assets/css/creative.css
@@ -1,13 +1,9 @@
-/*div {*/
-    /*box-sizing: border-box;*/
-/*}*/
 main .search {
     width: 60%;
     min-height: 100%;
 }
 
 .search-cover {
-    /*height: auto;*/
     padding-bottom: 10%;
 }
 
@@ -33,12 +29,6 @@ main .search {
     }
 }
 
-
-/*main #solutions {
-    padding-top: 65px;
-}*/
-
-
 h2 {
 font-family: 'Lato', sans-serif;
 color: gray;
@@ -47,6 +37,9 @@ margin: 4%;
 padding-top: 200px;
 }
 
+/*** NAVBAR DEFAULT OVERWRITE ***/
+/* For top navigation panel use */
+
 .navbar-default {
     border-color: rgba(34,34,34,.05);
     font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif;
@@ -64,17 +57,14 @@ padding-top: 200px;
     transition: all .35s;
 }
 
-
 .navbar-default .navbar-header .navbar-brand {
     text-transform: uppercase;
     font-family: 'Open Sans','Helvetica Neue',Arial,sans-serif;
     font-weight: 700;
-    /*color: #f05f40;*/
 }
 
 .navbar-default .navbar-header .navbar-brand:hover ,
 .navbar-default .navbar-header .navbar-brand:focus {
-    /*color: #eb3812;*/
 }
 
 .navbar-default .nav > li>a,
@@ -87,12 +77,10 @@ padding-top: 200px;
 
 .navbar-default .nav > li>a:hover,
 .navbar-default .nav>li>a:focus:hover {
-    /*color: #f05f40;*/
 }
 
 .navbar-default .nav > li.active>a,
 .navbar-default .nav>li.active>a:focus {
-    /*color: #f05f40!important;*/
     background-color: transparent;
 }
 
@@ -113,14 +101,7 @@ padding-top: 200px;
     margin: 0;
 }
 
-/*.navbar-default .dropdown-submenu .dropdown-menu li a {
-    padding: 0;
-    padding-top: 5px;
-    padding-bottom: 5px;
-    margin: 0;
-}*/
-
-
+/*** FOOTER DEFAULT OVERWRITE ***/
 footer .navbar-default {
         border-color: rgba(255,255,255,.3);
         background-color: #333333;
@@ -146,26 +127,22 @@ footer .navbar-default .affix .nav>li>a:focus {
     color: #222;
 }
 
+<<<<<<< HEAD
 @media(min-width:768px) {
    
 }
 
 
+=======
+>>>>>>> 952f7cefcd35550bb0930418e56c524f09eca92d
 header {
     position: relative;
     width: 100%;
     min-height: 100%;
     text-align: center;
-    /*color: #fff;*/
     background-image: url("../images/main.jpg");
-    /*background-color: #5bc0de;*/
     background-size: 250px 250px;
     background-position: center;
-    /*-webkit-background-size: cover;*/
-    /*-moz-background-size: cover;*/
-    /*background-size: cover;*/
-    /*-o-background-size: cover;*/
-
 }
 
 header .header-spec {
@@ -190,16 +167,6 @@ header .header-content .header-content-inner hr {
     margin: 30px auto;
 }
 
-/*header .header-content .header-content-inner p {
-    margin-bottom: 50px;
-    font-family: 'Lato', sans-serif;
-    color: red;
-    font-size: 2.5em;
-    /color: #333333
-}*/
-
-
-
 @media (min-width: 320px) {
     header {
         min-height: 100%;
@@ -218,8 +185,6 @@ header .header-content .header-content-inner hr {
         margin-right: auto;
         margin-left: auto;
         max-width: 1000px;
-
-        /* Shift search bar content up */
         padding-top: 14%;
     }
 
@@ -257,7 +222,6 @@ header .header-content .header-content-inner hr {
         margin-right: auto;
         margin-left: auto;
         max-width: 80%;
-        font-size: 32px;
         font-family: 'Lato', sans-serif;
         color: gray;
         font-size: 2.5em;
@@ -278,33 +242,37 @@ header .header-content .header-content-inner hr {
     border-radius: 20px;
 }
 
+/*** SUB-MENU ***/
 .dropdown-submenu {
   position: relative;
 }
+
 .dropdown-submenu > .dropdown-menu {
   top: 0;
   left: 100%;
   margin-top: -6px;
   margin-left: -1px;
 }
+
 .dropdown-submenu:hover > .dropdown-menu {
   display: block;
 }
+
 .dropdown-submenu:hover > a:after {
   border-left-color: #fff;
 }
+
 .dropdown-submenu.pull-left {
   float: none;
 }
+
 .dropdown-submenu.pull-left > .dropdown-menu {
   left: -100%;
   margin-left: 10px;
 }
 
-
-
-/******************************************************/
-
+/* Humair: Cannot find a usage for the styles below (not including user-profile)
+ * Remove if not in use. Remove this comment once done.*/
 
 .user-row {
     margin-bottom: 14px;
@@ -324,6 +292,7 @@ header .header-content .header-content-inner hr {
     cursor: pointer;
 }
 
+/*** USER PROFILE STYLES ***/
 .table-user-information > tbody > tr {
     border-top: 1px solid rgb(221, 221, 221);
 }
@@ -332,17 +301,17 @@ header .header-content .header-content-inner hr {
     border-top: 0;
 }
 
-
 .table-user-information > tbody > tr > td {
     border-top: 0;
 }
+
+/* VERTICAL OFFSET FOR CONTENT CARD */
 .toppad {
     margin-top:20px;
 }
 
-/****************************************/
-/* user-profile-nav */
-/* only children of navbar-custom are affected*/
+/* USER PROFILE CUSTOM NAV */
+/* Note: only children of navbar-custom are affected */
 .navbar-custom{
     background-color: #ffffff; /* Green */
     margin: 0 0 3px 0;
@@ -350,9 +319,8 @@ header .header-content .header-content-inner hr {
     font-size: 1em;
     -webkit-transition-duration: 0.4s; /* Safari */
     transition-duration: 0.4s;
-    border-radius: 10px 10px 0px 0px;
+    border-radius: 10px 10px 0 0;
 }
-
 .navbar-custom .navbar-toggle{
     border-color: #ddd;
 }
@@ -366,5 +334,5 @@ header .header-content .header-content-inner hr {
     background-color: #d9edf7;
     color: #3170a6;
 }
-/********************************************/
+
 
diff --git a/exams.html b/exams.html
index 12d15f0..2e40503 100644
--- a/exams.html
+++ b/exams.html
@@ -41,11 +41,6 @@
             <div class="collapse navbar-collapse"
                  id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav navbar-right">
-                    <!--<li><a href="user_solutions.html">Solutions Page</a></li>
-                    <li><a href="user_profile_alt.html">Profile Page</a></li>
-                    <li><a href="questions.html">Questions Page</a></li>
-                    <li><a href="exams.html">Exams Pages</a></li>-->
-
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></a>
                         <ul class="dropdown-menu">
@@ -74,9 +69,6 @@
                         </ul>
 
                     </li>
-                    
-
-                    <!--<li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> &ndash;&gt;-->
                 </ul>
             </div>
             <!-- /.navbar-collapse -->
@@ -84,13 +76,6 @@
         <!-- /.container-fluid -->
     </nav>
 
-<!--any class or id pertaining to this section specifically starts with "solutions"-->
-<!--KEYS: solutions-card - holds the solutions for each exam
-          solutions-title - the name of the courses
-          solutions-time - when the exam was held (Fall/Summer/Winter)
-          solutions-type - the kind of examination (Midterm/Final/Quizzes-->
-
-
     <main id = 'solutions-main'>
         <div class = 'search container' id = 'solutions-div'>
                 <h4 class='search-head'>Search results for "CSC148"</h4>
@@ -133,14 +118,6 @@
     </main>
 
     <footer>
-    <!--    <div id="footer-container" class="container-fluid">
-        <nav>
-        <a href="#">Contact</a>
-        <a href="#">About Us</a>
-        <a href="#">Terms of Use</a>
-        </nav>
-        <h6>Copyright 2016</h6>
-        </div>-->
         <div class="navbar navbar-default navbar-fixed-bottom">
             <div class="container-fluid">
                 <div class="navbar-collapse collapse" id="footer-body">
diff --git a/index.html b/index.html
index 8cce20b..0f12814 100644
--- a/index.html
+++ b/index.html
@@ -86,47 +86,36 @@
 	</nav>
 
 	<header>
-		<div class="header-content">
-
-			<div class="header-content-inner">
-				<p>
-					<strong>The solutions to all your problems</strong>
-				</p>
-				<hr>
-
+		<div class="header-content"
+			<section class="header-content-inner">
+				<p><strong>The solutions to all your problems</strong></p>
+				<hr> <!-- Divider -->
 				<div class="search col-md-8 col-lg-8 col-md-offset-2">
+					<!-- Search-bar, Drop-down and Prompt -->
 					<div class="input-group">
+						<!-- Search Category Drop-Down -->
 						<div class="input-group-btn">
 							<button type="button" class="btn btn-default dropdown-toggle search-button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></button>
-						
 							<ul class="dropdown-menu">
 								<li><a href="#">Courses</a></li>
 								<li><a href="#">Users</a> </li>
 							</ul>
 						</div>
 
-						<input type="search" class="form-control" aria-label="..." name="search" placeholder="Enter course name">
+						<!-- Search bar -->
+						<input type="text" class="form-control" aria-label="..." name="search" placeholder="Enter course name">
+						<!-- Prompt Search -->
 						<span class="input-group-btn">
 					    	<button onclick="window.location='exams.html';"class="btn btn-default search-button go-button" type="button">Go!</button>
 					    </span>
 					</div>
-
 				</div>
+				<!-- Site Desciprtion -->
 				<h5 class="home-intro">
 					Solutions.repo is a community driven service that provides visitors
 					with solutions to past UofT Exams.
 				</h5>
-
-				<!--<div class="search">
-					<div class="search-select">
-						<select>
-							<option value="courses">Courses</option>
-							<option value="users">Users</option>
-						</select>
-					</div>
-				<input type="text" name="search" placeholder="Enter course name">
-				</div> -->
-			</div>
+			</section>
 		</div>
 	</header>
 
@@ -148,7 +137,6 @@
 						<span class="icon-bar"></span>
 					</button>
 				</div>
-
 			</div>
 		</nav>
 	</footer>
diff --git a/questions.html b/questions.html
index 6461dcd..18cda15 100644
--- a/questions.html
+++ b/questions.html
@@ -41,11 +41,6 @@
             <div class="collapse navbar-collapse"
                  id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav navbar-right">
-                    <!--<li><a href="user_solutions.html">Solutions Page</a></li>
-                    <li><a href="user_profile_alt.html">Profile Page</a></li>
-                    <li><a href="questions.html">Questions Page</a></li>
-                    <li><a href="exams.html">Exams Pages</a></li>-->
-
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Courses <span class="caret"></span></a>
                         <ul class="dropdown-menu">
@@ -74,8 +69,6 @@
                         </ul>
 
                     </li>
-                    
-
                     <!--<li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> &ndash;&gt;-->
                 </ul>
             </div>
@@ -86,9 +79,9 @@
 
     <main id = 'solutions-main'>
         <div class = 'search container' id = 'solutions-div'>
-                <!--<h1 id = 'solutions-header'>CSC309-Programming on the Web</h1>
-                <h3> Summer, 2016</h3>
-                <h3> Final</h3>-->
+
+                <!-- EXAM DETAILS -->
+
                 <a href="http://www.cs.toronto.edu/~fpitt/CSC148/20131/tests/test1-0101.pdf" target='_blank'><img src="assets/images/exam.png" class='exam-img img-responsive exam-info'></a>
                 
                 <section class='exam-info'>
@@ -101,6 +94,8 @@
                     <p><em>Question count:</em> 10</p>
                 </section>
 
+                <!-- QUESTION LISTINGS -->
+
                 <a href="user_solutions.html">
                 <section class = 'solutions-card row'>
                     <div class='pull-left col-sm-8 col-md-8'>
@@ -162,10 +157,8 @@
                 </section>
                 </a>
         </div>
-
     </main>
 
-
     <footer>
 
         <div class="navbar navbar-default navbar-fixed-bottom">
@@ -213,6 +206,5 @@
         });
     </script>
 
-
 </body>
 </html>
\ No newline at end of file
diff --git a/user_profile_alt.html b/user_profile_alt.html
index 36885a4..5142110 100644
--- a/user_profile_alt.html
+++ b/user_profile_alt.html
@@ -86,7 +86,6 @@
     </nav>
 
 <main id="solutions-main">
-
     <div class="container user-info-content">
         <div class="row">
 
@@ -114,7 +113,6 @@
                                 <li><a href="#" class="prf-page">Comments</a></li>
                             </ul>
                         </div>
-
                     </div>
                 </nav>
 
@@ -123,16 +121,15 @@
                         <div class="panel-heading">
                             <h3 class="panel-title">Walter White</h3>
                         </div>
-
                         <div class="panel-body">
-
-                            <!------------ User-Profile Pages ------------>
+                            <!--- User-Profile Pages -->
                             <div class="row" id="profile-general">
+                                <!-- User Image -->
                                 <div class="col-md-3 col-lg-3 " align="center">
                                     <img alt="User Pic" src="assets/images/avatar.png"
                                          class="img-circle img-responsive">
                                 </div>
-
+                                <!-- User Details -->
                                 <div class=" col-md-9 col-lg-9 ">
                                     <table class="table table-user-information">
                                         <tbody>
@@ -148,7 +145,6 @@
                                             <td>Answered:</td>
                                             <td>50</td>
                                         </tr>
-
                                         <tr>
                                         <tr>
                                             <td>Messages:</td>
@@ -162,20 +158,15 @@
                                             <td>Email:</td>
                                             <td><a href="mailto:info@support.com">info@support.com</a></td>
                                         </tr>
-                                        <td>Phone Number:</td>
-                                        <td>111-111-1111(Mobile)
-                                        </td>
-
+                                        <tr>
+                                            <td>Phone Number:</td>
+                                            <td>111-111-1111(Mobile)</td>
                                         </tr>
-
                                         </tbody>
                                     </table>
-
                                 </div>
                             </div>
-
                             <div class="row" id="profile-follows">
-
                                 <h3>You are following:</h3>
                                 <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6">
                                     <table class="table-condensed">
@@ -215,12 +206,8 @@
 
                                     </table>
                                 </div>
-
-
                             </div>
-
                             <div class="row" id="profile-friends">
-
                                 <h3>Friends</h3>
                                 <div class="col-xs-offset-1 col-sm-offset-3 col-xs-10 col-sm-6">
                                     <table class="table-condensed">
@@ -234,7 +221,6 @@
                                                 <h4>He-Man</h4>
                                                 <p>20 comments</p>
                                             </th>
-
                                         </tr>
                                         <tr>
                                             <th>
@@ -257,13 +243,9 @@
                                             </th>
                                         </tr>
                                         </tbody>
-
                                     </table>
                                 </div>
-
-
                             </div>
-
                             <div class="row" id="profile-inbox">
                                 <h3>Inbox</h3>
                                 <div class="col-sm-10 col-sm-offset-1 prf-tables">
@@ -297,12 +279,9 @@
                                                 <td>Lisa</td>
                                             </tr>
                                         </tbody>
-
                                     </table>
                                 </div>
-
                             </div>
-
                             <div class="row" id="profile-comments">
                                 <h3>Comment History</h3>
                                 <div class="col-sm-10 col-sm-offset-1 prf-tables">
@@ -356,7 +335,6 @@
             </div>
         </div>
     </div>
-
 </main>
 
 <footer>
diff --git a/user_solutions.html b/user_solutions.html
index e307cbd..7da5797 100644
--- a/user_solutions.html
+++ b/user_solutions.html
@@ -87,25 +87,29 @@
 	</nav>
 
 	<main id="solutions-main">
-	<!--made the id in to a class-->
 		<div class='search solutions-container container'>
-
 			<div>
+				<!-- Add Solution button and path -->
 				<div class="row top-sol">
-					<button class="col-xs-4 col-sm-2 col-md-2 col-lg-2 col-xs-offset-4 col-sm-offset-5 col-md-offset-2 col-lg-offset-2 rounded" id="add-solution"><h3>Add a solution</h3></button>
+					<button class="col-xs-4 col-sm-2 col-md-2 col-lg-2
+					col-xs-offset-4 col-sm-offset-5 col-md-offset-2
+					col-lg-offset-2 rounded" id="add-solution">
+						<h3>Add a solution</h3>
+					</button>
 
 					<!-- Replace p below with breadcrumbs later -->
-					<p class="col-xs-12 col-sm-12 col-md-6 show-path">CSC148 > Winter 2015 > Question 1</p> 
+					<p class="col-xs-12 col-sm-12 col-md-6 show-path">
+						CSC148 > Winter 2015 > Question 1
+					</p>
 				</div>
 
+				<!-- Solution 1 Example -->
 				<div class="row">
 				<section id="sol-1" class="col-md-10 col-md-offset-1 rounded">
 					<div class="post-info">
 						<div class="">
 							<img class="img-responsive img-circle user-image" src="assets/images/misc/user1.jpeg">
 							<p class="username"><a href="user_profile_alt.html">jSmith123</a></p>
-
-
 						</div>
 
 						<div class="pull-right">
@@ -156,8 +160,9 @@
 				</section>
 				</div>
 
+				<!-- Solution 2 Example -->
 				<div class="row">
-					<section id="sol-1" class="col-md-10 col-md-offset-1 rounded">
+					<section id="sol-2" class="col-md-10 col-md-offset-1 rounded">
 					<div class="post-info">
 						<div class="">
 							<img class="img-responsive img-circle user-image" src="assets/images/misc/user3.jpeg">
@@ -201,27 +206,13 @@
 						</ul>
 						</div>
 					</div>
-					
 					</section>
 				</div>
-
-
 			</div>
-			
-
 		</div>
-		
 	</main>
 
 	<footer>
-		<!--<div id="footer-container" class="container-fluid">-->
-		<!--<nav>-->
-		<!--<a href="#">Contact</a>-->
-		<!--<a href="#">About Us</a>-->
-		<!--<a href="#">Terms of Use</a>-->
-		<!--</nav>-->
-		<!--<h6>Copyright 2016</h6>-->
-		<!--</div>-->
 		<div class="navbar navbar-default navbar-fixed-bottom">
 			<div class="container-fluid">
 				<div class="navbar-collapse collapse" id="footer-body">
@@ -239,12 +230,10 @@
 						<span class="icon-bar"></span>
 					</button>
 				</div>
-
 			</div>
 		</div>
 	</footer>
 
-
 	<script>
 		$(document).ready(function() {