diff options
30 files changed, 85 insertions, 869 deletions
diff --git a/static/workshop_app/css/sticky-footer.css b/static/workshop_app/css/sticky-footer.css index bad5ff7..3db4f72 100644 --- a/static/workshop_app/css/sticky-footer.css +++ b/static/workshop_app/css/sticky-footer.css @@ -13,7 +13,7 @@ /* OnActive Tab */ .navbar-custom .navbar-nav > .active > a { color: black; - background: white; + background: white; } .navbar-custom .navbar-nav > li > a:hover, @@ -32,6 +32,7 @@ } .navbar-custom .navbar-brand:hover{ + color: white; } /** diff --git a/statistics_app/templates/statistics_app/profile_stats.html b/statistics_app/templates/statistics_app/profile_stats.html index a0f83d9..7c0c2b5 100644 --- a/statistics_app/templates/statistics_app/profile_stats.html +++ b/statistics_app/templates/statistics_app/profile_stats.html @@ -4,35 +4,6 @@ Profile Statistics {% endblock %} - -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> - </div> - <ul class="nav navbar-nav"> - <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li ><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li class="active"><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> -{% endblock %} - {% block extra %} <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> diff --git a/statistics_app/templates/statistics_app/workshop_public_stats.html b/statistics_app/templates/statistics_app/workshop_public_stats.html index cfc95c4..a42f818 100644 --- a/statistics_app/templates/statistics_app/workshop_public_stats.html +++ b/statistics_app/templates/statistics_app/workshop_public_stats.html @@ -4,24 +4,6 @@ Open Statistics {% 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 }}/">FOSSEE Python Workshops</a> - </div> - - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{URL_ROOT}}/register">Register</a></li> - <li><a href="{{URL_ROOT}}/login">Login</a></li> - <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li> - <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li> - <li class="active"><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li> - </ul> - </div> - </nav> -{% endblock %} - {% block extra %} <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> <script src="https://code.jquery.com/jquery-1.12.4.js"></script> diff --git a/statistics_app/templates/statistics_app/workshop_stats.html b/statistics_app/templates/statistics_app/workshop_stats.html index dd0d7bd..6a48279 100644 --- a/statistics_app/templates/statistics_app/workshop_stats.html +++ b/statistics_app/templates/statistics_app/workshop_stats.html @@ -1,38 +1,12 @@ {% extends 'workshop_app/base.html' %} {% block title %} - Statistics + Workshop Statistics {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> - </div> - <ul class="nav navbar-nav"> - <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li ><a href="{{ URL_ROOT }}/my_workshops/"> Workshop Status</a></li> - <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li class="active"><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li ><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> -{% endblock %} {% block extra %} + <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> <script src="https://code.jquery.com/jquery-1.12.4.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"></script> diff --git a/workshop_app/static/workshop_app/css/sticky-footer.css b/workshop_app/static/workshop_app/css/sticky-footer.css index f04b48f..3db4f72 100644 --- a/workshop_app/static/workshop_app/css/sticky-footer.css +++ b/workshop_app/static/workshop_app/css/sticky-footer.css @@ -32,8 +32,7 @@ } .navbar-custom .navbar-brand:hover{ - color: black; - background-color: #efefef; + color: white; } /** diff --git a/workshop_app/templates/workshop_app/activation.html b/workshop_app/templates/workshop_app/activation.html index f9fc805..dc6114a 100644 --- a/workshop_app/templates/workshop_app/activation.html +++ b/workshop_app/templates/workshop_app/activation.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="#">Home</a> + <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> </div> <ul class="nav navbar-nav navbar-right"> {% if request.user.profile.is_email_verified %} @@ -67,4 +67,4 @@ </div> </div> {% endif %} -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/workshop_app/templates/workshop_app/base.html b/workshop_app/templates/workshop_app/base.html index 0119806..1722e59 100644 --- a/workshop_app/templates/workshop_app/base.html +++ b/workshop_app/templates/workshop_app/base.html @@ -2,8 +2,8 @@ <html> <head> <meta name="viewport" content="width=device-width, initial-scale=1"> - <title> - {% block title %} + <title> + {% block title %} HomePage {% endblock %} </title> @@ -24,16 +24,64 @@ {% 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" >FOSSEE Python Workshops</a> </div> - <ul class="nav navbar-nav"> - <li class="active"><a href="#">Home</a></li> - </ul> - <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> + <ul class="nav navbar-nav"> + <li><a href="{{ URL_ROOT }}/manage/">Manage Workshops</a></li> + <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> + <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> + </ul> + {% elif request.user.profile.position == 'coordinator' %} + <div class="navbar-header"> + <a class="navbar-brand" >FOSSEE Python Workshops</a> + </div> + <ul class="nav navbar-nav"> + <li ><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops + <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> + <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> + </ul> + </li> + <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> + </ul> + {% else %} + <div class="navbar-header"> + <a class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Python Workshops</a> + </div> + + {% endif %} + + <ul class="nav navbar-nav navbar-right"> + {% if request.user.profile.position == 'instructor' %} + <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> + <li class="dropdown"> + <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics + <span class="caret"></span></a> + <ul class="dropdown-menu"> + <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> + <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> + </ul> + </li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + {% elif request.user.profile.position == 'coordinator' %} + <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> + <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> + <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> + <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> + {% else %} + <li><a href="{{URL_ROOT}}/register">Register</a></li> + <li><a href="{{URL_ROOT}}/login">Login</a></li> + <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li> + <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li> + <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li> + </ul> + {% endif %} </div> </nav> {% endblock %} @@ -48,4 +96,4 @@ <p align="center">Developed by FOSSEE group, IIT Bombay</p> </div> </footer> -</html>
\ No newline at end of file +</html> diff --git a/workshop_app/templates/workshop_app/booking.html b/workshop_app/templates/workshop_app/booking.html index bb372a4..8c2b2c3 100644 --- a/workshop_app/templates/workshop_app/booking.html +++ b/workshop_app/templates/workshop_app/booking.html @@ -81,35 +81,6 @@ </script> {% endblock %} -{% block header %} - - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header" class="active"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> - </div> - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT}}/my_workshops/">Workshop Status</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li class="active"><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> -{% endblock %} - {% block content %} <h3 align="center">List of Available Workshops </h3> <br> diff --git a/workshop_app/templates/workshop_app/create_workshop.html b/workshop_app/templates/workshop_app/create_workshop.html index cffcb7d..3498da4 100644 --- a/workshop_app/templates/workshop_app/create_workshop.html +++ b/workshop_app/templates/workshop_app/create_workshop.html @@ -12,33 +12,6 @@ <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script> {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <li class="navbar-brand">FOSSEE Python Workshops</li> - </div> - <ul class="nav navbar-nav"> - <li class="active"><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> -{% endblock %} {% block content %} <div class="container"> diff --git a/workshop_app/templates/workshop_app/edit_profile.html b/workshop_app/templates/workshop_app/edit_profile.html index 23a8827..4c1ab45 100644 --- a/workshop_app/templates/workshop_app/edit_profile.html +++ b/workshop_app/templates/workshop_app/edit_profile.html @@ -4,52 +4,9 @@ Edit Profile {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> - </div> - {% if request.user.profile.position == 'instructor' %} - <ul class="nav navbar-nav"> - <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li ><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li><a href="{{ URL_ROOT }}/manage/"> Workshops</a></li> - </ul> - {% else %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/my_workshops/"> Workshop Status</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - </ul> - {% endif %} - <ul class="nav navbar-nav navbar-right"> - {% if request.user.profile.position == 'instructor' %} - <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - {% else %} - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li> - {% endif %} - <li class="active"><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{request.user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> +{% block extra %} +<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> +<script src="{{URL_ROOT}}/static/workshop_app/js/bootstrap-3.3.7.min.js"></script> {% endblock %} {% block content %} diff --git a/workshop_app/templates/workshop_app/how_to_participate.html b/workshop_app/templates/workshop_app/how_to_participate.html index 166ed55..c23b178 100644 --- a/workshop_app/templates/workshop_app/how_to_participate.html +++ b/workshop_app/templates/workshop_app/how_to_participate.html @@ -10,73 +10,42 @@ <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'> + <link href='//fonts.googleapis.com/css?family=Open Sans' rel='stylesheet'> <style> h1 { - font-family: 'Antic Slab'; + font-family: 'Open Sans'; color: #2952a2; } h4 { - padding-left: 3%; - padding-top: 1%; + font-family: 'Open Sans', 'Light'; color: #04a9cf; + padding-left: 5%; } img { display: block; margin: 0 auto; } + #info { + + padding-left :6%; + padding-right :6%; + + } + + </style> {% 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="#">FOSSEE Python Workshops</a> - </div> - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT}}/my_workshops/">Workshop Status</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li class="active"><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </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}}/">FOSSEE Python Workshops</a> - </div> - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{URL_ROOT}}/register">Register</a></li> - <li><a href="{{URL_ROOT}}/login">Login</a></li> - <li class="active"><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li> - <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li> - <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li> - </ul> - {% endif %} - </div> - </nav> - {% endblock %} {% block content %} - <div class="container-fluid" > + <div class="container-fluid" id="info"> <div class="row"> <div class="col-12"> <ul> <h1>Steps for conducting workshop</h1> + <br> <h4><li>Register on this website as a Coordinator</li></h4> <h4><li>Login using your credentials and propose a workshop or select a workshop from the list of available workshops</li></h4> <h4><li>Wait for instructor approval till you receive a confirmation mail</li></h4> diff --git a/workshop_app/templates/workshop_app/index.html b/workshop_app/templates/workshop_app/index.html index c6cda03..5bba4cc 100644 --- a/workshop_app/templates/workshop_app/index.html +++ b/workshop_app/templates/workshop_app/index.html @@ -61,7 +61,7 @@ $(document).ready(function(){ <div class="row" id="r1"> <div class="col-md-6" id="r1_c1"> - FOSSEE Python Workshop + FOSSEE Python Workshops </div> <div class="col-md-6" > <ul class="topnav"> diff --git a/workshop_app/templates/workshop_app/login.html b/workshop_app/templates/workshop_app/login.html index 37e6094..e5d5d78 100644 --- a/workshop_app/templates/workshop_app/login.html +++ b/workshop_app/templates/workshop_app/login.html @@ -4,25 +4,7 @@ Login {% 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 }}/">FOSSEE Python Workshops</a> - </div> - - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{URL_ROOT}}/register">Register</a></li> - <li class="active"><a href="{{URL_ROOT}}/login">Login</a></li> - <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li> - <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li> - <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li> - </ul> - </div> - </nav> - {% endblock %} - - {% block content %} +{% block content %} <div class="container" align="center"> <br> <form method="post"> diff --git a/workshop_app/templates/workshop_app/logout.html b/workshop_app/templates/workshop_app/logout.html index d83a08d..620e67e 100644 --- a/workshop_app/templates/workshop_app/logout.html +++ b/workshop_app/templates/workshop_app/logout.html @@ -4,24 +4,6 @@ Logged out {% 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 }}/">FOSSEE Python Workshops</a> - </div> - - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{URL_ROOT}}/register">Register</a></li> - <li><a href="{{URL_ROOT}}/login">Login</a></li> - <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li> - <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li> - <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li> - </ul> - </div> - </nav> - {% endblock %} - {% block content %} <div class="container" align="center"> diff --git a/workshop_app/templates/workshop_app/manage.html b/workshop_app/templates/workshop_app/manage.html index 28c5606..f2e1c5a 100644 --- a/workshop_app/templates/workshop_app/manage.html +++ b/workshop_app/templates/workshop_app/manage.html @@ -5,33 +5,6 @@ Workshops {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> - </div> - <ul class="nav navbar-nav"> - <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li ><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li class="active"><a href="{{ URL_ROOT }}/manage/"> Workshops</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li ><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{request.user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> -{% endblock %} {% block extra %} <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> diff --git a/workshop_app/templates/workshop_app/my_workshops.html b/workshop_app/templates/workshop_app/my_workshops.html index 1602ef9..1708c95 100644 --- a/workshop_app/templates/workshop_app/my_workshops.html +++ b/workshop_app/templates/workshop_app/my_workshops.html @@ -117,55 +117,6 @@ </script> {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> - </div> - {% if request.user.profile.position == 'instructor' %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li> - </ul> - {% else %} - <ul class="nav navbar-nav"> - <li class="active"><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - </ul> - {% endif %} - - <ul class="nav navbar-nav navbar-right"> - {% if request.user.profile.position == 'instructor' %} - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - {% else %} - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> - {% endif %} - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> -{% endblock %} - {% block content %} {% if workshop_occurences %} diff --git a/workshop_app/templates/workshop_app/profile_updated.html b/workshop_app/templates/workshop_app/profile_updated.html index 6b1a0fb..31747b8 100644 --- a/workshop_app/templates/workshop_app/profile_updated.html +++ b/workshop_app/templates/workshop_app/profile_updated.html @@ -5,54 +5,6 @@ {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops </a> - </div> - {% if request.user.profile.position == 'instructor' %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li><a href="{{ URL_ROOT }}/manage/">Workshops </a></li> - </ul> - {% else %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> - </ul> - {% endif %} - <ul class="nav navbar-nav navbar-right"> - {% if request.user.profile.position == 'instructor' %} - <li><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - {% else %} - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li> - {% endif %} - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> -{% endblock %} - {% block extra %} <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="{{URL_ROOT}}/static/workshop_app/js/bootstrap-3.3.7.min.js"></script> diff --git a/workshop_app/templates/workshop_app/propose_workshop.html b/workshop_app/templates/workshop_app/propose_workshop.html index db1dcfd..8cc18d6 100644 --- a/workshop_app/templates/workshop_app/propose_workshop.html +++ b/workshop_app/templates/workshop_app/propose_workshop.html @@ -33,33 +33,6 @@ </script> {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> - </div> - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> -{% endblock %} {% block content %} <style type="text/css"> diff --git a/workshop_app/templates/workshop_app/registration/register.html b/workshop_app/templates/workshop_app/registration/register.html index a2a3edd..2d154f6 100644 --- a/workshop_app/templates/workshop_app/registration/register.html +++ b/workshop_app/templates/workshop_app/registration/register.html @@ -4,25 +4,6 @@ Register {% 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 }}/">FOSSEE Python Workshops</a> - </div> - - <ul class="nav navbar-nav navbar-right"> - <li class="active"><a href="{{URL_ROOT}}/register">Sign Up</a></li> - <li><a href="{{URL_ROOT}}/login">Login</a></li> - <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li> - <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li> - <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li> - </ul> - </div> - </nav> - {% endblock %} - - {% block content %} <style type="text/css"> diff --git a/workshop_app/templates/workshop_app/self_workshop.html b/workshop_app/templates/workshop_app/self_workshop.html index 8c6e7a4..b914145 100644 --- a/workshop_app/templates/workshop_app/self_workshop.html +++ b/workshop_app/templates/workshop_app/self_workshop.html @@ -13,22 +13,6 @@ {% 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 }}/">FOSSEE Python Workshops</a> - </div> - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{URL_ROOT}}/register">Register</a></li> - <li><a href="{{URL_ROOT}}/login">Login</a></li> - <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li> - <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li> - <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li> - </ul> - </div> - </nav> - {% endblock %} {% block content %} diff --git a/workshop_app/templates/workshop_app/testimonals.html b/workshop_app/templates/workshop_app/testimonals.html deleted file mode 100644 index fafd197..0000000 --- a/workshop_app/templates/workshop_app/testimonals.html +++ /dev/null @@ -1,80 +0,0 @@ -{% 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 }}/">FOSSEE Workshops</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-1"> - <img src="{{ URL_ROOT}}/static/workshop_app/img/sides_img_2.png"> - </div> - <div class="col-md-6 col-md-offset-2"> - <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 class="col-md-1"> - <img src="{{ URL_ROOT}}/static/workshop_app/img/sides_img_1.png"> - </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 deleted file mode 100644 index 2a622d7..0000000 --- a/workshop_app/templates/workshop_app/view_benefits.html +++ /dev/null @@ -1,68 +0,0 @@ -{% extends 'workshop_app/base.html' %} - -{% block title %} - View Benefits -{% endblock %} - -{% 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> - <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_list/"> 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}}/">FOSSEE Workshops</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"> - <h1 style="font-family: 'Antic Slab'; color:#2952a2">Features and Benefits:</h1><br> - <p><h4 style="font-family: 'Antic Slab'; color: #04a9cf;"> - 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 style="font-family: 'Antic Slab'; color: #04a9cf;"> - Hone your programming skills in Python. - Live video/chat assistance from FOSSEE Python experts - Closely integrated with online programming evaluation tool. - Designed, developed, and presented by Prof.Prabhu Ramachandran and the FOSSEE team at IIT Bombay - </h4></p> - <br><br> - </div> - -{% endblock %} diff --git a/workshop_app/templates/workshop_app/view_faq.html b/workshop_app/templates/workshop_app/view_faq.html index 64779b6..1eb801e 100644 --- a/workshop_app/templates/workshop_app/view_faq.html +++ b/workshop_app/templates/workshop_app/view_faq.html @@ -14,46 +14,6 @@ {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - {% if request.user.profile.position == 'coordinator' %} - <div class="navbar-header"> - <span class="navbar-brand" href="#">FOSSEE Python Workshops</span> - </div> - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT}}/my_workshops/">Workshop Status</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li class="active"><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - {% else %} - <div class="navbar-header"> - <span class="navbar-brand" href="{{ URL_ROOT }}/">FOSSEE Workshops</span> - </div> - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{URL_ROOT}}/register">Register</a></li> - <li><a href="{{URL_ROOT}}/login">Login</a></li> - <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li> - <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li> - <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li> - </ul> - {% endif %} - </div> - </nav> - {% endblock %} {% block content %} diff --git a/workshop_app/templates/workshop_app/view_profile.html b/workshop_app/templates/workshop_app/view_profile.html index e95de6c..6a35890 100644 --- a/workshop_app/templates/workshop_app/view_profile.html +++ b/workshop_app/templates/workshop_app/view_profile.html @@ -4,54 +4,6 @@ View Profile {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> - </div> - {% if request.user.profile.position == 'instructor' %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li> - </ul> - {% else %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - </ul> - {% endif %} - - <ul class="nav navbar-nav navbar-right"> - {% if request.user.profile.position == 'instructor' %} - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - {% else %} - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li><a href="{{ URL_ROOT }}/faq/"> FAQ's</a></li> - {% endif %} - <li class="active"><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - </nav> - {% endblock %} {% block extra %} <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> diff --git a/workshop_app/templates/workshop_app/view_workshoptype_details.html b/workshop_app/templates/workshop_app/view_workshoptype_details.html index 60a57ad..1504430 100644 --- a/workshop_app/templates/workshop_app/view_workshoptype_details.html +++ b/workshop_app/templates/workshop_app/view_workshoptype_details.html @@ -6,68 +6,6 @@ {% 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 }}/">FOSSEE Python Workshops</a> - </div> - {% if request.user.profile.position == 'instructor' %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li> - </ul> - - <ul class="nav navbar-nav navbar-right"> - <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - {% elif request.user.profile.position == 'coordinator' %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li class="active"><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_workshoptype_list/"> Workshop List</a></li> - </ul> - - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ user.first_name }} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - {% else %} - - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{URL_ROOT}}/register"> Register</a></li> - <li><a href="{{URL_ROOT}}/login">Login</a></li> - <li><a href="{{URL_ROOT}}/how_to_participate">How to Participate</a></li> - <li ><a href="https://python.fossee.in/about" target="_blank">About Us</a></li> - <li><a href="{{URL_ROOT}}/statistics/public_stats/">Stats</a></li> - </ul> - {% endif %} - - </div> - </nav> - <link href='//fonts.googleapis.com/css?family=Antic Slab' rel='stylesheet'> -{% endblock %} - {% block extra %} <!-- <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"> --> diff --git a/workshop_app/templates/workshop_app/view_workshoptype_list.html b/workshop_app/templates/workshop_app/view_workshoptype_list.html index b2dc405..2a561e7 100644 --- a/workshop_app/templates/workshop_app/view_workshoptype_list.html +++ b/workshop_app/templates/workshop_app/view_workshoptype_list.html @@ -51,64 +51,6 @@ <script src="{{URL_ROOT}}/static/workshop_app/js/bootstrap-3.3.7.min.js"></script> {% endblock %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="#">FOSSEE Python Workshops</a> - </div> - {% if request.user.profile.position == 'coordinator' %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT}}/my_workshops/">Workshop Status</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Workshops - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/book/">Book a Workshop</a></li> - <li><a href="{{ URL_ROOT }}/propose_workshop/">Propose a Workshop</a></li> - </ul> - </li> - <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_details/"> Workshop List</a></li> - </li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li><a href="{{ URL_ROOT }}/how_to_participate/">How to Participate</a></li> - <li><a href="{{ URL_ROOT }}/faq/">FAQ's</a></li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name}} </a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span>Logout</a></li> - </ul> - </div> - {% elif request.user.profile.position == 'instructor' %} - <ul class="nav navbar-nav"> - <li><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</a></li> - <li><a href="{{ URL_ROOT }}/my_workshops/">Workshop Status</a></li> - <li><a href="{{ URL_ROOT }}/manage/">Workshops</a></li> - </ul> - - <ul class="nav navbar-nav navbar-right"> - <li class="active"><a href="{{ URL_ROOT }}/view_workshoptype_list/">Workshop List</a></li> - <li class="dropdown"> - <a class="dropdown-toggle" data-toggle="dropdown" href="#">Statistics - <span class="caret"></span></a> - <ul class="dropdown-menu"> - <li><a href="{{ URL_ROOT }}/statistics/">Workshop Statistics</a></li> - <li><a href="{{ URL_ROOT }}/statistics/profile_stats/">Profile Statistics</a></li> - </ul> - </li> - <li><a href="{{ URL_ROOT }}/view_profile/"><span class="glyphicon glyphicon-user"></span> {{ request.user.first_name}}</a></li> - <li><a href="{{ URL_ROOT }}/logout/"><span class="glyphicon glyphicon-log-out"></span> Logout</a></li> - </ul> - </div> - {% else %} - - <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 %} - </nav> - {% endblock %} - {% block content %} <div class="container"> diff --git a/workshop_app/templates/workshop_app/workshop_stats.html b/workshop_app/templates/workshop_app/workshop_stats.html index 18f5f6e..15c4a55 100644 --- a/workshop_app/templates/workshop_app/workshop_stats.html +++ b/workshop_app/templates/workshop_app/workshop_stats.html @@ -1,25 +1,5 @@ {% extends 'workshop_app/base.html' %} -{% block header %} - <nav class="navbar navbar-default navbar-custom"> - <div class="container-fluid"> - <div class="navbar-header"> - <a class="navbar-brand" href="{{ URL_ROOT }}/manage/">Home</a> - </div> - <ul class="nav navbar-nav"> - <li ><a href="{{ URL_ROOT }}/create_workshop/">Create Workshop</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> - <li class="active"><a href="{{ URL_ROOT }}/workshop_stats/" >Workshop Stats</a></li> - <li><a href="{{ URL_ROOT }}/statistics/profile_stats/" >Profile Stats</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> - </div> - </nav> -{% endblock %} {% block extra %} <link rel="stylesheet" href="https://code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css"> diff --git a/workshop_app/tests/test_views.py b/workshop_app/tests/test_views.py index d692baa..efe8c38 100644 --- a/workshop_app/tests/test_views.py +++ b/workshop_app/tests/test_views.py @@ -283,10 +283,6 @@ class TestWorkshopDashboard(TestCase): class TestStaticPages(TestCase): - def test_testimonials(self): - response = self.client.get('/testimonials/') - self.assertEqual(response.status_code, 200) - def test_register(self): response = self.client.get('/register/') self.assertEqual(response.status_code, 200) @@ -299,10 +295,6 @@ class TestStaticPages(TestCase): response = self.client.get('/how_to_participate/') self.assertEqual(response.status_code, 200) - def test_benefits(self): - response = self.client.get('/benefits/') - self.assertEqual(response.status_code, 200) - def test_view_workshoptype_list(self): response = self.client.get('/view_workshoptype_list/') self.assertEqual(response.status_code, 200) diff --git a/workshop_app/urls.py b/workshop_app/urls.py index c1827f5..6f428b3 100644 --- a/workshop_app/urls.py +++ b/workshop_app/urls.py @@ -33,7 +33,6 @@ urlpatterns = [ url(r'^book/$', views.book), url(r'^book_workshop/$', views.book_workshop), url(r'^my_workshops/$', views.my_workshops), - url(r'^benefits/$', views.benefits), url(r'^how_to_participate/$', views.how_to_participate), url(r'^faq/$', views.faq), url(r'^manage/$', views.manage), @@ -43,8 +42,6 @@ urlpatterns = [ url(r'^create_workshop/$', views.create_workshop), url(r'^propose_workshop/$', views.propose_workshop), url(r'^workshop_stats/$', views.workshop_stats), - url(r'^testimonials/$', views.testimonials), - #url(r'^file_view/(?P<workshop_title>[\w|\W]+)$', views.file_view), url(r'^jsi18n/$', django.views.i18n.javascript_catalog, js_info_dict), url(r'^self_workshop', views.self_workshop), ] diff --git a/workshop_app/views.py b/workshop_app/views.py index efa36bc..699c4d9 100644 --- a/workshop_app/views.py +++ b/workshop_app/views.py @@ -903,10 +903,6 @@ def view_workshoptype_list(request): ) -def benefits(request): - return render(request, 'workshop_app/view_benefits.html') - - def faq(request): return render(request, 'workshop_app/view_faq.html') @@ -937,22 +933,6 @@ def file_view(request, workshop_title): return response -def testimonials(request): - testimonials = Testimonial.objects.all().order_by('-id') - paginator = Paginator(testimonials, 3) #Show upto 12 workshops per page - - page = request.GET.get('page') - try: - messages = paginator.page(page) - except PageNotAnInteger: - #If page is not an integer, deliver first page. - messages = paginator.page(1) - except EmptyPage: - #If page is out of range(e.g 999999), deliver last page. - messages = paginator.page(paginator.num_pages) - return render(request, 'workshop_app/testimonals.html', - {"messages":messages}) - def check_workshop_type(x): try: |