Skip to content

Commit

Permalink
配置 url ，删除无用的 html
Browse files Browse the repository at this point in the history
  • Loading branch information
@kele59
kele59 committed Apr 17, 2017
1 parent ea1de5d commit a765c34
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 144 deletions.
10 changes: 10 additions & 0 deletions apps/courses/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ def get(self, request, course_id):
user_courses = UserCourse(user=request.user, course=course)
user_courses.save()

# 得出学过该课程的同学还学过的课程
user_courses = UserCourse.objects.filter(course=course)
user_ids = [user_course.user.id for user_course in user_courses]
all_user_courses = UserCourse.objects.filter(user_id__in=user_ids)
Expand All @@ -122,10 +123,19 @@ def get(self, request, course_id):
course = Course.objects.get(id=int(course_id))
all_resources = CourseResource.objects.filter(course=course)
all_comments = CourseComments.objects.filter(course=course)

# 得出学过该课程的同学还学过的课程
user_courses = UserCourse.objects.filter(course=course)
user_ids = [user_course.user.id for user_course in user_courses]
all_user_courses = UserCourse.objects.filter(user_id__in=user_ids)
course_ids = [user_course.course.id for user_course in all_user_courses]
relate_courses = Course.objects.filter(id__in=course_ids).order_by('-click_nums')[:5]

return render(request, 'course-comment.html', {
'course': course,
'all_comments': all_comments,
'all_resources': all_resources,
'relate_courses': relate_courses,
})


Expand Down
19 changes: 0 additions & 19 deletions static/js/select.js
View file

This file was deleted.

39 changes: 5 additions & 34 deletions templates/course-comment.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,43 +143,14 @@ <h2 class="cp-tit l">该课的同学还学过</h2>
<div class="cp-tab-pannel js-comp-tab-pannel" data-pannel="course" style="display: block">
<!-- img 200 x 112 -->
<ul class="other-list">

<li class="curr">
<a href="course-detail.html" target="_blank">
<img src="../media/courses/2016/11/540e57300001d6d906000338-240-135_n0L8vbw.jpg"
alt="django与vuejs实战项目2">
<span class="name autowrap">django与vuejs实战项目2</span>
</a>
</li>

<li class="curr">
<a href="course-detail.html" target="_blank">
<img src="../media/courses/2016/12/python面向对象.jpg" alt="python面向对象">
<span class="name autowrap">python面向对象</span>
</a>
</li>

{% for relate_course in relate_courses %}
<li class="curr">
<a href="course-detail.html" target="_blank">
<img src="../media/courses/2016/12/python文件处理.jpg" alt="python文件处理">
<span class="name autowrap">python文件处理</span>
<a href="{% url 'courses:course_detail' relate_course.id %}" target="_blank">
<img src="{{ MEDIA_URL }}{{ relate_course.image }}" alt="{{ relate_course.name }}" />
<span class="name autowrap">{{ relate_course.name }}</span>
</a>
</li>

<li class="curr">
<a href="course-detail.html" target="_blank">
<img src="../media/courses/2016/11/mysql.jpg" alt="django入门">
<span class="name autowrap">django入门</span>
</a>
</li>

<li class="curr">
<a href="course-detail.html" target="_blank">
<img src="../media/courses/2016/12/mysql.jpg" alt="xadmin进阶开发">
<span class="name autowrap">xadmin进阶开发</span>
</a>
</li>

{% endfor %}
</ul>
</div>
<div class="cp-tab-pannel js-comp-tab-pannel" data-pannel="plan">
Expand Down
2 changes: 1 addition & 1 deletion templates/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ <h1>公开课程</h1>
<img width="233" height="190" src="{{ MEDIA_URL }}{{ course.image }}"/>
</a>
<div class="des">
<a href="course-detail.html">
<a href="{% url 'courses:course_detail' course.id %}">
<h2 title="django入门">{{ course.name }}</h2>
</a>
<span class="fl">难度：<i class="key">{{ course.degree }}</i></span>
Expand Down
90 changes: 0 additions & 90 deletions templates/org-base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,97 +109,7 @@ <h1>
</div>

{% block right_form %}
<div class="right companycenter layout grouping">
<div class="head">
<h1>全部课程</h1>
<a class="green fr more" href="org-detail-course.html">查看更多 > </a>
</div>
<div class="brief group_list">

<div class="module1_5 box">
<a href="course-detail.html"><img width="214" src="media/courses/2016/11/mysql.jpg"/></a>
<div class="des">
<a href="course-detail.html"><h2>django入门</h2></a>
<span class="fl">课时：<i class="key">0</i></span>
<span class="fr">参加人数：3</span>
</div>
<div class="bottom">
<span class="fl">慕课网</span>
<span class="star fr notlogin
" data-favid="13" data-fav-type="4">
0
</span>
</div>
</div>

<div class="module1_5 box">
<a href="course-detail.html"><img width="214"
src="media/courses/2016/11/540e57300001d6d906000338-240-135_mvvGYHL.jpg"/></a>
<div class="des">
<a href="course-detail.html"><h2>django实战项目</h2></a>
<span class="fl">课时：<i class="key">0</i></span>
<span class="fr">参加人数：0</span>
</div>
<div class="bottom">
<span class="fl">慕课网</span>
<span class="star fr notlogin
" data-favid="13" data-fav-type="4">
0
</span>
</div>
</div>

<div class="module1_5 box">
<a href="course-detail.html"><img width="214" src="media/courses/2016/12/python错误和异常.jpg"/></a>
<div class="des">
<a href="course-detail.html"><h2>python错误和异常</h2></a>
<span class="fl">课时：<i class="key">0</i></span>
<span class="fr">参加人数：0</span>
</div>
<div class="bottom">
<span class="fl">慕课网</span>
<span class="star fr notlogin
" data-favid="13" data-fav-type="4">
0
</span>
</div>
</div>


</div>
</div>
<div class="right companycenter layout">
<div class="head">
<h1>机构教师</h1>
<a class="green fr more" href="org-detail-teachers.html">查看更多 > </a>
</div>

<div class="diarys">
<div class="module5 share company-diary-box" style="padding:10px 0;">
<div class="left">
<img class="pic" src="media/teacher/2016/11/aobama_CXWwMef.png"/>
<p>昵称：bobby</p>
</div>
<div class="right">
<div class="top">
<div class="fl">
<a href=""><h1>java开发教程</h1></a>
<span>发表于：2015-10-12</span>
</div>
</div>
<div class="middle" style="border-bottom:0;">课程介绍</div>
</div>
</div>
</div>


</div>
<div class="right companycenter layout">
<div class="head">
<h1>机构介绍</h1>
<a class="green fr more" href="org-detail-desc.html">查看更多 > </a>
</div>
</div>
{% endblock %}

</div>
Expand Down

0 comments on commit a765c34

Please sign in to comment.