Skip to content
Permalink
Browse files

Some little fixes

  • Loading branch information
giterlizzi committed Jan 1, 2020
1 parent ad370d5 commit d51d39b0ce416658a004c57b6b4b4fd5c92f3fb3
Showing with 14 additions and 12 deletions.
  1. +12 −10 Template.php
  2. +1 −1 js/template.js
  3. +1 −1 template.info.txt
@@ -342,9 +342,6 @@ public function metaheadersHandler(\Doku_Event $event)

}

# Material Design Icons
#$stylesheets[] = $tpl_basedir . 'assets/mdi/css/materialdesignicons.min.css';

# Bootstrap JavaScript
$scripts[] = $tpl_basedir . 'assets/bootstrap/js/bootstrap.min.js';

@@ -354,6 +351,7 @@ public function metaheadersHandler(\Doku_Event $event)
# Typeahead (Bootstrap3)
$scripts[] = $tpl_basedir . 'assets/typeahead/bootstrap3-typeahead.min.js';

# Iconify
$scripts[] = $tpl_basedir . 'assets/iconify/iconify.min.js';

foreach ($stylesheets as $style) {
@@ -363,18 +361,19 @@ public function metaheadersHandler(\Doku_Event $event)
'href' => $style));
}

# Set Iconify default API URL
$event->data['script'][] = array(
'type' => 'text/javascript',
'_data' => "if (typeof IconifyConfig == 'undefined') { var IconifyConfig = { 'defaultAPI' : '{$tpl_basedir}iconify.php?prefix={prefix}&icons={icons}' } }"
);

foreach ($scripts as $script) {
$event->data['script'][] = array(
'type' => 'text/javascript',
'_data' => '',
'src' => $script);
}

$event->data['script'][] = array(
'type' => 'text/javascript',
'_data' => "Iconify.setConfig('defaultAPI', '$tpl_basedir/iconify.php?prefix={prefix}&icons={icons}');"
);

if ($google_analitycs = $this->getGoogleAnalitycs()) {
$event->data['script'][] = array(
'type' => 'text/javascript',
@@ -1990,7 +1989,7 @@ public function normalizeContent($content)
}

foreach ($html->find('div.table') as $elm) {
$elm->class = trim(str_replace('table', '', $eml->class));
$elm->class = trim(str_replace('table', '', $elm->class));
}

# Tag and Pagelist (table)
@@ -2171,7 +2170,7 @@ public function normalizeContent($content)
if ($INPUT->str('page') == 'usermanager') {

foreach ($html->find('.notes') as $elm) {
$elm->class = str_replace('notes', '', $eml->class);
$elm->class = str_replace('notes', '', $elm->class);
}

foreach ($html->find('h2') as $idx => $elm) {
@@ -2183,6 +2182,9 @@ public function normalizeContent($content)
case 1:
$elm->innertext = iconify('mdi:account-plus') . ' ' . $elm->innertext;
break;
case 2:
$elm->innertext = iconify('mdi:account-edit') . ' ' . $elm->innertext;
break;
}

}
@@ -109,7 +109,7 @@ jQuery(document).on('bootstrap3:nav', function(event) {
.contents().unwrap();

// Move the font-icons inside a link
var $links = jQuery('.nav li i + a');
var $links = jQuery('.nav li .dw-icons + a');
if ($links.length) {
jQuery.each($links, function() {
var $link = jQuery(this),
@@ -5,4 +5,4 @@ date 2019-05-22
name Bootstrap3 Template
desc Bootstrap-based template for Dokuwiki
url https://www.dokuwiki.org/template:bootstrap3
build develop/20191229
build develop/20200101

0 comments on commit d51d39b

Please sign in to comment.
You can’t perform that action at this time.