This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, master has been updated
via 3870bc59290954c0e7a736cc8fe48a6218a89c95 (commit)
from 662be9b944e39c2c2a2bc119a4f1ca7f0313a66f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 3870bc59290954c0e7a736cc8fe48a6218a89c95
Author: Marc-Etienne Vargenau <[email protected]>
Date: Mon Jul 7 11:01:15 2014 +0200
wiki: make highlight.js work for all themes
diff --git a/src/plugins/wiki/common/WikiPlugin.class.php
b/src/plugins/wiki/common/WikiPlugin.class.php
index c157ad5..2cb1704 100644
--- a/src/plugins/wiki/common/WikiPlugin.class.php
+++ b/src/plugins/wiki/common/WikiPlugin.class.php
@@ -111,6 +111,7 @@ class FusionForgeWikiPlugin extends Plugin {
if (defined('PHPWIKI_BASE_URL')) {
use_stylesheet('/wiki/themes/fusionforge/fusionforge.css');
use_stylesheet('/wiki/themes/fusionforge/fusionforge-print.css', 'print');
+ use_stylesheet('/wiki/highlight.js/styles/github.css');
echo ' <link rel="alternate"
type="application/x-wiki" title="Edit this page!"
href="'.$_SERVER['PHP_SELF'].'?action=edit" />';
echo "\n".' <link rel="alternate stylesheet"
type="text/css" href="/wiki/themes/fusionforge/fusionforge-fullscreen.css"
media="screen" title="Fullscreen" />';
diff --git a/src/plugins/wiki/www/themes/Crao/templates/bottom.tmpl
b/src/plugins/wiki/www/themes/Crao/templates/bottom.tmpl
index e845630..b06d704 100644
--- a/src/plugins/wiki/www/themes/Crao/templates/bottom.tmpl
+++ b/src/plugins/wiki/www/themes/Crao/templates/bottom.tmpl
@@ -1,3 +1,8 @@
<!-- Add your Disclaimer here -->
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
<?php if (defined('DEBUG') and DEBUG) { ?><?php echo Template('debug') ?><?php
} ?>
+<script type="text/javascript" src="<?php echo DATA_PATH
?>/highlight.js/highlight.pack.js"></script>
+<script>
+ hljs.tabReplace = ' ';
+ hljs.initHighlightingOnLoad();
+</script>
diff --git a/src/plugins/wiki/www/themes/Crao/templates/head.tmpl
b/src/plugins/wiki/www/themes/Crao/templates/head.tmpl
index 5f286d8..06fd390 100644
--- a/src/plugins/wiki/www/themes/Crao/templates/head.tmpl
+++ b/src/plugins/wiki/www/themes/Crao/templates/head.tmpl
@@ -11,6 +11,7 @@
<meta name="generator" content="PhpWiki" />
<base href="<?php echo PHPWIKI_BASE_URL?>" />
<link rel="shortcut icon" href="<?php echo
$WikiTheme->getImageURL('favicon.ico')?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH
?>/highlight.js/styles/github.css"/>
<?php /* The next few lines are wrapped in an odd manner to allow gettext
string extraction: cd locale;make */ ?>
<link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo
WikiURL(HOME_PAGE)?>" />
<link rel="help" title="<?php echo
diff --git a/src/plugins/wiki/www/themes/Portland/templates/body.tmpl
b/src/plugins/wiki/www/themes/Portland/templates/body.tmpl
index 741ed69..c565d5b 100644
--- a/src/plugins/wiki/www/themes/Portland/templates/body.tmpl
+++ b/src/plugins/wiki/www/themes/Portland/templates/body.tmpl
@@ -12,4 +12,5 @@
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
<?php if (defined('DEBUG') && DEBUG) { ?><?php echo Template('debug') ?><?php
} ?>
+<?php echo Template('bottom') ?>
</body>
diff --git a/src/plugins/wiki/www/themes/Wordpress/templates/body.tmpl
b/src/plugins/wiki/www/themes/Wordpress/templates/body.tmpl
index 4883691..fdf435d 100644
--- a/src/plugins/wiki/www/themes/Wordpress/templates/body.tmpl
+++ b/src/plugins/wiki/www/themes/Wordpress/templates/body.tmpl
@@ -10,4 +10,6 @@
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
+<?php echo Template('bottom') ?>
+
</body>
diff --git a/src/plugins/wiki/www/themes/blog/templates/bottom.tmpl
b/src/plugins/wiki/www/themes/blog/templates/bottom.tmpl
index b5e634c..b42a115 100644
--- a/src/plugins/wiki/www/themes/blog/templates/bottom.tmpl
+++ b/src/plugins/wiki/www/themes/blog/templates/bottom.tmpl
@@ -4,3 +4,8 @@
<?php if (DEBUG & _DEBUG_VERBOSE) { ?><?php echo Template('debug') ?><?php } ?>
<?php } ?>
<!--/span-->
+<script type="text/javascript" src="<?php echo DATA_PATH
?>/highlight.js/highlight.pack.js"></script>
+<script>
+ hljs.tabReplace = ' ';
+ hljs.initHighlightingOnLoad();
+</script>
diff --git a/src/plugins/wiki/www/themes/default/templates/bottom.tmpl
b/src/plugins/wiki/www/themes/default/templates/bottom.tmpl
index aaebbfa..59c6d55 100644
--- a/src/plugins/wiki/www/themes/default/templates/bottom.tmpl
+++ b/src/plugins/wiki/www/themes/default/templates/bottom.tmpl
@@ -4,3 +4,8 @@
<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?>
<?php if (defined('DEBUG') and DEBUG & 1) { ?><?php echo Template('debug')
?><?php } ?>
<?php } ?>
+<script type="text/javascript" src="<?php echo DATA_PATH
?>/highlight.js/highlight.pack.js"></script>
+<script>
+ hljs.tabReplace = ' ';
+ hljs.initHighlightingOnLoad();
+</script>
diff --git a/src/plugins/wiki/www/themes/default/templates/head.tmpl
b/src/plugins/wiki/www/themes/default/templates/head.tmpl
index 81ca357..a3e2ca1 100644
--- a/src/plugins/wiki/www/themes/default/templates/head.tmpl
+++ b/src/plugins/wiki/www/themes/default/templates/head.tmpl
@@ -15,6 +15,7 @@
<meta name="generator" content="PhpWiki" />
<base href="<?php echo PHPWIKI_BASE_URL?>" />
<link rel="shortcut icon" href="<?php echo
$WikiTheme->getImageURL('favicon.ico')?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH
?>/highlight.js/styles/github.css"/>
<?php /* The next few lines are wrapped in an odd manner to allow gettext
string extraction: cd locale;make */ ?>
<link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo
WikiURL(HOME_PAGE)?>" />
<link rel="help" title="<?php echo
diff --git a/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl
b/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl
index 8d5bea4..3478b5e 100644
--- a/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl
+++ b/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl
@@ -5,3 +5,8 @@
<?php echo Template('debug') ?>
<?php } ?>
<?php } ?>
+<script type="text/javascript"
src="/wiki/highlight.js/highlight.pack.js"></script>
+<script>
+ hljs.tabReplace = ' ';
+ hljs.initHighlightingOnLoad();
+</script>
diff --git a/src/plugins/wiki/www/themes/wikilens/templates/head.tmpl
b/src/plugins/wiki/www/themes/wikilens/templates/head.tmpl
index efab908..2c23df8 100644
--- a/src/plugins/wiki/www/themes/wikilens/templates/head.tmpl
+++ b/src/plugins/wiki/www/themes/wikilens/templates/head.tmpl
@@ -11,6 +11,7 @@
<meta name="generator" content="PhpWiki" />
<base href="<?php echo PHPWIKI_BASE_URL?>" />
<link rel="shortcut icon" href="<?php echo
$WikiTheme->getImageURL('favicon.ico')?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo DATA_PATH
?>/highlight.js/styles/github.css"/>
<?php /* The next few lines are wrapped in an odd manner to allow gettext
string extraction: cd locale;make */ ?>
<link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo
WikiURL(HOME_PAGE)?>" />
<link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo
WikiURL(
-----------------------------------------------------------------------
Summary of changes:
src/plugins/wiki/common/WikiPlugin.class.php | 1 +
src/plugins/wiki/www/themes/Crao/templates/bottom.tmpl | 5 +++++
src/plugins/wiki/www/themes/Crao/templates/head.tmpl | 1 +
src/plugins/wiki/www/themes/Portland/templates/body.tmpl | 1 +
src/plugins/wiki/www/themes/Wordpress/templates/body.tmpl | 2 ++
src/plugins/wiki/www/themes/blog/templates/bottom.tmpl | 5 +++++
src/plugins/wiki/www/themes/default/templates/bottom.tmpl | 5 +++++
src/plugins/wiki/www/themes/default/templates/head.tmpl | 1 +
src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl | 5 +++++
src/plugins/wiki/www/themes/wikilens/templates/head.tmpl | 1 +
10 files changed, 27 insertions(+)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
