diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-04-15 13:45:45 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-04-15 13:45:45 +0200 |
| commit | ae7c596cf4e6a0a09ebcf01fe8ae98789360c5be (patch) | |
| tree | f156252e404e9893922cb5d984fdc646644b6c17 /lib/tpl/dokuwiki/main.php | |
| parent | f41c79d730286e8e8c95deb88a4c876e08e278a2 (diff) | |
| parent | 026b314868ee80aca644bf4107f78d8e8052b43e (diff) | |
| download | rpg-ae7c596cf4e6a0a09ebcf01fe8ae98789360c5be.tar.gz rpg-ae7c596cf4e6a0a09ebcf01fe8ae98789360c5be.tar.bz2 | |
Merge branch 'master' into htmlmail
* master: (382 commits)
Romanian language update
Marathi language update
Arabic Language Update
when there's not enough space for images, make sure they stay proportional (might be FS#2480)
added minimal RTL print styles (part of FS#2185)
moved plugins' rtl.css to their style.css counterpart (part of FS#2185)
removed all browser-specific gradients as the recently (in 42ff6730) introduced svg makes them unnecessary
removed comments from accidentally commented lines in tpl_includeFile()
removed obsolete template file
added tpl_includeFile() to core
Make getTitle method in remote interface public
Changed an error code in XML-RPC interface. This error hasn't anything to do with the rest of the -32600 errors.
BG: language update
Korean language update
fixed performance issues with gradient in Firefox (which also added gradient support for IE9) (FS#2447)
deleted very old (and unused) images
added accidentally removed '<?php' back in (was in 57fc5edd)
wrapped X-UA-Compatible meta tag with conditional comments
added explanation to todo in _forms.css
removed problematic 'overflow: hidden' from lists again ('unfixes' FS#1950)
...
Conflicts:
inc/auth.php
inc/load.php
Diffstat (limited to 'lib/tpl/dokuwiki/main.php')
| -rw-r--r-- | lib/tpl/dokuwiki/main.php | 92 |
1 files changed, 92 insertions, 0 deletions
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php new file mode 100644 index 000000000..57c94f174 --- /dev/null +++ b/lib/tpl/dokuwiki/main.php @@ -0,0 +1,92 @@ +<?php +/** + * DokuWiki Default Template 2012 + * + * @link http://dokuwiki.org/template + * @author Anika Henke <anika@selfthinker.org> + * @author Clarence Lee <clarencedglee@gmail.com> + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ + +if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ + +$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show'); +?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang'] ?>" + lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]--> + <title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title> + <?php tpl_metaheaders() ?> + <meta name="viewport" content="width=device-width,initial-scale=1" /> + <?php echo tpl_favicon(array('favicon', 'mobile')) ?> + <?php tpl_includeFile('meta.html') ?> +</head> + +<body> + <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]--> + <div id="dokuwiki__site"><div id="dokuwiki__top" + class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>"> + + <?php include('tpl_header.php') ?> + + <div class="wrapper group"> + + <?php if($showSidebar): ?> + <!-- ********** ASIDE ********** --> + <div id="dokuwiki__aside"><div class="pad include group"> + <?php tpl_flush() ?> + <?php tpl_includeFile('sidebarheader.html') ?> + <?php tpl_include_page($conf['sidebar']) ?> + <?php tpl_includeFile('sidebarfooter.html') ?> + </div></div><!-- /aside --> + <?php endif; ?> + + <!-- ********** CONTENT ********** --> + <div id="dokuwiki__content"><div class="pad group"> + + <div class="pageId"><span><?php echo hsc($ID) ?></span></div> + + <div class="page group"> + <?php tpl_flush() ?> + <?php tpl_includeFile('pageheader.html') ?> + <!-- wikipage start --> + <?php tpl_content() ?> + <!-- wikipage stop --> + <?php tpl_includeFile('pagefooter.html') ?> + </div> + + <div class="docInfo"><?php tpl_pageinfo() ?></div> + + <?php tpl_flush() ?> + </div></div><!-- /content --> + + <hr class="a11y" /> + + <!-- PAGE ACTIONS --> + <div id="dokuwiki__pagetools"> + <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3> + <div class="tools"> + <ul> + <?php + tpl_action('edit', 1, 'li', 0, '<span>', '</span>'); + tpl_action('revert', 1, 'li', 0, '<span>', '</span>'); + tpl_action('revisions', 1, 'li', 0, '<span>', '</span>'); + tpl_action('backlink', 1, 'li', 0, '<span>', '</span>'); + tpl_action('subscribe', 1, 'li', 0, '<span>', '</span>'); + tpl_action('top', 1, 'li', 0, '<span>', '</span>'); + ?> + </ul> + </div> + </div> + </div><!-- /wrapper --> + + <?php include('tpl_footer.php') ?> + </div></div><!-- /site --> + + <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div> + <!--[if ( lte IE 7 | IE 8 ) ]></div><![endif]--> +</body> +</html> |