harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for toc bbcode and bbcode wiki toc

Browse Source
This commit is contained in:
Mario Vavti 2016-12-04 12:51:23 +01:00
parent 792527d456
commit b12d4c03cb
5 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Zotlabs/Module/Wiki.php
View File

@ -214,7 +214,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$content = ($p['content'] !== '' ? $rawContent : '"# New page\n"'); $content = ($p['content'] !== '' ? $rawContent : '"# New page\n"');
// Render the Markdown-formatted page content in HTML // Render the Markdown-formatted page content in HTML
if($mimeType == 'text/bbcode') { if($mimeType == 'text/bbcode') {
$renderedContent = bbcode($content); $renderedContent = wiki_convert_links(bbcode($content),argv(0).'/'.argv(1).'/'.$wikiUrlName);
} }
else { else {
require_once('library/markdown.php'); require_once('library/markdown.php');
@ -314,7 +314,7 @@ class Wiki extends \Zotlabs\Web\Controller {
$mimeType = $w['mimeType']; $mimeType = $w['mimeType'];
if($mimeType == 'text/bbcode') { if($mimeType == 'text/bbcode') {
$html = bbcode($content); $html = wiki_convert_links(bbcode($content),$wikiURL);
} }
else { else {
require_once('library/markdown.php'); require_once('library/markdown.php');

10
include/bbcode.php
View File

@ -824,12 +824,14 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
$Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text); $Text = preg_replace("(\[h6\](.*?)\[\/h6\])ism",'<h6>$1</h6>',$Text);
} }
// Check for table of content without params // Check for table of content without params
if (strpos($Text,'[toc]') !== false) { while(strpos($Text,'[toc]') !== false) {
$Text = preg_replace("/\[toc\]/ism",'<ul id="toc"></ul>',$Text); $toc_id = 'toc-' . random_string(10);
$Text = preg_replace("/\[toc\]/ism", '<strong>' . t('Contents:') . '</strong><ul id="' . $toc_id . '" class="toc" data-toc=".section-content-wrapper"></ul><script>$("#' . $toc_id . '").toc();</script>', $Text, 1);
} }
// Check for table of content with params // Check for table of content with params
if (strpos($Text,'[toc') !== false) { while(strpos($Text,'[toc') !== false) {
$Text = preg_replace("/\[toc([^\]]+?)\]/ism",'<ul$1></ul>',$Text); $toc_id = 'toc-' . random_string(10);
$Text = preg_replace("/\[toc([^\]]+?)\]/ism", '<strong>' . t('Contents:') . '</strong><ul id="' . $toc_id . '" class="toc"$1></ul><script>$("#' . $toc_id . '").toc();</script>', $Text, 1);
} }
// Check for centered text // Check for centered text
if (strpos($Text,'[/center]') !== false) { if (strpos($Text,'[/center]') !== false) {

13
view/css/conversation.css
View File

@ -336,6 +336,19 @@ a.wall-item-name-link {
/* bb-code */ /* bb-code */
/* prevent [toc] bbcode links to scroll the titles behind the navbar */
.section-content-wrapper h1,
.section-content-wrapper h2,
.section-content-wrapper h3,
.section-content-wrapper h4 {
padding-top: 60px;
margin-top: -40px;
}
.toc {
margin-top: 1em;
}
code { code {
font-family: Courier, monospace; font-family: Courier, monospace;
font-size: 1em; font-size: 1em;

1
view/js/main.js
View File

@ -1315,7 +1315,6 @@ $(document).ready(function() {
numbers : aStr['t17'], numbers : aStr['t17'],
}; };
$("#toc").toc();
}); });
function zFormError(elm,x) { function zFormError(elm,x) {

5
view/tpl/wiki.tpl
View File

@ -184,7 +184,9 @@
function (data) { function (data) {
if (data.success) { if (data.success) {
$('#wiki-preview').html(data.html); $('#wiki-preview').html(data.html);
{{if !$mimeType || $mimeType == 'text/markdown'}}
$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"}); $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
{{/if}}
$('#page-tools').hide(); $('#page-tools').hide();
} else { } else {
window.console.log('Error previewing page.'); window.console.log('Error previewing page.');
@ -418,13 +420,12 @@
$(document).ready(function () { $(document).ready(function () {
wiki_refresh_page_list(); wiki_refresh_page_list();
$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
// This seems obsolete // This seems obsolete
// Show Edit tab first. Otherwise the Ace editor does not load. // Show Edit tab first. Otherwise the Ace editor does not load.
//$("#wiki-nav-tabs li:eq(1) a").tab('show'); //$("#wiki-nav-tabs li:eq(1) a").tab('show');
{{if !$mimeType || $mimeType == 'text/markdown'}} {{if !$mimeType || $mimeType == 'text/markdown'}}
$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
window.editor.on("input", function() { window.editor.on("input", function() {
if(window.editor.getSession().getUndoManager().isClean()) { if(window.editor.getSession().getUndoManager().isClean()) {
$('#save-page').addClass('disabled'); $('#save-page').addClass('disabled');