Merge branch 'master' of https://github.com/HumairAK/solutions_repo

5 files changed, 125 insertions, 39 deletions

diff --git a/assets/css/style.css b/assets/css/style.css
index 0ce312b..8d5997a 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -307,20 +307,46 @@ main [id^="sol-"] div.comments ul li p.user-comment {
 #solutions-main{
     min-height: 100%;
     padding-top: 65px;
+    text-align: left;
+}
+
+
+#solutions-main em {
+	font-weight: bold;
 }
 
 /*the section which holds each of the solutions*/
+
 section.solutions-card{
     text-align: left;
     background-color: white;
     border-radius: 20px;
     width: 95%;
     margin-left: 2.5%;
+    margin-bottom: 2%;
     cursor: pointer;
+    padding-bottom: 5px;
 }
+
+section.solutions-card .right-arrow {
+	vertical-align: middle;
+}
+
+section.solutions-card img {
+	margin-top: 12px;
+	margin-right: 8px;
+	width: 40px;
+	height: auto;
+}
+
+h4.search-head {
+	margin-left: 5%;
+	margin-top: 2%;
+	color: dimgray;
+}	
+
 /*the title of the course*/
 h3.solutions-title{
-    font-family: 'Roboto',sans-serif;
     font-size: large;
     color: #333333;
     margin-left: 5%;
@@ -328,22 +354,16 @@ h3.solutions-title{
     padding-top: 20px;
 }
 /*the time of the examination*/
-p.solutions-time{
-    font-family: 'Roboto',sans-serif;
+p.solutions-time, p.solutions-type, p.exam-instr{
     font-size: medium;
     color: dimgrey;
     margin-left: 5%;
     margin-top: 0px;
-    margin-bottom: 2px;
 }
 /*whether its a midterm or final exam*/
-p.solutions-type{
-    font-family: 'Roboto',sans-serif;
-    font-size: medium;
-    color: dimgrey;
-    margin-left: 5%;
-    margin-top: 0px;
-    padding-bottom: 20px;
+
+p.solutions-time {
+	margin-bottom: 2px;
 }
 
 #solutions-footer{
@@ -352,23 +372,42 @@ p.solutions-type{
 
 /**********************************************************************************************************************/
 
+/*THE EXAM QUESTIONS PAGE BEGINS HERE*/
+.exam-info {
+	margin-left: 5%;
+	display: inline-block;
+}
+
+img.exam-info {
+	padding: 10px;
+	min-width: 30%;
+	vertical-align: top;
+}
+
+section.exam-info em {
+	font-weight: bold;
+}
+
+
+
 .questions-number{
-    font-family: 'Roboto',sans-serif;
     font-size: large;
     color: #333333;
     margin-left: 5%;
     margin-bottom: 5px;
-    padding-top: 15px;
+
 }
-.questions-comment{
-    font-family: 'Roboto',sans-serif;
+.questions-comment, .questions-sol-num{
     font-size: medium;
     color: dimgrey;
-    margin-left: 5%;
     margin-top: 0px;
     padding-bottom: 15px;
 }
 
+.questions-sol-num {
+	margin-left: 5%;
+}
+
 /********** user-profile styles  **********/
 .user-info-content{
     padding-top: 100px;
diff --git a/assets/images/exam.png b/assets/images/exam.png
new file mode 100644
index 0000000..5bb13ad
--- /dev/null
+++ b/assets/images/exam.png
diff --git a/assets/images/right-arrow.png b/assets/images/right-arrow.png
new file mode 100644
index 0000000..e3b8f57
--- /dev/null
+++ b/assets/images/right-arrow.png
diff --git a/exams.html b/exams.html
index 80439cb..84a2e7d 100644
--- a/exams.html
+++ b/exams.html
@@ -93,28 +93,32 @@
 
     <main id = 'solutions-main'>
         <div class = 'search container' id = 'solutions-div'>
-                <h1 id = 'solutions-header'>All Exams</h1>
+                <h4 class='search-head'>Search results for "CSC148"</h4>
                 <section class = 'solutions-card'>
-                    <h3 class = 'solutions-title'>CSC309 - Programming on the Web</h3>
-                    <p class = 'solutions-time' >Summer, 2016</p>
+                    <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
+                    <p class = 'solutions-time' ><em>Term: </em>Winter 2015</p>
+                    <p class = 'exam-instr'><em>Instructors: </em>Fairgrieve and Hangerman</p>
                     <p class = 'solutions-type'>Final Examination</p>
                 </section>
 
                 <section class = 'solutions-card'>
-                    <h3 class = 'solutions-title'>ECE344 - Operating Systems</h3>
-                    <p class = 'solutions-time' >Winter, 2016</p>
+                    <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
+                    <p class = 'solutions-time' ><em>Term: </em>Fall 2014</p>
+                    <p class = 'exam-instr'><em>Instructors: </em>Campbell and Fairgrieve</p>
                     <p class = 'solutions-type'>Midterm Examination</p>
                 </section>
 
                 <section class = 'solutions-card'>
-                    <h3 class = 'solutions-title'>ECE345 - Algorithms and Data Structures</h3>
-                    <p class = 'solutions-time' >Fall, 2015</p>
+                    <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
+                    <p class = 'solutions-time' ><em>Term: </em>Winter 2014</p>
+                    <p class = 'exam-instr'><em>Instructors: </em>Campbell and Papadopoulou</p>
                     <p class = 'solutions-type'>Final Examination</p>
                 </section>
 
                 <section class = 'solutions-card'>
-                    <h3 class = 'solutions-title'>CSC343 - Introduction to Databases</h3>
-                    <p class = 'solutions-time' >Fall, 2014</p>
+                    <h3 class = 'solutions-title'>CSC148 - Introduction to Computer Science</h3>
+                    <p class = 'solutions-time' ><em>Term: </em>Fall 2013</p>
+                    <p class = 'exam-instr'><em>Instructors: </em>Craig and Gries</p>
                     <p class = 'solutions-type'>Final Examination</p>
                 </section>
         </div>
diff --git a/questions.html b/questions.html
index 4fd07a2..e4da15e 100644
--- a/questions.html
+++ b/questions.html
@@ -86,27 +86,70 @@
 
     <main id = 'solutions-main'>
         <div class = 'search container' id = 'solutions-div'>
-                <h1 id = 'solutions-header'>CSC309-Programming on the Web</h1>
+                <!--<h1 id = 'solutions-header'>CSC309-Programming on the Web</h1>
                 <h3> Summer, 2016</h3>
-                <h3> Final</h3>
-                <section class = 'solutions-card'>
-                    <h3 class = 'questions-number'>Question 1</h3>
-                    <p class = 'questions-comment' >Comments: 4</p>
+                <h3> Final</h3>-->
+                <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'>
+                    <h3>CSC148</h3>
+                    <p>Winter 2015 exam</p>
+                    <p><em>Instructor(s): </em>Fairgrieve and Hangerman </p>
+                    <p><em>Upload date:</em> 2016-07-08</p>
+                    <p><em>Uploaded by:</em> John Smith</p>
+                    <p><em>Page count:</em> 22</p>
+                    <p><em>Question count:</em> 10</p>
                 </section>
 
-                <section class = 'solutions-card'>
-                    <h3 class = 'questions-number'>Question 2</h3>
-                    <p class = 'questions-comment' >Comments: 3</p>
+                <section class = 'solutions-card row'>
+                    <div class='pull-left col-sm-8 col-md-8'>
+                        <h3 class = 'questions-number'>Question 1</h3>
+                        <p><span class='questions-sol-num'>2 solutions, </span> <span class = 'questions-comment'>6 comments</span></p>
+                    </div>
+                    <div class='pull-right right-arrow'>
+                        <img class='rounded' src="assets/images/right-arrow.png">
+                    </div>
                 </section>
 
-                <section class = 'solutions-card'>
-                    <h3 class = 'questions-number'>Question 3</h3>
-                    <p class = 'questions-comment' >Comments: 2</p>
+                <section class = 'solutions-card row'>
+                    <div class='pull-left col-sm-8 col-md-8'>
+                        <h3 class = 'questions-number'>Question 2</h3>
+                        <p><span class='questions-sol-num'>1 solution, </span> <span class = 'questions-comment'>2 comments</span></p>
+                    </div>
+                    <div class='pull-right right-arrow'>
+                        <img class='rounded' src="assets/images/right-arrow.png">
+                    </div>
                 </section>
 
-                <section class = 'solutions-card'>
-                    <h3 class = 'questions-number'>Question 4</h3>
-                    <p class = 'questions-comment' >Comments: 1</p>
+                <section class = 'solutions-card row'>
+                    <div class='pull-left col-sm-8 col-md-8'>
+                        <h3 class = 'questions-number'>Question 3</h3>
+                        <p><span class='questions-sol-num'>1 solution, </span> <span class = 'questions-comment'>2 comments</span></p>
+                    </div>
+                    <div class='pull-right right-arrow'>
+                        <img class='rounded' src="assets/images/right-arrow.png">
+                    </div>
+                    
+                </section>
+
+                <section class = 'solutions-card row'>
+                    <div class='pull-left col-sm-8 col-md-8'>
+                        <h3 class = 'questions-number'>Question 4</h3>
+                        <p><span class='questions-sol-num'>3 solutions, </span> <span class = 'questions-comment'>2 comments</span></p>
+                    </div>
+                    <div class='pull-right right-arrow'>
+                        <img class='rounded' src="assets/images/right-arrow.png">
+                    </div>
+                </section>
+
+                <section class = 'solutions-card row'>
+                    <div class='pull-left col-sm-8 col-md-8'>
+                        <h3 class = 'questions-number'>Question 5</h3>
+                        <p><span class='questions-sol-num'>0 solutions </span> <span class = 'questions-comment'></span></p>
+                    </div>
+                    <div class='pull-right right-arrow'>
+                        <img class='rounded' src="assets/images/right-arrow.png">
+                    </div>
                 </section>
         </div>