From 80de3ec4d54f961420695c12071abbba6a0de412 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E775174143?= <775174143@qq.com> Date: Tue, 14 Aug 2018 17:50:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B7=A6=E8=BE=B9=E6=A0=91?= =?UTF-8?q?=E5=BD=A2=E7=9B=AE=E5=BD=95=20=E5=9C=B0=E5=9D=80=E9=9A=8F?= =?UTF-8?q?=E4=B9=8B=E4=BF=AE=E6=94=B9=E5=AF=B9=E5=BA=94=E7=9A=84=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/utils/get_project_tree.py | 8 ++++---- static/css/code_show.css | 6 ++---- static/css/monokai-sublime.css | 2 +- static/image/annotation.png | Bin 1339 -> 1322 bytes static/image/newadd.png | Bin 1392 -> 1272 bytes static/image/question.png | Bin 1334 -> 1200 bytes static/js/source.js | 11 ++++++++++- 7 files changed, 17 insertions(+), 10 deletions(-) diff --git a/apps/utils/get_project_tree.py b/apps/utils/get_project_tree.py index 5266518..53a62a9 100644 --- a/apps/utils/get_project_tree.py +++ b/apps/utils/get_project_tree.py @@ -44,8 +44,8 @@ def genetree(path,parentdirs): index = path.find(project_name) relative_path = path[index+len(project_name):]+"/"+dir dirname = parentdirs + dir - # ondbclick_str = '' %(project_id,relative_path,dirname) - ondbclick_str = '' %(project_id,relative_path,dirname) + # ondbclick_str = '' %(project_id,relative_path,dirname) + ondbclick_str = '' %(project_id,relative_path,dirname) ondbclick_str += (dirname +"") # 形成li字符串 @@ -62,7 +62,7 @@ def genetree(path,parentdirs): # 合成ondbclick 字符串 index = path.find(project_name) relative_path = path[index+len(project_name):]+"/"+file - ondbclick_str = '' %(project_id,relative_path,file) + ondbclick_str = '' %(project_id,relative_path,file) ondbclick_str += (file +"") # 合成li htmlstr += "
  • "+ ondbclick_str+"
    • " @@ -81,7 +81,7 @@ def getHtml(path): project_name = path.split("/")[-1] project_id = str(Project.objects.get(name=project_name).pk) - ondbclick_str = '' %(project_id,"",project_name) + ondbclick_str = '' %(project_id,"",project_name) ondbclick_str += (project_name+"") htmlstr += "
    • "+ ondbclick_str htmlstr += genetree(path,"") diff --git a/static/css/code_show.css b/static/css/code_show.css index 3e253ef..3c85708 100644 --- a/static/css/code_show.css +++ b/static/css/code_show.css @@ -26,7 +26,7 @@ p, input, table { } .color-yellow{ - color: #4CD5FC; + color: #2281a9; } .color-dark-blue { @@ -1485,11 +1485,10 @@ color: #FFF !important; margin-left: -5px; } .rightimgcomment{ - color: red; font-size: 13px; background-size: 100% 100%; height: 14px; - width: 16px; + width: 14px; } .rightimgcommentblue{ @@ -1497,5 +1496,4 @@ color: #FFF !important; background-size: 100% 100%; height: 16px; width: 16px; - color: blue; } \ No newline at end of file diff --git a/static/css/monokai-sublime.css b/static/css/monokai-sublime.css index 996fac1..b4ae910 100644 --- a/static/css/monokai-sublime.css +++ b/static/css/monokai-sublime.css @@ -28,7 +28,7 @@ Monokai Sublime style. Derived from Monokai by noformnocontent http://nn.mit-lic .hljs-regexp, .hljs-literal, .hljs-link { - color: #ae81ff; + color: #CCC; } .hljs-code, diff --git a/static/image/annotation.png b/static/image/annotation.png index a995d33d96bec7f70ef764b5b9e28b1cb728a54b..cb9bb3fc2f181c22ba57093d99fd8eb6459e6b35 100644 GIT binary patch delta 655 zcmdnZwTerzGr-TCmrII^fq{Y7)59eQNDBk800$e8{Bp!4X``YhlY*J6iIJOyxud0< zqk*BJtA(SfxwD&rtBI?dvx%9JsmbIlCK;F_C!C6wF&V@_O|rnHNJ*i%Bq%k_DkVR; zG&eP`#M8xAsUo*PFC{a@3aZxEaktacj=y)7nP@MGkzF zT$biosXK*r=E}e+*O|H_BNZ2Qq$!$dgauvEG0-_8?;xiwz5YsovwAh3sGV^B~2wakKX=6+6mB)9!m1`eR;k)bHoqHzFE$&$6 z@^Ina7wS$=_VqjtJVrppOIys9;2Bydjr=n#{1~E{RoN*~qQYbD7N=>s$$xklL zP0cIubg@;c$Su%I$xN|=>UF`Tcd`+)Q@!EW%c~d|7*~6`IEGZ*I&m(V9k;hHx;-)vQIdE>X1e&ucE3aXXO-){ykzzikhA) zKiYn^F1?eMk@E1$@|pMdrq>mp`}z0X*1vW8zfM;^^Xsu-;1g@!lD#}{H5`PLJ~mdr zNfyzr&w4aZ{d2aH`y!n)%ChMZM>yjInsY*uB)6|Pp0}ap)ia%K0qu|T%cgZ3zS(eC zEX?wyjq`RD=_&7z+sj-P^t#y3Iq8~J_zunVN4y)^YEMi^-t?7A`f1wF{8gvQY+p?d zttvg_cSoXlmTKNq3-;?XjGyH^X8I_!`jq)g-PPMH4AknED@p2gKA!MMBcZd#O)5QV zq3}Jg*)J}3YsPr(X*98sDi#t@tzGG6H}C7T_NVO6c9a|muP}Y2en+x!-j<1};(n|5 zZN0a#>s9=fR7O*g<7U4DzJ`eIa`G`-GU?>vUrRTJ1|D0w@oQpx{p1x9To>2Q(+b-z z_u^u8Ge7T)iP_!}hrO7SR3}DTJqQq;obvqOywvGA(O+Ywg;Xo~zj%L+{CD7SjV6ni rM6Y0p#C0~OwG;lnzkg#s6Ay#r&&03cX>JFBiH^b3)z4*}Q$iB}0Kp5z diff --git a/static/image/newadd.png b/static/image/newadd.png index 894138e4e35a13550dc755f8200011286c9d20f3..1413a882bcd4bf60a0be2a15564d3c5b8915f904 100644 GIT binary patch delta 605 zcmeys^@CHfGr-TCmrII^fq{Y7)59eQNDF~52OE$KJJ%P!QBjjg!PLyj%*n*i(9+G( zz|hdu!qLgX!qUjm&B)ct~m3`~&`PDRU@3}PTA8Mxt6q@++>5|o-|m6D%a znwy$e;^|_mRFPYtmy(%c1$Bi1F1?eDn4Rix=FUuKU|`Jfba4!+xRn%=6?3wIc?RP~ zU4hk1AL|wN@f~Sz_`$Sk(eBd3gjuZJjDZd@yhoxebS#*U^g8Tejhw*gd$C3#uIspf zfC1y9vkrGUPb*B27v7L@hyBR$4IR@N3+;C~Zgh}oJIosAFsH|Pox{$|snTZ@0xZrR zcr032uON0**`7UZg0(>L!@v_gsyY)JbuNUO`2;L~%)Ew0hl$aA!giC1EM|-!MKX3Z z?)+gWu%9i7U*R9OXgbRyE`_qDPpXj%{Ms2Ov}I>(`^)yI-l2xo_YZH;n`WLWh9hMG zjVU^YOW2NhIqYHXzkbh9Fo1!nzTpQuqbd8$1rM9}>;JfO8RtCU7RYCn{36=%`hx~b zyRa@OGu?~!K_B7RIsaWZW=>{3R|w%?n(dYBz@T9;XfPggvVIe}Am z*4oA$vK{r0KAuX?2w0$!lJhiBRNy;Pp@P6{rj0Bie(7?!G*W*^z V?h$$!m|z$@*Z0Tlc zW@zYY;b`D!=s$$xklL zP0cIubg@;c$Su%I$xN|=>UF}Ucd`+)Q@w!gJAMWR#s{7*jv*Dd)?D@V5J{9d{xLTE z(uNbwX`b7ySU9_N8s9DS&Y0LCyQ`!6!sH)Pf(PZkEO-zdE0l83SyQBGg~xOzez~Iw z;ei1eqE<^(SQfeHT)g$A_R;?XoB7Y5ImvE!=8UoN{@Q!bZfAc1)c1`^lG`d?EFZCmzehA1)=cyKB`?vKuCq8>=tXDH&Tzd%uZU}l{yp6D zZ()+;4Xd3Wc>`BlhZi&*zwzN^k#64?3BScW;Gr@uHpZOfa8X}&ROAyWl;ZX`dr#UFoiN9m)G uY2NGKIP71ztNf(sGOr(d{xkjKG+=12$g4@(Zj%g5sSKX3elF{r5}E)6gC|V@ diff --git a/static/image/question.png b/static/image/question.png index 25abe9538f27c797e2384f0aa09aa5c151c9cb9c..262edfc8774fbdd0e5fc39062c5124a55215a6da 100644 GIT binary patch delta 532 zcmdnSwSiNyGr-TCmrII^fq{Y7)59eQNb>=)5C}l;PR?SIfhjV^sc0FKK@8L+16+!f6pBlNQq!zb@{>z* zQ}aqZU2K&qatriQGE=OedJS>uoovMHRIhL5#lpbAsNm`17*cU7DI_aq<-r37F0dat zjYU3#Y={a<*4;FBv?17`1M+Ndj_pOmP;BgVW@ zU7%jtIhKRVBr(b471Kvy1v}m&^$Q<Kc~h{X;x~?Nsj!Sy zNk^7`WD!{Iu$X-r#}pRVh93%5G0NE`Y>$3tZ2RlJol~vv-IeDNB8@qJIeNJQszTXW zwYVpB9&fN<_OEE**}(QlRiS>f!p^ p{~R4^6Y*3UvEVr{q8U70{an^LB{Ts59df4} delta 667 zcmdnMxs6M)Gr-TCmrII^fq{Y7)59eQNQ;0l2OE&=?Ud!+sHn-LU|?o!YGUc;Z0Tlc zW@zYY;b>xP;^gA$Waj8%>grs$$xklL zP0cIubg@;c$Su%I$xN|=>UF}Ucd`+)Q~jyiop}rljLSS-978H@t(m%8-^Eel=-sXS zuQ$pC<}@=+o#gWL=7pdRj@BkO#S9S`@4h=qh&0wM zdvN#D{^bo%4}`P$9~7)$7B@4j5I=4tS0bWww3KT~qges>vxemyozvYNSZ@?@p4#j@ zf#2*$%(}auBUWTibf3O}r}F&O@Fz|{AW#C2Hl;N jKh}k9vuBKF;$gU?o$xs7j+YfMy)k&Y`njxgN@xNAy?Xg! diff --git a/static/js/source.js b/static/js/source.js index 713e1b4..ba5739d 100644 --- a/static/js/source.js +++ b/static/js/source.js @@ -663,7 +663,16 @@ function open_tab(path) { // 如果标签页已经存在，则打开对应的标签页 // 并调用open_tab function add_tab(project_id,path,filename) { - + // var href = window.location.href; + var ip=window.location.host; //端口号 + // console.log(window.location.pathname); 端口号后面的路径 + var pathName= $("#pathName").text(); + var newhtefpath = "/projects/"+pathName+path; + console.log(pathName); + var stateObject = {}; + //修改地址栏中的地址 + history.pushState(stateObject, ip, newhtefpath); + var tree_node = $("#jstree").jstree("get_selected"); var path_before = path