diff options
| author | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-13 09:20:40 +0000 |
|---|---|---|
| committer | nanalelfe <nargiza.nosirova@mail.utoronto.ca> | 2016-07-13 09:20:40 +0000 |
| commit | 9dae81bf68e584ec99b45f3df0235bfdafd0412a (patch) | |
| tree | c4d8edb5ac32a068933eaa6d2693bfade2149b46 | |
| parent | 32a07ea09bed919cf1c30f46ef0a1cefd46dd3cf (diff) | |
Updated nav for each page
| -rw-r--r-- | about.html | 88 | ||||
| -rw-r--r-- | exams.html | 97 | ||||
| -rw-r--r-- | questions.html | 96 | ||||
| -rw-r--r-- | user_profile_alt.html | 89 | ||||
| -rw-r--r-- | user_solutions.html | 89 |
5 files changed, 434 insertions, 25 deletions
@@ -52,9 +52,9 @@ <li class="dropdown-submenu"> <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right"></i></a> <ul class="dropdown-menu"> - <li><a tabindex="-1" href="#">CSC108</a></li> - <li><a href="#">CSC148</a></li> - <li><a href="#">CSC165</a></li> + <li><a tabindex="-1" href="exams.html">CSC108</a></li> + <li><a href="exams.html">CSC148</a></li> + <li><a href="exams.html">CSC165</a></li> </ul> </li> <li><a href="#">Second Year</a></li> @@ -62,8 +62,8 @@ <li><a href="#">Fourth Year</a></li> </ul> </li> - <li><a href="#">Log In</a></li> - <li><a href="#">Register</a></li> + <li><a href="#" data-toggle="modal" data-target=".login-window">Log In</a></li> + <li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links <span class="caret"></span></a> <ul class="dropdown-menu"> @@ -135,6 +135,84 @@ </div> </div> </footer> + <!-- POP UP WINDOW FOR LOGIN --> + <article class="modal fade login-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Log In</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="Password"> + </div> + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + + <!-- POP UP WINDOW FOR REGISTRATION --> + <article class="modal fade registration-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Sign Up</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="First Name"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Last Name"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="Email"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="New Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="New Password"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="University (optional)"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Department (optional)"> + </div> + + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> <script> $(document).ready(function() { @@ -41,15 +41,20 @@ <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"> <li class="dropdown-submenu"> <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right"></i></a> <ul class="dropdown-menu"> - <li><a tabindex="-1" href="#">CSC108</a></li> - <li><a href="#">CSC148</a></li> - <li><a href="#">CSC165</a></li> + <li><a tabindex="-1" href="exams.html">CSC108</a></li> + <li><a href="exams.html">CSC148</a></li> + <li><a href="exams.html">CSC165</a></li> </ul> </li> <li><a href="#">Second Year</a></li> @@ -57,8 +62,8 @@ <li><a href="#">Fourth Year</a></li> </ul> </li> - <li><a href="#">Log In</a></li> - <li><a href="#">Register</a></li> + <li><a href="#" data-toggle="modal" data-target=".login-window">Log In</a></li> + <li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links <span class="caret"></span></a> <ul class="dropdown-menu"> @@ -69,6 +74,9 @@ </ul> </li> + + + <!--<li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> –>--> </ul> </div> <!-- /.navbar-collapse --> @@ -140,6 +148,85 @@ </div> </footer> + <!-- POP UP WINDOW FOR LOGIN --> + <article class="modal fade login-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Log In</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="Password"> + </div> + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + + <!-- POP UP WINDOW FOR REGISTRATION --> + <article class="modal fade registration-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Sign Up</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="First Name"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Last Name"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="Email"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="New Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="New Password"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="University (optional)"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Department (optional)"> + </div> + + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + <script> $(document).ready(function() { diff --git a/questions.html b/questions.html index 18cda15..faaffde 100644 --- a/questions.html +++ b/questions.html @@ -41,15 +41,20 @@ <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"> <li class="dropdown-submenu"> <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right"></i></a> <ul class="dropdown-menu"> - <li><a tabindex="-1" href="#">CSC108</a></li> - <li><a href="#">CSC148</a></li> - <li><a href="#">CSC165</a></li> + <li><a tabindex="-1" href="exams.html">CSC108</a></li> + <li><a href="exams.html">CSC148</a></li> + <li><a href="exams.html">CSC165</a></li> </ul> </li> <li><a href="#">Second Year</a></li> @@ -57,8 +62,8 @@ <li><a href="#">Fourth Year</a></li> </ul> </li> - <li><a href="#">Log In</a></li> - <li><a href="#">Register</a></li> + <li><a href="#" data-toggle="modal" data-target=".login-window">Log In</a></li> + <li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links <span class="caret"></span></a> <ul class="dropdown-menu"> @@ -69,6 +74,8 @@ </ul> </li> + + <!--<li id="header"><header><a href="#"><img src="assets/images/logo.png"></a></header></li> –>--> </ul> </div> @@ -183,6 +190,85 @@ </div> </footer> + <!-- POP UP WINDOW FOR LOGIN --> + <article class="modal fade login-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Log In</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="Password"> + </div> + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + + <!-- POP UP WINDOW FOR REGISTRATION --> + <article class="modal fade registration-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Sign Up</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="First Name"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Last Name"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="Email"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="New Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="New Password"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="University (optional)"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Department (optional)"> + </div> + + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + <script> $(document).ready(function() { diff --git a/user_profile_alt.html b/user_profile_alt.html index 5142110..960212a 100644 --- a/user_profile_alt.html +++ b/user_profile_alt.html @@ -53,9 +53,9 @@ <li class="dropdown-submenu"> <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right"></i></a> <ul class="dropdown-menu"> - <li><a tabindex="-1" href="#">CSC108</a></li> - <li><a href="#">CSC148</a></li> - <li><a href="#">CSC165</a></li> + <li><a tabindex="-1" href="exams.html">CSC108</a></li> + <li><a href="exams.html">CSC148</a></li> + <li><a href="exams.html">CSC165</a></li> </ul> </li> <li><a href="#">Second Year</a></li> @@ -63,8 +63,8 @@ <li><a href="#">Fourth Year</a></li> </ul> </li> - <li><a href="#">Log In</a></li> - <li><a href="#">Register</a></li> + <li><a href="#" data-toggle="modal" data-target=".login-window">Log In</a></li> + <li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links <span class="caret"></span></a> <ul class="dropdown-menu"> @@ -360,6 +360,85 @@ </div> </footer> + <!-- POP UP WINDOW FOR LOGIN --> + <article class="modal fade login-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Log In</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="Password"> + </div> + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + + <!-- POP UP WINDOW FOR REGISTRATION --> + <article class="modal fade registration-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Sign Up</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="First Name"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Last Name"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="Email"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="New Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="New Password"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="University (optional)"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Department (optional)"> + </div> + + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + <script> $(document).ready(function() { diff --git a/user_solutions.html b/user_solutions.html index 7da5797..85cc4a3 100644 --- a/user_solutions.html +++ b/user_solutions.html @@ -54,9 +54,9 @@ <li class="dropdown-submenu"> <a tabindex="-1" href="#">First Year<i class="fa fa-chevron-right"></i></a> <ul class="dropdown-menu"> - <li><a tabindex="-1" href="#">CSC108</a></li> - <li><a href="#">CSC148</a></li> - <li><a href="#">CSC165</a></li> + <li><a tabindex="-1" href="exams.html">CSC108</a></li> + <li><a href="exams.html">CSC148</a></li> + <li><a href="exams.html">CSC165</a></li> </ul> </li> <li><a href="#">Second Year</a></li> @@ -64,8 +64,8 @@ <li><a href="#">Fourth Year</a></li> </ul> </li> - <li><a href="#">Log In</a></li> - <li><a href="#">Register</a></li> + <li><a href="#" data-toggle="modal" data-target=".login-window">Log In</a></li> + <li><a href="#" data-toggle="modal" data-target=".registration-window">Sign up</a></li> <li class="dropdown"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Links <span class="caret"></span></a> <ul class="dropdown-menu"> @@ -234,6 +234,85 @@ </div> </footer> + <!-- POP UP WINDOW FOR LOGIN --> + <article class="modal fade login-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Log In</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="Password"> + </div> + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + + <!-- POP UP WINDOW FOR REGISTRATION --> + <article class="modal fade registration-window"> + <div class="modal-dialog"> + <div class="modal-content"> + + <section class="modal-header"> + <button type="button" class="close" data-dismiss="modal">×</button> + <h4 class="modal-title">Sign Up</h4> + </section> + + <section class="modal-body"> + <form role="form"> + <div class="form-group"> + <input type="text" class="form-control" placeholder="First Name"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Last Name"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="Email"> + </div> + + <div class="form-group"> + <input type="email" class="form-control" placeholder="New Username"> + </div> + <div class="form-group"> + <input type="password" class="form-control" placeholder="New Password"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="University (optional)"> + </div> + + <div class="form-group"> + <input type="text" class="form-control" placeholder="Department (optional)"> + </div> + + </form> + </section> + + <div class="modal-footer"> + <button class="btn">Submit</button> + </div> + + </div> + </div> + </article> + <script> $(document).ready(function() { |