diff options
author | Akshen | 2019-05-13 16:15:57 +0530 |
---|---|---|
committer | Akshen | 2019-05-13 16:15:57 +0530 |
commit | 8543fed00c912877375b0835b63c765baed654e2 (patch) | |
tree | c0224a75d12f3708646db6b3d78dae88bbce6ec6 /fossee_manim/templates | |
parent | de7e3898ccb851dda8b5f9e69023d4b630e5f080 (diff) | |
download | FOSSEE_animations-8543fed00c912877375b0835b63c765baed654e2.tar.gz FOSSEE_animations-8543fed00c912877375b0835b63c765baed654e2.tar.bz2 FOSSEE_animations-8543fed00c912877375b0835b63c765baed654e2.zip |
Minor Updates
- Proposal 1 fields changed
- Forgot Password files moved
- No search Results Found
- Pincode field added
Diffstat (limited to 'fossee_manim/templates')
-rw-r--r-- | fossee_manim/templates/fossee_manim/edit_proposal.html | 3 | ||||
-rw-r--r-- | fossee_manim/templates/fossee_manim/register.html (renamed from fossee_manim/templates/fossee_manim/registration/register.html) | 0 | ||||
-rw-r--r-- | fossee_manim/templates/fossee_manim/search_results.html | 6 | ||||
-rw-r--r-- | fossee_manim/templates/registration/base.html | 99 | ||||
-rw-r--r-- | fossee_manim/templates/registration/password_change_done.html (renamed from fossee_manim/templates/fossee_manim/password_change_done.html) | 0 | ||||
-rw-r--r-- | fossee_manim/templates/registration/password_change_form.html (renamed from fossee_manim/templates/fossee_manim/password_change_form.html) | 0 | ||||
-rw-r--r-- | fossee_manim/templates/registration/password_reset_complete.html (renamed from fossee_manim/templates/fossee_manim/password_reset_complete.html) | 1 | ||||
-rw-r--r-- | fossee_manim/templates/registration/password_reset_confirm.html (renamed from fossee_manim/templates/fossee_manim/password_reset_confirm.html) | 0 | ||||
-rw-r--r-- | fossee_manim/templates/registration/password_reset_done.html (renamed from fossee_manim/templates/fossee_manim/password_reset_done.html) | 0 | ||||
-rw-r--r-- | fossee_manim/templates/registration/password_reset_form.html (renamed from fossee_manim/templates/fossee_manim/password_reset_form.html) | 2 |
10 files changed, 109 insertions, 2 deletions
diff --git a/fossee_manim/templates/fossee_manim/edit_proposal.html b/fossee_manim/templates/fossee_manim/edit_proposal.html index e42a358..55c0f75 100644 --- a/fossee_manim/templates/fossee_manim/edit_proposal.html +++ b/fossee_manim/templates/fossee_manim/edit_proposal.html @@ -31,6 +31,9 @@ <button class="btn btn-success" type="submit">Upload</button> </label> </form> + {% elif proposal_form.instance.status == 'pending' %} + <h3>Awaiting Reviewer's Moderation </h3> + {% else %} <video width="100%" height="100%" controls> <source src="{{video.0.video_path.url}}" type="video/mp4"> diff --git a/fossee_manim/templates/fossee_manim/registration/register.html b/fossee_manim/templates/fossee_manim/register.html index 5b148a9..5b148a9 100644 --- a/fossee_manim/templates/fossee_manim/registration/register.html +++ b/fossee_manim/templates/fossee_manim/register.html diff --git a/fossee_manim/templates/fossee_manim/search_results.html b/fossee_manim/templates/fossee_manim/search_results.html index 744f953..e58616b 100644 --- a/fossee_manim/templates/fossee_manim/search_results.html +++ b/fossee_manim/templates/fossee_manim/search_results.html @@ -10,7 +10,8 @@ <br> <hr> - <br> + <br> + {%if s_result %} {% for anime in s_result %} <div class="row"> <div class="col-md-4" > @@ -27,6 +28,9 @@ </div> <hr> {% endfor %} + {% else %} + <h3>No Results Found </h3> + {% endif %} <br> </div> <br> diff --git a/fossee_manim/templates/registration/base.html b/fossee_manim/templates/registration/base.html new file mode 100644 index 0000000..1a4945d --- /dev/null +++ b/fossee_manim/templates/registration/base.html @@ -0,0 +1,99 @@ +<!DOCTYPE html> +<html> +<head> + <meta name="viewport" content="width=device-width, initial-scale=1"> + <title> + {% block title %} + HomePage + {% endblock %} + </title> + <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css"> + <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script> + <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.bundle.min.js"></script> + + <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet"> + + <link rel="stylesheet" href="{{ URL_ROOT }}/static/css/sticky-footer.css" type="text/css" /> + <!-- favicon --> + <link rel="shortcut icon" type="image/png" href="{{ URL_ROOT}}/"/> +</head> + + <!-- For js/ajax and other related scripts --> + {% block extra %} + + {% endblock %} + +<body style="overflow: scroll;"> + {% block header %} + <nav class="navbar navbar-expand-lg navbar-custom"> + <a class="navbar-brand" href="#">FOSSEE Animations</a> + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" + aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> + <span class="navbar-toggler-icon">=</span> + </button> + + <div class="collapse navbar-collapse" id="navbarSupportedContent"> + <ul class="navbar-nav mr-auto"> + <form class="form-inline" method="POST" action="/search/"> + {% csrf_token %} + <input class="form-control mr-sm-2" id="sbox" name="sbox" type="search" placeholder="Search" aria-label="Search"> + <button class="btn btn-outline-success my-2 my-sm-0" type="submit">Search</button> + </form> + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + Categories + </a> + + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> + {% for c in categories %} + <a class="dropdown-item" href="{% url 'search_category' c.name %}">{{c.name}}</a> + {% endfor %} + </div> + </li> + </ul> + + {% if user.is_authenticated %} + <ul class="navbar-nav ml-auto mr-5"> + <li class="nav-item dropdown"> + <a class="nav-link dropdown-toggle" id="navbarDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {{user.first_name}} + </a> + {% if request.user.profile.position == 'contributor' %} + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> + <a class="dropdown-item" href="{% url 'how_to' %}">How To</a> + <a class="dropdown-item" href="{% url 'send_proposal' %}">Send Proposal</a> + <a class="dropdown-item" href="{% url 'proposal_status' %}">Proposal Status</a> + <a class="dropdown-item" href="{% url 'view_profile' %}">View Profile</a> + <a class="dropdown-item" href="{% url 'logout' %}">Logout</a> + </div> + {% else %} + <div class="dropdown-menu" aria-labelledby="navbarDropdown"> + <a class="dropdown-item" href="{% url 'proposal_status' %}">Proposal Status</a> + <a class="dropdown-item" href="{% url 'view_profile' %}">View Profile</a> + <a class="dropdown-item" href="{% url 'logout' %}">Logout</a> + </div> + {% endif %} + </li> + </ul> + {% else %} + <ul class="navbar-nav ml-auto"> + <li class="nav-item"> + <a class="nav-link" href="{% url 'register' %}">Register</a> + </li> + <li class="nav-item"> + <a class="nav-link" href="{% url 'login' %}">Login</a> + </li> + </ul> + {% endif %} + </div> + </nav> + {% endblock %} + + {% block content %} + <br><br> + <h1>Base Template Content. Please override me</h1> + {% endblock %} + +</body> +<br> +</html>
\ No newline at end of file diff --git a/fossee_manim/templates/fossee_manim/password_change_done.html b/fossee_manim/templates/registration/password_change_done.html index 93b93cb..93b93cb 100644 --- a/fossee_manim/templates/fossee_manim/password_change_done.html +++ b/fossee_manim/templates/registration/password_change_done.html diff --git a/fossee_manim/templates/fossee_manim/password_change_form.html b/fossee_manim/templates/registration/password_change_form.html index 918f820..918f820 100644 --- a/fossee_manim/templates/fossee_manim/password_change_form.html +++ b/fossee_manim/templates/registration/password_change_form.html diff --git a/fossee_manim/templates/fossee_manim/password_reset_complete.html b/fossee_manim/templates/registration/password_reset_complete.html index 99f8782..1ff3f76 100644 --- a/fossee_manim/templates/fossee_manim/password_reset_complete.html +++ b/fossee_manim/templates/registration/password_reset_complete.html @@ -1,4 +1,5 @@ {% extends "base.html" %} + {% block pagetitle %}Password reset complete{% endblock %} {% block content %} <p>Your password has been reset. </p> diff --git a/fossee_manim/templates/fossee_manim/password_reset_confirm.html b/fossee_manim/templates/registration/password_reset_confirm.html index 9f5b47a..9f5b47a 100644 --- a/fossee_manim/templates/fossee_manim/password_reset_confirm.html +++ b/fossee_manim/templates/registration/password_reset_confirm.html diff --git a/fossee_manim/templates/fossee_manim/password_reset_done.html b/fossee_manim/templates/registration/password_reset_done.html index 0d335b8..0d335b8 100644 --- a/fossee_manim/templates/fossee_manim/password_reset_done.html +++ b/fossee_manim/templates/registration/password_reset_done.html diff --git a/fossee_manim/templates/fossee_manim/password_reset_form.html b/fossee_manim/templates/registration/password_reset_form.html index 977fbc3..c67fdfc 100644 --- a/fossee_manim/templates/fossee_manim/password_reset_form.html +++ b/fossee_manim/templates/registration/password_reset_form.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block pagetitle %} - Email will be send to the registered email address + Email will be send to the registered email address {% endblock %} {% block content %} |