keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix formatting in mod/help

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-09 21:53:19 -04:00
parent 627fa08a1b
commit 4161908f43
1 changed files with 54 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
mod/help.php
View file

@ -2,31 +2,32 @@
/** /**
* @file mod/help.php * @file mod/help.php
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Content\Nav; use Friendica\Content\Nav;
use Friendica\Content\Text\Markdown; use Friendica\Content\Text\Markdown;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\System; use Friendica\Core\System;
if (!function_exists('load_doc_file')) { function load_doc_file($s)
{
function load_doc_file($s) {
global $lang; global $lang;
if (!isset($lang)) if (!isset($lang)) $lang = 'en';
$lang = 'en';
$b = basename($s); $b = basename($s);
$d = dirname($s); $d = dirname($s);
if (file_exists("$d/$lang/$b")) if (file_exists("$d/$lang/$b")) {
return file_get_contents("$d/$lang/$b"); return file_get_contents("$d/$lang/$b");
if (file_exists($s)) }
if (file_exists($s)) {
return file_get_contents($s); return file_get_contents($s);
}
return ''; return '';
} }
} function help_content(App $a)
{
function help_content(App $a) {
Nav::setSelected('help'); Nav::setSelected('help');
global $lang; global $lang;
@ -38,8 +39,10 @@ function help_content(App $a) {
// looping through the argv keys bigger than 0 to build // looping through the argv keys bigger than 0 to build
// a path relative to /help // a path relative to /help
for ($x = 1; $x < argc(); $x ++) { for ($x = 1; $x < argc(); $x ++) {
if(strlen($path)) if (strlen($path)) {
$path .= '/'; $path .= '/';
}
$path .= argv($x); $path .= argv($x);
} }
$title = basename($path); $title = basename($path);
@ -47,6 +50,7 @@ function help_content(App $a) {
$text = load_doc_file('doc/' . $path . '.md'); $text = load_doc_file('doc/' . $path . '.md');
$a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', notags($title)); $a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', notags($title));
} }
$home = load_doc_file('doc/Home.md'); $home = load_doc_file('doc/Home.md');
if (!$text) { if (!$text) {
$text = $home; $text = $home;
@ -78,10 +82,19 @@ function help_content(App $a) {
if ($level != "r") { if ($level != "r") {
$level = intval($level); $level = intval($level);
if ($level < $lastlevel) { if ($level < $lastlevel) {
for($k=$level;$k<$lastlevel; $k++) $toc.="</ul>"; for ($k = $level; $k < $lastlevel; $k++) {
for($k=$level+1;$k<count($idnum);$k++) $idnum[$k]=0; $toc .= "</ul>";
} }
if ($level>$lastlevel) $toc.="<ul>";
for ($k = $level + 1; $k < count($idnum); $k++) {
$idnum[$k] = 0;
}
}
if ($level > $lastlevel) {
$toc .= "<ul>";
}
$idnum[$level] ++; $idnum[$level] ++;
$id = implode("_", array_slice($idnum, 1, $level)); $id = implode("_", array_slice($idnum, 1, $level));
$href = System::baseUrl() . "/help/{$filename}#{$id}"; $href = System::baseUrl() . "/help/{$filename}#{$id}";
@ -91,12 +104,15 @@ function help_content(App $a) {
} }
} }
} }
for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
for ($k = 0; $k < $lastlevel; $k++) {
$toc .= "</ul>";
}
$html = implode("\n", $lines); $html = implode("\n", $lines);
$a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>'; $a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>';
} }
return $html; return $html;
} }