p27318694
/
codepedia2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FixBug 

修复不同文件注释符号不同的bug：之前全都默认为//
内容放在operation/views.py中的get_currentfile_comment_anno()中

新增功能：
添加移除项目功能
This commit is contained in:
wrmswindmill 2018-08-18 22:51:23 +08:00
parent 96fc8bc561 512b77b1c2
commit 213f853fe9
4 changed files with 104 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
static/css/code_show.css
View File

@ -411,7 +411,7 @@ a:hover {
margin: 0; margin: 0;
float: left; float: left;
background-color: #26292b!important; background-color: #26292b!important;
height: 100%; height: 880px;
} }
.codeopration { .codeopration {
@ -494,12 +494,22 @@ a:hover {
.panel-left { .panel-left {
display: block; display: block;
float: left; float: left;
width: 60px; width: 250px;
text-align: left; text-align: left;
color: #C3BDBD; color: #FEFEFE;
font-size: 13px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap
}
.panel-left00 {
display: block;
float: left;
width: 35px;
text-align: left;
color: #FEFEFE;
font-size: 13px; font-size: 13px;
} }
.panel-right { .panel-right {
color: #EBEBEB; color: #EBEBEB;
@ -823,8 +833,18 @@ pre.prettyprint {
.put-select span.active { .put-select span.active {
color: #05101a; color: #05101a;
border: 1px solid #05101a;
text-align: center;
margin: 10px 10px 10px 0px;
} }
.put-selectspanactive{
font-weight: bold;
font-size: 16px;
margin: 10px 0px 10px 10px;
border: 1px solid transparent;
text-align: center;
}
.addno-panel { .addno-panel {
position: absolute; position: absolute;
width: 410px; width: 410px;
@ -1496,4 +1516,11 @@ color: #FFF !important;
background-size: 100% 100%; background-size: 100% 100%;
height: 16px; height: 16px;
width: 16px; width: 16px;
}
.both{
clear: both;
}
.panel-leffont{
fonr-size:24px;
color:#C3BDBD;
} }

8
static/js/source.js
View File

@ -322,8 +322,12 @@ function submit_annotation(file_id, line_num, content) {
$(".source-addno-panel").remove(); $(".source-addno-panel").remove();
// show_annotation(file_id,line_num); // show_annotation(file_id,line_num);
//将注释添加到当前行的上一行 //将注释添加到当前行的上一行
<<<<<<< HEAD
console.log(data.anno_content) console.log(data.anno_content)
var contenthtml ='<div class="linenum"></div>'+'<div class="sourcecode">'+'<pre class="mypre newaddmypre hljs-comment ' + file_id+line_num + '">'+data.anno_content+'</pre>'+'</div>'+'<div class="linestatus"></div>'; var contenthtml ='<div class="linenum"></div>'+'<div class="sourcecode">'+'<pre class="mypre newaddmypre hljs-comment ' + file_id+line_num + '">'+data.anno_content+'</pre>'+'</div>'+'<div class="linestatus"></div>';
=======
var contenthtml ='<div class="linenum"></div>'+'<div class="sourcecode">'+'<pre class="mypre newmypre hljs-comment ' + file_id+line_num + '">'+"//"+content+'</pre>'+'</div>'+'<div class="linestatus"></div>';
>>>>>>> 512b77b1c28e9490004a69c13e10080bcf7409bc
var html = '<div class="codeline codelinebox">'+contenthtml+'</div>'; var html = '<div class="codeline codelinebox">'+contenthtml+'</div>';
var id=file_id+'_'+"L"+line_num; var id=file_id+'_'+"L"+line_num;
$("#"+id).before(html) $("#"+id).before(html)
@ -878,8 +882,8 @@ function inject_addnoPanel_html(item,file_id,linenum) {
'<div class="trangle-op"></div>'+ '<div class="trangle-op"></div>'+
'<div class="put-content">'+ '<div class="put-content">'+
'<p class="put-select clearfix" id="addno-select-'+linenum+'">'+ '<p class="put-select clearfix" id="addno-select-'+linenum+'">'+
'<span class="active" onclick=\'$(this).siblings("span").removeClass("active");$(this).addClass("active");\'>注释</span>'+ '<span class="active put-selectspanactive" onclick=\'$(this).siblings("span").removeClass("active");$(this).addClass("active");\'>注释</span>'+
'<span onclick=\'$(this).siblings("span").removeClass("active"); $(this).addClass("active");\'>问题</span>'+ '<span class="put-selectspanactive" onclick=\'$(this).siblings("span").removeClass("active"); $(this).addClass("active");\'>问题</span>'+
'</p>'+ '</p>'+
'<textarea id="addno-text-'+file_id+'-'+linenum+'" class="put-text" placeholder="输入注释或者问题"> </textarea>'+ '<textarea id="addno-text-'+file_id+'-'+linenum+'" class="put-text" placeholder="输入注释或者问题"> </textarea>'+
'<a href="#" onclick="add_annotation(this,'+file_id+','+linenum+')" class="submit fr" id="submit">提交</a>'+ '<a href="#" onclick="add_annotation(this,'+file_id+','+linenum+')" class="submit fr" id="submit">提交</a>'+

22
templates/projects/filesub/dir_info.html
View File

@ -20,8 +20,8 @@
<div class="trangle-op"></div> <div class="trangle-op"></div>
<div class="put-content"> <div class="put-content">
<p class="put-select clearfix" id="addno-select-0"> <p class="put-select clearfix" id="addno-select-0">
<span class="active" onclick='$(this).siblings("span").removeClass("active"); $(this).addClass("active");'>注释</span> <span class="active put-selectspanactive" onclick='$(this).siblings("span").removeClass("active"); $(this).addClass("active");'>注释</span>
<span onclick='$(this).siblings("span").removeClass("active"); $(this).addClass("active");'>问题</span> <span class="put-selectspanactive" onclick='$(this).siblings("span").removeClass("active"); $(this).addClass("active");'>问题</span>
</p> </p>
<textarea id="addno-text-{{file_id}}-0" class="put-text" placeholder="输入注释或者问题"> </textarea> <textarea id="addno-text-{{file_id}}-0" class="put-text" placeholder="输入注释或者问题"> </textarea>
<a href="#" onclick="add_dir_annotation(this,{{file_id}},0)" class="submit fr" id="submit">提交</a> <a href="#" onclick="add_dir_annotation(this,{{file_id}},0)" class="submit fr" id="submit">提交</a>
@ -73,6 +73,7 @@
</span> </span>
</div> </div>
</div> </div>
<div class="clearfix mb10 mt10"> <div class="clearfix mb10 mt10">
<span class="fl font-20 colorFFF">文件信息</span> <span class="fl font-20 colorFFF">文件信息</span>
<p class="fr"> <p class="fr">
@ -95,4 +96,21 @@
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
<div class="clearfix mb10 mt10">
<span class="fl font-20 colorFFF">Hot Questions</span>
</div>
<div class="filePathInfo">
<p class="clearfix">
<span class="panel-left00">1</span>
<span class="panel-left">测试测试测试测试测试测试</span>
</p>
<p class="clearfix">
<span class="panel-left00">2</span>
<span class="panel-left">测试测试测试测试测试测试</span>
</p>
</div>
</div> </div>

49
templates/projects/filesub/file-right.html
View File

@ -21,8 +21,8 @@
<div class="trangle-op"></div> <div class="trangle-op"></div>
<div class="put-content"> <div class="put-content">
<p class="put-select clearfix" id="addno-select-0"> <p class="put-select clearfix" id="addno-select-0">
<span class="active" onclick='$(this).siblings("span").removeClass("active"); $(this).addClass("active");'>注释</span> <span class="active put-selectspanactive" onclick='$(this).siblings("span").removeClass("active"); $(this).addClass("active");'>注释</span>
<span onclick='$(this).siblings("span").removeClass("active"); $(this).addClass("active");'>问题</span> <span class="put-selectspanactive" onclick='$(this).siblings("span").removeClass("active"); $(this).addClass("active");'>问题</span>
</p> </p>
<textarea id="addno-text-{{file_id}}-0" class="put-text" placeholder="输入注释或者问题"> </textarea> <textarea id="addno-text-{{file_id}}-0" class="put-text" placeholder="输入注释或者问题"> </textarea>
<a href="#" onclick="add_file_annotation(this,{{file_id}},0)" class="submit fr" id="submit">提交</a> <a href="#" onclick="add_file_annotation(this,{{file_id}},0)" class="submit fr" id="submit">提交</a>
@ -51,6 +51,51 @@
</p> </p>
</div> </div>
<div class="middle-right-item">
<p class="right-item-title">Web Docomentations</p>
<p class="clearfix">
<span class="panel-left00">1</span>
<span class="panel-left">测试测试测试测试测试测试</span>
</p>
<p class="clearfix">
<span class="panel-left00">2</span>
<span class="panel-left">测试测试测试测试测试</span>
</p>
<p class="clearfix">
<span class="panel-left00">3</span>
<span class="panel-left">测试测试测试测试测试测试</span>
</p>
<p class="clearfix">
<span class="panel-left00">4</span>
<span class="panel-left">测试测试测试测试测试测试</span>
</p>
<p class="right panel-leffont">add a link</p>
<div class="both"></div>
</div>
<div class="middle-right-item">
<p class="right-item-title">Code Track</p>
<p class="clearfix">
<span class="panel-left00">1</span>
<span class="panel-left">测试测试测试测试</span>
</p>
<p class="clearfix">
<span class="panel-left00">2</span>
<span class="panel-left">测试测试测试测试测试</span>
</p>
<p class="clearfix">
<span class="panel-left00">3</span>
<span class="panel-left">测试测试测试测试测试测试</span>
</p>
<p class="clearfix">
<span class="panel-left00">4</span>
<span class="panel-left">测试测试测试测试测试测试</span>
</p>
<p class="right panel-leffont">add a link</p>
<div class="both"></div>
</div>
<!-- 相关文档链接 --> <!-- 相关文档链接 -->
<!-- <div class="middle-right-item"> <!-- <div class="middle-right-item">
<p class="right-item-title">Relatvie Links</p> <p class="right-item-title">Relatvie Links</p>