aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-13 10:15:53 +1100
committerfriendica <info@friendica.com>2014-03-13 10:15:53 +1100
commitb2e831ce98f3b17cd92adbf9b26283da84cbcffb (patch)
tree565041aa774057a84f1b3a7af0742efe64499d96
parent3f337dad2c783e62338a88887d1ef3d7754da410 (diff)
parent031b888e2c447048b5459e5e8f1a2afd34f695cf (diff)
downloadvolse-hubzilla-b2e831ce98f3b17cd92adbf9b26283da84cbcffb.tar.gz
volse-hubzilla-b2e831ce98f3b17cd92adbf9b26283da84cbcffb.tar.bz2
volse-hubzilla-b2e831ce98f3b17cd92adbf9b26283da84cbcffb.zip
Merge pull request #366 from beardy-unixer/master
Stick help in a template
-rw-r--r--mod/help.php10
-rw-r--r--view/tpl/help.tpl3
2 files changed, 10 insertions, 3 deletions
diff --git a/mod/help.php b/mod/help.php
index aa0ee8ae6..81ecd6ba9 100644
--- a/mod/help.php
+++ b/mod/help.php
@@ -76,14 +76,18 @@ function help_content(&$a) {
$text = preg_replace_callback("/#include (.*?)\;/ism", 'preg_callback_help_include', $text);
if($doctype === 'html')
- return $text;
+ $content = $text;
if($doctype === 'markdown')
- return Markdown($text);
+ $content = Markdown($text);
if($doctype === 'bbcode') {
require_once('include/bbcode.php');
- return bbcode($text);
+ $content = bbcode($text);
}
+ return replace_macros(get_markup_template("help.tpl"), array(
+ '$content' => $content
+ ));
+
}
diff --git a/view/tpl/help.tpl b/view/tpl/help.tpl
new file mode 100644
index 000000000..e01243077
--- /dev/null
+++ b/view/tpl/help.tpl
@@ -0,0 +1,3 @@
+<div id = "help-content" class="generic-content-wrapper">
+{{$content}}
+</div>