1.项目右边 web 和 code 两个小框隐藏，与顶部距离调整。

2.代码字体大小间隔缩小缩小 3.projectjects 数字拥挤问题 4. 注释文本框文字调整，输入框与边增加距离 5. projects 右侧隐藏 6.代码页logo和首页logo颜色统一，logo 右边增加首页的三个按钮 7.注释信息页横线去掉 8.按照PPT 进行调整并进行翻译
2018-08-22 17:54:24 +08:00 · 2018-08-22 17:54:24 +08:00 · e30f722b1e
parent 4d901dad9b
commit e30f722b1e
12 changed files with 111 additions and 62 deletions
--- a/Codepedia2/settings.py
+++ b/Codepedia2/settings.py
@ -120,7 +120,7 @@ WSGI_APPLICATION = 'Codepedia2.wsgi.application'
 DATABASES = {
    'default': {
        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'codepedia_1',
+        'NAME': 'codepedia',
        'USER': 'root',
        'PASSWORD': 'codepedia123',
        'HOST': '127.0.0.1'
--- a/static/css/base.css
+++ b/static/css/base.css
@ -178,7 +178,8 @@ h2{
  width:70px;
  display:inline;
  float:left;
-    text-align: center;
+  text-align: center;
+  margin-right: 20px;
 }
 .project_stat{
  width:280px;
--- a/static/css/code_show.css
+++ b/static/css/code_show.css
@ -458,7 +458,7 @@ a:hover {

 .middle-right {
    width: 25%;
-    margin-top: 40px;
+    margin-top: 30px;
    padding: 30px;
    box-sizing: border-box;
 	overflow-y:auto;
@ -473,8 +473,8 @@ a:hover {
 }

 .right-item-title{
-    font-size: 15px;
-    color: #FEFEFE;
+    font-size: 17px;
+    color: #fff;
    margin-top: -5px;
    margin-bottom: 5px;
 }
@ -490,6 +490,29 @@ a:hover {
 .middle-right-item p {
    display: flex;
 }
+.panel-leftfontnew {
+    display: block;
+    float: left;
+    width: 56px;
+    text-align: left;
+    color: #FEFEFE;
+    font-size: 13px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap
+}
+
+.panel-leftfont {
+    display: block;
+    float: left;
+    width: 90px;
+    text-align: left;
+    color: #FEFEFE;
+    font-size: 13px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap
+}

 .panel-left {
    display: block;
@ -709,7 +732,7 @@ a:hover {

 .comments {
    padding: 10px 20px;
-    border-bottom: 1px solid #eee;
+    /*border-bottom: 1px solid #eee;*/
    display: flex
 }

@ -830,20 +853,19 @@ pre.prettyprint {
    text-align: left;
    cursor: pointer;
 }
-
+.put-select span{
+    text-align: center;
+    font-size: 16px;
+}
 .put-select span.active {
    color: #05101a;
-    border: 1px solid #989898;
    text-align: center;
-    margin: 10px 10px 10px 0px;
+    font-size: 16px;
 }
 .put-selectspanactive{
    font-weight: bold;
    font-size: 16px;
-    margin: 10px 0px 10px 10px;
-    border: 1px solid transparent;
    text-align: center;
-
 }
 .addno-panel {
    position: absolute;
@ -869,11 +891,11 @@ pre.prettyprint {
 }

 .put-text {
-    width: 100%;
+    width: 92%;
    border: 1px solid transparent;
    border-bottom: 1px solid #ccc;
    height: 170px;
-    margin: 10px 0px 10px 0px;
+    margin: 10px 0px 10px 18px;
    box-sizing: border-box;
    color: black;
 }
@ -1402,7 +1424,7 @@ color: #FFF !important;
 .mypre{
    margin: 0 0 0;
    overflow:visible !important;
-    font-size: 18px;
+    font-size: 16px;
    white-space:pre;
 }

@ -1442,7 +1464,7 @@ color: #FFF !important;
 .codelinebox{
    line-height: 19px;
    min-height: 19px;
-    margin-bottom: -16px;
+    margin-bottom: -18px;
 }
 .newmypre{
    margin: 0 0 16px 28px;
@ -1539,4 +1561,11 @@ color: #FFF !important;
    overflow: hidden;
    text-overflow: ellipsis;
    white-space: nowrap;
+}
+.navbarli a {
+    color:#FFF;
+}
+.nav>li>a:hover, .nav>li>a:focus{
+    text-decoration: none !important;
+    background-color: transparent !important;
 }
--- a/static/image/codepedia.png
+++ b/static/image/codepedia.png
--- a/templates/common/site_nums.html
+++ b/templates/common/site_nums.html
@ -1,4 +1,4 @@
-<div class="module" id="snippets-count">
+<div class="module" id="snippets-count" style="display:none;">
    <div class="-details platforminfonum" >
        <div class="summarycount"> {{ nums.project_nums }} </div>
        <p class="modelcount">Projects</p>
--- a/templates/projects/file/hot_blobs.html
+++ b/templates/projects/file/hot_blobs.html
@ -1,5 +1,5 @@
 {% load base_filter %}
-<div id="hot-network-snippets" class="module">
+<div id="hot-network-snippets" class="module" style="display:none;">
   <h4>
     <a href="#">
        Hot Network {% get_model_name hot_objs.first as model %}
--- a/templates/projects/file/sidebar.html
+++ b/templates/projects/file/sidebar.html
@ -1,6 +1,6 @@
 {% load staticfiles %}
 {% load static %}
-<div id="sidebar" role="complementary" aria-label="sidebar">
+<div id="sidebar" role="complementary" aria-label="sidebar" style="display:none;">
    {% include 'common/site_nums.html' %}
    {% include 'projects/obj_list/hot_blobs.html' with hot_objs=hot_objs %}
 </div>
--- a/templates/projects/filesub/dir_info.html
+++ b/templates/projects/filesub/dir_info.html
@ -1,6 +1,6 @@
 <div class="path_info">
    <div class="clearfix mb10 path_infonav">
-        <span class="fl font-20 colorFFF">目录信息</span>
+        <span class="fl font-20 colorFFF">Module Information</span>
        <p class="fr">
            <span class="fl mr15 mt7">
                <img src="/static/image/annotation.png" onclick="show_dir_annotation({{file_id}})" class="mr3">
@ -32,61 +32,62 @@
    <div class="filePathInfo">
        <div class="clearfix filePathline">
                <span>
-                    <label>代码行数</label>
+                    <label>Num.of Files:</label>
                    <label>{{line_sum}}</label>
                </span>
                <span>
-                    <label>方法数</label>
+                    <label>Num.of Methods:</label>
                    <label>{{method_sum}}</label>
                </span>
                <span>
-                    <label>文件数</label>
+                    <label>Lines of Code:</label>
                    <label>{{file_sum}}</label>
                </span>
        </div>
        <div class="clearfix filePathline">
            <span>
-                <label>标注文件数</label>
+                <label>Involved Users:</label>
                <label>{{anno_filenum}}</label>
            </span>
            <span>
-                <label>系统提问数</label>
+                <label>Annotated Files:</label>
                <label>{{issue_sum}}</label>
            </span>
            <span>
-                <label>参与用户数</label>
+                <label>Annotated Methods:</label>
                <label>{{usersum}}</label>
            </span>
        </div>
        <div class="clearfix filePathline">
            <span>
-                <label>用户注释数</label>
+                <label>Num.of Questions:</label>
                <label>{{anno_sum}}</label>
            </span>
            <span>
-                <label>用户提问数</label>
+                <label>Num.of Comments:</label>
                <label>{{question_sum}}</label>
            </span>
-            <span>
-                <label>最新标注文件数</label>
-                <label>0</label>
-            </span>
+{#            <span>#}
+{#                <label>最新标注文件数</label>#}
+{#                <label>0</label>#}
+{#            </span>#}
        </div>
    </div>

    <div class="clearfix mb10 mt10">
-        <span class="fl font-20 colorFFF">文件信息</span>
+        <span class="fl font-20 colorFFF">Annotated Files</span>
        <p class="fr">
-            <span class="fl mt7 info-nav active">注释</span>
+            <span class="fl mt7 info-nav active">Questions</span>
            <em class="ver-line"></em>
-            <span class="fl mt7 info-nav">问题</span>
+            <span class="fl mt7 info-nav">Comments</span>
        </p>
    </div>
    <div class="filePathInfo">
        <div class="clearfix filePathline fileinfo-item">
-            <span>名称</span>
-            <span>注释</span>
-            <span>问题</span>
+            <span>File Name</span>
+            <span>Num.of Annotations</span>
+            <span>Num.of Comments</span>
+            <span>Num.of Questions</span>
        </div>
        {% for fileid, name_anno_issue in fileid_name_anno_issue.items %}
        <div class="clearfix filePathline fileinfo-item">
--- a/templates/projects/filesub/file-right.html
+++ b/templates/projects/filesub/file-right.html
@ -1,6 +1,6 @@
 <!-- 这个是文件的信息 -->
 <div class="middle-right-item">
-    <p class="right-item-title">File Infomation</p>
+    <p class="right-item-title">File Summary</p>

    <p class="fr">
            <span class="fl mr15 mt7">
@ -30,29 +30,40 @@
            </div>
    </p>
    <p class="clearfix">
-        <span class="panel-left">methods</span>
-        <span class="panel-right">{{method_num}}</span>
+        <span class="panel-leftfontnew">Created:</span>
+        <span class="panel-right">2018/06/06</span>
    </p>
    <p class="clearfix">
-        <span class="panel-left">lines</span>
-        <span class="panel-right">{{filelinenum}}</span>
-    </p>
-    <p class="clearfix">
-        <span class="panel-left">view</span>
-        <span class="panel-right">{{view_num}}</span>
-    </p>
-    <p class="clearfix">
-        <span class="panel-left">annotation</span>
-        <span class="panel-right">{{anno_num}}</span>
-    </p>
-    <p class="clearfix">
-            <span class="panel-left">questions</span>
+        <div style="width:52%; float:left">
+            <span class="panel-leftfontnew">lines:</span>
+            <span class="panel-right">{{filelinenum}}</span>
+        </div>
+
+         <div style="width:48%; float:left">
+            <span class="panel-leftfont">methods:</span>
+            <span class="panel-right">{{method_num}}</span>
+        </div>
+
+         <div style="width:52%; float:left">
+            <span class="panel-leftfontnew">views:</span>
+            <span class="panel-right">{{view_num}}</span>
+        </div>
+
+         <div style="width:48%; float:left">
+            <span class="panel-leftfont">Annotations:</span>
+            <span class="panel-right">{{anno_num}}</span>
+        </div>
+
+         <div style="width:52%; float:left">
+            <span class="panel-leftfontnew">Ques:</span>
            <span class="panel-right">{{issue_num}}</span>
+        </div>
+        <div class="both"></div>
    </p>
 </div>


-<div class="middle-right-item">
+<div class="middle-right-item" style="display:none;">
    <p class="right-item-title">Web Docomentations</p>
    <p class="clearfix">
        <span class="panel-left00">1</span>
@ -75,7 +86,7 @@
    <div class="both"></div>
 </div>

-<div class="middle-right-item">
+<div class="middle-right-item"  style="display:none;">
    <p class="right-item-title">Code Track</p>
    <p class="clearfix">
        <span class="panel-left00">1</span>
--- a/templates/projects/list/sidebar.html
+++ b/templates/projects/list/sidebar.html
@ -1,6 +1,6 @@
-<div id="sidebar" role="complementary" aria-label="sidebar">
+<div id="sidebar" role="complementary" aria-label="sidebar" >
    {% include 'common/site_nums.html' %}
-    <div id="hot-network-snippets" class="module">
+    <div id="hot-network-snippets" class="module"  style="display:none;">
       <h4>
         <a href="#">
            Hot Network Projects
--- a/templates/projects/source.html
+++ b/templates/projects/source.html
@ -33,9 +33,15 @@
 <body id="codepanel">
    <!-- 要求与codepeida的保持一致 -->
    <div class="clearfix head">
-        <a href="/">
-            <img src="/static/image/codepedia.png" style="margin:10px 0px 0px 10px;height: 28px">
-        </a>
+        <ul class="nav navbar-nav">
+             <img src="/static/image/codepedia.png" style="margin:10px 10px 0px 10px;height: 28px; float:left;">
+            <li class='active navbarli'><a href="{% url 'index' %}">Home</a></li>
+            <li class='active navbarli'><a href="{% url 'projects:list' %}">Project</a></li>
+            <li class='active navbarli'><a href="{% url 'files' %}">File</a></li>
+             {% comment %}<li class='active'><a href="{% url 'method_list' %}">Method</a></li>
+            <li> {% if request.path|slice:'8' == '/snippet' %}class='active'{% endif %}><a href="">Snippet</a></li> {% endcomment %}
+          </ul>
+    .
        <!-- 要求与codepeida的保持一致 -->
        <ul class="nav navbar-nav navbar-right">
            {% if request.user.is_authenticated %}
--- a/templates/shared/navbar.html
+++ b/templates/shared/navbar.html
@ -6,7 +6,8 @@
  <ul class="container-fluid" style="margin-bottom: 0px !important;height: 50px;">
    <!-- Brand and toggle get grouped for better mobile display -->
    <div class="navbar-header">
-      <img class="brand_img" src="{% static 'image/CodePedia.ico' %}"><a class="navbar-brand" href="{% url 'index' %}">CodePedia</a>
+        <img src="/static/image/codepedia.png" style="margin:10px 10px 0px 10px;height: 28px">
+{#      <img class="brand_img" src="{% static 'image/CodePedia.ico' %}"><a class="navbar-brand" href="{% url 'index' %}">CodePedia</a>#}
    </div>
    <li style="height: 50px !important;" class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
      <ul class="nav navbar-nav">