优化

newpanjing · Jun 13, 2019 · a13215e · a13215e
1 parent aa93d0b
commit a13215e
Show file tree

Hide file tree

Showing 9 changed files with 163 additions and 93 deletions.
diff --git a/myblog/views.py b/myblog/views.py
@@ -171,7 +171,11 @@ def category_page(request, alias, page):
 # 自定义页面
 def page(request, alias):
  page = Page.objects.values('title', 'content', 'id').get(alias=alias)
-
+ page['content']=markdown.markdown(page.get('content'), extensions=[
+ 'markdown.extensions.extra',
+ 'markdown.extensions.codehilite',
+ 'markdown.extensions.toc',
+ ], safe_mode=True, enable_attributes=False)
  sid = short_id.get_short_id()
  request.session['sid'] = sid
  comment = get_comment(2, page.get('id'))

diff --git a/static/css/style.css b/static/css/style.css
diff --git a/static/css/style.less b/static/css/style.less
@@ -606,7 +606,7 @@ header .top {
 }
 
 .search-input .input-group {
- width: 200px;
+ width: 100%;
 }
 
 .project-item {
@@ -681,7 +681,22 @@ header .top {
  max-width: 100%;
  max-height: 100%;
 }
+.article{
+ font: 400 1em/1.8 "PingFang SC","Lantinghei SC","Microsoft Yahei","Hiragino Sans GB","Microsoft Sans Serif","WenQuanYi Micro Hei",sans;
+ .info .user, .aritcle-item .info .date {
+ margin-right: 10px;
+ }
 
+ .info {
+ font-size: 14px;
+ color: #a1a1a1;
+ margin-top: 10px;
+
+ a {
+ color: #a1a1a1;
+ }
+ }
+}
 .aritcle-item {
  padding-top: 20px;
  padding-bottom: 20px;
@@ -717,4 +732,21 @@ header .top {
  .thumbnail {
  height: 350px;
  }
-}
+}
+
+/*滚动条样式*/
+*::-webkit-scrollbar {
+ width: 4px;
+}
+
+*::-webkit-scrollbar-thumb {
+ border-radius: 10px;
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+ background: rgba(0, 0, 0, 0.2);
+}
+
+*::-webkit-scrollbar-track {
+ -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+ border-radius: 0;
+ background: rgba(0, 0, 0, 0.1);
+}
diff --git a/templates/detail.html b/templates/detail.html
@@ -29,35 +29,31 @@
  <div class="block">
  <div class="block-main">
  <div>
- <ol class="breadcrumb">
- <li><a href="{% url 'home' %}">首页</a></li>
- <li><a href="{% url 'category_alias' article.category.alias %}">{{ article.category.name }}</a></li>
- <li class="active">{{ article.title }}</li>
- </ol>
+ <h1 class="article-title">{{ article.title }}</h1>
  </div>
- {# <h1 class="article-title">{{ article.title }}</h1>#}
- <div class="infobar">
- <a href="{% url 'category_alias' article.category.alias %}"
- class="tag tag-green">{{ article.category }}</a>
- {% if article.top %}
- <span class="tag tag-black">置顶</span>
- {% endif %}
-{# <span class="tag-box tag-blue">{{ article.user }}</span>#}
- <span class="tag-box">{{ article.createDate|date:'Y年m月d日 H:i:s' }}</span>
- <span class="float-right">
- <i class="glyphicon glyphicon-eye-open"></i>
- {{ article.hits }}
+
+ <div class="article">
+ <div class="info">
+ <span class="date"><span
+ class="glyphicon glyphicon-calendar"></span>{{ article.createDate|date:"Y-m-d" }}</span>
+ <span>
+ <span class="glyphicon glyphicon-pencil"></span>
+ {{ article.category.alias }}
+ <span>发表在 <a
+ href="{% url 'category_alias' article.category.alias %}">{{ article.category.name }}</a> </span>
+ </span>
+ <span class="hits">
+ <span class="glyphicon glyphicon-eye-open"></span>
+ <span>{{ article.hits }}</span>
  </span>
  </div>
- <div class="article">
+
  {{ article.content|safe }}
  </div>
  <div class="alert alert-success" role="alert">
- <div>本文地址：<a href="{{ request.scheme }}:https://{{ request.META.HTTP_HOST }}{% url 'article' article.sid %}"
- target="_blank">{{ request.scheme }}://{{ request.META.HTTP_HOST }}/article/{{ article.sid }}</a>
- </div>
  <div>
- <strong class="glyphicon glyphicon-flag"></strong> 转载请注明来源为{{ commonData.configs.name }}
+ 感谢您的阅读，本文由 {{ commonData.configs.name }} 版权所有。如若转载，请注明出处：{{ commonData.configs.name }}（<a href="{{ request.scheme }}:https://{{ request.META.HTTP_HOST }}{% url 'article' article.sid %}"
+ target="_blank">{{ request.scheme }}://{{ request.META.HTTP_HOST }}/article/{{ article.sid }}</a>）
  </div>
  </div>
  <div>

diff --git a/templates/extend.html b/templates/extend.html
@@ -20,7 +20,6 @@
  {% endcompress %}
  <script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
  <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
-
  {% block head %}
  <meta name="keywords" content="{{ commonData.configs.keywords }}">
  <meta name="description" content="{{ commonData.configs.description }}">
@@ -73,7 +72,8 @@
 <div class="container content-wrap">
  {% block main %}
  <div class="row">
- <div class="col-md-8">
+ <div class="col-md-9">
+ {% block category %}
  <div class="categorys">
 
  {% if request.path == '/category' %}
@@ -89,26 +89,27 @@
  {% endif %}
  {% endfor %}
  </div>
- <div class="block mobile-login">
- <div class="block-main user-info">
- {% if request.session.member %}
- <div class="clearfix">
- <img class="avatar float-left" src="{{ request.session.member.avatar }}"/>
- <div class="float-left">
- <div class="nickname">{{ request.session.member.name }}</div>
- <div><a href="{% url 'logout' %}" class="btn btn-success">退出登录</a></div>
- </div>
- </div>
- {% else %}
- <a href="javascript:;" class="btn btn-success" data-toggle="modal"
- data-target="#login_modal">点击登录</a>
- <div>登录后可以发表评论</div>
- {% endif %}
- </div>
- </div>
+ {% endblock %}
+{# <div class="block mobile-login">#}
+{# <div class="block-main user-info">#}
+{# {% if request.session.member %}#}
+{# <div class="clearfix">#}
+{# <img class="avatar float-left" src="{{ request.session.member.avatar }}"/>#}
+{# <div class="float-left">#}
+{# <div class="nickname">{{ request.session.member.name }}</div>#}
+{# <div><a href="{% url 'logout' %}" class="btn btn-success">退出登录</a></div>#}
+{# </div>#}
+{# </div>#}
+{# {% else %}#}
+{# <a href="javascript:;" class="btn btn-success" data-toggle="modal"#}
+{# data-target="#login_modal">点击登录</a>#}
+{# <div>登录后可以发表评论</div>#}
+{# {% endif %}#}
+{# </div>#}
+{# </div>#}
  {% block body %}{% endblock %}
  </div>
- <div class="col-md-4 notice-box">
+ <div class="col-md-3 notice-box">
  <div class="block">
  <div class="search-input">
  <form target="_blank" role="search" method="get" id="searchform"
@@ -123,34 +124,34 @@
  </form>
  </div>
  </div>
- <div class="block">
- <div class="block-main user-info">
- {% if request.session.member %}
- <div class="clearfix">
- <img class="avatar float-left" src="{{ request.session.member.avatar }}"/>
- <div class="float-left">
- <div class="nickname">{{ request.session.member.name }}</div>
- <div><a href="{% url 'logout' %}" class="btn btn-success">退出登录</a></div>
- </div>
- </div>
- {% else %}
- <a href="javascript:;" class="btn btn-success" data-toggle="modal"
- data-target="#login_modal">点击登录</a>
- <div>登录后可以发表评论</div>
- {% endif %}
- </div>
- </div>
- <div class="block">
- <div class="block-title">
- <span><i class="glyphicon glyphicon-bullhorn"></i>动态</span>
- <span style="margin-right: 10px"
- class="navbar-right"><i
- class="glyphicon glyphicon-time"></i>{{ commonData.notice.createDate|date:'m月d日 H:i' }}</span>
- </div>
- <div class="block-main">
- {{ commonData.notice.content|converToHtml|safe }}
- </div>
- </div>
+{# <div class="block">#}
+{# <div class="block-main user-info">#}
+{# {% if request.session.member %}#}
+{# <div class="clearfix">#}
+{# <img class="avatar float-left" src="{{ request.session.member.avatar }}"/>#}
+{# <div class="float-left">#}
+{# <div class="nickname">{{ request.session.member.name }}</div>#}
+{# <div><a href="{% url 'logout' %}" class="btn btn-success">退出登录</a></div>#}
+{# </div>#}
+{# </div>#}
+{# {% else %}#}
+{# <a href="javascript:;" class="btn btn-success" data-toggle="modal"#}
+{# data-target="#login_modal">点击登录</a>#}
+{# <div>登录后可以发表评论</div>#}
+{# {% endif %}#}
+{# </div>#}
+{# </div>#}
+{# <div class="block">#}
+{# <div class="block-title">#}
+{# <span><i class="glyphicon glyphicon-bullhorn"></i>动态</span>#}
+{# <span style="margin-right: 10px"#}
+{# class="navbar-right"><i#}
+{# class="glyphicon glyphicon-time"></i>{{ commonData.notice.createDate|date:'m月d日 H:i' }}</span>#}
+{# </div>#}
+{# <div class="block-main">#}
+{# {{ commonData.notice.content|converToHtml|safe }}#}
+{# </div>#}
+{# </div>#}
  <div class="block">
  <div class="block-main">
  <a href="https://item.taobao.com/item.htm?spm=a1z10.1-c-s.w4004-17784580154.2.55076106E5vQl3&id=589786659783"

diff --git a/templates/index.html b/templates/index.html
@@ -2,26 +2,28 @@
 {% load common_tag %}
 {% block body %}
 
- <div class="block">
- <div class="block-title">置顶</div>
- <div class="block-main">
+<div id="myCarousel" class="carousel slide">
+ <ol class="carousel-indicators">
+ {% for i in tops %}
+ <li data-target="#myCarousel" data-slide-to="{{ forloop.counter0 }}" {% if forloop.counter0 == 0 %}class="active"{% endif %}></li>
+ {% endfor %}
+ </ol>
+ <div class="carousel-inner">
+ {% for i in tops %}
+ <div style="background: url('{{i.image|safe}}');background-size: cover" class="item {% if forloop.counter0 == 0 %} active{% endif %}">
+ <a href="/article/{{ i.sid }}" target="_blank" style="height: 300px;width: 100%;display: block"></a>
+ </div>
 
- <div class="row">
- {% for i in tops %}
+ {% endfor %}
+ </div>
+ <a class="carousel-control left" href="#myCarousel"
+ data-slide="prev"> <span _ngcontent-c3="" aria-hidden="true" class="glyphicon glyphicon-chevron-left"></span></a>
 
- <div class="col-sm-6 col-md-6 top-block">
- <div class="thumbnail">
- <img src="{{ i.image }}!600" alt="{{ i.title }}">
- <div class="caption">
- <h3>{{ i.title }}</h3>
- </div>
- </div>
- </div>
+ <a class="carousel-control right" href="#myCarousel"
+ data-slide="prev">
+ <span aria-hidden="true" data-slide="next" class="glyphicon glyphicon-chevron-right"></span></a>
+</div>
 
- {% endfor %}
- </div>
- </div>
- </div>
  <div class="block">
  <div class="block-title">最新发布</div>
  {% for i in articles %}
@@ -38,7 +40,7 @@ <h3>{{ i.title }}</h3>
 
  <div class="info">
  <span class="date"><span
- class="glyphicon glyphicon-calendar"></span>{{ i.createDate|date:"Y-m-d" }}</span>
+ class="glyphicon glyphicon-calendar"></span>{{ i.createDate }}</span>
  <span>
  <span class="glyphicon glyphicon-pencil"></span>
  <span>发表在 <a
@@ -63,5 +65,5 @@ <h3>{{ i.title }}</h3>
  <a href="{% url 'category' %}" class="btn btn-success">查看更多数据</a>
  </div>
  </div>
-
+ <script src="" type="text/javascript"></script>
 {% endblock %}
diff --git a/templates/page.html b/templates/page.html
@@ -1,5 +1,7 @@
 {% extends 'extend.html' %}
 {% block title %}{{ page.title }}-{{ commonData.configs.name }}{% endblock %}
+{% block banner %}{% endblock %}
+{% block category %}{% endblock %}
 {% block body %}
  <div class="block custom-page">
  <div class="block-main">

diff --git a/templates/project.html b/templates/project.html
@@ -1,5 +1,7 @@
 {% extends 'extend.html' %}
 {% block title %}项目列表-{{ commonData.configs.name }}{% endblock %}
+{% block banner %}{% endblock %}
+{% block category %}{% endblock %}
 {% block body %}
  <div class="block">
  <div class="block-title">项目列表</div>

diff --git a/templates/project_detail.html b/templates/project_detail.html
@@ -1,5 +1,7 @@
 {% extends 'extend.html' %}
 {% block title %}{{ name }}-{{ commonData.configs.name }}{% endblock %}
+{% block banner %}{% endblock %}
+{% block category %}{% endblock %}
 {% block head %}
  {% if tags %}
  <meta name="keywords" content="{{ name }},{{ tags }}">