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

Merge branch 'develop' of http://git.trustie.net/wrm1995/codepedia2 into develop

This commit is contained in:
wrmswindmill 2018-08-20 18:50:03 +08:00
parent 182c4c4ed3 3a99c00d6a
commit a3282dd9ff
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
static/css/code_show.css
View File

@ -833,7 +833,7 @@ pre.prettyprint {
.put-select span.active { .put-select span.active {
color: #05101a; color: #05101a;
border: 1px solid #05101a; border: 1px solid #989898;
text-align: center; text-align: center;
margin: 10px 10px 10px 0px; margin: 10px 10px 10px 0px;
} }
@ -1442,7 +1442,7 @@ color: #FFF !important;
.codelinebox{ .codelinebox{
line-height: 19px; line-height: 19px;
min-height: 19px; min-height: 19px;
margin-bottom: -5px; margin-bottom: -16px;
} }
.newmypre{ .newmypre{
margin: 0 0 16px 28px; margin: 0 0 16px 28px;
@ -1524,4 +1524,19 @@ color: #FFF !important;
.panel-leffont{ .panel-leffont{
fonr-size:24px; fonr-size:24px;
color:#C3BDBD; color:#C3BDBD;
}
.newcodeline{
min-width: 910px;
width: 100%;
height: 23px;
/* background: #f1efec; */
display: flex;
}
.newcodelinebox{
line-height: 25px;
min-height: 25px;
margin-bottom: 0px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
} }

7
static/js/source.js
View File

@ -98,7 +98,6 @@ function modify_anno(file_id,line_num){
} }
}); });
$("."+file_id+line_num).text("//"+content) $("."+file_id+line_num).text("//"+content)
console.log(content);
} }
// FIXME // FIXME
@ -324,7 +323,7 @@ function submit_annotation(file_id, line_num, content) {
//将注释添加到当前行的上一行 //将注释添加到当前行的上一行
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 html = '<div class="codeline codelinebox">'+contenthtml+'</div>'; var html = '<div class="newcodeline newcodelinebox">'+contenthtml+'</div>';
var id=file_id+'_'+"L"+line_num; var id=file_id+'_'+"L"+line_num;
console.log(html) console.log(html)
$("#"+id).before(html); $("#"+id).before(html);
@ -694,9 +693,9 @@ function generate_codereading_content(lines,self_annos,fileid,annos_count,issues
function generate_codereading_anno_line(linenum,self_annos){ function generate_codereading_anno_line(linenum,self_annos){
var htmlstr = '' var htmlstr = ''
htmlstr += '<div class="codeline codelinebox">' htmlstr += '<div class="newcodeline newcodelinebox">'
htmlstr += '<div class="sourcecode">' htmlstr += '<div class="sourcecode">'
htmlstr += '<pre class="mypre mypre newmypre hljs-comment}">' htmlstr += '<pre class="mypre mypre newmypre hljs-comment">'
htmlstr += self_annos[linenum] htmlstr += self_annos[linenum]
htmlstr += '</pre>' htmlstr += '</pre>'
htmlstr += '</div>' htmlstr += '</div>'

4
templates/projects/filesub/code-reading.html
View File

@ -1,6 +1,6 @@
{% load base_filter %} {% load base_filter %}
<div class="code_file"> <div class="code_file">
{% formatText2Line project.name file.path as lines %} {% formatText2Line project.name file.path as lines %}
{% for linenum,line in lines.items %} {% for linenum,line in lines.items %}
{% if linenum in self_annos %} {% if linenum in self_annos %}
@ -14,7 +14,7 @@
<!-- <div id="linestatus_{{fileid}}_{{ linenum }}" class="linestatus"> --> <!-- <div id="linestatus_{{fileid}}_{{ linenum }}" class="linestatus"> -->
<div class="linestatus"> <div class="linestatus">
</div> </div>
</div> </div>
{% endif %} {% endif %}