Skip to content
Permalink
Browse files

Many improvments in template

  • Loading branch information...
giterlizzi committed Oct 10, 2019
1 parent 1d0182e commit d17ab28c04bb0848b0795087110462d473d1607d
Showing with 17 additions and 19 deletions.
  1. +4 −4 Template.php
  2. +1 −1 main.php
  3. +1 −3 mediamanager.php
  4. +1 −1 tpl/menu-admin.php
  5. +4 −4 tpl/menu-tools.php
  6. +1 −1 tpl/menu-user.php
  7. +1 −1 tpl/navbar-searchform.php
  8. +1 −1 tpl/new-page.php
  9. +3 −3 tpl/theme-switcher.php
@@ -2811,13 +2811,13 @@ private function initToolsMenu()
global $ACT;
$tools_menus = array(
'user' => array('icon' => 'mdi mdi-account', 'object' => new \dokuwiki\Menu\UserMenu),
'site' => array('icon' => 'mdi mdi-toolbox', 'object' => new \dokuwiki\Menu\SiteMenu),
'page' => array('icon' => 'mdi mdi-file-document-outline', 'object' => new \dokuwiki\template\bootstrap3\Menu\PageMenu),
'user' => array('icon' => 'account', 'object' => new \dokuwiki\Menu\UserMenu),
'site' => array('icon' => 'toolbox', 'object' => new \dokuwiki\Menu\SiteMenu),
'page' => array('icon' => 'file-document-outline', 'object' => new \dokuwiki\template\bootstrap3\Menu\PageMenu),
);
if (defined('DOKU_MEDIADETAIL')) {
$tools_menus['page'] = array('icon' => 'mdi mdi-image', 'object' => new \dokuwiki\Menu\DetailMenu);
$tools_menus['page'] = array('icon' => 'image', 'object' => new \dokuwiki\Menu\DetailMenu);
}
foreach ($tools_menus as $tool => $data) {
@@ -185,7 +185,7 @@
?>
</footer>

<a href="#dokuwiki__top" class="back-to-top hidden-print btn btn-xs btn-default" title="<?php echo $lang['skip_to_content'] ?>" accesskey="t">
<a href="#dokuwiki__top" class="back-to-top hidden-print btn btn-default" title="<?php echo $lang['skip_to_content'] ?>" accesskey="t">
<?php echo \Mdi::icon('chevron-up'); ?>
</a>

@@ -13,8 +13,6 @@
require_once(template('tpl/global.php'));
require_once(template('tpl/functions.php'));
header('X-UA-Compatible: IE=edge,chrome=1');
?><!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="popup no-js">
<head>
@@ -39,7 +37,7 @@
<div id="dw__msgarea" class="small">
<?php $TEMPLATE->getMessageArea() ?>
</div>
<div id="media__manager" class="<?php echo tpl_classes(); ?> row">
<div id="media__manager" class="<?php echo $TEMPLATE->getClasses() ?> row">

<div id="mediamgr__aside" class="col-xs-4">
<h1><?php echo hsc($lang['mediaselect'])?></h1>
@@ -37,7 +37,7 @@
<li class="dropdown dropdown-large">

<a href="<?php wl($ID) ?>" class="dropdown-toggle" data-target="#" data-toggle="dropdown" title="<?php echo $lang['btn_admin'] ?>" role="button" aria-haspopup="true" aria-expanded="false">
<i class="mdi mdi-settings"></i> <span class="<?php echo (in_array('admin', $TEMPLATE->getConf('navbarLabels')) ? '' : 'hidden-lg hidden-md hidden-sm') ?>"> <?php echo $lang['btn_admin'] ?></span> <span class="caret"></span>
<?php echo \Mdi::icon('settings'); ?> <span class="<?php echo (in_array('admin', $TEMPLATE->getConf('navbarLabels')) ? '' : 'hidden-lg hidden-md hidden-sm') ?>"> <?php echo $lang['btn_admin'] ?></span> <span class="caret"></span>
</a>

<ul class="dropdown-menu dropdown-menu-large" role="menu">
@@ -34,13 +34,13 @@
<li class="dropdown">

<a href="<?php wl($ID) ?>" class="dropdown-toggle" data-target="#" data-toggle="dropdown" title="<?php echo $lang[$tool.'_tools'] ?>" role="button" aria-haspopup="true" aria-expanded="false">
<i class="<?php echo $data['icon'] ?>"></i> <span class="<?php echo (in_array($tool, $navbar_labels) ? '' : 'hidden-lg hidden-md hidden-sm') ?>"><?php echo $lang[$tool.'_tools'] ?></span> <span class="caret"></span>
<?php echo \Mdi::icon($data['icon']); ?> <span class="<?php echo (in_array($tool, $navbar_labels) ? '' : 'hidden-lg hidden-md hidden-sm') ?>"><?php echo $lang[$tool.'_tools'] ?></span> <span class="caret"></span>
</a>

<ul class="dropdown-menu tools" role="menu">

<li class="dropdown-header hidden-xs hidden-sm">
<i class="<?php echo $data['icon'] ?>"></i> <?php echo $lang[$tool.'_tools'] ?>
<?php echo \Mdi::icon($data['icon']); ?> <?php echo $lang[$tool.'_tools'] ?>
</li>
<?php
@@ -58,14 +58,14 @@
<li class="dropdown">

<a href="<?php wl($ID) ?>" class="dropdown-toggle" data-target="#" data-toggle="dropdown" title="<?php $lang['tools'] ?>" role="button" aria-haspopup="true" aria-expanded="false">
<i class="mdi mdi-wrench"></i> <span class="<?php echo (in_array('tools', $navbar_labels) ? '' : 'hidden-lg hidden-md hidden-sm') ?>"><?php echo $lang['tools'] ?></span> <span class="caret"></span>
<?php echo \Mdi::icon('wrench'); ?> <span class="<?php echo (in_array('tools', $navbar_labels) ? '' : 'hidden-lg hidden-md hidden-sm') ?>"><?php echo $lang['tools'] ?></span> <span class="caret"></span>
</a>

<ul class="dropdown-menu tools" role="menu">
<?php $i = 1; $max = count(array_keys($tools_menus)); foreach($tools_menus as $tool => $data): ?>

<li class="dropdown-header">
<i class="<?php echo $data['icon'] ?>"></i> <?php echo $lang[$tool.'_tools'] ?>
<?php echo \Mdi::icon($data['icon']); ?> <?php echo $lang[$tool.'_tools'] ?>
</li>

<?php
@@ -68,7 +68,7 @@
<?php if ($use_avatar): ?>
<img alt="<?php echo hsc($_SERVER['REMOTE_USER']) ?>" src="<?php echo $avatar_img_small ?>" class="img-circle profile-image" width="<?php echo $avatar_size_small ?>" height="<?php echo $avatar_size_small ?>" />
<?php else: ?>
<i class="mdi mdi-account"></i>
<?php echo \Mdi::icon('account'); ?>
<?php endif; ?> <span class="hidden-lg hidden-md hidden-sm"><?php echo hsc($_SERVER['REMOTE_USER']) ?></span> <span class="caret"></span>
</a>

@@ -25,7 +25,7 @@
<input id="qsearch" autocomplete="off" type="search" placeholder="<?php echo $lang['btn_search']; ?>" value="<?php echo ($ACT == 'search') ? htmlspecialchars($QUERY) : ''; ?>" accesskey="f" name="q" class="form-control" title="[F]" />
<div class="input-group-btn">
<button class="btn btn-default" type="submit" title="<?php echo $lang['btn_search']; ?>">
<i class="glyphicon glyphicon-search"></i>
<?php echo \Mdi::icon('magnify'); ?>
</button>
</div>

@@ -20,7 +20,7 @@
<ul class="nav navbar-nav" id="dw__addnewpage">
<li class="dropdown">
<a href="<?php wl($ID) ?>" class="dropdown-toggle" data-target="#" data-toggle="dropdown" title="<?php echo tpl_getLang('add_new_page') ?>" role="button" aria-haspopup="true" aria-expanded="false">
<i class="mdi mdi-file-plus"></i> <span class="hidden-lg hidden-md hidden-sm"><?php echo tpl_getLang('add_new_page') ?></span><span class="caret"></span>
<?php echo \Mdi::icon('file-plus'); ?> <span class="hidden-lg hidden-md hidden-sm"><?php echo tpl_getLang('add_new_page') ?></span><span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu">
<li class="dropdown-header hidden-xs hidden-sm"><i class="mdi mdi-file-plus"></i> <?php echo tpl_getLang('add_new_page') ?></li>
@@ -22,18 +22,18 @@
<li class="dropdown">

<a href="<?php wl($ID) ?>" class="dropdown-toggle" data-toggle="dropdown" data-target="#" role="button" aria-haspopup="true" aria-expanded="false">
<i class="mdi mdi-palette"></i> <span class="<?php echo (in_array('themes', $TEMPLATE->getConf('navbarLabels')) ? '' : 'hidden-lg hidden-md hidden-sm') ?>"><?php echo tpl_getLang('themes') ?></span> <span class="caret"></span>
<?php echo \Mdi::icon('palette'); ?> <span class="<?php echo (in_array('themes', $TEMPLATE->getConf('navbarLabels')) ? '' : 'hidden-lg hidden-md hidden-sm') ?>"><?php echo tpl_getLang('themes') ?></span> <span class="caret"></span>
</a>

<ul class="dropdown-menu" aria-labelledby="themes">
<li class="dropdown-header">
<i class="mdi mdi-palette"></i> <?php echo tpl_getLang('themes') ?>
<?php echo \Mdi::icon('palette'); ?> <?php echo tpl_getLang('themes') ?>
</li>
<li<?php echo ($bootswatch_theme == 'default') ? ' class="active"' : '' ?>>
<a href="<?php echo wl($ID, array('bootswatch-theme' => hsc('default'))); ?>">Default</a>
</li>
<li class="dropdown-header">
<i class="mdi mdi-palette"></i> Bootswatch Themes
<?php echo \Mdi::icon('palette'); ?> Bootswatch Themes
</li>
<?php foreach ($TEMPLATE->getAvailableBootswatchThemes() as $theme): ?>
<li<?php echo ($bootswatch_theme == $theme) ? ' class="active"' : '' ?>>

0 comments on commit d17ab28

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