From 15508fe5a11b8f873ee2320415a8c34422d3254c Mon Sep 17 00:00:00 2001
From: jianw4 <jianw4@cisco.com>
Date: Sun, 20 May 2018 21:37:05 +0800
Subject: [PATCH] add story,userinfo

---
 BabyEnglish/settings.py                       |   1 +
 BabyEnglish/urls.py                           |  17 +-
 UserManage/forms.py                           |  19 +
 UserManage/models.py                          |  16 +-
 UserManage/urls.py                            |  29 ++
 UserManage/views.py                           | 136 +++++-
 db.sqlite3                                    | Bin 59392 -> 70656 bytes
 static/css/detail.css                         |  19 +-
 static/css/header.css                         |  83 ++++
 static/css/index.css                          |  68 ++-
 static/css/password_reset.css                 |  98 +++++
 static/css/story_list.css                     |  87 ++++
 static/css/user_info.css                      | 413 ++++++++++++++++++
 story/__init__.py                             |   0
 story/__pycache__/__init__.cpython-34.pyc     | Bin 0 -> 144 bytes
 story/__pycache__/admin.cpython-34.pyc        | Bin 0 -> 644 bytes
 story/__pycache__/models.cpython-34.pyc       | Bin 0 -> 828 bytes
 story/__pycache__/urls.cpython-34.pyc         | Bin 0 -> 1070 bytes
 story/__pycache__/views.cpython-34.pyc        | Bin 0 -> 1671 bytes
 story/admin.py                                |  13 +
 story/apps.py                                 |   5 +
 story/migrations/0001_initial.py              |  29 ++
 story/migrations/__init__.py                  |   0
 .../__pycache__/0001_initial.cpython-34.pyc   | Bin 0 -> 1041 bytes
 .../__pycache__/__init__.cpython-34.pyc       | Bin 0 -> 155 bytes
 story/models.py                               |  17 +
 story/tests.py                                |   3 +
 story/urls.py                                 |  26 ++
 story/views.py                                |  44 ++
 templates/detail.html                         |  84 ++--
 templates/header.html                         | 117 ++---
 templates/index.html                          |  75 +++-
 templates/list.html                           | 188 ++++++++
 templates/login.html                          |  12 +-
 templates/password_reset.html                 |  40 ++
 templates/register.html                       |  28 +-
 templates/story_detail.html                   |  15 +
 templates/story_list.html                     |  57 +++
 templates/user_info.html                      |  95 ++++
 templates/youku1.html                         |  15 +
 utils/__pycache__/tools.cpython-34.pyc        | Bin 0 -> 338 bytes
 utils/tools.py                                |   4 +
 video/admin.py                                |   2 +-
 video/models.py                               |   3 +
 video/urls.py                                 |   3 +
 video/views.py                                |  93 +---
 46 files changed, 1752 insertions(+), 202 deletions(-)
 create mode 100644 UserManage/forms.py
 create mode 100644 UserManage/urls.py
 create mode 100644 static/css/header.css
 create mode 100644 static/css/password_reset.css
 create mode 100644 static/css/story_list.css
 create mode 100644 static/css/user_info.css
 create mode 100644 story/__init__.py
 create mode 100644 story/__pycache__/__init__.cpython-34.pyc
 create mode 100644 story/__pycache__/admin.cpython-34.pyc
 create mode 100644 story/__pycache__/models.cpython-34.pyc
 create mode 100644 story/__pycache__/urls.cpython-34.pyc
 create mode 100644 story/__pycache__/views.cpython-34.pyc
 create mode 100644 story/admin.py
 create mode 100644 story/apps.py
 create mode 100644 story/migrations/0001_initial.py
 create mode 100644 story/migrations/__init__.py
 create mode 100644 story/migrations/__pycache__/0001_initial.cpython-34.pyc
 create mode 100644 story/migrations/__pycache__/__init__.cpython-34.pyc
 create mode 100644 story/models.py
 create mode 100644 story/tests.py
 create mode 100644 story/urls.py
 create mode 100644 story/views.py
 create mode 100644 templates/list.html
 create mode 100644 templates/password_reset.html
 create mode 100644 templates/story_detail.html
 create mode 100644 templates/story_list.html
 create mode 100644 templates/user_info.html
 create mode 100644 templates/youku1.html
 create mode 100644 utils/__pycache__/tools.cpython-34.pyc
 create mode 100644 utils/tools.py

diff --git a/BabyEnglish/settings.py b/BabyEnglish/settings.py
index 3b339b5..f0fe373 100644
--- a/BabyEnglish/settings.py
+++ b/BabyEnglish/settings.py
@@ -40,6 +40,7 @@
     'django.contrib.staticfiles',
     'video',
     'UserManage',
+    'story',
 ]
 
 MIDDLEWARE = [
diff --git a/BabyEnglish/urls.py b/BabyEnglish/urls.py
index aa2a875..5f4b3b7 100644
--- a/BabyEnglish/urls.py
+++ b/BabyEnglish/urls.py
@@ -16,17 +16,18 @@
 from django.conf.urls import *
 from django.contrib import admin
 from video import  urls, views
+from UserManage import views as UserViews
 
 urlpatterns = [
     url(r'^admin/', admin.site.urls),
     url(r'^video/', include('video.urls')),
-    url(r'^login/',views.login),
-    url(r'^logout/',views.logout),
-    url(r'^register/',views.register, name='register'),
-    url(r'^index/$', views.list),
-    url(r'^index/(?P<username>\w+)/$',views.list),
+    url(r'^story/', include('story.urls')),
+    url(r'^users/', include('UserManage.urls',namespace="users")),
+    url(r'^login/',UserViews.login),
+    url(r'^logout/',UserViews.logout, name='logout'),
+    url(r'^register/',UserViews.register, name='register'),
+    url(r'^index/$', views.list, name='index'),
+    url(r'^$', views.list),
+    url(r'^index/(?P<username>\w+)/$',views.list, name='index_user'),
     url(r'^pl/$', views.pl),
-    #url(r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
-    
 ]
-
diff --git a/UserManage/forms.py b/UserManage/forms.py
new file mode 100644
index 0000000..d547fad
--- /dev/null
+++ b/UserManage/forms.py
@@ -0,0 +1,19 @@
+# 引入Django表单
+from  django import forms
+from UserManage.models import User
+
+
+# 重置密码form实现
+class UpdatePwdForm(forms.Form):
+    # 密码不能小于5位
+    password1 = forms.CharField(required=True, min_length=5)
+    # 密码不能小于5位
+    password2 = forms.CharField(required=True, min_length=5)
+
+
+# 用于个人中心修改个人信息
+class UserInfoForm(forms.ModelForm):
+
+    class Meta:
+        model = User
+        fields = ['nickname','gender','address','mobile', 'email']
\ No newline at end of file
diff --git a/UserManage/models.py b/UserManage/models.py
index 18d984c..f93eede 100644
--- a/UserManage/models.py
+++ b/UserManage/models.py
@@ -8,9 +8,21 @@
 class User(models.Model):
     username = models.CharField(max_length=50, unique=True)
     password = models.CharField(max_length=100)
-    sex = models.BooleanField()
+    # 自定义的性别选择规则
+    GENDER_CHOICES = (
+        ("male", u"男"),
+        ("female", u"女")
+    )
+    gender = models.CharField(
+        max_length=6,
+        verbose_name=u"性别",
+        choices=GENDER_CHOICES,
+        default="female")
+    # 地址
+    address = models.CharField(max_length=100, default="")
     city = models.CharField(max_length=100)
-    nickname = models.CharField(max_length=50, unique=True)
+    mobile = models.CharField(max_length=20, default="")
+    nickname = models.CharField(max_length=10, unique=True)
     is_admin = models.BooleanField(default=False)
     is_superuser = models.BooleanField(default=False)
     email = models.EmailField(max_length=50, null=True, blank=True)
diff --git a/UserManage/urls.py b/UserManage/urls.py
new file mode 100644
index 0000000..f40ff3c
--- /dev/null
+++ b/UserManage/urls.py
@@ -0,0 +1,29 @@
+"""BabyEnglish URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/1.11/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.conf.urls import url, include
+    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
+"""
+from django.conf.urls import url
+from UserManage.views import UpdatePwdView,UserInfoView
+from UserManage import views
+
+
+urlpatterns = [
+
+    #url(r'update/$', views.update),
+    url('updatepwd/', UpdatePwdView.as_view(), name="updatepwd"),
+    url('userinfo/', UserInfoView.as_view(), name="userinfo"),
+    # 专用于发送验证码的
+    #url('sendemail_code/', SendEmailCodeView.as_view(),  name="sendemail_code"),
+
+]
diff --git a/UserManage/views.py b/UserManage/views.py
index 91ea44a..3d585b9 100644
--- a/UserManage/views.py
+++ b/UserManage/views.py
@@ -1,3 +1,135 @@
-from django.shortcuts import render
-
+from django.shortcuts import  render,redirect,render_to_response,HttpResponse
+# 基于类实现需要继承的view
+from django.views.generic.base import View
+from UserManage.forms import UpdatePwdForm
+from UserManage.models import User
+from utils.tools import *
+from django.contrib.auth.mixins import LoginRequiredMixin
+import json
+from UserManage.forms import UserInfoForm
 # Create your views here.
+
+
+def login_required(func):
+    """要求登录的装饰器"""
+    def _deco(request, *args, **kwargs):
+        if not request.session.get('username'):
+            return redirect('/login/')
+        return func(request, *args, **kwargs)
+    return _deco
+
+def login(request):
+    """登录界面"""
+    # if request.session.get('username'):
+    #     return redirect('/')
+    if request.method == 'GET':
+        return render_to_response('login.html')
+    else:
+        username = request.POST.get('username')
+        password = request.POST.get('password')
+        user = User.objects.filter(username=username)
+        if user:
+            user = user[0]
+            if md5_crypt(password) == user.password:
+                request.session['username'] = username
+                if user.is_admin:
+                    request.session['admin'] = 1
+                elif user.is_superuser:
+                    request.session['admin'] = 2
+                else:
+                    request.session['admin'] = 0
+                return redirect('/index/%s/' % username)
+            else:
+                error = '密码错误，请重新输入。'
+        else:
+            error = '用户不存在。'
+    return render_to_response('login.html', {'error': error})
+
+
+
+def logout(request):
+    """注销登录调用"""
+    if request.session.get('username'):
+        del request.session['username']
+        del request.session['admin']
+    return redirect('/login/')
+
+def register(request):
+    if request.method == "POST":
+        print("-------------------register handle--------")
+        username =  request.POST.get("username")
+        passwd =  request.POST.get("password")
+        email = request.POST.get("email")
+        nickname = request.POST.get("nickname")
+        gender = request.POST.get("sex")
+        mobile = request.POST.get("mobile")
+        address = request.POST.get("address")
+
+        city = request.POST.get("city")
+        error_info = dict()
+
+        if User.objects.filter(username= username):
+            error_info['error'] = "用户名已经注册了"
+        elif   User.objects.filter(nickname=nickname):
+            error_info['error'] = "昵称已被使用"
+        elif User.objects.filter(email=email):
+            error_info['error'] = "邮箱已被注册"
+        else:
+            User.objects.create(username=username, password=md5_crypt(passwd), nickname=nickname, email=email, gender=gender, city=city)
+            return  redirect("/login/")
+
+        return render_to_response("register.html", error_info )
+    else:
+        return render_to_response("register.html")
+
+
+
+class UpdatePwdView(View):
+
+    def get(self, request):
+       return render(   request, "password_reset.html")
+
+    def post(self, request):
+        modiypwd_form = UpdatePwdForm(request.POST)
+        if modiypwd_form.is_valid():
+            pwd1 = request.POST.get("password1", "")
+            pwd2 = request.POST.get("password2", "")
+            #active_code = request.POST.get("active_code", "")
+            #print("active_code=%s" % active_code)
+            email = request.POST.get("email", "")
+            # 如果两次密码不相等，返回错误信息
+            if pwd1 != pwd2:
+                return render(
+                    request, "password_reset.html", { "msg": "密码不一致"})
+
+            user = User.objects.get(username=request.session['username'])
+            # 加密成密文
+            user.password = md5_crypt(pwd2)
+            # save保存到数据库
+            user.save()
+            return redirect("/login/")
+        # 验证失败说明密码位数不够。
+        else:
+
+            return render(
+                request, "password_reset.html", {  "modiypwd_form": modiypwd_form})
+
+
+
+class UserInfoView(View):
+
+
+    def get(self, request):
+        user = User.objects.get(username=request.session['username'])
+        return render(request, "user_info.html", {'user':user  })
+
+    def post(self, request):
+        # 不像用户咨询是一个新的。需要指明instance。不然无法修改，而是新增用户
+        user = User.objects.get(username=request.session['username'])
+        user_info_form = UserInfoForm(request.POST, instance=user)
+
+        if user_info_form.is_valid():
+            user_info_form.save()
+            return render_to_response("user_info.html",  {'user':user,'status':"修改成功"})
+        else:
+            render_to_response("user_info.html", {'user': user, 'status':user_info_form.errors})
diff --git a/db.sqlite3 b/db.sqlite3
index 4b7b0d952357b732fb6dd06a33eb2fb7b3f6f293..d9ca92fbd538e68f9d06c4c7ff1cf1886ec58490 100644
GIT binary patch
literal 70656
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
RwDa3Q$pWO4K&Dfa{y)Q71q1*9

delta 2419
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
SbEPyA%uHdLv4P!lzW)L!bG1DH

diff --git a/static/css/detail.css b/static/css/detail.css
index 66a70e5..7c40ee3b 100644
--- a/static/css/detail.css
+++ b/static/css/detail.css
@@ -77,11 +77,26 @@
         }
 
         .main-navigation .menu li a {
-            color: #505050;
+           /* color: #505050;
             line-height: 4em;
             display: block;
-            padding: 0 21px
+            padding: 0 21px;*/
+             font-size: 1.60rem;
+            color: #c87d90;
+            text-decoration: none;
+              margin-right: 2rem;
+            display: inline-block;
+            font-family: Heiti, "Microsoft Yahei";
+            white-space: nowrap;
+             padding: 0 21px;
+            line-height: 4em;
+
         }
+        .main-navigation .menu li  a:hover {
+              color: #657E7C;
+             text-decoration: none;
+        }
+
 
         .navbar-header {
             text-align: center
diff --git a/static/css/header.css b/static/css/header.css
new file mode 100644
index 0000000..c90b87d
--- /dev/null
+++ b/static/css/header.css
@@ -0,0 +1,83 @@
+
+
+.userdetail {
+    display: none;
+    position: absolute;
+    right: 0;
+    top: 38px;
+    background: #fff;
+    padding: 10px;
+    z-index: 99;
+    border: 1px solid #ccc;
+    border-top: 0;
+}
+
+.userdetail dl {
+    width: 300px;
+    height: auto;
+    overflow: hidden;
+}
+
+.userdetail dt {
+    width: 80px;
+    height: 80px;
+    overflow: hidden;
+    border-radius: 50%;
+    float: left;
+}
+
+ .userdetail dd {
+    text-align: right;
+    line-height: 20px;
+    width: 190px;
+    float: right;
+    position: absolute;
+    right: 10px;
+    top: 30px;
+    color: #333;
+    height: auto;
+    overflow: hidden;
+}
+
+ .userdetail h2 {
+    color: #717171;
+}
+
+ .userdetail .btn {
+    width: 100%;
+    height: 30px;
+    line-height: 30px;
+    margin-top: 20px;
+    clear: both;
+}
+
+.userdetail .btn a {
+    display: block;
+    height: 30px;
+    line-height: 30px;
+    text-align: center;
+    background: #717171;
+    color: #fff;
+}
+
+.userdetail .btn a:hover {
+    background: #4FB137;
+}
+
+.userdetail .btn a.fl {
+    width: 65%;
+      float: left!important;
+}
+
+.userdetail .btn a.fr {
+     width: 32%;
+    float: right!important;
+ }
+
+.personal {
+    height: auto;
+    float: right;
+    position: relative;
+}
+
+}
\ No newline at end of file
diff --git a/static/css/index.css b/static/css/index.css
index 8ddbc28..528c440 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -54,10 +54,24 @@
         }
 
         .main-navigation .menu li a {
-            color: #505050;
+         /*   color: #505050;
             line-height: 4em;
             display: block;
-            padding: 0 21px
+            padding: 0 21px*/
+            font-size: 1.60rem;
+            color: #c87d90;
+            text-decoration: none;
+              margin-right: 2rem;
+            display: inline-block;
+            font-family: Heiti, "Microsoft Yahei";
+            white-space: nowrap;
+             padding: 0 21px;
+            line-height: 4em;
+
+        }
+        .main-navigation .menu li  a:hover {
+              color: #657E7C;
+             text-decoration: none;
         }
 
 
@@ -77,9 +91,9 @@
 
         }
         .post {
-            padding: 35px;
+            padding: 0px;
             background: #fff;
-            margin-bottom: 35px;
+            margin-bottom: 11px;
             position: relative;
             overflow: hidden
         }
@@ -115,6 +129,7 @@
 
         .post .featured-media {
             margin-top: 30px;
+            margin-right: 30px;
             width:220px;
             heigth: 120px;
             overflow: hidden;
@@ -249,3 +264,48 @@
             background: #303030;
             color: #fff
         }
+
+.main-navigation .menu li a #ai-logopl-alink {
+    font-size: 1.60rem;
+    color: #47484A;
+    ext-decoration: none;
+}
+
+.main-navigation .menu li a #ai-logopl-alink {
+    font-size: 1.6rem;
+    margin-right: 2rem;
+    display: inline-block;
+    font-family: Heiti, "Microsoft Yahei";
+    white-space: nowrap;
+}
+
+.horiz-img-region .horiz-img-item {
+    width: 240px;
+    height: 280px;
+    overflow: hidden;
+    float: left;
+    padding: 10px;
+    margin: 10px 20px 20px 10px;
+    text-decoration: none;
+    background-color: white;
+    -moz-box-shadow: 1px 1px 5px #888888;
+    box-shadow: 1px 1px 5px #888888;
+}
+
+
+.horiz-img-region .horiz-img-item h3 {
+    font-size: 18px;
+    margin: 10px 5px;
+    text-align: center;
+}
+
+.horiz-img-region .horiz-img-item p {
+    margin: 5px 0;
+    font-size: 12px;
+    color: #b4bbbf;
+    width: 212px;
+}
+
+li {
+    list-style: none;
+}
\ No newline at end of file
diff --git a/static/css/password_reset.css b/static/css/password_reset.css
new file mode 100644
index 0000000..03ff28e
--- /dev/null
+++ b/static/css/password_reset.css
@@ -0,0 +1,98 @@
+.resetpassword {
+    min-height: 400px;
+}
+
+.resetpassword h1 {
+    line-height: 50px;
+    font-size: 16px;
+    color: #717171;
+    border-bottom: 1px solid #717171;
+    margin-bottom: 20px;
+}
+
+.resetpassword p {
+    font-size: 14px;
+    line-height: 30px;
+}
+
+.resetpassword li {
+    height: 40px;
+    line-height: 40px;
+    position: relative;
+    margin: 30px 0;
+    list-style: none;
+}
+
+.resetpassword li input {
+    width: 300px;
+    height: 40px;
+    line-height: 40px;
+    position: absolute;
+    left: 70px;
+    text-indent: 10px;
+    border: 1px solid #717171;
+}
+
+.resetpassword li i {
+    position: absolute;
+    margin-left: 340px;
+    color: #aa0b0b;
+}
+
+.resetpassword .errorput input {
+    border-color: #f00;
+    box-shadow: 0 0 5px #aa0b0b;
+}
+
+.resetpassword .rightput {
+    background: url(../images/check.png) no-repeat 400px center;
+}
+
+.resetpassword .button input {
+    cursor: pointer;
+}
+
+.resetpassword .button:hover input {
+    background: #717171;
+    color: #fff;
+    border: 0;
+}
+
+.resetpassword .successword {
+    line-height: 100px;
+    font-size: 20px;
+    font-weight: bold;
+    color: #717171;
+}
+
+
+.dialogbox .box {
+    width: 100%;
+    height: 45px;
+    line-height: 45px;
+    border: 1px solid #ccc;
+    margin: 15px 0;
+    border-radius: 3px;
+    position: relative;
+}
+.resetpassword span {
+    color: #7c7c7c;
+    border-right: 1px solid #ccc;
+    width: 80px;
+    height: 20px;
+    line-height: 20px;
+    margin-top: 12px;
+    text-align: center;
+    display: block;
+}
+
+
+.resetpassword input {
+    width: 235px;
+    padding: 10px;
+    line-height: 24px;
+    border: 0;
+    position: absolute;
+    right: 0;
+    top: 0;
+}
\ No newline at end of file
diff --git a/static/css/story_list.css b/static/css/story_list.css
new file mode 100644
index 0000000..009d5c4
--- /dev/null
+++ b/static/css/story_list.css
@@ -0,0 +1,87 @@
+.nlist_nr {
+    clear: both;
+    line-height: 200%;
+    margin-bottom: 20px;
+    overflow: hidden;
+    padding-bottom: 20px;
+    padding-right: 20px;
+    width: 725px;
+    margin:  0 auto;
+}
+
+.list_right_nr1 {
+    width: 725px;
+}
+
+.list_right_nr1 ul {
+    float: left;
+    font-size: 14px;
+    line-height: 150%;
+    overflow: hidden;
+    padding-left: 10px;
+    width: 100%;
+}
+
+ul, li {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+ul, menu, dir {
+    display: block;
+    list-style-type: disc;
+    -webkit-margin-before: 1em;
+    -webkit-margin-after: 1em;
+    -webkit-margin-start: 0px;
+    -webkit-margin-end: 0px;
+    -webkit-padding-start: 40px;
+}
+
+
+
+.list_right_nr1 li {
+    float: left;
+    line-height: 2rem;
+}
+.nlist_nr li {
+    display: inline;
+    float: left;
+    overflow: hidden;
+    white-space: nowrap;
+    width: 320px;
+    margin: 0 10px;
+}
+.flashul li {
+    width: 120px;
+}
+ul, li {
+    margin: 0;
+    padding: 0;
+    list-style: none;
+}
+
+li {
+    display: list-item;
+    text-align: -webkit-match-parent;
+}
+
+.webusermenu a:link, a:visited {
+    color: #333;
+    text-decoration: none;
+}
+
+a {
+    text-decoration: none;
+    color: #333;
+}
+
+.sortimg {
+    width: 104px;
+    height: 104px;
+    border: 2px solid #D4E3F2;
+}
+
+img {
+    border: 0;
+}
\ No newline at end of file
diff --git a/static/css/user_info.css b/static/css/user_info.css
new file mode 100644
index 0000000..622d940
--- /dev/null
+++ b/static/css/user_info.css
@@ -0,0 +1,413 @@
+ul, ol {
+    list-style: none;
+}
+
+.personal_list {
+    margin-top: 0;
+}
+.list {
+    height: auto;
+    margin-top: 40px;
+    margin-bottom: 40px;
+    min-height: 200px;
+    overflow: hidden;
+    clear: both;
+    position: relative;
+}
+.wp {
+    width: 1200px;
+    margin: 0 auto;
+    position: relative;
+    clear: both;
+}
+
+.list .right {
+    width: 280px;
+    float: right;
+    margin-bottom: 20px;
+    overflow: hidden;
+}
+
+.personal_list .right {
+    width: 945px;
+    float: right;
+    overflow: hidden;
+}
+
+.personal_list {
+    margin-top: 0;
+}
+
+.personal_list .left {
+    width: 210px;
+    float: left;
+    background: #f8f8f8;
+    border: 1px solid #eaeaea;
+    overflow: hidden;
+}
+
+.personal_list .left li {
+    width: 100%;
+    height: 60px;
+    line-height: 60px;
+    font-size: 16px;
+    color: #3a3a3a;
+    border-bottom: 1px solid #eaeaea;
+    background: url(../images/arrow.png) no-repeat 95% center;
+}
+
+.personal_list .left li:last-child {
+    border: 0;
+}
+
+.personal_list .left li:hover, .personal_list .left .active2 {
+    background: #fff url(../images/arrow_g.png) no-repeat 95% center;
+    border-left: 2px solid #717171;
+}
+
+.personal_list .left a {
+    width: 90%;
+    margin: 0 5%;
+    height: 100%;
+    display: block;
+    color: #3a3a3a;
+}
+
+.personal_list .left .dropwrap {
+    height: auto;
+    overflow: hidden;
+    background: url(../images/drop_plus.png) no-repeat 95% 20px;
+    width: 100%;
+}
+
+.personal_list .left .dropwrap:hover {
+    border: 0;
+    background: url(../images/drop_plus.png) no-repeat 95% 20px;
+}
+
+.personal_list .left .dropwrap:hover .drophead {
+    background: #fff url(../images/drop_plus_g.png) no-repeat 95% 20px;
+    border-left: 2px solid #717171;
+}
+
+.personal_list .left .drophead {
+    margin: 0;
+    text-indent: 10px;
+    width: 100%;
+}
+
+.personal_list .left .drop a {
+    width: 100%;
+    height: 40px;
+    line-height: 40px;
+}
+
+.personal_list .left .drop a:hover, .personal_list .drop .active {
+    color: #717171;
+}
+
+.personal_list .left .dropwrap .drop {
+    display: none;
+    font-size: 14px;
+    color: #6f6f6f;
+    text-indent: 20px;
+    width: 100%;
+    height: auto;
+    overflow: hidden;
+}
+
+
+.personal_des .inforcon {
+    border: 1px solid #eaeaea;
+    height: auto;
+    overflow: hidden;
+    width: 943px;
+    border-top: 0;
+}
+
+.personal_list  .inforcon .right {
+    width: 650px !important;
+    height: 100%;
+    border-left: 1px solid #eaeaea;
+    font-size: 14px;
+    margin: 0;
+}
+
+.personal_list  .inforcon .right > li, .inputs li {
+    height: 50px;
+    line-height: 50px;
+    border-bottom: 1px solid #eaeaea;
+    text-indent: 20px;
+    color: #a9a9a9;
+    position: relative;
+}
+
+.personal_list  .inforcon .right > li {
+    float: left;
+    width: 100%;
+}
+
+.personal_list .inforcon .li-col3 li {
+    float: left;
+    width: 33.3%;
+}
+
+.inputs select {
+    margin-left: 16px !important;
+}
+
+.personal_list  .inforcon .right .pics {
+    height: 100px;
+    line-height: 100px;
+}
+
+.personal_list .inforcon .right .pics label {
+    display: block;
+    left: 90px;
+    top: 25px;
+    position: absolute;
+    width: 500px;
+    height: 50px;
+    overflow: hidden;
+    cursor: pointer;
+}
+
+.personal_list .inforcon .right .pics label .pic {
+    width: 50px;
+    height: 50px;
+    overflow: hidden;
+    float: left;
+}
+
+.personal_list .inforcon .right .pics label .pic img {
+    width: 100%;
+}
+
+.personal_list .inforcon .right .pics label .changebtn {
+    width: 435px;
+    float: right;
+    margin-top: 10px;
+}
+
+.personal_list .inforcon .right .pics label #up_img {
+    opacity: 1;
+}
+
+.personal_list .inforcon .right li div {
+    line-height: 20px;
+    text-indent: 0;
+}
+
+.personal_list .inforcon .right li input[type=text] {
+    color: #3d3d3d;
+    height: 30px;
+    line-height: 30px;
+    margin-left: 20px;
+    text-indent: 10px;
+    width: 300px;
+    background: #fafafa;
+}
+
+.personal_list .inforcon .right li.errorput input[type=text] {
+}
+
+.personal_list .inforcon .right li .error {
+    top: 15px;
+    width: 300px !important;
+    left: 110px;
+    height: 40px;
+    line-height: 40px;
+    color: #fff;
+    background: #ff7800;
+}
+
+.personal_list .inforcon .right li select {
+    color: #3d3d3d;
+    height: 30px;
+    line-height: 30px;
+    margin-left: 20px;
+    text-indent: 2px;
+    width: 300px;
+    border: 1px solid #eaeaea;
+    background: #fff;
+}
+
+.personal_list .inforcon .right li input:focus {
+    border-color: #717171;
+}
+
+.personal_list .inforcon .right li span {
+    color: #171717;
+    overflow: hidden;
+    word-break: break-all;
+}
+
+.personal_list .inforcon .right li textarea:focus {
+    border-color: #717171;
+}
+
+.personal_list .inforcon .right li label {
+    width: 50px;
+}
+
+.personal_list .inforcon .right li.upload label {
+    display: block;
+    height: 100%;
+    overflow: hidden;
+    position: relative;
+    width: 100%;
+    margin-left: 0;
+}
+
+.personal_list .inforcon .right li.upload label .pic {
+    line-height: normal;
+}
+
+.personal_list .inforcon .right li.upload label input[type=file] {
+    top: 30px;
+}
+
+.personal_list .inforcon .right li label input[type='radio'] {
+    margin-right: 5px;
+}
+
+.personal_list  input.borderno {
+    border: 0;
+    margin-right: 10px;
+    width: 252px !important;
+    display: inline;
+    text-indent: 0;
+}
+
+.personal_list .inrcon .right li .green {
+    text-indent: 0;
+    color: #717171;
+    cursor: pointer;
+}
+
+.personal_list  .right .focus input {
+    background: #fff !important;
+    color: #717171 !important;
+}
+
+.personal_list  .right .button {
+    text-align: center;
+}
+
+.personal_list  .right .button input {
+    cursor: pointer;
+    background: #717171;
+    color: #fff;
+    text-align: center;
+    border-radius: 2px;
+    border: 0;
+    height: 35px;
+    width: 100px;
+    margin: 0 auto;
+}
+
+.personal_list  .right .button .cancle {
+    background: #a5a5a5;
+}
+
+.personal_list  .right .city {
+    display: inline;
+    margin-left: 16px;
+}
+
+.personal_list  .right .photo {
+    height: 700px;
+}
+
+.personal_list  .wrapper li {
+    text-indent: 0;
+}
+
+.personal_list  .wrapper span {
+    text-indent: 0;
+    color: #fff !important;
+}
+
+.p_infor_city {
+    position: relative;
+}
+
+.p_infor_city .citys {
+    position: absolute;
+    left: 95px;
+    margin-top: 20px;
+    top: 0;
+}
+
+.p_infor_city .citys .dizhi_t {
+    width: 400px;
+}
+
+.p_infor_city .dizhi_t .dizhi_t_2 {
+    width: 100%;
+}
+
+.p_infor_city .city {
+    left: 75px;
+    margin-top: 20px;
+}
+
+.p_infor_city .city .option, .p_infor_city .city select {
+    width: auto !important;
+    display: inline;
+    float: left;
+}
+
+.personal_list .left a {
+    width: 90%;
+    margin: 0 5%;
+    height: 100%;
+    display: block;
+    color: #3a3a3a;
+        text-decoration: none;
+}
+.btn-w100 {
+    width: 100px;
+}
+.btn-green {
+    background: #717171;
+}
+.button {
+    display: block;
+    height: 35px;
+    line-height: 35px;
+    margin: 0 auto;
+    border: 0;
+    -webkit-border-radius: 2px;
+    -moz-border-radius: 2px;
+    border-radius: 2px;
+    color: #fff !important;
+    cursor: pointer;
+    text-align: center;
+    text-indent: 0 !important;
+}
+
+.personal_list .head h1 {
+    display: inline;
+    color: #717171;
+}
+h1, h2, h3, h4, h5, h6 {
+    font-weight: normal;
+    color: #202020;
+}
+
+.personal_des .head {
+    border-bottom: 1px solid #eaeaea;
+    background: #f8f8f8;
+}
+.personal_des .head {
+    border-bottom: 1px solid #eaeaea;
+    background: #f8f8f8;
+    color: #333;
+    height: 50px;
+    line-height: 50px;
+    text-indent: 20px;
+    font-size: 14px;
+}
+
+}
\ No newline at end of file
diff --git a/story/__init__.py b/story/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/story/__pycache__/__init__.cpython-34.pyc b/story/__pycache__/__init__.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f2d1f95fcd44e026975838801a18bef061b86c21
GIT binary patch
literal 144
zcmaFI!^<Tv!5GZ|1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnFI#7;n9$<XqT-mW
z%*4EMlbC?Y<c!3k+<>C|tkmR^;uxpIq)OMk^qkD%jF{q*{G!U3`1s7c%#!$cy@JYH
T95%W6DWy57b|7PmftUdRCpaVU

literal 0
HcmV?d00001

diff --git a/story/__pycache__/admin.cpython-34.pyc b/story/__pycache__/admin.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..39e5f05730b99428e3f996874f961aec23b67249
GIT binary patch
literal 644
zcmYk4!EV$r5QfLuB&69CRf0<;ULYJ+95_`7m7=N=5~xz)5+Ye{Y<3+b&SHD1l56`i
zyppe+xbOfyb?g9LE1vwGc)ppj^QSn>H?PRoGXn4n_C}2Q6sP%shT}t^1Lz4<1c+Zp
z&_(e1f-iu_aEFc<1c7z|w+pCdoj{v{cmg7Z+X$l)xGK}%$b*u&gz;V~6y#;&UH?Xg
z;uNQOfkuGOhv}*acn%dNTY5S_Kvd!KD?8}%od>x{au+Ms3zx{At%b{Wx}#fWH!e50
zP0ad0?Rxq{iW}pWT$o17t(Ajvd7}lhg402LDzgb`_klLewCO)>+M`X6v}vC<?a@l2
z53!RnaT%q)K1y9qX+Q8?=XF8p_Z{p0eknR>EalQ{J2tvySbdY775XRWXUGZW{^b2h
z{ly4v>Q*v!^SZtqn+?<br5;+*SW};|>+xKzF@96~?#DVD_i8)p7%3@E<3&MI5<J*+
z^^~_vt%p@JD68eQj&MU&gzy#CD>~!ykNzD_JcPN}NQ-B!#TpA2+9lyi9!s6ob0oR!
S&D```{MW$v5{^h7AEys6>$A-O

literal 0
HcmV?d00001

diff --git a/story/__pycache__/models.cpython-34.pyc b/story/__pycache__/models.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..9a61ff26dedad6548cfbc79c58ac8ead5ebb0625
GIT binary patch
literal 828
zcmZ`%y^hmB5T3Q;BzBx5qCixLh9U*2r~si8;YSn~os`fRORG(GFLCfs*tNOKiSBqA
zS{`Rxs%v-v8kkvMq%^EO<JoU!zS)`e?|2xUJz}38djP-SXm!v&MKMoNNqiaP00o1D
z0ede!kUo4z*ayX6>%ol=i4U>^^Ko#CDKKWXTU1izW<}e>3eY%3F+Wi$AUb4EJWxJt
zJ5&a_Z-6Di0dcGc+)KLu!Fvwx(}`r@7($0c4ngKF$R6TeGB_}}S`^=Lc<k^YNF<?1
zmYjeLK}OVQau4JHn~QBQuPeQ`Q6a8)uF7@2x&4d1*q&4uqRDFun$bR3=A!((u(4?B
zikH<T7gDasMT@>TbC{x-0V?e98^9Le!F=q^uDvG)C)g=Pq3CN=e(?izjDde%OrNJ8
zjnXFFW}>`&mY(ld8=;GHU2WB>HtB1z+`lc?d1f}Lp~I%_MND>k+vD8Sn)4CWr2_!F
z9=eVucb?gJWc!>`WzKEHIVLwb*)iu|8j-giP02Q#V&!+4%B7BIA5lHUccR|dexvi&
zia(UKTB|nDhGkRmubH|uHe9Hy+NIlpRA!~KU7b~>4YES4l^wnjwOV9_av@2y(h32|
zt5Tm}H8+kUH6+YO)kQJXVa)EchxpuS-+5=_jt%8jl<R6Dmu(-x8U3oxeMCs(*2HT2
PFWV`+qI+|58wLLWRs+Hy

literal 0
HcmV?d00001

diff --git a/story/__pycache__/urls.cpython-34.pyc b/story/__pycache__/urls.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..60d4cca6027b708f38f4a400117eefc6a5aff739
GIT binary patch
literal 1070
zcma)5!EVz)5FIB@(z>n4rT0BVN-T=4AUF^K0;*P2LZ||IF&638-XxCfU2AtkNe^83
z1O9?5pW`bhE_?tdX4kP4RYIzjY<6E}-n@A`{<DAJ{XBI(es2T(f~}{A`xp3C0+$pZ
z!qtJa1-S!73!)Y{=G=z74TTGl3l3{R>H>3N*?|;4UHI0rV9$bG3+^=Ft_6D*^b9y}
zL$m|w9=!MW>DLy(D|)p);qyFG3v%)94LKHkmd#g^>P&FY`><f-awYSUYRx29mjoj<
zkz%EpG6{-kK|W{fS_R}(NKy#NNXBPE7M6mPIirdZ#n{9n_$;(8)g%m4k*FYDQa%@@
z6ib%qAQ45#csLHm<4}t-OH^p0L#(et@8k<DkW5Xy(-lvQyt=Ms9S7uPni9%MR+K{O
z2_Z8n3R0}6v@AE^R{X<FyzLn~*lH0|@idadPlMsnrnQAA*b(8hV9$nTKlHuhoGSI;
z3VTbpc>kwE=mnETN?^Te1ieNstN+e=Oh!P})X<FlTbj;zlCRQ?&(R25(X^M~jW!;g
zS#t=A!8<asY~+*K#?DD?S$!vX8GIHP=NqlKKWeh>uK6k#^ALS($_))*d56C5{l>Wm
z->KS2jz1l1&P~_MSU9L$V|e5#E#!J?u$zOFX`1EXC{FMDgJ{40s|IhnI5UsKL6cxk
zZ~fh>H=W|FO{Z1=c4rdjAF7Tek@#*x<(ev0w<e5SLs9Lawr2c)fZW44yZn7}Jc%z9
zlPX?jlwUuJ&)3O<%Hq5pXBBU~Td^$?8$W|`UF|$AM7qk^^LxmqJY2d?-|2S_okQmz
D6evbZ

literal 0
HcmV?d00001

diff --git a/story/__pycache__/views.cpython-34.pyc b/story/__pycache__/views.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..96b365b9a149ab977a9d95d738fa60114b34e89f
GIT binary patch
literal 1671
zcmZ`(O>ZMb5Url?8INOcLX;pDSgrOlhxoLc!wMmGmk1D26cG^YV9A<zTK3G&hv{zb
zVk<rc?wt4!{H4Bf%7q`miK?E&i9n3p<*M%L>gqS|&0ldpI?vdT4?TcC;of7R{}~SX
z8=4${3@U({LCSzpY(Zr~Z9{5zu?>|2wF{}+#ST;+q@LO9LghmpKpH?DLK;FHK^k>=
z9#lQ3V@P9+eaHj&1t9H19zq@&e+Tj&<gxJwkUMam^sliiNSO8nZ*nfsi@#KA@eP-Y
zwvilT_guANb(+{ZJj-T9lVPaClX{_67;`-&d)lfO%~y@$GgG4{xhS%#SaTt#gaADb
z4nzlD;gBhsOMub<^8UsG#h|pHv<Z+)23No~HeA|JI*{9NfZoJ0v5RZKlt<g~4h5#;
zCKrw`EduxW%Eo(nr#e_-6HQigZ58=7!}Hb;Bwb~abCng<Xs+r?yJjl!wJ*7pMcW8!
zQ~T{j$)`$cd&ZRxn`J$DTkv;MJ2HFA1zjm|v@iHiOD<LF$Vril5NAb<<_{2i`1kko
zSI@`aVHa{-7FqM|>G*6looAvx6RoK}ewkgYPMTR&$obebGB&4-7Ax&_T}D_(k^$Cd
z`)tS}CiXF!(uL@uc5NI6)vwXHhbp^66)__uEx2NYCj$4Y1qOE)N+g#H2;Y?j2)gnK
zQOqM4&861S(G~$g2Vc8rv{TBqNdnQwz`!PUXxh%IN(Ze#I!!KCBA~hOju6yr;)q?^
zv_&lS@=RqDX>jYzd$i9{?c&)3^dyxb3?8#xCO$xaivX<*aTo+1VSE3J0MQIdggm*u
zE2VY-m>X{#SnU~>AqEa%uyNu0=5ugV0B<4?5*TB|N)*`b`s?Niu7_s*_q%n<if&50
zZW#QaP<*#AGYXKxNM;Mk+#|1yiP<P!^84f?mD$~b1BV;4rCY@F4>vxj9V3JQ3X}_K
z0W(Z*2lRf8EL=M27&Wz3N7%jAYvPr57N}p*BiAz=l-ey6ujSf4IyzbpI?W(Ol~GJG
z_}BXuhqzT3LfBuNd@BYNen`eALyGSNMCV}bg(w=Ods1aWO$z+z{H#O#_H=Hitl%Cy
zJ~I1p@6DGdpfVGrqxhIsP`_A5+gRa0+@YQiFiAc_L);m#fwjwQw#WJwjRUK1_1QyI
z)sTq<bCRJR=4IB*+L4^MLQR)SnwE6$W_pevM?n-$V*|{nZgXDAj{bC*-oMG5wt|ng
zeH(xb7zUQ~wjN~}i5OKIVw+CxU4}j-!l)tm1W#L5{8Q4PB+gUkLl)B=oY;@Oe*iat
BVJH9q

literal 0
HcmV?d00001

diff --git a/story/admin.py b/story/admin.py
new file mode 100644
index 0000000..1d8832a
--- /dev/null
+++ b/story/admin.py
@@ -0,0 +1,13 @@
+from django.contrib import admin
+from story.models import *
+
+# Register your models here.
+
+class StoryAdmin(admin.ModelAdmin):
+    list_display = ('id', 'name', 'image', 'url_path', 'store_path', 'num_views', 'description', 'created_on')
+    list_filter = ('name',)
+
+
+
+admin.site.register(Story, StoryAdmin)
+
diff --git a/story/apps.py b/story/apps.py
new file mode 100644
index 0000000..d8c9522
--- /dev/null
+++ b/story/apps.py
@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class StoryConfig(AppConfig):
+    name = 'story'
diff --git a/story/migrations/0001_initial.py b/story/migrations/0001_initial.py
new file mode 100644
index 0000000..484540f
--- /dev/null
+++ b/story/migrations/0001_initial.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.5 on 2018-05-20 07:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Story',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('store_path', models.CharField(default='', max_length=255)),
+                ('url_path', models.CharField(default='', max_length=255)),
+                ('num_views', models.IntegerField(default=0)),
+                ('description', models.TextField(blank=True, default='')),
+                ('image', models.CharField(default='', max_length=255)),
+                ('created_on', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+    ]
diff --git a/story/migrations/__init__.py b/story/migrations/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/story/migrations/__pycache__/0001_initial.cpython-34.pyc b/story/migrations/__pycache__/0001_initial.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..18fdca2e69edaf66eec0b0df42f0f68849f4b740
GIT binary patch
literal 1041
zcmZ`%O>fgM7=Du`X_Ka-d~6Ija2&l%MdE}I8gvXzV$;yZrBt%q+D+Z%qu9x|avgt$
zzvL^YUAV&qUOOw}vb28ne);j^$M4U$6McN@eE!t{_yPZY9{M}D)Bp{`zXK^i=D^Sa
z$HXqAE@TZDHX!q0=z;T|HGp~W4T~P|2F!i9#JUg6hvQywg+S1AbhpaIq+pz+qU4gM
zs^{t`6N#jyC~~EP42!9nnD*7zMP~<>3LO9rh6HjLx`q}KNYKY4eV7M^Sj_`Z<xQBk
zfMF8*o7Q3&0*ipP;S#(lHoLYBlQFOkCLNPpTP5!R>;5abrgZoA(mh*3aNKo&1@*ut
z+rZW>0SkBu7HZ>msE4+Mls3(-npM(5$4&6c9bk`8)5khISP6Hcy_{xT`^RM=mpYgV
zo-(Cf!E{WkvLF-5X~~&xFQmw*T#{41)S=>1&{TZodpbVja$G1*ERMUsi_bzYNXql1
zoL&7v`E{faoRbADXS&JwlvZh}LANTI*2yrhGIA#Pxsv!&pxcbAi4+U-wAvr1G(Xio
z9-nX>T@xZ$sTt<QIiZXl_SSTZSQdonh!7lzD&^?MgnX%JYWQK)6uBsoyp9=P@SO2{
zBDj(`$$0L--uA$ZlJra_e1jtF8BugNm{D1~@qS+NgkMMD3BM@oLT4AnIuRMK!>Cx`
ztl9zn4sr_tt@-_7@N)DCHB_Uyp!xZW(a~~(;MtKZ=6q7B(OWuRzRQzTsM*Mfw;bJ!
z`l#RUKPT6>*j_B9kGL&dY7<TD25#VmPT+1i>&_GW)z)?$_5!2Kv??on4<cRMphGsN
ic~We%u@%AI+jid&uDxfbyY;Hp^|cX98I8K`M&mCUI}r&0

literal 0
HcmV?d00001

diff --git a/story/migrations/__pycache__/__init__.cpython-34.pyc b/story/migrations/__pycache__/__init__.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..d116622f6c7fdc905b51ed96f6d9dea74120b0c0
GIT binary patch
literal 155
zcmaFI!^<Tv!5GZ|1dl-k3@`#24nSPY0whux7=kq!{Z=v*frJsnFAry{n9$<XqT-mW
z%*4EMlbC?Y<c!3k+<>C|tkmR^;uxpIq)OMk^qkD%jF{q*{G!U3+|2Z%#FEVXyyBSn
e_{_Y_lK6PNg34PQHo5sJr8%i~ARCH-m;nI&W+;>Z

literal 0
HcmV?d00001

diff --git a/story/models.py b/story/models.py
new file mode 100644
index 0000000..b0228d7
--- /dev/null
+++ b/story/models.py
@@ -0,0 +1,17 @@
+from django.db import models
+
+# Create your models here.
+
+
+class Story(models.Model):
+    name = models.CharField(max_length=255)
+    store_path = models.CharField(default='', max_length=255)
+    url_path=models.CharField(default='', max_length=255)
+    num_views = models.IntegerField(default=0)
+    description = models.TextField(default='', blank=True)
+    image = models.CharField(max_length=255, default='')
+    created_on = models.DateTimeField(auto_now_add=True)
+
+
+    def __str__(self):
+        return '%s' % self.name
diff --git a/story/tests.py b/story/tests.py
new file mode 100644
index 0000000..7ce503c
--- /dev/null
+++ b/story/tests.py
@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.
diff --git a/story/urls.py b/story/urls.py
new file mode 100644
index 0000000..7fb6d1d
--- /dev/null
+++ b/story/urls.py
@@ -0,0 +1,26 @@
+"""BabyEnglish URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/1.11/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  url(r'^$', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  url(r'^$', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.conf.urls import url, include
+    2. Add a URL to urlpatterns:  url(r'^blog/', include('blog.urls'))
+"""
+from django.conf.urls import url
+from story import views
+
+
+urlpatterns = [
+
+    url(r'list/$', views.list, name='story_list'),
+    url(r'detail/(\d+)$', views.detail, name='story_detail'),
+    url(r'top5/$', views.top5, name='story_top5'),
+
+]
diff --git a/story/views.py b/story/views.py
new file mode 100644
index 0000000..fc419fc
--- /dev/null
+++ b/story/views.py
@@ -0,0 +1,44 @@
+from django.shortcuts import render
+from django.http import HttpResponse
+from story.models import Story
+import json
+from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
+from django.core import serializers
+
+# Create your views here.
+
+def detail(request, s_id):
+    username = request.session['username']
+    story = Story.objects.get(id=s_id)
+    story.num_views= story.num_views+1
+    story.save()
+    return render(request, "story_detail.html", {'story': story, 'username':username})
+
+def top5(request):
+    username = request.session['username']
+    story = Story.objects.all().order_by('-num_views')[0:5]
+    data_s = serializers.serialize("json", story)
+    return HttpResponse(data_s)
+
+def list(request):
+    username = request.session['username']
+    storys= Story.objects.all()
+    paginator = Paginator(storys, 10)  # Show 25 contacts per page
+
+    page_num = request.GET.get('page')
+    try:
+        items = paginator.page(page_num)
+    except PageNotAnInteger:
+        # If page is not an integer, deliver first page.
+        items = paginator.page(1)
+    except EmptyPage:
+        # If page is out of range (e.g. 9999), deliver last page of results.
+        items = paginator.page(paginator.num_pages)
+
+    print("storys", storys)
+
+    print("items", items)
+    print(items.start_index(),'---',items.end_index())
+    start = items.start_index()-1
+    end = items.end_index()-1
+    return render(request, "story_list.html",{'storys': storys[start:end+1], 'items':items, 'username':username})
\ No newline at end of file
diff --git a/templates/detail.html b/templates/detail.html
index acfb7ec..a96d80a 100644
--- a/templates/detail.html
+++ b/templates/detail.html
@@ -1,4 +1,3 @@
-{% load static %} 
 <!DOCTYPE html>
 <html lang="en">
 
@@ -13,9 +12,9 @@
     <meta name="HandheldFriendly" content="True">
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <link rel="shortcut icon" href="/assets/icons/favicon.ico">
-    <link rel="stylesheet" href="/static/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/static/css/font-awesome.min.css">
-    <link rel="stylesheet" href="/static/css/vs.css">
+    <link rel="stylesheet" href="http://cdn.bootcss.com/bootstrap/3.3.4/css/bootstrap.min.css">
+    <link rel="stylesheet" href="http://cdn.bootcss.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="http://cdn.bootcss.com/highlight.js/9.0.0/styles/vs.min.css">
     <link rel="stylesheet" type="text/css" href="/assets/css/screen.min.css?1508333069353">
     <script src="https://pagead2.googlesyndication.com/pub-config/r20160913/ca-pub-5399482037315154.js"></script>
     <script>var _hmt = _hmt || [];</script>
@@ -27,11 +26,11 @@
             src="https://adservice.google.com/adsid/integrator.js?domain=www.golaravel.com"></script>
     <link rel="prefetch" href="https://securepubads.g.doubleclick.net/static/3p_cookie.html">
      <link rel="prefetch" href="https://securepubads.g.doubleclick.net/static/3p_cookie.html">
-     <link rel="stylesheet" href="{%static "css/detail.css" %}"/>
-    <link rel="stylesheet" href="{%static "css/video-js.css" %}"/>
+     <link rel="stylesheet" href="/static/css/detail.css" />
+    <link rel="stylesheet" href="/static/css/video-js.css" />
     <style id="fit-vids-style">
     </style>
-    <script src="{%static "js/jquery-1.11.1.min.js" %}"></script>
+    <script src="/static/js/jquery-1.11.1.min.js"></script>
 
 
 
@@ -60,19 +59,24 @@
                                 </div>
                                 <div class="outer">
                                     <span class="video_id" id={{ video.id }} style="display:none"> </span>
-									<span type='text' class="video_id" id='vfile' style="display:none">{{video.store_path}}</span>
-									
-									{% comment %}
-									
-                                    <video  id="my_video" class=" "  controls preload="none" controls="controls" width="700" height="500" poster="/static/img/gogo2.png" data-setup="{}" >
-                                        <source src="/static/{{ video.store_path}}"  type="video/mp4" >
-                                    </video>
-									
-									{% endcomment%}	
-								  <div id="video1" style="width:700px;height:500px;display:inline-block;float:left" class=""><img        src="/static/img/gogo2.png"/>
-									</div>;
-
-													
+                                    <span type='text' class="video_id" id='vfile' style="display:none">{{video.store_path}}</span>
+
+          {% comment %}                         <video  id="my_video" class=" "  controls preload="none" controls="controls" width="700" height="500" poster="/static/img/gogo2.png" data-setup="{}" >#}
+                                     <source src="/static/{{ video.store_path}}"  type="video/flv"
+                                     </video>{% endcomment %}
+
+
+{#                                       <embed style="display:inline-block;float:left" src="/static/{{ video.store_path }}" allowFullScreen='true' quality='high' width='700' height='500' align='middle' allowScriptAccess='always' type='application/x-shockwave-flash'></embed>#}
+
+
+
+
+                                       <div id="video1" style="width:700px;height:500px;display:inline-block;float:left" class=""><img
+                                                    src="/static/img/gogo2.png"/></div>;
+
+
+
+
                                     <div class="rightside">
                                        <div class="nano has-scrollbar">
                                             <div class="nano-content" tabindex="0" style="right: -17px;">
@@ -80,7 +84,7 @@ <h2>{{ video.e_name }}</h2>
                                                 <ul>
                                                     {% for video in videoList %}
                                                     <li data-id="15869">
-                                                         <a href="{{ video.store_path }}"><i class=""><em class="icon-full"></em></i><em class="icon-video"></em>{{ video.filename }}</a>
+                                                         <a href="{{ video.url_path }}"><i class=""><em class="icon-full"></em></i><em class="icon-video"></em>{{ video.filename }}</a>
                                                     </li>
                                                     {% endfor %}
 
@@ -131,10 +135,10 @@ <h2>{{ video.e_name }}</h2>
                     <div class="course-left">
                         <ul class="course-menu course-video-menu clearfix js-course-menu" data-ower="all"
                             data-sort="last" style="position: absolute; left: 0px;">
-                            <li class="course-menu-item"><a class="" href="javascript:void(0)" id="plMenu">评论</a></li>
-                            <li class="course-menu-item"><a href="javascript:void(0)" id="qaMenu">问答</a></li>
+                            <li class="course-menu-item"><a href="javascript:void(0)" id="plMenu" class="active">评论</a></li>
+{#                            <li class="course-menu-item"><a href="javascript:void(0)" id="qaMenu">问答</a></li>#}
                             <li class="course-menu-item"><a href="javascript:void(0)" id="noteMenu"
-                                                            class="active">笔记</a></li>
+                                                            >笔记</a></li>
                             <!--
                             <li class="course-menu-item"><a href="javascript:void(0)" id="wikiMenu">WIKI</a></li>
                             -->
@@ -342,6 +346,8 @@ <h2>{{ video.e_name }}</h2>
                  $("#note-content").hide();
                  $(".moco-modal-layer").hide();
                   $(".nano-content").hide();
+                 $("#pl-content").show();
+                $("#note-content").hide();
 
 
            });
@@ -350,6 +356,7 @@ <h2>{{ video.e_name }}</h2>
            $("#noteMenu").click(function () {
 
                $("#pl-content").hide();
+                 $("#plMenu").removeClass("active")
                 $("#note-content").show();
 
 //                $(this).next().removeClass("hide");
@@ -360,6 +367,7 @@ <h2>{{ video.e_name }}</h2>
 
                 $("#pl-content").show();
                 $("#note-content").hide();
+                  $("#noteMenu").removeClass("active")
              });
 
 
@@ -451,18 +459,42 @@ <h2>{{ video.e_name }}</h2>
 
 <script type="text/javascript"  charset="utf-8" >
 
+
 function playVedio( vfile){
+
 var flashvars={
         f:vfile,
         c:0,
         b:1,
           h:4
+
     };
     var params={bgcolor:'#FFF',allowFullScreen:true,allowScriptAccess:'always',wmode:'transparent'};
     CKobject.embedSWF('/static/ckplayer/ckplayer/ckplayer.swf','video1','ckplayer_a1','100%','100%',flashvars,params);
 
 }
 
+   /*
+    var flashvars={
+
+
+        c:0,
+        b:1,
+          h:4,
+         i: 'http://www.ckplayer.com/static/images/cqdw.jpg'
+
+    };
+     var video = [''];
+
+
+
+      var support = ['all'];
+    CKobject.embedHTML5('video1', 'ckplayer_a1', '100%', '100%', video, flashvars, support);
+}
+*/
+
+
+
 
 $(document).ready(function(){
      vfile = '/static/'+$('#vfile').text();
@@ -471,8 +503,8 @@ <h2>{{ video.e_name }}</h2>
     }
 )
 
-      
-  </script>
+
+</script>
 
 </body>
 </html>
diff --git a/templates/header.html b/templates/header.html
index 1842582..aa6a73e 100644
--- a/templates/header.html
+++ b/templates/header.html
@@ -1,92 +1,97 @@
 <header class="main-header"
         style="background-image: url(http://image.golaravel.com/5/c9/44e1c4e50d55159c65da6a41bc07e.jpg)">
-    <div class="container">
+  {% comment %}  <div class="container">
         <div class="row">
             <div class="col-xs-12"><h1><span class="hide"></span>Baby English</h1>
                 <h2 class="hide"></h2><img
                         src="http://image.golaravel.com/e/b0/4e4bd788405aab87f03d26edc4ab4.png" alt="Laravel"
-                        class="hide"></div>
-            <div class="col-xs-12 hidden-xs hidden-sm">
-                <a href="https://docs.golaravel.com/docs/5.4/"
-                   class="btn btn-default btn-doc" target="_blank">5.4 中文文档</a>
-                <a href="https://docs.golaravel.com/docs/5.3/" class="btn btn-default btn-doc" target="_blank">5.3
-                    中文文档</a>
-                <a href="https://docs.golaravel.com/docs/5.2/" class="btn btn-default btn-doc"
-                   target="_blank">5.2 中文文档</a>
-                <a href="https://docs.golaravel.com/docs/5.1/"
-                   class="btn btn-default btn-doc" target="_blank">5.1
-                    中文文档</a>
-                <a href="https://docs.golaravel.com/docs/5.0/" class="btn btn-default btn-doc"
-                   target="_blank">5.0 中文文档</a>
-                <a href="https://docs.golaravel.com/docs/4.2/"
-                   class="btn btn-default btn-doc" target="_blank">4.2
-                    中文文档</a>
-                <a href="https://docs.golaravel.com/docs/4.1/" class="btn btn-default btn-doc"
-                   target="_blank">4.1 中文文档</a>
-                <a href="https://docs.golaravel.com/docs/4.0/"
-                   class="btn btn-default btn-doc" target="_blank">4.0
-                    中文文档</a>
-                <a href="https://lumen.golaravel.com/docs/" class="btn btn-default btn-doc"
-                   target="_blank">Lumen 中文文档</a></div>
+                        class="hide">
+            </div>
         </div>
-    </div>
+
+    </div>{% endcomment %}
+     <link rel="stylesheet" href="/static/css/header.css" />
+     <script src="/static/js/jquery-1.11.1.min.js"></script>
 </header>
 
 <nav class="main-navigation">
     <div class="container">
         <div class="row">
             <div class="col-sm-12">
-                <div class="navbar-header"><span class="nav-toggle-button collapsed" data-toggle="collapse"
-                                                 data-target="#main-menu"><span class="sr-only">Toggle navigation</span> <i
-                        class="fa fa-bars"></i></span></div>
+               {% comment %} <div class="navbar-header"><span class="nav-toggle-button collapsed" data-toggle="collapse"
+                                                 data-target="#main-menu"><span class="sr-only">Toggle navigation</span> </span></div>{% endcomment %}
                 <li class="collapse navbar-collapse" id="main-menu">
                     <ul class="menu">
-                        <li role="presentation" style="font-weight: bold"><a href="/" title="首页">首页</a></li>
-                        <li role="presentation" style="font-weight: bold"><a href="" title="学习视频"
+                        <li role="presentation" style="font-weight: bold;float:left"><a href="{% url 'index_user' username  %}" id="ai-logopl-alink" title="首页">首页</a></li>
+                        <li role="presentation" style="font-weight: bold;float:left"><a href="" id="ai-logopl-alink"title="学习视频"
                                                    target="_blank"
                                                    onclick="">学习视频
                             </a></li>
-                        <li role="presentation" style="font-weight: bold"><a href=""
-                                                                             title="看图说话" target="_blank"
-                                                                             onclick="">看图说话
+                        <li role="presentation" style="font-weight: bold;float:left"><a href="{% url 'story_list' %}" id="ai-logopl-alink"
+                                                                             title="英语故事" target="_blank"
+                                                                             onclick="">英语故事
                             </a></li>
-                        <li role="presentation" style="font-weight: bold"><a href="" title=""
+                        <li role="presentation" style="font-weight: bold"><a href="" id="ai-logopl-alink" title=""
                                                    target="_blank"
                                                    onclick="">
                             </a></li>
-                        <li role="presentation" style="font-weight: bold"><a href="" title="" target="_blank"
+                        <li role="presentation" style="font-weight: bold"><a href="" id="ai-logopl-alink" title="" target="_blank"
                                                    onclick="">
                             </a></li>
-                        <li role="presentation" style="font-weight: bold"><a href="" title="我们"
+                        {% if  username %}
+                           <div  class="personal">
+                           <li >
+                             <a href="javascript:void(0)" class="reg-btn-a" id="reg-link-a" style="font-weight: bold">{{ username }}</a>
+                             </li>
+                           <div class="userdetail">
+                            	<dl>
+	                                <dt><img width="80" height="80" src=""/></dt>
+	                                <dd>
+	                                    <h2>{{ user.nick_name }}</h2>
+	                                    <p>{{ user.username }}</p>
+                                         <p>{{ user.id }}</p>
+	                                </dd>
+                                </dl>
+                                <div class="btn">
+                               <a class="personcenter fl" href="{% url 'users:userinfo' %}">进入个人中心</a>
+	                                <a class="fr" href="{% url 'logout' %}">退出</a>
+                                </div>
+                            </div>
+                           </div>
+
+
+
+                       {% else %}
+                          <li style="float:right">
+                                <a href="/login/" class="login-btn-a" id="login-link-a" style="font-weight: bold;">登录</a>
+                           </li>
+
+                            <li style="float:right">
+                                <a href="/register/" class="reg-btn-a" id="reg-link-a" style="font-weight: bold;">注册</a>
+                            </li>
+                        {% endif %}
+
+                        <li role="presentation" style="font-weight: bold;float:right"><a href="" id="ai-logopl-alink" title="我们"
                                                    target="_blank"
                                                    onclick="">
                             我们</a></li>
-                        <li role="presentation" style="font-weight: bold"><a href="" title="问答社区" target="_blank"
+                        <li role="presentation" style="font-weight: bold;float:right"><a href="" id="ai-logopl-alink" title="问答社区" target="_blank"
                                                    onclick="">问答社区</a>
                         </li>
 
-                         <li role="presentation" style="font-weight: bold;display: none">
-                             <a href="/logout/" class="exit" title="退出登录" onclick="">退出登录</a>
-                        </li>
-                       {% if  username %}
-                           <li>
-                             <a href="javascript:void(0)" class="reg-btn-a" id="reg-link-a" style="font-weight: bold">{{ username }}</a>
-                           </li>
-                            <li>
-                                <a href="/logout/" class="logout-btn-a" id="logout-link-a" style="font-weight: bold">退出登录</a>
-                           </li>
-                       {% else %}
-                          <li>
-                                <a href="/login/" class="login-btn-a" id="login-link-a" style="font-weight: bold">登录</a>
-                           </li>
 
-                            <li>
-                                <a href="/register/" class="reg-btn-a" id="reg-link-a" style="font-weight: bold">注册</a>
-                            </li>
-                        {% endif %}
+
                     </ul>
                 </div>
             </div>
         </div>
     </div>
-</nav>
\ No newline at end of file
+</nav>
+<script>
+   //顶部个人中心下拉框
+    $('.personal').hover(function(){
+        $('.userdetail').stop(true).show();
+    },function(){
+        $('.userdetail').stop(true).hide();
+    });
+</script>
\ No newline at end of file
diff --git a/templates/index.html b/templates/index.html
index c5757aa..eaf9580 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -13,8 +13,8 @@
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <link rel="shortcut icon" href="/assets/icons/favicon.ico">
     <link rel="stylesheet" href="/static/css/bootstrap.min.css">
-    <link rel="stylesheet" href="/static/css/font-awesome.min.css">
-    <link rel="stylesheet" href="/static/css/vs.css">
+    <link rel="stylesheet" href="http://cdn.bootcss.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="http://cdn.bootcss.com/highlight.js/9.0.0/styles/vs.min.css">
     <link rel="stylesheet" type="text/css" href="/assets/css/screen.min.css?1508333069353">
     <script src="https://pagead2.googlesyndication.com/pub-config/r20160913/ca-pub-5399482037315154.js"></script>
     <script>var _hmt = _hmt || [];</script>
@@ -42,19 +42,24 @@
             <main class="col-md-8 main-content">
                   {%  for v in videos %}
                 <article class="post">
-                     <div class="featured-media"><a href="/video/detail/{{v.store_path}}">
+                     <div class="featured-media"><a id='yy' href="/video/detail/{{v.store_path}}">
 
+                        {% comment %}
                         <video src="/static/{{v.store_path}}" controls="controls" width="200" height="100" >
                         your browser does not support the video tag
                         </video>
-
+                        {% endcomment %}
+                         <div>
+{#                         <embed id='embed' src="{{ v.url_path }}"  allowFullScreen="true" wmode="transparent " ShowTracker="false" quality='low' width='200' height='100' align='top' allowScriptAccess='always' type='application/x-shockwave-flash'></embed>#}
+                             <image src="{{ v.image_path }}" width='200' height='100'></image>
+                         </div>
                     </a></div>
                      <div class ="post-rightbar">
                         <div class="post-head"><h1 class="post-title"><a
                                 href=""></a></h1>
                             <div class="post-meta"><span class="author">名称:{{v.filename}} <a href=""
-                                                                              target="_blank"></a></span> •
-                                <time class="post-date" datetime="2017年02月20日" title="2017年02月20日">2017年02月20日</time>
+                                                                              target="_blank"></a></span>
+
                             </div>
                         </div>
 
@@ -92,15 +97,28 @@
                                                      onclick=""> Go Go学英语
                         </a></div>
                 </div>
-                <div class="widget"><h4 class="title">本月热门</h4>
-                    <a href=""     class="btn btn-default btn-block" target="_blank"> Go Go学英语</a>
+                <div class="widget"><h4 class="title">本月热门英语故事</h4>
+                    <a href="" id="top1" class="btn btn-default btn-block" target="_blank"></a>
+
+                    <a href=""  id="top2" class="btn btn-default btn-block"  target="_blank"></a>
+                    <a href=""  id="top3" class="btn btn-default btn-block" target="_blank"></a>
+
+                    <a href=""  id="top4" class="btn btn-default btn-block"  target="_blank"></a>
+
+                    <a href=""   id="top5" class="btn btn-default btn-block" target="_blank"> </a>
+
+
+
+                </div>
+                <div class="widget"><h4 class="title">本月热门视频</h4>
+                    <a href="" id="v_top1" class="btn btn-default btn-block" target="_blank"></a>
 
-                    <a href="" class="btn btn-default btn-block"  target="_blank">培生幼儿英语</a>
-                    <a href="" class="btn btn-default btn-block" target="_blank">巧虎</a>
+                    <a href=""  id="v_top2" class="btn btn-default btn-block"  target="_blank"></a>
+                    <a href=""  id="v_top3" class="btn btn-default btn-block" target="_blank"></a>
 
-                    <a href="" class="btn btn-default btn-block"  target="_blank">朵拉</a>
+                    <a href=""  id="v_top4" class="btn btn-default btn-block"  target="_blank"></a>
 
-                    <a href=""  class="btn btn-default btn-block" target="_blank"> </a>
+                    <a href=""   id="v_top5" class="btn btn-default btn-block" target="_blank"> </a>
 
 
 
@@ -113,7 +131,7 @@
 {% for item in items %}
     {# Each "contact" is a Contact model object. #}
     {{ item.full_name|upper }}<br />
-    ...
+
 {% endfor %}
 
 <div class="pagination">
@@ -134,7 +152,7 @@
 
 
 <div class="body-register" style="border-radius:0 0 5px 0;">
-    <div class="step-box"><span class="step step-1 step-active">1 填写手机号</span><span> &gt; </span><span
+    <div style="display:none" class="step-box"><span class="step step-1 step-active">1 填写手机号</span><span> &gt; </span><span
             class="step         step-2">2 填写基本资料</span></div>
 
     <div class="box-register" style="display:none;">
@@ -223,6 +241,35 @@
 
     );
 
+
+    $(document).ready(function(){
+
+  $.get("/story/top5/",function(data_s,status){
+    alert("Data: " + data_s + "\nStatus: " + status);
+    data = JSON.parse(data_s)
+    $('#top1').text(data[0].fields["name"])
+      $('#top2').text(data[1].fields["name"])
+           $('#top3').text(data[2].fields["name"])
+           $('#top4').text(data[3].fields["name"])
+           $('#top5').text(data[4].fields["name"])
+  });
+
+  $.get("/video/top5/",function(data_v,status){
+    alert("Data: " + data_v + "\nStatus: " + status);
+    data = JSON.parse(data_v)
+    $('#v_top1').text(data[0].fields["filename"])
+      $('#v_top2').text(data[1].fields["filename"])
+           $('#v_top3').text(data[2].fields["filename"])
+           $('#v_top4').text(data[3].fields["filename"])
+           $('#v_top5').text(data[4].fields["filename"])
+  });
+});
+
+    //taga=document.getElementById('yy')
+    //taga.addEventListener("click", alertName, true);
+
+
+
 </script>
 </body>
 </html>
diff --git a/templates/list.html b/templates/list.html
new file mode 100644
index 0000000..377909e
--- /dev/null
+++ b/templates/list.html
@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html lang="en">
+
+
+<html lang="zh-CN">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Laravel-简洁、优雅的PHP开发框架(PHP Web Framework)。- Laravel中文网（Laravel中国社区）</title>
+    <meta name="description" content="Laravel是一套简洁、优雅的PHP Web开发框架(PHP Web Framework) -- Laravel中文网">
+    <meta name="keywords" content="Laravel中文社区,php框架,laravel中文网,php framework,restful routing,laravel,laravel php">
+    <meta name="HandheldFriendly" content="True">
+    <meta name="viewport" content="width=device-width,initial-scale=1">
+    <link rel="shortcut icon" href="/assets/icons/favicon.ico">
+    <link rel="stylesheet" href="http://cdn.bootcss.com/bootstrap/3.3.4/css/bootstrap.min.css">
+    <link rel="stylesheet" href="http://cdn.bootcss.com/font-awesome/4.3.0/css/font-awesome.min.css">
+    <link rel="stylesheet" href="http://cdn.bootcss.com/highlight.js/9.0.0/styles/vs.min.css">
+    <link rel="stylesheet" type="text/css" href="/assets/css/screen.min.css?1508333069353">
+    <script src="https://pagead2.googlesyndication.com/pub-config/r20160913/ca-pub-5399482037315154.js"></script>
+    <script>var _hmt = _hmt || [];</script>
+    <script src="/static/js/jquery-1.11.1.min.js"></script>
+    <link rel="preload" href="https://adservice.google.com.hk/adsid/integrator.js?domain=www.golaravel.com" as="script">
+    <script type="text/javascript"
+            src="https://adservice.google.com.hk/adsid/integrator.js?domain=www.golaravel.com"></script>
+    <link rel="preload" href="https://adservice.google.com/adsid/integrator.js?domain=www.golaravel.com" as="script">
+    <script type="text/javascript"
+            src="https://adservice.google.com/adsid/integrator.js?domain=www.golaravel.com"></script>
+    <link rel="prefetch" href="https://securepubads.g.doubleclick.net/static/3p_cookie.html">
+
+    <link rel="stylesheet" href="/static/css/index.css" />
+</head>
+<body class="home-template">
+
+{% include 'header.html' %}
+
+<div class="content">
+    <div class="container">
+        <div class="col-md-12 horiz-img-region clearfix gw_contair">
+
+                {% for video in videos  %}
+
+                <li class="horiz-img-item animated" style="animation-delay: 1s;">
+                    <div class="thumbnail">
+                        <img src="{{ video.image_path }}">
+                        <div class="caption">
+                            <h3>{{video.filename}}</h3>
+                            <p>{{video.description}}</p>
+                        </div>
+                    </div>
+                </li>
+
+             {% endfor %}
+        </div>
+    </div>
+
+
+        <input type="hidden" name="csrfmiddlewaretoken" value="UK4mBswSKeDDMxP5nAfD3MsRMKNnGQpOpQsNPjXabY3TJfLprPDcQo8UVlKrcfOn">
+        <div class="gw_zz" style="display: none;">
+            <h3></h3>
+            <p class="gw_qq"></p>
+            <p class="gw_secret"></p>
+            <img src="" alt="">
+        </div>
+
+    </div>
+
+
+{% for item in items %}
+    {# Each "contact" is a Contact model object. #}
+    {{ item.full_name|upper }}<br />
+    ...
+{% endfor %}
+
+<div class="pagination">
+    <span class="step-links">
+        {% if items.has_previous %}
+            <a href="?page={{ items.previous_page_number }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ items.number }} of {{ items.paginator.num_pages }}.
+        </span>
+
+        {% if items.has_next %}
+            <a href="?page={{ items.next_page_number }}">next</a>
+        {% endif %}
+    </span>
+</div>
+
+
+<div class="body-register" style="border-radius:0 0 5px 0;">
+    <div class="step-box"><span class="step step-1 step-active">1 填写手机号</span><span> &gt; </span><span
+            class="step         step-2">2 填写基本资料</span></div>
+
+    <div class="box-register" style="display:none;">
+        <div class="err-msg"></div>
+
+        <div class="pr"><input type="text" placeholder="用户名" class="username"></div>
+        <div class="pr"><input type="password" placeholder="确认码" class="rgcode"></div>
+        <div class="pr"><input type="password" placeholder="密码" class="rgpwd"></div>
+
+        <div>
+            <div class="btn btn-register pub-icons pub-btn pub-btn-valid"><span>下一步</span><span
+                    style="display:none;"><img src="/images/loading.gif">正在注册</span></div>
+        </div>
+    </div>
+
+    <div class="box-register-detail" style="display:none;">
+        <div class="err-msg"></div>
+        <div class="pr"><input type="text" placeholder="昵称（10个汉字以内）" maxlength="10" class="nick"></div>
+        <div class="pr"><input type="radio" name="rgsex" class="sex" value="false" checked="">女 <input type="radio"
+                                                                                                       name="rgsex"
+                                                                                                       class="sex"
+                                                                                                       value="true">男
+        </div>
+
+
+
+        <div class="box-rgcity">
+            <select class="rgpro" style="width:49%;">
+                <option value="">请选择</option>
+                <option value="北京">北京</option>
+                <option value="天津">天津</option>
+                <option value="河北">河北</option>
+                <option value="山西">山西</option>
+                <option value="内蒙古">内蒙古</option>
+                <option value="辽宁">辽宁</option>
+                <option value="吉林">吉林</option>
+                <option value="黑龙江">黑龙江</option>
+                <option value="上海">上海</option>
+                <option value="江苏">江苏</option>
+                <option value="浙江">浙江</option>
+                <option value="安徽">安徽</option>
+                <option value="福建">福建</option>
+                <option value="江西">江西</option>
+                <option value="山东">山东</option>
+                <option value="河南">河南</option>
+                <option value="湖北">湖北</option>
+                <option value="湖南">湖南</option>
+                <option value="广东">广东</option>
+                <option value="广西">广西</option>
+                <option value="海南">海南</option>
+                <option value="重庆">重庆</option>
+                <option value="四川">四川</option>
+                <option value="贵州">贵州</option>
+                <option value="云南">云南</option>
+                <option value="西藏">西藏</option>
+                <option value="陕西">陕西</option>
+                <option value="甘肃">甘肃</option>
+                <option value="青海">青海</option>
+                <option value="宁夏">宁夏</option>
+                <option value="新疆">新疆</option>
+                <option value="香港">香港</option>
+                <option value="澳门">澳门</option>
+                <option value="台湾">台湾</option>
+            </select>
+            <select class="rgcity" style="width:49%;">
+                <option value="">请选择</option>
+            </select>
+        </div>
+
+        <div class="pr"><textarea placeholder="签名档（100个汉字以内）" maxlength="100" class="sign"></textarea></div>
+
+        <div>
+            <div class="btn btn-accomplish pub-icons pub-btn pub-btn-valid"><span>提交资料</span><span
+                    style="display:none;"><img src="/images/loading.gif">正在提交</span></div>
+        </div>
+    </div>
+</div>
+
+<script>
+
+    $(".reg-btn-a").click(function () {
+
+                $(".box-register").show();
+
+             }
+
+    );
+
+    //taga=document.getElementById('yy')
+    //taga.addEventListener("click", alertName, true);
+
+
+
+</script>
+</body>
+</html>
diff --git a/templates/login.html b/templates/login.html
index 786607a..94a9e94 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -3,11 +3,11 @@
 <head>
 <meta charset="utf-8">
 <title>登录</title>
-<!--<link href="css/bootstrap.css" rel="stylesheet">-->
-<link href="css/main.css" rel="stylesheet">
+<!--<link href="/static/css/bootstrap.css" rel="stylesheet">-->
+<link href="/static/css/main.css" rel="stylesheet">
 <meta name="viewport" content="width=device-wdith,initial-scale=1.0">
 <link rel="shortcut icon" href="http://www.10086.cn/favicon.ico" type="images/x-icon" />
-<link rel="stylesheet" href="/static/css/bootstrap.min.css">
+<link rel="stylesheet" href="http://cdn.bootcss.com/bootstrap/3.3.4/css/bootstrap.min.css">
 <!--[if lt IE 9]>
 	<script src="http://html5shim.googlecode.com/svn/trunk/html5js"></script>
 <![endif]-->
@@ -57,14 +57,14 @@
     </div>
     <div class="row">
       <div class="col-md-3 col-md-offset-4">
-        <button type="submit" class="btn btn-success btn-block">
+        <button type="submit" class="btn btn-warning btn-block">
             <span>登录</span>
         </button>
       </div>
     </div>
   </form>
 </div>
-<script src="js/bootstrap.js"></script> 
-<script src="js/jquery-1.11.1.min.js"></script>
+<script src="/static/js/bootstrap.js"></script> 
+<script src="/static/js/jquery-1.11.1.min.js"></script>
 </body>
 </html>
diff --git a/templates/password_reset.html b/templates/password_reset.html
new file mode 100644
index 0000000..782e3a4
--- /dev/null
+++ b/templates/password_reset.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+   <title>密码修改</title>
+    <link rel="stylesheet" href="/static/css/password_reset.css"/>
+</head>
+<body>
+<div class="wp">
+    <div class="resetpassword" id="resetPwdForm">
+        <h1>修改密码</h1>
+        <p>已经通过验证，请设置新密码</p>
+        <form id="reset_password_form" action="{% url 'users:updatepwd' %}" method="post">
+            <ul>
+                <li>
+                    <span class="">新 密 码 ：</span>
+                    <input type="password" name="password1" id="pwd" placeholder="6-20位非中文字符">
+                    <i></i>
+                </li>
+                <li>
+                    <input type="hidden" name="active_code" value="{{ active_code }}">
+                    <span class="">确定密码：</span>
+                    <input type="password" name="password2" id="repwd" placeholder="6-20位非中文字符">
+                    <i></i>
+                </li>
+                <li class="button">
+                    <input type="submit" value="提交" >
+                </li>
+            </ul>
+            {% csrf_token %}
+        </form>
+    </div>
+    <div class="resetpassword" id="reset_password_tips" style="display:none;">
+        <h1>修改密码成功,请重新登录</h1>
+        <img class="fl" src="">
+        <p class="successword">已经成功修改密码，请重新登录</p>
+    </div>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/register.html b/templates/register.html
index f659f9b..adcbdbb 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -7,7 +7,7 @@
 <style>
 
     .body-register {
-        border-left: 1px dotted #808080;
+{#        border-left: 1px dotted #808080;#}
         margin: 0 auto;
     }
 
@@ -24,8 +24,28 @@
 }
   .pr{
       margin-bottom: 20px;
+      width: 300px;
+  }
+  .pr .nick{
+      width: 300px;
+  }
+  .pr .username{
+      width: 300px;
   }
 
+  .pr .rgpwd{
+      width: 300px;
+  }
+  .pr .email{
+      width: 300px;
+  }
+  .pr .rgcode{
+      width: 300px;
+  }
+    .pr .sign{
+      width: 300px;
+        height: 100px;
+  }
     * {
         margin: 0;
         padding: 0;
@@ -40,7 +60,7 @@
 
     <div class="box-register-detail " >
         <form action="/register/" method="post">
-                <div class="err-msg"></div>
+                <div class="err-msg" style="color: red">{{ error }}</div>
 
                 <p class="pr">  注册 </p>
                 <div class="pr"><input type="text" placeholder="用户名" class="username" name="username"></div>
@@ -50,7 +70,7 @@
 
 
                 <div class="pr"><input type="text" placeholder="昵称（10个汉字以内）" maxlength="10" class="nick" name="nickname"></div>
-                    <div class="pr"><input type="text" placeholder="邮箱" maxlength="10" class="" name="email"></div>
+                    <div class="pr"><input type="text" placeholder="邮箱" maxlength="30" class="email" name="email"></div>
                 <div class="pr"><input type="radio" name="sex" class="sex" value="false" checked="">女 <input type="radio"
                                                                                                                name="sex"
                                                                                                                class="sex"
@@ -99,7 +119,9 @@
                     </select>
 
                 </div>
+                <div class="pr"><input type="text" placeholder="地址" class="address" name="address"></div>
 
+                <div class="pr"><input type="text" placeholder="手机号码" class="mobile" name="mobile"></div>
                 <div class="pr"><textarea placeholder="签名档（100个汉字以内）" maxlength="100" class="sign"></textarea></div>
 
                 <div  class="pr">
diff --git a/templates/story_detail.html b/templates/story_detail.html
new file mode 100644
index 0000000..19405ff
--- /dev/null
+++ b/templates/story_detail.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+     <link rel="stylesheet" href="/static/css/story_list.css"/>
+    <link rel="stylesheet" href="/static/css/index.css"/>
+</head>
+<body>
+{% include 'header.html' %}
+<div id="flashdiv_flashgame" style="margin: 0 auto; width: 670px;height: 480px;">
+    <embed allownetworking="internal" allowscriptaccess="never" type="application/x-shockwave-flash" src="{{ story.url_path }}" width="670" height="480" style="undefined" id="flashgame" name="flashgame" quality="high" menu="false" allowfullscreen="false" flashvars="load22=0" wmode="Opaque windowless" base=".">
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/story_list.html b/templates/story_list.html
new file mode 100644
index 0000000..041370a
--- /dev/null
+++ b/templates/story_list.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="/static/css/story_list.css"/>
+    <link rel="stylesheet" href="/static/css/index.css"/>
+</head>
+<body>
+{% include 'header.html' %}
+<div class="nlist_nr"><!--3-->
+				<form id="qx" target="_self" method="post">
+										<div class="list_right_nr1">
+					<ul class="flashul">
+
+                        {% for story in storys %}
+                        <li>
+                            <a style="margin-bottom: 0px;padding-bottom: 0px" target="_blank" href="{% url 'story_detail' story.id %}">
+						<img src="{{ story.image }}" class="sortimg" alt="{{ story.name }}">
+                                <br>{{ story.name }}
+						</a>
+                        <div style="border-radius:5px  ;margin-top:-7px;border: 1px solid #f4645f; background: #f4645f; color: #fff;line-height:20px;width:70px;height: 20px">浏览：{{ story.num_views }}</div>
+                        </li>
+                        {% endfor %}
+
+                    </ul>
+					</div>
+									</form>
+
+                    <div class="pagination">
+                        <span class="step-links">
+                            {% if items.has_previous %}
+                                <a href="?page={{ items.previous_page_number }}">previous</a>
+                            {% endif %}
+
+                            <span class="current">
+                                Page {{ items.number }} of {{ items.paginator.num_pages }}.
+                            </span>
+
+                            {% if items.has_next %}
+                                <a href="?page={{ items.next_page_number }}">next</a>
+                            {% endif %}
+                        </span>
+                    </div>
+
+				<div class="pagecontent" style="float:right;margin:6px 0px 0 0px;">
+				  				  <span class="pg">
+				  				  					<b>1</b>
+									  					<a href="/kj_yy_p2.html">2</a>				  					<a href="/kj_yy_p3.html">3</a>				  					<a href="/kj_yy_p4.html">4</a>				  				  				  <span class="pge">...</span>
+				  <a href="/kj_yy_p11.html">11</a>
+				  </span>
+				  				  <span class="pgnext"><a href="/kj_yy_p2.html">下一页</a></span>
+				  				  <span class="total">共488集</span>
+				</div>
+				</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/user_info.html b/templates/user_info.html
new file mode 100644
index 0000000..d02146e
--- /dev/null
+++ b/templates/user_info.html
@@ -0,0 +1,95 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+    <link rel="stylesheet" href="/static/css/user_info.css"/>
+</head>
+<body>
+
+
+        <section>
+        <div class="wp">
+            <ul  class="crumbs">
+                <li><a href="{% url 'index_user' user.username %}">首页</a>></li>
+                <li><a href="{% url 'users:userinfo' %}">个人中心</a>></li>
+                <li>个人信息</li>
+            </ul>
+        </div>
+        </section>
+
+
+   <section>
+   <div class="wp list personal_list">
+	<div class="left">
+        <ul>
+            <li {% ifequal  '/users/info/' request.path %}
+            class="active2"
+            {% endifequal %}><a href="{% url 'users:userinfo' %}">个人资料</a></li>
+
+
+
+            </li>
+        </ul>
+	</div>
+
+
+        <div class="right">
+		<div class="personal_des ">
+			<div class="head" style="border:1px solid #eaeaea;">
+                <h1>个人信息</h1><span style="margin-left:30px">{{ status }}</span>
+			</div>
+			<div class="inforcon">
+				<div class="left" style="width:242px;">
+                    <iframe id='frameFile' name='frameFile' style='display: none;'></iframe>
+                    <form class="clearfix" id="jsAvatarForm" enctype="multipart/form-data" autocomplete="off" method="post" action="" target='frameFile'>
+                        <label class="changearea" for="avatarUp">
+                            <span id="avatardiv" class="pic">
+                                <img width="100" height="100" class="js-img-show" id="avatarShow" src="{{ MEDIA_URL }}{{ request.user.image }}"/>
+                            </span>
+                            <span class="fl upload-inp-box" style="margin-left:70px;">
+                                <span class="button btn-green btn-w100" id="jsAvatarBtn">修改头像</span>
+                                <input type="file" name="image" id="avatarUp" class="js-img-up"/>
+                            </span>
+                        </label>
+                        {% csrf_token %}
+                    </form>
+                    <div style="border-top:1px solid #eaeaea;margin-top:30px;">
+                        <a class="button btn-green btn-w100" href="{% url 'users:updatepwd' %}" id="jsUserResetPwd" style="margin:80px auto;width:100px;">修改密码</a>
+                    </div>
+				</div>
+				<form class="perinform" id="jsEditUserForm" action="" method="post" autocomplete="off">
+					<ul class="right">
+						<li>昵&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;称：
+                           <input type="text" name="nickname" id="nickname" value="{{ user.nickname }}" maxlength="10">
+                            <i class="error-tips"></i>
+                        </li>
+
+						<li>性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别：
+							<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="radio"  name="gender" value="male" {% ifequal user.gender "male" %}checked="checked"{% endifequal %} >男</label>
+							<label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="radio" name="gender" value="female" {% ifequal user.gender "female" %}checked="checked"{% endifequal %}>女</label>
+						</li>
+						<li class="p_infor_city">地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址：
+                            <input type="text" name="address" id="address" placeholder="请输入你的地址" value="{{ user.address }}" maxlength="10">
+						    <i class="error-tips"></i>
+                        </li>
+						<li>手&nbsp;&nbsp;机&nbsp;&nbsp;号：
+                            <input type="text" name="mobile" id="mobile" placeholder="请输入你的手机号码" value="{{ user.mobile }}" maxlength="10">
+                        </li>
+                        <li>邮&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;箱：
+                        	<input class="borderno" type="text" name="email" readonly="readonly" value="{{ user.email }}"/>
+                            <span class="green changeemai_btn">[修改]</span>
+                    	</li>
+						<li class="button heibtn">
+							<input type="submit" id="jsEditUserBtn" value="保存">
+						</li>
+					</ul>
+                                        {% csrf_token %}
+				</form>
+			</div>
+		</div>
+	</div>
+   </div>
+   </section>
+</body>
+</html>
\ No newline at end of file
diff --git a/templates/youku1.html b/templates/youku1.html
new file mode 100644
index 0000000..0e0c7c0
--- /dev/null
+++ b/templates/youku1.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title>Title</title>
+</head>
+<body>
+
+
+<iframe height=498 width=510 src='http://player.youku.com/embed/XNDU3MDQ4MTI4' frameborder=0 'allowfullscreen'></iframe>
+http://player.youku.com/player.php/sid/XMjI0NTEwMDg=/v.swf
+<embed src='http://player.youku.com/player.php/sid/XMjI0NTEwMDg=/v.swf' allowFullScreen='true' quality='high' width='480' height='400' align='middle' allowScriptAccess='always' type='application/x-shockwave-flash'></embed>
+<embed src='http://player.youku.com/player.php/sid/XMjI0NTEwMDg=/v.swf' allowFullScreen='true' quality='high' width='480' height='400' align='middle' allowScriptAccess='always' type='application/x-shockwave-flash'></embed>
+</body>
+</html>
\ No newline at end of file
diff --git a/utils/__pycache__/tools.cpython-34.pyc b/utils/__pycache__/tools.cpython-34.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..f2c3aee402903c8c45e87b03958956f81bdcd5c2
GIT binary patch
literal 338
zcmYjM!Ait15S=7-ce|{AAb9RUPYSY#h>O={LA)#h={B)VP1_|&Su5V^&-hEhn<p=R
zfES(gusGzsc}!;VGT*bqY5MWIegc3`#6BphYlJ;Q5_kw`fHevVg25YV5{h?8^o1R;
z%t%NWAxDS>!X6_zfO6=4MS;^4dICL#l0gsn09$%iiSw6();*qFB#|E%sV%hHcvj1u
zAIUmvg!FMCpM}b$bqVn!>x`=NcQ6xl_?a)}{N74qd8yKRcg9y;R-~p{nWmJPv-~FA
zbhmY`l`VMdl(yV8jkc%T&d2EekeP1lSom>R9Eh1BC)9+}pa-9S6yt@TTvm-}wY&;D
I50f+c2Uadkg#Z8m

literal 0
HcmV?d00001

diff --git a/utils/tools.py b/utils/tools.py
new file mode 100644
index 0000000..60593d5
--- /dev/null
+++ b/utils/tools.py
@@ -0,0 +1,4 @@
+import hashlib
+
+def md5_crypt(string):
+    return hashlib.new("md5", string.encode('utf-8')).hexdigest()
\ No newline at end of file
diff --git a/video/admin.py b/video/admin.py
index 66d3434..b400b6c 100644
--- a/video/admin.py
+++ b/video/admin.py
@@ -13,7 +13,7 @@ class VideoAdmin(admin.ModelAdmin):
 
 
 class EpisodeAdmin(admin.ModelAdmin):
-    list_display = ('name', 'description', 'nums',)
+    list_display = ('slug','name', 'description', 'nums',)
     list_filter = ('name',)
 
 
diff --git a/video/models.py b/video/models.py
index 880d12d..d52de67 100644
--- a/video/models.py
+++ b/video/models.py
@@ -3,6 +3,7 @@
 # Create your models here.
 
 class Episode(models.Model):
+    slug= models.CharField(max_length=50, default="")
     name = models.CharField(max_length=255)
     description = models.TextField(default='', blank=True)
     nums =  models.IntegerField(default=0)
@@ -15,9 +16,11 @@ class Video(models.Model):
     filename = models.CharField(max_length=255)
     e_name = models.ForeignKey(Episode, verbose_name='Video', related_name="videos")
     store_path = models.CharField(default='', max_length=255)
+    url_path=models.CharField(default='', max_length=255)
     #is_img = models.BooleanField(default=False)
     num_views = models.IntegerField(default=0)
     description = models.TextField(default='', blank=True)
+    image_path = models.CharField(max_length=255, default='/static/img/gogo2.png')
     #is_active = models.BooleanField(default=False)
 
     #created_on = models.DateTimeField(auto_now_add=True)
diff --git a/video/urls.py b/video/urls.py
index d95f893..b1a7928 100644
--- a/video/urls.py
+++ b/video/urls.py
@@ -21,4 +21,7 @@
 
     url(r'list/$', views.list),
     url(r'detail/(\d-\d).flv$', views.detail),
+    url(r'episode/(?P<slug>\d+)$', views.episode),
+    url(r'top5/$', views.top5),
+
 ]
diff --git a/video/views.py b/video/views.py
index 75fea34..0ae3069 100644
--- a/video/views.py
+++ b/video/views.py
@@ -3,25 +3,19 @@
 from video.models import Video, Episode
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from UserManage.models import *
-import hashlib
+from utils.tools import *
 import json
 from datetime import datetime
+from django.core import serializers
 
 
 # Create your views here.
 
-def login_required(func):
-    """要求登录的装饰器"""
-    def _deco(request, *args, **kwargs):
-        if not request.session.get('username'):
-            return redirect('/login/')
-        return func(request, *args, **kwargs)
-    return _deco
 
-@login_required
+
 def list(request, username=None):
     videos= Video.objects.all()
-    paginator = Paginator(videos, 3)  # Show 25 contacts per page
+    paginator = Paginator(videos, 5)  # Show 25 contacts per page
 
     page_num = request.GET.get('page')
     try:
@@ -54,75 +48,18 @@ def detail(request, path):
     print("comment", comment)
     return render(request, "detail.html",{'video': video,"videoList":videoList, "comment":comment, "username":username})
 
+def episode(request, slug):
+    episode = Episode.objects.get(slug=slug)
+    videos = episode.videos.all()
+    print("videos",videos)
+    username = request.session.get("username")
+    return render(request, "list.html", {'videos': videos,  "username": username})
 
-def login(request):
-    """登录界面"""
-    # if request.session.get('username'):
-    #     return redirect('/')
-    if request.method == 'GET':
-        return render_to_response('login.html')
-    else:
-        username = request.POST.get('username')
-        password = request.POST.get('password')
-        user = User.objects.filter(username=username)
-        if user:
-            user = user[0]
-            #if md5_crypt(password) == user.password:
-            if password == user.password:
-                request.session['username'] = username
-                if user.is_admin:
-                    request.session['admin'] = 1
-                elif user.is_superuser:
-                    request.session['admin'] = 2
-                else:
-                    request.session['admin'] = 0
-                return redirect('/index/%s/' % username)
-            else:
-                error = '密码错误，请重新输入。'
-        else:
-            error = '用户不存在。'
-    return render_to_response('login.html', {'error': error})
-
-
-
-def md5_crypt(string):
-    return hashlib.new("md5", string).hexdigest()
-
-def logout(request):
-    """注销登录调用"""
-    if request.session.get('username'):
-        del request.session['username']
-        del request.session['admin']
-    return redirect('/login/')
-
-def register(request):
-    if request.method == "POST":
-        print("-------------------register handle--------")
-        username =  request.POST.get("username")
-        passwd =  request.POST.get("password")
-        email = request.POST.get("email")
-        nickname = request.POST.get("nickname")
-        sex = request.POST.get("sex")
-        if sex == "false":
-            sex ="False"
-        elif sex =="true":
-            sex = "True"
-        city = request.POST.get("city")
-        error_info = dict()
-
-        if User.objects.filter(username= username):
-            error_info['error'] = "用户名已经注册了"
-        elif   User.objects.filter(nickname=nickname):
-            error_info['error'] = "昵称已被使用"
-        elif User.objects.filter(email=email):
-            error_info['error'] = "邮箱已被注册"
-        else:
-            User.objects.create(username=username, password=passwd, nickname=nickname, email=email, sex=sex, city=city)
-            return  redirect("/login/")
-
-        return render_to_response("register.html",  error_info)
-    else:
-        return render_to_response("register.html")
+def top5(request):
+    username = request.session['username']
+    videos = Video.objects.all().order_by('-num_views')[0:5]
+    data_v = serializers.serialize("json", videos)
+    return HttpResponse(data_v)
 
 
 class DateEncoder(json.JSONEncoder):