1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-13 22:01:06 +00:00

[wiki] improvement & bug fix for header links, index, & creating wiki by choosing a lib

This commit is contained in:
llj
2014-01-14 15:35:53 +08:00
parent 8cfd795ef3
commit a33a971bed
6 changed files with 110 additions and 63 deletions

View File

@@ -805,11 +805,6 @@ textarea:-moz-placeholder {/* for FF */
padding:6px 13px;
border:1px solid #ccc;
}
/**** index ****/
#index-content li {
padding-left: 10px;
background: transparent url('../img/li.gif') no-repeat scroll left 6.5px;
}
/********** container ***********/
#main, #footer,
#repo-top .block-inner,
@@ -2148,6 +2143,13 @@ textarea:-moz-placeholder {/* for FF */
margin-left: auto;
margin-right: auto;
}
.anchor {
font-size:0.8em;
margin-left:6px;
}
.anchor:hover {
text-decoration:none;
}
#svg-view {
min-height:500px;/*for ff*/
}
@@ -2598,3 +2600,19 @@ textarea:-moz-placeholder {/* for FF */
.help-con {
padding:0 0 0 60px;
}
/* wiki index */
.wiki-index {
border:1px solid #ddd;
padding:10px;
background:#f7f7f7;
border-radius:5px;
margin-top:25px;
}
.wiki-index h3 {
border-bottom:1px solid #ddd;
}
.wiki-index ul {
list-style-type: square;
padding-left: 1.5em;
margin-bottom:5px;
}

View File

@@ -649,16 +649,16 @@ function trimFilename(name, n) {
return str;
}
function buildAnchorName(raw_text) {
/*
* Only unicode letter category, '-' and '_' will be used to build
* an anchor name, spaces will be coverted to '-' and others will be omitted.
*/
var punctuation = /[^\u0020\u002D\u0030-\u0039\u005F\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/g;
return raw_text.replace(punctuation, "").replace(/\s+/g, "-");
}
function addAnchorsToHeaders(html) {
var buildAnchorName = function(raw_text) {
/*
* Only unicode letter category, '-' and '_' will be used to build
* an anchor name, spaces will be coverted to '-' and others will be omitted.
*/
var punctuation = /[^\u0020\u002D\u0030-\u0039\u005F\u0041-\u005A\u0061-\u007A\u00AA\u00B5\u00BA\u00C0-\u00D6\u00D8-\u00F6\u00F8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0370-\u0374\u0376\u0377\u037A-\u037D\u0386\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0527\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA\u07F4\u07F5\u07FA\u0800-\u0815\u081A\u0824\u0828\u0840-\u0858\u08A0\u08A2-\u08AC\u0904-\u0939\u093D\u0950\u0958-\u0961\u0971-\u0977\u0979-\u097F\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BD\u09CE\u09DC\u09DD\u09DF-\u09E1\u09F0\u09F1\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A59-\u0A5C\u0A5E\u0A72-\u0A74\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABD\u0AD0\u0AE0\u0AE1\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3D\u0B5C\u0B5D\u0B5F-\u0B61\u0B71\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BD0\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C33\u0C35-\u0C39\u0C3D\u0C58\u0C59\u0C60\u0C61\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBD\u0CDE\u0CE0\u0CE1\u0CF1\u0CF2\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D\u0D4E\u0D60\u0D61\u0D7A-\u0D7F\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0E01-\u0E30\u0E32\u0E33\u0E40-\u0E46\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB0\u0EB2\u0EB3\u0EBD\u0EC0-\u0EC4\u0EC6\u0EDC-\u0EDF\u0F00\u0F40-\u0F47\u0F49-\u0F6C\u0F88-\u0F8C\u1000-\u102A\u103F\u1050-\u1055\u105A-\u105D\u1061\u1065\u1066\u106E-\u1070\u1075-\u1081\u108E\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u1380-\u138F\u13A0-\u13F4\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u1700-\u170C\u170E-\u1711\u1720-\u1731\u1740-\u1751\u1760-\u176C\u176E-\u1770\u1780-\u17B3\u17D7\u17DC\u1820-\u1877\u1880-\u18A8\u18AA\u18B0-\u18F5\u1900-\u191C\u1950-\u196D\u1970-\u1974\u1980-\u19AB\u19C1-\u19C7\u1A00-\u1A16\u1A20-\u1A54\u1AA7\u1B05-\u1B33\u1B45-\u1B4B\u1B83-\u1BA0\u1BAE\u1BAF\u1BBA-\u1BE5\u1C00-\u1C23\u1C4D-\u1C4F\u1C5A-\u1C7D\u1CE9-\u1CEC\u1CEE-\u1CF1\u1CF5\u1CF6\u1D00-\u1DBF\u1E00-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u2071\u207F\u2090-\u209C\u2102\u2107\u210A-\u2113\u2115\u2119-\u211D\u2124\u2126\u2128\u212A-\u212D\u212F-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2183\u2184\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CEE\u2CF2\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D80-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2E2F\u3005\u3006\u3031-\u3035\u303B\u303C\u3041-\u3096\u309D-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FCC\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA61F\uA62A\uA62B\uA640-\uA66E\uA67F-\uA697\uA6A0-\uA6E5\uA717-\uA71F\uA722-\uA788\uA78B-\uA78E\uA790-\uA793\uA7A0-\uA7AA\uA7F8-\uA801\uA803-\uA805\uA807-\uA80A\uA80C-\uA822\uA840-\uA873\uA882-\uA8B3\uA8F2-\uA8F7\uA8FB\uA90A-\uA925\uA930-\uA946\uA960-\uA97C\uA984-\uA9B2\uA9CF\uAA00-\uAA28\uAA40-\uAA42\uAA44-\uAA4B\uAA60-\uAA76\uAA7A\uAA80-\uAAAF\uAAB1\uAAB5\uAAB6\uAAB9-\uAABD\uAAC0\uAAC2\uAADB-\uAADD\uAAE0-\uAAEA\uAAF2-\uAAF4\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uABC0-\uABE2\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D\uFB1F-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE70-\uFE74\uFE76-\uFEFC\uFF21-\uFF3A\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]/g;
return raw_text.replace(punctuation, "").replace(/\s+/g, "-");
}
var tree = $('<div>'+ html + '</div>');
var headers = tree.find('h1,h2');
headers.each(function() {
@@ -667,9 +667,8 @@ function addAnchorsToHeaders(html) {
href: '#' + name,
name: name
});
anchor.append('<span class=icon-link> </span>')
.css('textDecoration','none');
$(this).prepend(anchor);
anchor.append('<span class=icon-link></span>').addClass('anchor vh');
$(this).append(anchor);
});
return tree.html();
}

View File

@@ -8,8 +8,9 @@
{% block left_panel %}
{{ block.super }}
{% if wiki_index_exists %}
<h3>{% trans "Index" %}</h3>
<div id="index-content"></div><!--content will be offered by js-->
<div class="wiki-index">
<h3>{% trans "Wiki Index" %}</h3>
</div>
{% endif %}
{% endblock %}
@@ -20,7 +21,10 @@
<h2 class="alc">{% trans "This group currently has no wiki" %}</h2>
<p>{% trans "Seafile Wiki enables you to organize your knowledge in a simple way. The contents of wiki is stored in a normal library with pre-defined file/folder structure. This enables you to edit your wiki in your desktop and then sync back to the server." %}</p>
{% if is_staff %}
<a id="wiki-create" href="#">{% trans "Create Wiki Now" %}</a>{% trans " or " %}<a id="wiki-use-lib" href="#">{% trans "Choose a Library" %}</a>
<a id="wiki-create" href="#">{% trans "Create Wiki Now" %}</a>
{% if group_repos %}
<br /><a id="wiki-use-lib" href="#">{% trans "Choose a library as wiki" %}</a>
{% endif %}
{% endif %}
</div>
<form id="wiki-create-form" action="" method="post" class="hide">{% csrf_token %}
@@ -87,7 +91,16 @@
var converter = new Markdown.Converter();
{% include 'snippets/md_xss.html' %}
Markdown.Extra.init(converter, {extensions: ["fenced_code_gfm", "tables", "def_list"]});
$('#wiki-content').html(addAnchorsToHeaders(converter.makeHtml('{{ content|escapejs }}'))).children(':first').css('margin-top', '0');
$('#wiki-content')
.html(addAnchorsToHeaders(converter.makeHtml('{{ content|escapejs }}')))
.find('h1, h2').hover(
function() {
$('.anchor', $(this)).removeClass('vh');
},
function() {
$('.anchor', $(this)).addClass('vh');
}
);
$('#page-create').click(function() {
$('#page-create-form').modal({appendTo: '#main', autoResize: true});
@@ -163,6 +176,7 @@ $('#wiki-create-form').submit(function () {
return false;
});
{% if group_repos %}
var all_repos = [];
{% for a_repo in group_repos %}
all_repos.push({
@@ -175,18 +189,21 @@ $('#wiki-use-lib').click(function() {
file_tree = new FileTree();
form.modal({appendTo:'#main', autoResize:true, focus:false});
file_tree.renderDirTree($('#repos-dirs').data('site_root', '{{SITE_ROOT}}'), form, all_repos);
return false;
});
$('#wiki-use-lib-form').submit(function() {
var dst_repo = $('[name="dst_repo"]', $(this)).val();
if (!$.trim(dst_repo)) {
$('.error', form).removeClass('hide');
$('.error', $(this)).removeClass('hide');
return false;
}
});
{% endif %}
{% endif %} // END wiki_exists
{% if wiki_index_exists %}
$('#index-content').html(converter.makeHtml('{{ index_content|escapejs }}'));
$('.wiki-index').append(converter.makeHtml('{{ index_content|escapejs }}'));
{% endif %}
</script>
{% endblock %}

View File

@@ -1362,7 +1362,17 @@ def group_wiki(request, group, page_name="home"):
repo_perm = seafile_api.check_repo_access_permission(repo.id, username)
d = {
wiki_index_exists = True
index_pagename = 'index'
index_content = None
try:
index_content, index_repo, index_dirent = get_group_wiki_page(username, group, index_pagename)
except (WikiDoesNotExist, WikiPageMissing) as e:
wiki_index_exists = False
else:
index_content = convert_wiki_link(index_content, url_prefix, index_repo.id, username)
return render_to_response("group/group_wiki.html", {
"group" : group,
"is_staff": group.is_staff,
"wiki_exists": wiki_exists,
@@ -1377,21 +1387,9 @@ def group_wiki(request, group, page_name="home"):
"mods_enabled": mods_enabled,
"mods_available": mods_available,
"repo_perm": repo_perm,
}
wiki_index_exists = True
index_pagename = 'index'
try:
index_content, index_repo, index_dirent = get_group_wiki_page(username, group, index_pagename)
except (WikiDoesNotExist, WikiPageMissing) as e:
wiki_index_exists = False
else:
index_content = convert_wiki_link(index_content, url_prefix, index_repo.id, username)
d["index_content"] = index_content
d["wiki_index_exists"] = wiki_index_exists
return render_to_response("group/group_wiki.html", d, context_instance=RequestContext(request))
"wiki_index_exists": wiki_index_exists,
"index_content": index_content,
}, context_instance=RequestContext(request))
@group_check
def group_wiki_pages(request, group):
@@ -1490,7 +1488,7 @@ def group_wiki_use_lib(request, group):
# create home page if not exist
page_name = "home.md"
if not seaserv.get_file_id_by_path(repo_id, "/" + page_name + ".md"):
if not seaserv.get_file_id_by_path(repo_id, "/" + page_name):
if not seaserv.post_empty_file(repo_id, "/", page_name, username):
messages.error(request, _('Failed to create home page. Please retry later'))

View File

@@ -10,8 +10,9 @@
{% block left_panel %}
{{ block.super }}
{% if wiki_index_exists %}
<h3>{% trans "Index" %}</h3>
<div id="index-content"></div><!--content will be offered by js-->
<div class="wiki-index">
<h3>{% trans "Wiki Index" %}</h3>
</div>
{% endif %}
{% endblock %}
@@ -20,7 +21,10 @@
<div class="empty-tips">
<h2 class="alc">{% trans "You do not have personal wiki" %}</h2>
<p>{% trans "Seafile Wiki enables you to organize your knowledge in a simple way. The contents of wiki is stored in a normal library with pre-defined file/folder structure. This enables you to edit your wiki in your desktop and then sync back to the server." %}</p>
<a id="wiki-create" href="#">{% trans "Create Wiki Now" %}</a>{% trans " or " %}<a id="wiki-use-lib" href="#">{% trans "Choose a Library" %}</a>
<a id="wiki-create" href="#">{% trans "Create Wiki Now" %}</a>
{% if owned_repos %}
<br /><a id="wiki-use-lib" href="#">{% trans "Choose a library as wiki" %}</a>
{% endif %}
</div>
<form id="wiki-create-form" action="" method="post" class="hide">{% csrf_token %}
<h3>{% trans "Create Wiki" %}</h3>
@@ -82,7 +86,16 @@
var converter = new Markdown.Converter();
{% include 'snippets/md_xss.html' %}
Markdown.Extra.init(converter, {extensions: ["fenced_code_gfm", "tables", "def_list"]});
$('#wiki-content').html(addAnchorsToHeaders(converter.makeHtml('{{ content|escapejs }}'))).children(':first').css('margin-top', '0');
$('#wiki-content')
.html(addAnchorsToHeaders(converter.makeHtml('{{ content|escapejs }}')))
.find('h1, h2').hover(
function() {
$('.anchor', $(this)).removeClass('vh');
},
function() {
$('.anchor', $(this)).addClass('vh');
}
);
$('#page-create').click(function() {
$('#page-create-form').modal({appendTo: '#main', autoResize: true});
@@ -159,6 +172,7 @@ $('#wiki-create-form').submit(function () {
return false;
});
{% if owned_repos %}
var all_repos = [];
{% for a_repo in owned_repos %}
all_repos.push({
@@ -171,18 +185,21 @@ $('#wiki-use-lib').click(function() {
file_tree = new FileTree();
form.modal({appendTo:'#main', autoResize:true, focus:false});
file_tree.renderDirTree($('#repos-dirs').data('site_root', '{{SITE_ROOT}}'), form, all_repos);
return false;
});
$('#wiki-use-lib-form').submit(function() {
var dst_repo = $('[name="dst_repo"]', $(this)).val();
if (!$.trim(dst_repo)) {
$('.error', form).removeClass('hide');
$('.error', $(this)).removeClass('hide');
return false;
}
});
{% endif %}
{% endif %} // END wiki_exists
{% if wiki_index_exists %}
$('#index-content').html(converter.makeHtml('{{ index_content|escapejs }}'));
$('.wiki-index').append(converter.makeHtml('{{ index_content|escapejs }}'));
{% endif %}
</script>
{% endblock %}

View File

@@ -69,7 +69,17 @@ def personal_wiki(request, page_name="home"):
repo.id, path.encode('utf-8'), file_path_hash, dirent.obj_id)
latest_contributor = contributors[0] if contributors else None
d = {
wiki_index_exists = True
index_pagename = 'index'
index_content = None
try:
index_content, index_repo, index_dirent = get_personal_wiki_page(username, index_pagename)
except (WikiDoesNotExist, WikiPageMissing) as e:
wiki_index_exists = False
else:
index_content = convert_wiki_link(index_content, url_prefix, index_repo.id, username)
return render_to_response("wiki/personal_wiki.html", {
"wiki_exists": wiki_exists,
"content": content,
"page": os.path.splitext(dirent.obj_name)[0],
@@ -79,21 +89,9 @@ def personal_wiki(request, page_name="home"):
"repo_id": repo.id,
"search_repo_id": repo.id,
"search_wiki": True,
}
wiki_index_exists = True
index_pagename = 'index'
try:
index_content, index_repo, index_dirent = get_personal_wiki_page(username, index_pagename)
except (WikiDoesNotExist, WikiPageMissing) as e:
wiki_index_exists = False
else:
index_content = convert_wiki_link(index_content, url_prefix, index_repo.id, username)
d["index_content"] = index_content
d["wiki_index_exists"] = wiki_index_exists
return render_to_response("wiki/personal_wiki.html", d, context_instance=RequestContext(request))
"wiki_index_exists": wiki_index_exists,
"index_content": index_content,
}, context_instance=RequestContext(request))
@login_required
def personal_wiki_pages(request):
@@ -170,7 +168,7 @@ def personal_wiki_use_lib(request):
# create home page if not exist
page_name = "home.md"
if not seaserv.get_file_id_by_path(repo_id, "/" + page_name + ".md"):
if not seaserv.get_file_id_by_path(repo_id, "/" + page_name):
if not seaserv.post_empty_file(repo_id, "/", page_name, username):
messages.error(request, _('Failed to create home page. Please retry later'))