diff --git a/app_doc/templatetags/project_filter.py b/app_doc/templatetags/project_filter.py index 8937e02..3db4d7d 100644 --- a/app_doc/templatetags/project_filter.py +++ b/app_doc/templatetags/project_filter.py @@ -14,7 +14,7 @@ def get_doc_count(value): # 获取文集下最新的文档及其修改时间 @register.filter(name='get_new_doc') def get_new_doc(value): - new_doc = Doc.objects.filter(top_doc=int(value),status=1).order_by('-modify_time')[:2] + new_doc = Doc.objects.filter(top_doc=int(value),status=1).order_by('-modify_time')[:3] if new_doc is None: new_doc = '它还没有文档……' return new_doc diff --git a/static/mrdoc/mrdoc.css b/static/mrdoc/mrdoc.css index 0a23c10..84d9722 100644 --- a/static/mrdoc/mrdoc.css +++ b/static/mrdoc/mrdoc.css @@ -78,6 +78,10 @@ border-radius: 4px; box-shadow: 0 1px 3px rgba(0,0,0,.055); } +.project-item:hover{ + box-shadow:4px 4px 5px #ddd; +} + .project-desc{ overflow:hidden; text-overflow:ellipsis; /* 加省略号 */ @@ -111,11 +115,11 @@ .tooltip-content { position: absolute; z-index: 9999; - width: 170px; + /* width: 200px; */ left: 78%; margin: 0 -60px 20px -150px; padding:10px; - top: 100%; + /* top: 100%; */ text-align: left; box-shadow: -5px -5px 15px rgba(48,54,61,0.2); background: #2a3035; @@ -155,6 +159,12 @@ /*margin-left: 10px;8*/ } +.index-doc-link{ + color: #999; +} +.index-doc-link:hover{ + color: #333; +} .layui-card{ box-shadow:0 0 0 0; @@ -506,10 +516,51 @@ input#doc-name,input#doctemp-name{ fill: currentColor; overflow: hidden; } -.hide-project-icon-list{ +.hide-project-icon-list,.hide-doc-import-list{ display: none; } +.mrdoc-import-doc-list{ + margin-bottom: 10px; +} +.mrdoc-import-doc-item{ + line-height: 30px !important; + background-color:#fff; + border-radius:2px; + box-shadow:0 2px 4px rgba(0,0,0,.12); + box-sizing:border-box; + margin-right: 5px; + padding-right: 5px; +} +.mrdoc-import-doc-item a{ + padding: 0 12px !important; +} +.mrdoc-import-doc-item .layui-nav-more{ + border-top-color:#333; +} + +.layui-nav .layui-nav-mored{ + /* border-left:6px solid transparent !important; + border-right: 6px solid transparent !important; + border-top-color:#333 !important; */ + border-color: transparent transparent #333; + +} +.mrdoc-import-doc-child{ + top: 32px !important; +} +.mrdoc-import-doc-child a{ + background-color: #fff !important; + color: #333 !important; +} +.mrdoc-import-doc-child a:hover{ + background-color: #f2f2f2 !important; + color: #333 !important; +} +.layui-nav-bar{ + height: 0px !important; +} + /* 文字悬浮提示样式 */ /* tooltip样式 */ [tooltip] { diff --git a/template/app_doc/pro_list.html b/template/app_doc/pro_list.html index 0061913..ea48564 100644 --- a/template/app_doc/pro_list.html +++ b/template/app_doc/pro_list.html @@ -114,13 +114,6 @@ - -
-
- -
-
- @@ -134,17 +127,17 @@ {% for p in projects %}
- +
{% if p.icon %} -

{{ p.name }}

+

{{ p.name }}  {{p.id|get_doc_count}}

{% else %} -

{{ p.name }}

+

{{ p.name }}  {{p.id|get_doc_count}}

{% endif %}
-
-

{% if p.create_user.first_name != '' %} {{p.create_user.first_name}} {% else %} {{p.create_user}}{% endif %}

+
+

{% if p.intro == "" %} @@ -155,54 +148,17 @@ {% endif %}

{% for new_doc in p.id|get_new_doc %} -

- {{new_doc.name}} - {{new_doc.modify_time|date:"n-d"}}

+

+ {{new_doc.name}} + {{new_doc.modify_time|date:"n-d"}} +

{% endfor %} -
+
- -
- -
- {% if p.role == 1 %} - - {% elif p.role == 2 %} - - {% elif p.role == 3 %} - - {% else %} - - {% endif %} -
-
-
-
- {{p.name}} -
-
-

- {{p.create_user}} -

-

- {% if p.intro == "" %} - {% trans "此文集没有填写简介" %} - {% else %} - - {{ p.intro }} - {% endif %} -

-
-
-
- - -
- {% endfor %} {% if project_list.count == 0 %}
@@ -453,18 +409,7 @@ }, }) }; - //切换文集列表和网格 - $("#switch-grid-list").click(function(){ - // 切换按钮图标 - $(this).children("i").toggleClass("layui-icon-align-left layui-icon-app");//切换图标 - // 切换class - $(".project-item").toggleClass("layui-hide") - $(".project-item-list").toggleClass("layui-hide") - // 重新计算底部 - var footerHeight = 0; - var footerTop = 0; - positionFooter(); - }); + {% if debug %}