Skip to content

Commit

Permalink
Many improvments in template
Browse files Browse the repository at this point in the history
  • Loading branch information
@giterlizzi
giterlizzi committed Oct 10, 2019
1 parent 1d0182e commit d17ab28
Show file tree
Hide file tree
Showing 9 changed files with 17 additions and 19 deletions.
8 changes: 4 additions & 4 deletions Template.php
View file
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion main.php
View file
Expand Up @@ -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>

Expand Down
4 changes: 1 addition & 3 deletions mediamanager.php
View file
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion tpl/menu-admin.php
View file
Expand Up @@ -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">
Expand Down
8 changes: 4 additions & 4 deletions tpl/menu-tools.php
View file
Expand Up @@ -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

Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tpl/menu-user.php
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tpl/navbar-searchform.php
View file
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion tpl/new-page.php
View file
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions tpl/theme-switcher.php
View file
Expand Up @@ -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"' : '' ?>>
Expand Down

0 comments on commit d17ab28

Please sign in to comment.