From 74449c6bd278ae72451808bda6611130ff4415d0 Mon Sep 17 00:00:00 2001 From: wrmswindmill Date: Wed, 18 Jul 2018 23:27:40 +0800 Subject: [PATCH] add new code color using highlight.js but indentation has error --- apps/operations/views.py | 4 +-- static/css/code_show.css | 4 ++- static/js/source.js | 32 +++++++++++-------- templates/projects/.source.html.swp | Bin 16384 -> 0 bytes templates/projects/filesub/code-reading.html | 14 ++++---- templates/projects/source.html | 7 +--- 6 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 templates/projects/.source.html.swp diff --git a/apps/operations/views.py b/apps/operations/views.py index eff461d..cea89b9 100644 --- a/apps/operations/views.py +++ b/apps/operations/views.py @@ -587,7 +587,7 @@ class AddVoteView(View): exist_records = Vote.objects.filter(user=request.user, vote_type_id=object_id, vote_type=vote_type) if exist_records: vote_before = exist_records[0].value - object.vote -= vote_before + object.voteup -= vote_before object.save() exist_records.delete() return HttpResponse(json.dumps({"status": "success", "info": "cancel", "value": -(vote_before), "msg": "取消成功"}), @@ -600,7 +600,7 @@ class AddVoteView(View): vote.vote_type_id = object_id vote.value = vote_value vote.save() - object.vote += int(vote_value) + object.voteup += int(vote_value) object.save() return HttpResponse(json.dumps({"status": "success", "msg": "点赞成功", "value": int(vote_value)}), content_type='application/json') else: diff --git a/static/css/code_show.css b/static/css/code_show.css index ab9b3b1..71509c9 100644 --- a/static/css/code_show.css +++ b/static/css/code_show.css @@ -568,7 +568,8 @@ a:hover { padding: 15px 0px; max-height: 600px; overflow-y: auto; - z-index:3; + z-index:3; + color:black; } .loadCommentpanel-back, .loadQuestionpanel-back { @@ -628,6 +629,7 @@ a:hover { border-radius: 4px; right: 32px; z-index: 3; + color:black; } .ques-title { diff --git a/static/js/source.js b/static/js/source.js index 5171254..2644c37 100644 --- a/static/js/source.js +++ b/static/js/source.js @@ -18,7 +18,7 @@ function getCookie(name) { var csrftoken = getCookie('csrftoken'); function show_annotation(file_id, line_num) { - ev = window.event + ev = window.event; var mousePos = mouseCoords(ev) $.ajax({ @@ -53,7 +53,7 @@ function show_annotation(file_id, line_num) { function close_modify_anno(){ $(".modify_anno_div").remove(); - ev = window.event + ev = window.event; ev.stopPropagation(); } @@ -66,7 +66,7 @@ function inject_modifyAnno_html(item,file_id,linenum) { '取消'+ ''; $(item).after(html_str) - ev = window.event + ev = window.event; ev.stopPropagation(); } @@ -104,7 +104,7 @@ function modify_anno(file_id,line_num){ // FIXME function show_issue_question(file_id, line_num, issue_ids) { issueid_str=issue_ids.toString() - ev = window.event + ev = window.event; var mousePos = mouseCoords(ev) //发送问题id，返回问题内容 $.ajax({ @@ -223,7 +223,7 @@ function add_comment_action(item, id, type) { } } }); - ev = window.event + ev = window.event; ev.stopPropagation(); } @@ -373,7 +373,7 @@ function submint_question(file_id, line_num, content) { function search_symbol(args) { - ev = event || window.event + ev = window.event var mousePos = mouseCoords(ev) $.ajax({ @@ -567,14 +567,14 @@ $(function () { function addcomments(item) { $(item).siblings(".comment-write").removeClass("none"); $(item).addClass("none"); - ev = window.event + ev = window.event; ev.stopPropagation(); } function cancelcom(item) { $(item).parents(".comment-write").siblings("#addcom").removeClass("none"); $(item).parents(".comment-write").addClass("none"); - ev = window.event + ev = window.event; ev.stopPropagation(); } @@ -713,14 +713,18 @@ function add_tab(project_id,path,filename) { if (data.status === 'success') { // 获取code-reading的内容，并填充到对应的code-reading的Element var content = data.html_str - // console.log(content); + div_codereading.innerHTML = content; + if(data.is_dir=="0"){ + hljs.configure({useBR: false}); + hljs.highlightBlock(div_codereading) + // .each(function(i, block) { + // hljs.highlightBlock(block); + // }); + } - hljs.configure({useBR: false}); + - $('.code_Area').each(function(i, block) { - hljs.highlightBlock(block); - }); } else { div_codereading.innerHTML = ""; @@ -807,7 +811,7 @@ function inject_addnoPanel_html(item,file_id,linenum) { ''+ ''; $(item).after(html_str) - ev = window.event + ev = window.event; ev.stopPropagation(); } diff --git a/templates/projects/.source.html.swp b/templates/projects/.source.html.swp deleted file mode 100644 index a65bf3bb7a5c793bd0e4d95f60e9e386c3e78c7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16384 zcmeI2U#J~N9mmH++h~ocimx&`X}CAS?%qGaBsY66qSh){Z_%{0id^RG&N(|LyF1&R z*_&Lh7ZbIVg4BX9YH3X^6e^)KrG$tNeJDa->YJdiZTja)@WnqU>UZ|f$)0oeCXz%1 znZ113voo{5nfc6bezUuG`U?+z<$ik1JxXxgP00TF^>1ar+e7Bh5Ryx&P4bP7#RX?+ z+4-!qbmICYy)2g_9%$tSGUOQ#1#>i4`r74^yWnY_WHCefwc<(^dBELBC-L=bu(_6i zC9pez{bYG*alzyt>K&w?{KSL17qvN-fF)oFSOS)SC143y0+xU!@P9`@XM4$a(W^am z&mOMNADBA-t3Dp7)0=Zs?w@u3zB>Pvsr&0od$I&90ZYIVummgtOTZGa1S|ndz!I8boHZz zybV1C`Oryd4!U#~A?wiH&_3voA0gxd^f_oR^yd!~@+atR=q>0)=sD;D^mFJ5=$p_A zbQpRa9~dq}--o^qeHwb_PD0*(FPQJD`^U z;W0=;E6@SxZyzM&J?J8|1Fb=yg8sUfkiS50Ko3JcGza}1A5q?fEXZb*!oht5!VzVhch^gt4lZ#=bW1)19D!mo+ z)m|tRHh^rcq%!3vr!9CeG217Aui#|>U2n}Q`bLUJXG^fUvvv_=rCSzeJ z(qRQ{g&xb!0+8>C?)t9dM#Qvb`uH!o3^h!HBF};HfoccP*WhteBWoIS`&_9RMyK?w zNj$z+bW96$em9INW9iyAbY29y$hq&8*JOrXET~L_SOlk6dn%G=Hd3}JhD-~Y&g)31 zBV9edL9I2f-Rdl%9dsP(Pq~$GVYqL|9cjEQ9`-29vE2%hB;@I851qjP7|)@OGl{3P ziN4g~hXq<}P7jt}#7%xPk1_dM{cF$kR^;-_wzi@`6DVjRLowKLSR9X?Jz@D!q>h%^ z3SBBaecaZz`7RS{q#T~Ax+rfVOWWcCEY{b3skKa2s7dO}JmmSfQmSMuLVD=v=gr^A z9`!0ab5^NKu>V{0lr&$l&K1_KE0`%}?97ei;PZc4jb9ER~ zo*7(K^t~dDB?y)K;^q$TOs)gQVyrj}&ZO^dv1PCG#sSUwqXo9?xrO4nE7S%nbcA^= z0_@leC+=za2qprB`Yd-^Kg-D9_8H?G@4s;V-AmuQdgaM#i=YVEdq4ZZ)z_YR_lM`N zUOD&vvL#r$q5cxgr(%%b*Y&5?FKA z)2~Vv&L266SX7xBkAz<(P`#C5`DR&$7+8iqZ^SlPl?mo%RN$4>xX`(g@}kDRo3Y@u zJ5qD-AQP6F8Y*M-3ryVF zni-R8HILM|AMmINGWX06iWK2brgZ)Y-M(jj?$Ah?hlsf&Xsh`F96N0y?c1vkM_OlU z#q)wN1=JvxML39Aj+V;AVdwVE;+?WIoR3mF3(1|sv8N{j0O?Q71yi12Ty&; zIS!xltH6&l_Pyis;1}1waO#l5`o((C{L diff --git a/templates/projects/filesub/code-reading.html b/templates/projects/filesub/code-reading.html index a1b6b55..2637f65 100644 --- a/templates/projects/filesub/code-reading.html +++ b/templates/projects/filesub/code-reading.html @@ -1,12 +1,12 @@ {% load base_filter %} - +
{% formatText2Line project.name file.path as lines %} {% for linenum,line in lines.items %} -
+
{{ linenum }}
- {{ line }} + {{ line | safe }}
@@ -19,11 +19,11 @@ {% if linenum in issues_count %} - + {# {{ question_count | keyValue:linenum }} #} {% elif linenum in questions_count %} - + {% endif %} @@ -32,6 +32,6 @@
-
-{% endfor %} \ No newline at end of file +{% endfor %} +
\ No newline at end of file diff --git a/templates/projects/source.html b/templates/projects/source.html index dbc95de..e0f782f 100644 --- a/templates/projects/source.html +++ b/templates/projects/source.html @@ -22,12 +22,7 @@ - - - - + {{ project.name }}-{{ project.desc }}