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

Merge branch 'develop'

This commit is contained in:
wrmswindmill 2018-08-26 11:27:26 +08:00
parent 7bb916f632 09052ff918
commit 704b0e69ca
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
static/css/code_show.css
View File

@ -893,7 +893,7 @@ pre.prettyprint {
border: 1px solid transparent;
border-bottom: 1px solid #ccc;
height: 170px;
margin: 10px 0px 10px 18px;
margin: 15px 0px 10px 18px;
box-sizing: border-box;
color: black;
}
@ -1407,7 +1407,6 @@ color: #FFF !important;
white-space: normal;
word-wrap: break-word;
word-break: break-all;
width: 275px;
text-align: left;
}
.marbox{
@ -1502,7 +1501,7 @@ color: #FFF !important;
.newtopthumbs{
margin: 4px 0px 0px 16px;
width: 95%;
padding-left: 55px;
padding-left: 8px;
}
.thumbsmarginLeft{
margin-left: 0px;
@ -1584,4 +1583,7 @@ color: #FFF !important;
}
.anno_textarea{
}
.mt11{
margin-top:11px !important;
}

6
static/js/source.js
View File

@ -54,6 +54,7 @@ function show_annotation(file_id, line_num) {
}
function close_modify_anno(){
$("#modification").show();
$(".modify_anno_div").remove();
$("#modify_anno_textarea").attr("readonly","readonly")
@ -67,13 +68,14 @@ function close_modify_anno(){
//注入html代码
function inject_modifyAnno_html(item,file_id,linenum,anno_id) {
$("#modification").hide();
$(".modify_anno_div").remove();
$("#modify_anno_textarea").removeAttr("readonly");
$("#modify_anno_textarea").focus()
html_str = '<div class="modify_anno_div" style="display:block">'+
'<a href="javascript:void(0)" onclick="modify_anno('+file_id+','+linenum+','+anno_id+')" class="submit fr">提交</a>'+
'<a href="javascript:void(0)" onclick="close_modify_anno()">取消</a>'+
'<a href="javascript:void(0)" onclick="close_modify_anno()" class="btn fr mt10 mb10">取消</a>'+
'<a href="javascript:void(0)" onclick="modify_anno('+file_id+','+linenum+','+anno_id+')" class="btn btn-blue fr mt10 mb10 mr10">提交</a>'+
'</div>';
$(item).after(html_str)
ev = window.event;

4
templates/projects/filesub/annotation.html
View File

@ -27,7 +27,8 @@
<div class="parthalf_con clearfix">
<textarea id="modify_anno_textarea" class="fl break_word color-grey-des colorblack inlineBlock wi216" style="border:none" readonly>{{ self_anno.content }}</textarea>
{% if allow_modify %}
<a class="modify-anno" href="javascript:void(0)" onclick="inject_modifyAnno_html(this,{{self_anno.file_id}},{{self_anno.linenum}},{{self_anno.id}})">修改</a>
<a class="modify-anno btn btn-blue fr mt10 mb10" id="modification" href="javascript:void(0)" onclick="inject_modifyAnno_html(this,{{self_anno.file_id}},{{self_anno.linenum}},{{self_anno.id}})">修改</a>
<span class="color-grey-des inlineBlock marbox fr mt11">{{self_anno.user.nick_name}}</span>
{% endif %}
</div>
@ -36,7 +37,6 @@
<div class="parthalf_comment">
<div class="comment-btn clearfix">
<span class="color-grey-des inlineBlock marbox">{{self_anno.user.nick_name}}</span>
<a href="javascript:void(0)" class="btn btn-blue fr" onclick="addcomments(this)" >添加评论</a>
<div class="comment-write clearfix none">
<textarea class="writetext" id="writetext_{{ self_anno.pk }}" placehoder="请输入评论内容"></textarea>