diff options
| author | Akshen | 2019-05-16 16:35:53 +0530 |
|---|---|---|
| committer | GitHub | 2019-05-16 16:35:53 +0530 |
| commit | 10766f3627f1f013913c6ef9680c7d5f4e12f433 (patch) | |
| tree | 11aa6c3516f1f9f6a953c6755fdfeca05cdcf18d | |
| parent | aa58a80b07cb997d3d089e6943517b541f28bb03 (diff) | |
| parent | 54bc2c41eca86b28c48bc12cdf5da1757beadc02 (diff) | |
| download | FOSSEE_animations-10766f3627f1f013913c6ef9680c7d5f4e12f433.tar.gz FOSSEE_animations-10766f3627f1f013913c6ef9680c7d5f4e12f433.tar.bz2 FOSSEE_animations-10766f3627f1f013913c6ef9680c7d5f4e12f433.zip | |
Merge pull request #16 from Akshen/develop
add outline to videos
| -rw-r--r-- | fossee_manim/templates/fossee_manim/proposal_status.html | 18 | ||||
| -rw-r--r-- | fossee_manim/templates/fossee_manim/search_results.html | 4 | ||||
| -rw-r--r-- | fossee_manim/templates/fossee_manim/video.html | 6 | ||||
| -rw-r--r-- | fossee_manim/views.py | 3 |
4 files changed, 23 insertions, 8 deletions
diff --git a/fossee_manim/templates/fossee_manim/proposal_status.html b/fossee_manim/templates/fossee_manim/proposal_status.html index e9752ca..4a1b7ed 100644 --- a/fossee_manim/templates/fossee_manim/proposal_status.html +++ b/fossee_manim/templates/fossee_manim/proposal_status.html @@ -13,13 +13,21 @@ <tr> <th>Title</th> <th>Status</th> + <th>Created Date</th> </tr> </thead> {% for an in anime %} <tbody> <tr> <td>{{ an.title }}</td> - <td><span class="badge">{{ an.status }}</span></td> + {% if an.status == 'rejected' %} + <td><span class="text-danger">{{ an.status }}</span></td> + {% elif an.status == 'released' %} + <td><span class="text-success">{{ an.status }}</span></td> + {% else %} + <td><span class="text-info">{{ an.status }}</span></td> + {% endif %} + <td><span class="badge">{{ an.created }}</span></td> <td><a href="{% url 'edit_proposal' an.id %}"><button type="button" class="btn btn-info">Edit</button></a></td> </tr> </tbody> @@ -41,7 +49,13 @@ <tr> <td>{{ an.title }}</td> <td>{{ an.contributor.get_full_name }}</td> - <td><span class="badge">{{ an.status }}</span></td> + {% if an.status == 'rejected' %} + <td><span class="text-danger">{{ an.status }}</span></td> + {% elif an.status == 'released' %} + <td><span class="text-success">{{ an.status }}</span></td> + {% else %} + <td><span class="text-info">{{ an.status }}</span></td> + {% endif %} <td><span class="badge">{{ an.created }}</span></td> <td><a href="{% url 'edit_proposal' an.id %}"><button type="button" class="btn btn-info">View</button></a></td> </tr> diff --git a/fossee_manim/templates/fossee_manim/search_results.html b/fossee_manim/templates/fossee_manim/search_results.html index e58616b..1741123 100644 --- a/fossee_manim/templates/fossee_manim/search_results.html +++ b/fossee_manim/templates/fossee_manim/search_results.html @@ -11,7 +11,7 @@ <hr> <br> - {%if s_result %} + {% if s_result %} {% for anime in s_result %} <div class="row"> <div class="col-md-4" > @@ -35,4 +35,4 @@ </div> <br> - {% endblock %}
\ No newline at end of file +{% endblock %}
\ No newline at end of file diff --git a/fossee_manim/templates/fossee_manim/video.html b/fossee_manim/templates/fossee_manim/video.html index b94a34e..644d785 100644 --- a/fossee_manim/templates/fossee_manim/video.html +++ b/fossee_manim/templates/fossee_manim/video.html @@ -17,7 +17,7 @@ <p style="color:#26A669; font-size: 200%; float: left;"> {{ video.0.animation.title }} </p> </div> <div class="col-md-4"> - <a target="_blank" href="{{ video.animation.github }}"><p style="font-size: 70%; float: right;"> {{ video.0.animation.github }} </p></a> + <p style="font-size: 70%; float: right;"> {{ video.0.animation.subcategory }} </p> </div> </div> <br> @@ -29,7 +29,7 @@ <hr> <br> <p style="color:#26A669; font-size: 100%; float: left;"> - {{ video.0.animation.description }} + {{ video.0.animation.outline }} </p> <br> </div> @@ -63,7 +63,7 @@ <br> {% csrf_token %} {{ comment_form.as_p }} - <button type="submit" class="btn btn-default">Post</button> + <button type="submit" class="btn btn-success">Post</button> </form> </div> diff --git a/fossee_manim/views.py b/fossee_manim/views.py index 50aa816..ae3d90a 100644 --- a/fossee_manim/views.py +++ b/fossee_manim/views.py @@ -414,7 +414,8 @@ def search(request): word = request.POST.get('sbox') anime_list = AnimationStats.objects.filter( Q(animation__title__contains=word) | Q(animation__outline__contains=word) - | Q(animation__category__name__contains=word), animation__status='released') + | Q(animation__category__name__contains=word) | Q(animation__subcategory__contains=word), + animation__status='released') return render(request, 'fossee_manim/search_results.html', {'s_result': anime_list, 'categories': categories}) |