diff --git a/media/css/seahub.css b/media/css/seahub.css
index 06a3850838..72fe6dafdb 100644
--- a/media/css/seahub.css
+++ b/media/css/seahub.css
@@ -1,8 +1,12 @@
body,h1,h2,h3,h4,h5,h6,p,ul,ol,li,dl,dt,dd,pre,blockquote,form,input,textarea,button,img { margin:0; padding:0; }
-ul > li { list-style:none; }
+ul { list-style:none; }
a { color:#ee8833; text-decoration:none; font-weight:bold; }
a:hover { color: #ff9933; text-decoration: underline; }
img { border:none; }
+h1 {
+ font-size:24px;
+ margin:15px 0 8px;
+}
h2 { font-size:18px; color:#808; }
h3 { font-size:15px; color:#808; font-weight:normal; margin:12px 0 2px; }
h4 { font-size:14px; color:#000; font-weight:normal; margin:2px 0 0; }
@@ -64,6 +68,14 @@ input[type="file"] {
background:#ebebe4;
}
label { display: inline-block; margin:2px 0px; }
+iframe {
+ display:block;
+ width:100%;
+}
+pre {
+ white-space:pre-wrap;
+ word-wrap: break-word;
+}
/* table */
table {
border-spacing: 0;
@@ -687,15 +699,12 @@ table img {
}
#file-view {
margin-top:20px;
- padding:5px;
+ padding:3px;
background:#dedede;
border-radius:3px;
-moz-border-radius:3px;
}
#docu-view {
- white-space:pre-wrap;
- word-wrap: break-word;
- width:928px;
padding: 5px;
min-height: 200px;
border: 1px solid #ccc;
@@ -707,7 +716,8 @@ table img {
}
#docu-view,
#svg-view,
-#pdf {
+#pdf,
+#md-view {
background:#fff;
}
#svg-view {
@@ -740,6 +750,54 @@ table img {
border-radius:3px;
-moz-border-radius:3px;
}
+#md-view {
+ padding:30px;
+ border:1px solid #ccc;
+}
+#md-view h3 {
+ color:#000;
+ font-weight:bold;
+ margin:10px 0 4px;
+}
+#md-view p {
+ margin-bottom:3px;
+}
+#md-view ul {
+ list-style-type:disc;
+ padding-left:2em;
+ margin:4px 0;
+}
+#md-view code {
+ font-size:12px;
+ white-space: nowrap;
+ padding: 1px 5px 0;
+ background-color: #F8F8F8;
+ border: 1px solid #dadada;
+ border-radius: 2px;
+ -moz-border-radius: 2px;
+ -webkit-border-radius: 2px;
+ margin: 0 2px;
+}
+#md-view pre {
+ font-size:13px;
+ padding:5px 10px;
+ background:#f8f8f8;
+ border:1px solid #ddd;
+ border-radius:3px;
+ -moz-border-radius:3px;
+ -webkit-border-radius:3px;
+ margin:5px 0;
+}
+#md-view pre code {
+ white-space:pre-wrap;
+ padding:0;
+ margin:0;
+ border:none;
+}
+#md-view a {
+ font-weight:normal;
+}
+
/* shareadmin */
.view-link-alert p {
display: inline-block;
diff --git a/media/js/showdown.js b/media/js/showdown.js
new file mode 100644
index 0000000000..4e399a21b2
--- /dev/null
+++ b/media/js/showdown.js
@@ -0,0 +1,17 @@
+// showdown.js -- A javascript port of Markdown.
+// Copyright (c) 2007 John Fraser.
+// Original Markdown Copyright (c) 2004-2005 John Gruber
+//
"+d+"\n
",t(d)+e}),a=a.replace(/~0/,""),a},s=function(a){return a+="~0",a=a.replace(/\n```(.*)\n([^`]+)\n```/g,function(a,b,c){var d=b,e=c;return e=v(e),e=F(e),e=e.replace(/^\n+/g,""),e=e.replace(/\n+$/g,""),e=""+e+"\n
",t(e)}),a=a.replace(/~0/,""),a},t=function(a){return a=a.replace(/(^\n+|\n+$)/g,""),"\n\n~K"+(c.push(a)-1)+"K\n\n"},u=function(a){return a=a.replace(/(^|[^\\])(`+)([^\r]*?[^`])\2(?!`)/gm,function(a,b,c,d,e){var f=d;return f=f.replace(/^([ \t]*)/g,""),f=f.replace(/[ \t]*$/g,""),f=v(f),b+""+f+"
"}),a},v=function(a){return a=a.replace(/&/g,"&"),a=a.replace(//g,">"),a=G(a,"*_{}[]\\",!1),a},w=function(a){return a=a.replace(/(\*\*|__)(?=\S)([^\r]*?\S[*_]*)\1/g,"$2"),a=a.replace(/(\*|_)(?=\S)([^\r]*?\S)\1/g,"$2"),a},x=function(a){return a=a.replace(/((^[ \t]*>[ \t]?.+\n(.+\n)*\n*)+)/gm,function(a,b){var c=b;return c=c.replace(/^[ \t]*>[ \t]?/gm,"~0"),c=c.replace(/~0/g,""),c=c.replace(/^[ \t]+$/gm,""),c=h(c),c=c.replace(/(^|\n)/g,"$1 "),c=c.replace(/(\s*[^\r]+?<\/pre>)/gm,function(a,b){var c=b;return c=c.replace(/^ /mg,"~0"),c=c.replace(/~0/g,""),c}),t("\n"+c+"\n")}),a},y=function(a){a=a.replace(/^\n+/g,""),a=a.replace(/\n+$/g,"");var b=a.split(/\n{2,}/g),d=new Array,e=b.length;for(var f=0;f=0?d.push(g):g.search(/\S/)>=0&&(g=i(g),g=g.replace(/^([ \t]*)/g," "),g+="
",d.push(g))}e=d.length;for(var f=0;f=0){var h=c[RegExp.$1];h=h.replace(/\$/g,"$$$$"),d[f]=d[f].replace(/~K\d+K/,h)}return d.join("\n\n")},z=function(a){return a=a.replace(/&(?!#?[xX]?(?:[0-9a-fA-F]+|\w+);)/g,"&"),a=a.replace(/<(?![a-z\/?\$!])/gi,"<"),a},A=function(a){return a=a.replace(/\\(\\)/g,H),a=a.replace(/\\([`*_{}\[\]()>#+-.!])/g,H),a},B=function(a){return a=a.replace(/<((https?|ftp|dict):[^'">\s]+)>/gi,'$1'),a=a.replace(/<(?:mailto:)?([-.\w]+\@[-a-z0-9]+(\.[-a-z0-9]+)*\.[a-z]+)>/gi,function(a,b){return C(D(b))}),a},C=function(a){function b(a){var b="0123456789ABCDEF",c=a.charCodeAt(0);return b.charAt(c>>4)+b.charAt(c&15)}var c=[function(a){return""+a.charCodeAt(0)+";"},function(a){return""+b(a)+";"},function(a){return a}];return a="mailto:"+a,a=a.replace(/./g,function(a){if(a=="@")a=c[Math.floor(Math.random()*2)](a);else if(a!=":"){var b=Math.random();a=b>.9?c[2](a):b>.45?c[1](a):c[0](a)}return a}),a=''+a+"",a=a.replace(/">.+:/g,'">'),a},D=function(a){return a=a.replace(/~E(\d+)E/g,function(a,b){var c=parseInt(b);return String.fromCharCode(c)}),a},E=function(a){return a=a.replace(/^(\t|[ ]{1,4})/gm,"~0"),a=a.replace(/~0/g,""),a},F=function(a){return a=a.replace(/\t(?=\t)/g," "),a=a.replace(/\t/g,"~A~B"),a=a.replace(/~B(.+?)~A/g,function(a,b,c){var d=b,e=4-d.length%4;for(var f=0;f ').css({'text-align':'center', 'padding':'30px 0'}); {% endif %} {% if filetype == 'SVG' %} - $('#file-view').html(''); +$('#file-view').html(''); {% endif %} {% if filetype == 'Document' %} var uuid = ''; @@ -32,7 +32,7 @@ contentType: 'application/json; charset=utf-8', success: function(data) { if (data.length > 0) { - $('#file-view').html(''); + $('#file-view').html(''); } }, error: function(xhr, ajaxOptions, thrownError) { @@ -92,7 +92,7 @@ $.ajaxSetup({cache:true}); $.getScript('{{MEDIA_URL}}js/pdf.js', function() { PDFJS.workerSrc = '{{MEDIA_URL}}js/pdf.js'; - $('#file-view').html(' ').css({'text-align':'center', 'padding':'3px'}); + $('#file-view').html('/ 页').css({'text-align':'center'}); var seahub_getPage = function (pdf, page_number) { pdf.getPage(page_number).then(function(page) { var scale = 1.5; @@ -143,6 +143,23 @@ }); }); {% endif %} -{% if filetype == 'Unknown' %} - $('#file-view').html('/ 页该类型文件无法在线查看。下载
'); + +{% if filetype == 'Markdown' %} +$.ajaxSetup({cache:true}); +$.getScript('{{MEDIA_URL}}js/showdown.js', function() { + $.ajax({ + url: '{{ raw_path }}', + dataType: 'text', + cache: false, + success: function(data) { + var converter = new Showdown.converter(); + $('#file-view').html('' + converter.makeHtml(data) + ''); + $('#md-view').children(':first').css('margin-top', '0'); + } + }); +}) +{% endif %} + +{% if filetype == 'Unknown' %} +$('#file-view').html('该类型文件无法在线查看。下载
'); {% endif %} diff --git a/utils.py b/utils.py index c2b9bd1bb8..b1c65015ad 100644 --- a/utils.py +++ b/utils.py @@ -19,11 +19,12 @@ import settings EMPTY_SHA1 = '0000000000000000000000000000000000000000' PREVIEW_FILEEXT = { - 'Text': ('ac', 'am', 'bat', 'c', 'cc', 'cmake', 'cpp', 'css', 'diff', 'h', 'html', 'java', 'js', 'json', 'less', 'make', 'markdown', 'org', 'php', 'properties', 'py', 'rb', 'scala', 'script', 'sh', 'sql', 'txt','text', 'vi', 'vim'), + 'Text': ('ac', 'am', 'bat', 'c', 'cc', 'cmake', 'cpp', 'css', 'diff', 'h', 'html', 'java', 'js', 'json', 'less', 'make', 'org', 'php', 'properties', 'py', 'rb', 'scala', 'script', 'sh', 'sql', 'txt','text', 'vi', 'vim'), 'Image': ('gif', 'jpeg', 'jpg', 'png'), 'SVG': ('svg',), 'Document': ('doc', 'docx', 'ppt', 'pptx', 'xls', 'xlsx'), 'PDF': ('pdf',), + 'Markdown': ('markdown', 'md'), } def go_permission_error(request, msg=None):