added new chapters and content to latex thesis paper

This commit is contained in:
Esther Kleinhenz
2018-09-19 17:25:01 +02:00
parent 9c3d607f87
commit c2c238fe26
20 changed files with 334 additions and 134 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
<ul>
{% for tag in tags %}
<li>{{tag}}
<a class="btn btn-outline-dark" href="{% url 'tag_remove' %}">
<a class="btn btn-outline-dark" href="{% url 'tag_remove' tag.slug %}">
<span class="glyphicon glyphicon-remove">Remove</span>
</a>
</li>
-1
View File
@@ -1,5 +1,4 @@
{% extends "base.html" %} {% block content %} {% load taggit_templatetags2_tags %}
{% get_taglist as tags for 'application.customuser'%}
<div id="">
+1 -2
View File
@@ -7,7 +7,6 @@ urlpatterns = [
url(r'^$', views.post_list, name='post_list'),
url(r'^tag/(?P<slug>[-\w]+)/$', views.post_list, name='post_list_by_tag'),
url(r'^taglist/$', views.tag_list, name='tag_list'),
url(r'^taglist/(?P<slug>[-\w]+)/$', views.post_list, name='post_list_by_tag'),
url(r'^student/', views.student_page, name='student_page'),
url(r'^search/', views.blog_search_list_view, name='blog_search_list_view'),
url(r'^post/(?P<pk>\d+)/$', views.post_detail, name='post_detail'),
@@ -16,7 +15,7 @@ urlpatterns = [
url(r'^drafts/$', views.post_draft_list, name='post_draft_list'),
url(r'^post/(?P<pk>\d+)/publish/$', views.post_publish, name='post_publish'),
url(r'^post/(?P<pk>\d+)/remove/$', views.post_remove, name='post_remove'),
url(r'^student/remove/$', views.tag_remove, name='tag_remove'),
url(r'^student/(?P<slug>[-\w]+)/remove/$', views.tag_remove, name='tag_remove'),
url(r'^tags/', include('taggit_templatetags2.urls')),
]
+30 -11
View File
@@ -118,12 +118,11 @@ def post_remove(request, pk):
@login_required
def tag_remove(request):
tag_to_delete = CustomUser.objects.get(tags)
obj.user = request.user
obj.save()
obj.tags.tag_remove(tag_to_delete)
obj.save_m2m()
def tag_remove(request, slug=None):
if slug:
tag = get_object_or_404(Tag, slug=slug)
tag.delete()
save_m2m()
return redirect('student_page')
@login_required
@@ -142,15 +141,21 @@ def student_page(request):
else:
form = NewTagForm()
return render(request, 'student_page.html', {'form':form})
@login_required
def tag_list(request):
u= CustomUser.objects.get(user=request.user)
tags= Tag.objects.filter(name=u)
return render(request, 'tag_list.html', locals())
u = CustomUser.objects.get(user=request.user)
tags= Tag.objects.filter(customuser=u)
arr=[]
arr.append(tags)
"""
for tag in tags:
arr.append(str(tag))
"""
listing = list(arr)
return render(request, 'tag_list.html', {'tags':tags})
class TagSearch(TagCanvasListView):
template_name = 'blog_search_list_view.html'
@@ -178,3 +183,17 @@ def blog_search_list_view(request):
def tag_cloud(request):
return render(request, 'tag_cloud.html', {})
"""
@login_required
def post_of_user_list(request):
u= CustomUser.objects.get(user=request.user)
tag =[]
posts = Post.objects.filter(published_date__lte=timezone.now()).order_by('published_date')
if slug:
tag = get_object_or_404(Tag, slug=slug)
posts= posts.filter(tags__in=[tag])
page = request.GET.get('page')
return render(request, 'post_list.html', locals())
"""