diff options
Diffstat (limited to 'workshop_app/templates')
25 files changed, 473 insertions, 213 deletions
diff --git a/workshop_app/templates/workshop_app/activation.html b/workshop_app/templates/workshop_app/activation.html index 88bada9..29dd6ac 100644 --- a/workshop_app/templates/workshop_app/activation.html +++ b/workshop_app/templates/workshop_app/activation.html @@ -8,18 +8,23 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="#">SiteName</a> + <a class="navbar-brand" href="#">Home</a> </div> <ul class="nav navbar-nav navbar-right"> {% if request.user.profile.is_email_verified %} <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile</a></li> - {% endif %} + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + {% endif %} </ul> </div> </nav> {% endblock %} +{% block extra %} + +{% endblock %} + {% block content %} {% if status == '2' %} <div class="container"> @@ -29,10 +34,15 @@ </div> </div> {% elif status == '1' %} + <script type="text/javascript"> + window.setTimeout(function() + { + location.href="{{ URL_ROOT }}/register/" + }, 3000); + </script> <div class="container"> <div class="jumbotron"> <p> Your activation has expired please register again</p> - </div> </div> {% elif status == '0' %} @@ -43,10 +53,17 @@ </div> </div> {% else %} + <script type="text/javascript"> + window.setTimeout(function() + { + location.href="{{ URL_ROOT }}/logout/" + }, 5000); + </script> + <div class="container"> <div class="jumbotron"> <h1>Activation Awaiting</h1> - <p>Please <strong>Logout</strong> and check your email to activate your account. The key expires in <strong>3days</strong> from the date of registeration</p> + <p>Please check your email to activate your account. The key expires in <strong>24hours</strong> from the date of registeration. You will be logged out automatically.</p> </div> </div> {% endif %} diff --git a/workshop_app/templates/workshop_app/booking.html b/workshop_app/templates/workshop_app/booking.html index 13af37c..7265889 100644 --- a/workshop_app/templates/workshop_app/booking.html +++ b/workshop_app/templates/workshop_app/booking.html @@ -37,9 +37,9 @@ var $dialog = $('<div></div').html( '<form id="myform" action="">\ <input type="checkbox" id="one"\ - name="one" value="one"/> I will give minimum 50 participants for the workshop.<br/>\ - <input type="checkbox" id="two" name="two" value="two" /> I agree that this booking won\'t be cancelled without prior notice to the instructor and fossee.<br/>\ - <input type="checkbox" id="three" name="three" value="three"/> I am '+ check_count +' in the queue.\ + name="one" value="one"/> We assure to give minimum 50 participants for the workshop.<br/>\ + <input type="checkbox" id="two" name="two" value="two" /> We agree that this booking won\'t be cancelled without prior notice of 2days to the instructor and fossee.<br/>\ + <input type="checkbox" id="three" name="three" value="three"/> Your request will be number '+ check_count +' in the queue.\ </form> ') .dialog({ autoOpen: false, @@ -85,13 +85,16 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">Coordinator Profile</a> + <div class="navbar-header" class="active"> + <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Home</a> </div> <ul class="nav navbar-nav"> - <li class="active"><a href="{{ URL_ROOT}}/book/">Book</a></li> <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li> <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> </ul> <ul class="nav navbar-nav navbar-right"> <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> @@ -102,7 +105,7 @@ {% endblock %} {% block content %} - <h4 align="center">This is the list of events available, if you haved booked a workshop please goto My Workshops and check your workshop status.</h4> + <h3 align="center">List of Available Workshops </h3> <br> <div class="container"> <table class="table table-hover "> @@ -121,27 +124,13 @@ <tr > <td id="instructor-name">{{ workshop.1 }}</td> - <td class="accordion-toggle" data-toggle="collapse" href="#collapseOne{{ forloop.counter }}" - id="workshop-name">{{ workshop.2 }}<a href="#"> + <td + id="workshop-name">{{ workshop.2 }} <a href="{{URL_ROOT}}/file_view/{{workshop.4}}" > <span class="glyphicon glyphicon-info-sign"></span> - </a></td> + </a> </td> <td id="workshop-date{{ forloop.counter }}">{{ workshop.0 }}</td> <td><button class="btn btn-primary btn-sm" id="book-btn" onClick="sendData('{{workshop.0}},{{workshop.3}},{{workshop.4}}')" > Book</button></td> </tr> - - <tr> - <td colspan="12" class="hiddenRow"> - <div id="collapseOne{{ forloop.counter }}" class="accordion-body collapse"> - <table class="table table-striped"> - <tbody> - <tr> - <td>{{ workshop.5|safe }}</td> - </tr> - </tbody> - </table> - </div> - </td> - </tr> </tbody> {% endfor %} </table> diff --git a/workshop_app/templates/workshop_app/create_workshop.html b/workshop_app/templates/workshop_app/create_workshop.html index 8b4d4d1..3631bda 100644 --- a/workshop_app/templates/workshop_app/create_workshop.html +++ b/workshop_app/templates/workshop_app/create_workshop.html @@ -15,12 +15,11 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="#">Instructor Profile</a> + <a class="navbar-brand" href="{{URL_ROOT}}/manage/">Home</a> </div> <ul class="nav navbar-nav"> - <li ><a href="{{ URL_ROOT }}/manage/">Manage</a></li> <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> <ul class="nav navbar-nav navbar-right"> @@ -39,6 +38,10 @@ {{ form.media }} {{ form.as_p }} <br><br> + <div class="alert alert-info"> + <strong>Please Note:!</strong> While Making Recurring Workshops please also fill <strong>Repeat Until </strong> and while creating single event please set it <strong>4days after the current date.</strong> + </div> + <br> <button class="btn btn-success" type="submit">Save</button> </form> </div> diff --git a/workshop_app/templates/workshop_app/edit_profile.html b/workshop_app/templates/workshop_app/edit_profile.html index 2c7aea3..d9a39e1 100644 --- a/workshop_app/templates/workshop_app/edit_profile.html +++ b/workshop_app/templates/workshop_app/edit_profile.html @@ -7,21 +7,26 @@ {% block header %} <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> + {% if request.user.profile.position == 'instructor' %} <div class="navbar-header"> - <a class="navbar-brand" href="#">Booking</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a> </div> - {% if request.user.profile.position == 'instructor' %} <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li> <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> {% else %} + <div class="navbar-header"> + <a class="navbar-brand" href="{{ URL_ROOT }}/book/">Home</a> + </div> <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/book/">Book</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> </ul> {% endif %} <ul class="nav navbar-nav navbar-right"> diff --git a/workshop_app/templates/workshop_app/how_to_participate.html b/workshop_app/templates/workshop_app/how_to_participate.html index c732a7f..feed0b8 100644 --- a/workshop_app/templates/workshop_app/how_to_participate.html +++ b/workshop_app/templates/workshop_app/how_to_participate.html @@ -15,21 +15,39 @@ {% block header %} <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> + {% if request.user.profile.position == 'coordinator' %} + <div class="navbar-header"> + <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Home</a> + </div> + <ul class="nav navbar-nav"> + <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li class="active"><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + </ul> + {% else %} <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/">Booking</a> + <a class="navbar-brand" href="{{URL_ROOT}}/">Home</a> </div> <ul class="nav navbar-nav navbar-right"> <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> + {% endif %} </div> </nav> {% endblock %} {% block content %} - <div class="container-fluid" style="margin-left:auto;"> - <img src="{{ URL_ROOT }}/static/workshop_app/img/img2.jpg"> + <div class="container-fluid text-center" > + <img src="{{ URL_ROOT }}/static/workshop_app/img/structure.png"> </div> {% endblock %}
\ No newline at end of file diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html index d8c1232..718f9ba 100644 --- a/workshop_app/templates/workshop_app/index.html +++ b/workshop_app/templates/workshop_app/index.html @@ -1,120 +1,147 @@ + <!DOCTYPE html> -<html> - <head> - <title>Welcome</title> - </head> +<html lang="en"> + +<head> + + <meta charset="utf-8"> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <meta name="Akshen Doke" content=""> + + <title>Welcome</title> + + <!-- Bootstrap Core CSS --> + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> + + <!-- Custom CSS --> + <link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/index.css" type="text/css" /> - <!-- Bootstrap CDN --> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> + <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries --> + <!-- WARNING: Respond.js doesn't work if you view the page via file:// --> + <!--[if lt IE 9]> + <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script> + <script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script> + <![endif]--> - <link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"> - <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"> +</head> - <link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/index.css" type="text/css" /> - <body> - <div class="container" style="width: 90%; height:90%;background:#C8C5B6;"> - <div class="row"> +<body> + + <!-- Navigation --> + - <div class="col-md-4"> - <div class="fossee-label">FOSSEE Workshop</div> - <div class="logo"> - <img src="{{ URL_ROOT }}/static/workshop_app/img/python_logo.png" > - </div> + <div class="container"> + + <!-- Heading Row --> + <div class="row"> + <div class="col-md-5 fossee-label"> + FOSSEE <br>Workshops + + </div> + <div class="login col-md-7"> + <div id="first-right"> + <div class="label-bar"> + <a href="http://python.fossee.in/about/" + target="_blank" >About </a>|<a href="{{ URL_ROOT }}/testimonials/"> Testimonials </a>| <a href="http://fossee.in/fossee-stats" target="_blank" > Past Workshops</a> </div> - - <div class="login col-md-8"> - <div class="label-bar"><a href="http://python.fossee.in/about/" - target="_blank" style="color: #6D5847;">About </a>|<a href="" style="color: #6D5847;">Blog </a>| <a href="http://python.fossee.in/gallery/" target="_blank" style="color: #6D5847;">Gallery</a></div> - <img src=" {{ URL_ROOT }}/static/workshop_app/img/img_1.png" style="margin-left: 40%;padding-top: 25%;"><br> + <br> <br> + <img src=" {{ URL_ROOT }}/static/workshop_app/img/img_1.png" ><br> <div id="rectbox"> <form method="post"> {% csrf_token %} {{ form.as_p }} - <button class="btn btn-default btn-sm" style="margin-left: 35%;" type="submit">Login</button> - <br> + <button class="btn btn-default btn-sm" type="submit">Login</button> + <a href="{{URL_ROOT}}/forgotpassword/" class="btn btn-default btn-sm" >Forgot Password</a> </form> </div> - - <h4 style="margin-left: 27%; color: grey;">If not Registered yet, <br> please <a href="{{ URL_ROOT}}/register/" target="_blank">register here.</a></h4> + <br> + <p style="font-size: 15pt;">If not registered yet, <br> please <a href="{{ URL_ROOT}}/register/" >register here.</a></p> <br><br> - - </div> - - </div> - - <div class="row"> - <div class="icons col-sm-12"> - - <figure class="item" style="margin-left: 10%;"> - <a href="{{ URL_ROOT }}/view_workshoptype_details/" style="color: #6D5847;"> - <img class="caption-img" src="{{ URL_ROOT }}/static/workshop_app/img/list.png" > - <figcaption class="caption">Course List</figcaption> - </a> - </figure> - - <figure class="item" style="margin-left: 15%;"> - <a href="{{ URL_ROOT }}/benefits/" style="color: #6D5847;"> - <img class="caption-img" src="{{ URL_ROOT }}/static/workshop_app/img/bnft.png" > - <figcaption class="caption" >Benefits</figcaption> - </a> - </figure> - - <figure class="item" style="margin-left: 15%;"> - <a href="{{ URL_ROOT }}/faq/" style="color: #6D5847;"> - <img class="caption-img" src="{{ URL_ROOT }}/static/workshop_app/img/faq.png" > - <figcaption class="caption" >FAQs</figcaption> - </a> - </figure> - - <figure class="item" style="margin-left: 15%; "> - <a href="{{ URL_ROOT }}/how_to_participate/" style="color: #6D5847;"> - <img class="caption-img" src="{{ URL_ROOT }}/static/workshop_app/img/part.png" > - <figcaption class="caption">How to Participate</figcaption> - </a> - </figure> - - </div> - </div> - - <!-- Bottom 3 cols --> - <div class="row"> - <!-- Logo --> - <div class="org-logo col-sm-4"> - <span >Organized By:</span><br> - <img src="{{ URL_ROOT }}/static/workshop_app/img/fossee_logo.png"> - - <img src="{{ URL_ROOT }}/static/workshop_app/img/iitb_logo.png" > - <br> - </div> - - <!-- Related Links --> - <div class="related-links col-sm-4"> - Related Links<br> - <a href="http://fossee.in" target="_blank" >fossee.in</a><br> - <a href="http://yaksh.fossee.in" target="_blank" >yaksh.fossee.in</a><br> - <a href="http://python.fossee.in" target="_blank" >python.fossee.in</a> - </div> - - <!-- Contact Us --> - <div class="contact-us col-sm-4"> - Contact Us:<br> - FOSSEE, IIT-Bombay<br> - Mumbai, India<br> + </div> + </div> + <!-- /.col-md-4 --> + </div> + <!-- /.row --> + + <!-- Call to Action Well --> + <div class="row icons" style="align-items: center;"> + <div class="text-center"> + <div class="col-md-3" style="align-items: center;"> + <a href="{{ URL_ROOT }}/faq/"><img src="{{ URL_ROOT}}/static/workshop_app/img/faq.png"><br><br> + FAQ's</a> + <br><br> + </div> + <div class="col-md-3" style="align-items: center;"> + <a href="{{ URL_ROOT }}/file_view/flowchart" > + <img src="{{ URL_ROOT}}/static/workshop_app/img/part.png"><br><br> + How to Participate</a> + <br><br> + </div> + <div class="col-md-3"> + <a href="{{ URL_ROOT }}/benefits/"> + <img src="{{ URL_ROOT}}/static/workshop_app/img/bnft.png"><br><br> + Benefits</a> + <br><br> + </div> + <div class="col-md-3"> + <a href="{{ URL_ROOT }}/view_workshoptype_details/"> + <img src="{{ URL_ROOT}}/static/workshop_app/img/list.png"><br><br> + Workshops List</a> + <br><br> + </div> + <!-- /.col-lg-12 --> + </div> + </div> + <!-- /.row --> + + <!-- Content Row --> + <div class="row" id="bottom"> + <div class="col-md-4"> + <br><br> + <h4>Organized By:</h4> + <img src="{{ URL_ROOT}}/static/workshop_app/img/fossee_logo.png"> + + <img src="{{ URL_ROOT}}/static/workshop_app/img/iitb_logo.png"> + </div> + <!-- /.col-md-4 --> + <div class="col-md-4"> + <br> + <h3>Related Links</h3> + <a href="http://fossee.in" target="_blank" >fossee.in</a><br> + <a href="http://yaksh.fossee.in" target="_blank" >yaksh.fossee.in</a><br> + <a href="http://python.fossee.in" target="_blank" >python.fossee.in</a> + </div> + <!-- /.col-md-4 --> + <div class="col-md-4"> + <h3>Contact Us</h3> + FOSSEE, IIT-Bombay<br> + Mumbai, India <br> <br> - Phone: (+91) 22 2576 - 4133<br> - Email: workshops[at]fossee[dot]in - </div> - </div> - + Phone: (+91) 22 2576 4133<br> + Email: workshops[at]fossee[dot]in + </div> + <!-- /.col-md-4 --> + </div> + <!-- /.row --> + + <!-- Footer --> + <footer> + <div class="footer row"> + <div class="col-lg-12"> + <img src="" style="height: 40px;" > + <img src="{{ URL_ROOT }}/static/workshop_app/img/cc.png" > + This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License + </div> + </div> + </footer> - <div class="footer"> - <img src="{{ URL_ROOT }}/static/workshop_app/img/cc.png" style="width:5%;height:3%;"> - This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License </div> - </div> - </body> + <!-- /.container --> + +</body> + </html> diff --git a/workshop_app/templates/workshop_app/login.html b/workshop_app/templates/workshop_app/login.html index 47f5827..a659643 100644 --- a/workshop_app/templates/workshop_app/login.html +++ b/workshop_app/templates/workshop_app/login.html @@ -8,7 +8,7 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT }}/">Booking</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a> </div> <ul class="nav navbar-nav navbar-right"> diff --git a/workshop_app/templates/workshop_app/logout.html b/workshop_app/templates/workshop_app/logout.html index 5dd9587..796bb14 100644 --- a/workshop_app/templates/workshop_app/logout.html +++ b/workshop_app/templates/workshop_app/logout.html @@ -8,7 +8,7 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT }}/">Booking</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a> </div> <ul class="nav navbar-nav navbar-right"> diff --git a/workshop_app/templates/workshop_app/manage.html b/workshop_app/templates/workshop_app/manage.html index e210e5e..a390c8a 100644 --- a/workshop_app/templates/workshop_app/manage.html +++ b/workshop_app/templates/workshop_app/manage.html @@ -4,12 +4,11 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="#">Instructor Profile</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a> </div> <ul class="nav navbar-nav"> - <li class="active"><a href="{{ URL_ROOT }}/manage/">Manage</a></li> <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> <li ><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> <ul class="nav navbar-nav navbar-right"> diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html index c20a6ca..92dc20f 100644 --- a/workshop_app/templates/workshop_app/my_workshops.html +++ b/workshop_app/templates/workshop_app/my_workshops.html @@ -43,22 +43,24 @@ <div class="container-fluid"> {% if request.user.profile.position == 'instructor' %} <div class="navbar-header"> - <a class="navbar-brand" href="#">Instructor Profile</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a> </div> <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li> <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> {% else %} <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/book/">Coordinator Profile</a> + <a class="navbar-brand" href="{{URL_ROOT}}/book/">Home</a> </div> <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/book/">Book</a></li> <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> </ul> {% endif %} @@ -276,7 +278,7 @@ <div class="container"> <div class="jumbotron"> <h1>Welcome Instructor</h1> - <p>Your workshop related information will be shown here, Please navigate to <b>View Workshop list</b> and depending upon + <p>Your workshop related information will be shown here, Please navigate to <b>Workshop list</b> and depending upon your expertise and availability create a workshop by going to <b>Create Workshop</b>.</p> </div> diff --git a/workshop_app/templates/workshop_app/password_change_done.html b/workshop_app/templates/workshop_app/password_change_done.html new file mode 100644 index 0000000..45c8162 --- /dev/null +++ b/workshop_app/templates/workshop_app/password_change_done.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} + +{% block pagetitle %}Password change successful{% endblock %} +{% block script %} +<script type="text/javascript"> + window.setTimeout(function() + { + location.href="{{ URL_ROOT }}/login/" + }, 2000); +</script> +{% endblock %} +{% block content %} +<h3>Your password has been changed successfully.</h3> +<h4>Redirecting ...</h4> +{% endblock %} diff --git a/workshop_app/templates/workshop_app/password_change_form.html b/workshop_app/templates/workshop_app/password_change_form.html new file mode 100644 index 0000000..c5ed81a --- /dev/null +++ b/workshop_app/templates/workshop_app/password_change_form.html @@ -0,0 +1,16 @@ +{% extends "base.html" %} +<!DOCTYPE html> +{% block pagetitle %} Change Password {% endblock %} + +{% block content %} +<form action="" method="post" > + {% csrf_token %} + <center> + <table class=span1> + {{ form }} + </table> + </center> + <center><button class="btn" type="submit">Change Password</button> + <button class="btn" type="button" name="button" onClick='location.replace("{{URL_ROOT}}/login/");'>Cancel</button></center> +</form> +{% endblock content %} diff --git a/workshop_app/templates/workshop_app/password_reset_complete.html b/workshop_app/templates/workshop_app/password_reset_complete.html new file mode 100644 index 0000000..bf27059 --- /dev/null +++ b/workshop_app/templates/workshop_app/password_reset_complete.html @@ -0,0 +1,6 @@ +{% extends "base.html" %} +{% block pagetitle %}Password reset complete{% endblock %} +{% block content %} +<p>Your password has been reset. </p> + +{% endblock %} diff --git a/workshop_app/templates/workshop_app/password_reset_confirm.html b/workshop_app/templates/workshop_app/password_reset_confirm.html new file mode 100644 index 0000000..1b0a1b7 --- /dev/null +++ b/workshop_app/templates/workshop_app/password_reset_confirm.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% block pagetitle %}Reset Password{% endblock %} + +{% block content %} + {% if validlink %} + <p>Please enter your new password twice so we can verify you typed it in correctly</p>. + <form method="post"> + {% csrf_token %} + {{ form.as_p }} + <button class= "btn" type="submit">Submit</button> + </form> + {% else %} + <p>This reset link is no longer valid!</p> + {% endif %} +{% endblock %} diff --git a/workshop_app/templates/workshop_app/password_reset_done.html b/workshop_app/templates/workshop_app/password_reset_done.html new file mode 100644 index 0000000..1ac7b60 --- /dev/null +++ b/workshop_app/templates/workshop_app/password_reset_done.html @@ -0,0 +1,3 @@ +{% extends "base.html" %} +{% block title %}Password reset successful{% endblock %} +{% block pagetitle %} Instruction for setting new password has been mailed to your registered email address {% endblock %} diff --git a/workshop_app/templates/workshop_app/password_reset_form.html b/workshop_app/templates/workshop_app/password_reset_form.html new file mode 100644 index 0000000..fa14e9e --- /dev/null +++ b/workshop_app/templates/workshop_app/password_reset_form.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% block pagetitle %} Email will be send to the registered email address {% endblock %} +{% block content %} +<form action="" method="post"> + {% csrf_token %} + {{ form }} + <button class="btn" type="submit">Request</button> + <a class="btn" href="{{URL_ROOT}}/login/">Cancel</a> +</form> +{% endblock content %} diff --git a/workshop_app/templates/workshop_app/profile_updated.html b/workshop_app/templates/workshop_app/profile_updated.html index c90e176..610770a 100644 --- a/workshop_app/templates/workshop_app/profile_updated.html +++ b/workshop_app/templates/workshop_app/profile_updated.html @@ -7,21 +7,28 @@ {% block header %} <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> + {% if request.user.profile.position == 'instructor' %} <div class="navbar-header"> - <a class="navbar-brand" href="#">WebSiteName</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a> </div> <ul class="nav navbar-nav"> - {% if request.user.profile.position == 'instructor' %} - <li><a href="{{ URL_ROOT }}/manage/">Manage</a> - </li> <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> + </ul> {% else %} - <li><a href="{{ URL_ROOT }}/book/">Book</a></li> + <div class="navbar-header"> + <a class="navbar-brand" href="{{URL_ROOT}}/book/">Home</a> + </div> + <ul class="nav navbar-nav"> <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - {% endif %} - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop Details</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> </ul> + {% endif %} <ul class="nav navbar-nav navbar-right"> <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html index 697fe63..ce90dc8 100644 --- a/workshop_app/templates/workshop_app/propose_workshop.html +++ b/workshop_app/templates/workshop_app/propose_workshop.html @@ -11,11 +11,18 @@ <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script> <script> + var dateToday = new Date(); + var upto = new Date(); + + dateToday.setDate(dateToday.getDate() + 3); + upto.setFullYear(dateToday.getFullYear() + 1); + $(function() { $( ".datepicker" ).datepicker({ changeMonth: true, changeYear: true, - yearRange: "1994:2049", + minDate: dateToday, + maxDate: upto // You can put more options here. }); }); @@ -26,12 +33,15 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Coordinator Profile</a> + <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Home</a> </div> <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/book/">Book</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> </ul> <ul class="nav navbar-nav navbar-right"> <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> @@ -42,6 +52,12 @@ {% endblock %} {% block content %} + <style type="text/css"> + .errorlist { + color: red; + } + </style> + <div class="container"> <form method="post"> {% csrf_token %} diff --git a/workshop_app/templates/workshop_app/register.html b/workshop_app/templates/workshop_app/register.html index fcb0739..6804ad0 100644 --- a/workshop_app/templates/workshop_app/register.html +++ b/workshop_app/templates/workshop_app/register.html @@ -8,7 +8,7 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT }}/">Booking</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a> </div> <ul class="nav navbar-nav navbar-right"> @@ -27,10 +27,16 @@ content: "*"; color: red; } + + .errorlist { + color: red; + } </style> <div class="container" > <br> + <h3>Coordinator Registration Form</h3> + <br> <form action="" method="post"> {% csrf_token %} <table class="table table-bordered"> @@ -39,8 +45,9 @@ <button class="btn btn-primary" type="submit">Register</button> </form><br> - <div class="alert alert-info"> + <!-- Activate when Instructor registeration starts --> + <!-- <div class="alert alert-info"> <strong>Info!</strong> Instructors, please wait for our admin approval, if your instructor account is not activated in 7 days, please mail us at workshops[at]fossee[dot]in - </div> + </div> --> </div> {% endblock %} diff --git a/workshop_app/templates/workshop_app/testimonals.html b/workshop_app/templates/workshop_app/testimonals.html new file mode 100644 index 0000000..e4b7d24 --- /dev/null +++ b/workshop_app/templates/workshop_app/testimonals.html @@ -0,0 +1,74 @@ +{% extends 'workshop_app/base.html' %} + + {% block title %} + Testimonals + {% endblock %} + +{% block header %} + <nav class="navbar navbar-default navbar-custom"> + <div class="container-fluid"> + <div class="navbar-header"> + <a class="navbar-brand" href="{{ URL_ROOT }}/">Home</a> + </div> + + <ul class="nav navbar-nav navbar-right"> + <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> + <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> + </ul> + </div> + </nav> +{% endblock %} + + {% block extra %} + <link rel="stylesheet" href="{{ URL_ROOT }}/static/workshop_app/css/testimonials.css" type="text/css" /> + {% endblock %} + {% block content %} + + <div class="container content"> + <div class="row"> + <div class="col-md-6 col-md-offset-3"> + <div class="testimonials"> + {% for m in messages %} + <div class="active item"> + <div class="carousel-info"> + <div class="pull-left"> + <span class="testimonials-name">{{ m.name }},</span> + <span class="testimonials-post">{{ m.institute }}</span><br> + </div> + </div> + <blockquote><p>{{m.message}}</p></blockquote> + </div> + {% endfor %} + </div> + </div> + </div> + </div> + + <!-- Page Navigation --> + <div class="container"> + + <div class="Page-Nav" align="center"> + <nav aria-label="Page navigation"> + <ul class="pagination pagination-sm"> + <li class="page-item"> + {% if messages.has_previous %} + <a class="page-link" tabindex="-1" + href="?page={{ messages.previous_page_number }}">Previous</a> + {% endif %} + </li> + <li class="page-item"> + <span class="current"> + Page {{ messages.number }} of {{ messages.paginator.num_pages }} + </span> + </li> + <li class="page-item"> + {% if messages.has_next %} + <a class="page-link" href="?page={{ messages.next_page_number }}">Next + </a> + {% endif %} + </li> + </ul> + </nav> + </div> + </div> + {% endblock %} diff --git a/workshop_app/templates/workshop_app/view_benefits.html b/workshop_app/templates/workshop_app/view_benefits.html index 9b56244..76c9a85 100644 --- a/workshop_app/templates/workshop_app/view_benefits.html +++ b/workshop_app/templates/workshop_app/view_benefits.html @@ -10,18 +10,38 @@ <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> + <link href='//fonts.googleapis.com/css?family=Antic Slab' rel='stylesheet'> {% endblock %} {% block header %} <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> + {% if request.user.profile.position == 'coordinator' %} + <div class="navbar-header"> + <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Home</a> + </div> + <ul class="nav navbar-nav"> + <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/faq/">FAQ</a></li> + <li class="active"><a href="{{ URL_ROOT }}/benefits/">Benefits</a> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> + </li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + </ul> + {% else %} <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/">Booking</a> + <a class="navbar-brand" href="{{URL_ROOT}}/">Home</a> </div> <ul class="nav navbar-nav navbar-right"> <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> + {% endif %} </div> </nav> {% endblock %} @@ -29,14 +49,14 @@ {% block content %} <div class="container"> - <h1>Features and Benefits:</h1><br> - <p><h4> + <h1 style="font-family: 'Times New Roman';">Features and Benefits:</h1><br> + <p ><h4 style="font-family: 'Antic Slab';"> The workshops can be arranged at your convenience. Hands-on experience in Python programming with many practice sessions and quizzes. Certificates and honorarium will be provided on successful completion. </h4></p> <br> - <p><h4> + <p><h4 style="font-family: 'Antic Slab';"> Hone your programming skills in Python. Live video/chat assistance from FOSSEE Python experts Closely integrated with online programming evaluation tool. diff --git a/workshop_app/templates/workshop_app/view_faq.html b/workshop_app/templates/workshop_app/view_faq.html index 77ec095..b3eb5f1 100644 --- a/workshop_app/templates/workshop_app/view_faq.html +++ b/workshop_app/templates/workshop_app/view_faq.html @@ -17,13 +17,31 @@ {% block header %} <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> + {% if request.user.profile.position == 'coordinator' %} + <div class="navbar-header"> + <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Home</a> + </div> + <ul class="nav navbar-nav"> + <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> + <li class="active"><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + </ul> + {% else %} <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/">Booking</a> + <a class="navbar-brand" href="{{URL_ROOT}}/">Home</a> </div> <ul class="nav navbar-nav navbar-right"> <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> + {% endif %} </div> </nav> {% endblock %} diff --git a/workshop_app/templates/workshop_app/view_profile.html b/workshop_app/templates/workshop_app/view_profile.html index 751cc0b..5f01f83 100644 --- a/workshop_app/templates/workshop_app/view_profile.html +++ b/workshop_app/templates/workshop_app/view_profile.html @@ -9,22 +9,24 @@ <div class="container-fluid"> {% if request.user.profile.position == 'instructor' %} <div class="navbar-header"> - <a class="navbar-brand" href="#">Instructor Profile</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a> </div> <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li> <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> {% else %} <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/book/">Coordinator Profile</a> + <a class="navbar-brand" href="{{URL_ROOT}}/book/">Home</a> </div> <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/book/">Book</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a> <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li></li> + <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a></li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> </ul> {% endif %} diff --git a/workshop_app/templates/workshop_app/view_workshoptype_details.html b/workshop_app/templates/workshop_app/view_workshoptype_details.html index 0cb989e..60d63a4 100644 --- a/workshop_app/templates/workshop_app/view_workshoptype_details.html +++ b/workshop_app/templates/workshop_app/view_workshoptype_details.html @@ -7,22 +7,43 @@ {% block extra %} <!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> --> - + <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script> {% endblock %} {% block header %} <nav class="navbar navbar-default navbar-custom"> + {% if request.user.profile.position == 'coordinator' %} + <div class="container-fluid"> + <div class="navbar-header"> + <a class="navbar-brand" href="{{ URL_ROOT}}/book/">Home</a> + </div> + <ul class="nav navbar-nav"> + <li><a href="{{ URL_ROOT}}/my_workshops/">My Workshops</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/benefits/">Benefits</a> + <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> + </li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> Profile </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + </ul> + </div> + {% else %} <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="{{URL_ROOT}}/">Booking</a> + <a class="navbar-brand" href="{{URL_ROOT}}/">Home</a> </div> <ul class="nav navbar-nav navbar-right"> <li><a href="{{ URL_ROOT }}/register/"><span class="glyphicon glyphicon-user"></span> Register</a></li> <li><a href="{{ URL_ROOT }}/login/"><span class="glyphicon glyphicon-log-in"></span> Login</a></li> </ul> </div> + {% endif %} </nav> {% endblock %} @@ -30,7 +51,7 @@ <div class="container"> - <table class="table table-hover" style="border-collapse:collapse;"> + <table class="table table-hover"> <thead> <tr> <th>id</th> @@ -45,26 +66,12 @@ <td scope="row" id="{{ forloop.counter }}">{{ forloop.counter }}</td> <td>{{ w.workshoptype_name }}</td> <td>{{ w.workshoptype_duration }}</td> - <td><button class="btn btn-default btn-sm" class="accordion-toggle" data-toggle="collapse" href="#collapseOne{{ forloop.counter }}">View Workshop Details</button></td> + <td><a href="{{URL_ROOT}}/file_view/{{ w.id }}" class="btn btn-default btn-sm" class="accordion-toggle" >View Workshop Details</a></td> </tr> - - <tr> - <td colspan="12" class="hiddenRow"> - <div id="collapseOne{{ forloop.counter }}" class="accordion-body collapse"> - <table class="table table-striped"> - <tbody> - <tr> - <td>{{ w.workshoptype_description|safe }}</td> - </tr> - </tbody> - </table> - </div> - </td> - </tr> </tbody> {% endfor %} </table> - + <a style="color: white;" href="{{ URL_ROOT }}/book/"><button class="btn btn-primary btn-lg" style="float: right;">Start Booking Now</button></a> </div> <!-- Page Navigation --> diff --git a/workshop_app/templates/workshop_app/view_workshoptype_list.html b/workshop_app/templates/workshop_app/view_workshoptype_list.html index dddd119..b053305 100644 --- a/workshop_app/templates/workshop_app/view_workshoptype_list.html +++ b/workshop_app/templates/workshop_app/view_workshoptype_list.html @@ -10,17 +10,16 @@ <nav class="navbar navbar-default navbar-custom"> <div class="container-fluid"> <div class="navbar-header"> - <a class="navbar-brand" href="#">WebSiteName</a> + <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a> </div> <ul class="nav navbar-nav"> {% if request.user.profile.position == 'instructor'%} - <li><a href="{{ URL_ROOT }}/manage/">Manage</a></li> <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> {% else %} <li><a href="{{ URL_ROOT }}/book/">Book</a></li> <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> {% endif %} - <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">View Workshop List</a></li> + <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> <li><a href="{{ URL_ROOT }}/my_workshops/">My Workshops</a></li> </ul> @@ -44,7 +43,7 @@ <div class="container"> - <table class="table table-hover" style="border-collapse:collapse;"> + <table class="table table-hover" > <thead> <tr> <th>id</th> @@ -55,29 +54,14 @@ {% for w in workshoptype %} <tbody> - <tr > + <tr> <td scope="row" id="{{ forloop.counter }}">{{ forloop.counter }}</td> <td>{{ w.workshoptype_name }}</td> <td>{{ w.workshoptype_duration }}</td> - <td><button class="btn btn-default btn-sm" class="accordion-toggle" data-toggle="collapse" href="#collapseOne{{ forloop.counter }}">View Workshop Details</button></td> + <td><a class="btn btn-default btn-sm" href="{{URL_ROOT}}/file_view/{{ w.id }}">View Workshop Details</a></td> {% if request.user.profile.position == 'coordinator' %} - <td><button class="btn btn-default btn-sm" ><a href="{{ URL_ROOT }}/book/">Book</a></button></td> {% endif %} </tr> - - <tr> - <td colspan="12" class="hiddenRow"> - <div id="collapseOne{{ forloop.counter }}" class="accordion-body collapse"> - <table class="table table-striped"> - <tbody> - <tr> - <td>{{ w.workshoptype_description|safe }}</td> - </tr> - </tbody> - </table> - </div> - </td> - </tr> </tbody> {% endfor %} </table> |