diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2013-10-28 20:22:05 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2013-10-28 20:22:05 +0100 |
| commit | 23a363f01514464eb2238ac09ec7723d03d57ecb (patch) | |
| tree | 42c7dcff8c5b0e506a25d08ee5583ed2a24e8602 /lib/tpl/default/main.php | |
| parent | 25e48e54df60b3df6efa365daceb3a8966c8f427 (diff) | |
| parent | 75cf672f10a71f7dee6d50eb70b742689838bc36 (diff) | |
| download | rpg-23a363f01514464eb2238ac09ec7723d03d57ecb.tar.gz rpg-23a363f01514464eb2238ac09ec7723d03d57ecb.tar.bz2 | |
Merge branch 'master' into stable
* master: (413 commits)
release preparation
fixed strict violation in ACL plugin
Fix issues from teams:i18n:translation-check in localizations
ensure locale is set back to the original value
skip FS#2867 test if \s doesn't match \xA0 after attempting to change the locale
unittests for auth_loadACL
translation update
allow charset for SSO to be configured FS#2148
Mailer: avoid overlong headers in content ids FS#2868
translation update
translation update
replace \s, \S with [ \t], [^ \t] in regexs used with acls
translation update
translation update
translation update
translation update
Fix handling of the legacy subscription action name
remove obsolete opera handling and session closing
remove no longer used ajax.php
fix proxy CONNECT where HTTP 1.1 answer is given
...
Diffstat (limited to 'lib/tpl/default/main.php')
| -rw-r--r-- | lib/tpl/default/main.php | 135 |
1 files changed, 0 insertions, 135 deletions
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php deleted file mode 100644 index 851afde6c..000000000 --- a/lib/tpl/default/main.php +++ /dev/null @@ -1,135 +0,0 @@ -<?php -/** - * DokuWiki Default Template - * - * This is the template you need to change for the overall look - * of DokuWiki. - * - * @link http://dokuwiki.org/templates - * @author Andreas Gohr <andi@splitbrain.org> - */ - -// must be run from within DokuWiki -if (!defined('DOKU_INC')) die(); - -?> -<!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" /> - <title> - <?php tpl_pagetitle()?> - [<?php echo strip_tags($conf['title'])?>] - </title> - - <?php tpl_metaheaders()?> - <?php echo tpl_favicon(array('favicon', 'mobile')) ?> - - <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?> -</head> - -<body> -<?php /*old includehook*/ @include(dirname(__FILE__).'/topheader.html')?> -<div class="dokuwiki"> - <?php html_msgarea()?> - - <div class="stylehead"> - - <div class="header"> - <div class="pagename"> - [[<?php tpl_link(wl($ID,'do=backlink'),tpl_pagetitle($ID,true),'title="'.$lang['btn_backlink'].'"')?>]] - </div> - <div class="logo"> - <?php tpl_link(wl(),$conf['title'],'name="dokuwiki__top" id="dokuwiki__top" accesskey="h" title="[H]"')?> - </div> - - <div class="clearer"></div> - </div> - - <?php /*old includehook*/ @include(dirname(__FILE__).'/header.html')?> - - <div class="bar" id="bar__top"> - <div class="bar-left" id="bar__topleft"> - <?php tpl_button('edit')?> - <?php tpl_button('history')?> - </div> - - <div class="bar-right" id="bar__topright"> - <?php tpl_button('recent')?> - <?php tpl_searchform()?>  - </div> - - <div class="clearer"></div> - </div> - - <?php if($conf['breadcrumbs']){?> - <div class="breadcrumbs"> - <?php tpl_breadcrumbs()?> - <?php //tpl_youarehere() //(some people prefer this)?> - </div> - <?php }?> - - <?php if($conf['youarehere']){?> - <div class="breadcrumbs"> - <?php tpl_youarehere() ?> - </div> - <?php }?> - - </div> - <?php tpl_flush()?> - - <?php /*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?> - - <div class="page"> - <!-- wikipage start --> - <?php tpl_content()?> - <!-- wikipage stop --> - </div> - - <div class="clearer"></div> - - <?php tpl_flush()?> - - <div class="stylefoot"> - - <div class="meta"> - <div class="user"> - <?php tpl_userinfo()?> - </div> - <div class="doc"> - <?php tpl_pageinfo()?> - </div> - </div> - - <?php /*old includehook*/ @include(dirname(__FILE__).'/pagefooter.html')?> - - <div class="bar" id="bar__bottom"> - <div class="bar-left" id="bar__bottomleft"> - <?php tpl_button('edit')?> - <?php tpl_button('history')?> - <?php tpl_button('revert')?> - </div> - <div class="bar-right" id="bar__bottomright"> - <?php tpl_button('subscribe')?> - <?php tpl_button('media')?> - <?php tpl_button('admin')?> - <?php tpl_button('profile')?> - <?php tpl_button('login')?> - <?php tpl_button('index')?> - <?php tpl_button('top')?>  - </div> - <div class="clearer"></div> - </div> - - </div> - - <?php tpl_license(false);?> - -</div> -<?php /*old includehook*/ @include(dirname(__FILE__).'/footer.html')?> - -<div class="no"><?php /* provide DokuWiki housekeeping, required in all templates */ tpl_indexerWebBug()?></div> -</body> -</html> |