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 a995d33..cb9bb3f 100644 Binary files a/static/image/annotation.png and b/static/image/annotation.png differ diff --git a/static/image/newadd.png b/static/image/newadd.png index 894138e..1413a88 100644 Binary files a/static/image/newadd.png and b/static/image/newadd.png differ diff --git a/static/image/question.png b/static/image/question.png index 25abe95..262edfc 100644 Binary files a/static/image/question.png and b/static/image/question.png differ 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