Skip to content

Commit 17f4942

Browse files
committed
Added a new option to load a Bootswatch theme from a local directory (useLocalBootswatch: default 0) and little optimization in metadata.php
1 parent 8961a3c commit 17f4942

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

conf/default.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,3 +44,4 @@
4444
$conf['showLandingPage'] = 0;
4545
$conf['landingPages'] = '(intro)';
4646
$conf['showPageTools'] = 'always';
47+
$conf['useLocalBootswatch'] = 0;

conf/metadata.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,14 @@
66
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
77
*/
88

9+
910
// Themes
1011
$meta['bootstrapTheme'] = array('multichoice', '_choices' => array('default', 'optional', 'custom', 'bootswatch'));
1112
$meta['bootswatchTheme'] = array('multichoice', '_choices' => array('cerulean','cosmo','cyborg','darkly','flatly','journal','lumen','paper','readable','sandstone','simplex','slate','spacelab','superhero','united','yeti'));
1213
$meta['customTheme'] = array('string');
1314
$meta['showThemeSwitcher'] = array('onoff');
14-
$meta['hideInThemeSwitcher'] = array('multicheckbox', '_choices' => array('cerulean','cosmo','cyborg','darkly','flatly','journal','lumen','paper','readable','sandstone','simplex','slate','spacelab','superhero','united','yeti'));
15+
$meta['hideInThemeSwitcher'] = array('multicheckbox', '_choices' => $meta['bootswatchTheme']['_choices']);
16+
$meta['useLocalBootswatch'] = array('onoff');
1517

1618
// Sidebar
1719
$meta['sidebarPosition'] = array('multichoice', '_choices' => array('left', 'right'));

lang/en/settings.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,5 @@
5656
$lang['showPageTools'] = 'Enable the DokuWiki-style Page Tools';
5757
$lang['showPageTools_o_never'] = 'Never';
5858
$lang['showPageTools_o_logged'] = 'When logged in';
59-
$lang['showPageTools_o_always'] = 'Always';
59+
$lang['showPageTools_o_always'] = 'Always';
60+
$lang['useLocalBootswatch'] = 'Use the local Bootswatch directory. This option is useful in "intranet" DokuWiki installation';

0 commit comments

Comments
 (0)