diff options
author | matthiasgrimm <matthiasgrimm@users.sourceforge.net> | 2005-06-17 15:03:35 +0200 |
---|---|---|
committer | matthiasgrimm <matthiasgrimm@users.sourceforge.net> | 2005-06-17 15:03:35 +0200 |
commit | 4dc4b499e810ec672ae10f49fdcbf9a09a8e3115 (patch) | |
tree | c0af439df0245037ad86a726e7d252d554766c06 /lib | |
parent | 08eda5bc3c3fbfc539af9f9fd2f62a3c23fb7798 (diff) | |
download | rpg-4dc4b499e810ec672ae10f49fdcbf9a09a8e3115.tar.gz rpg-4dc4b499e810ec672ae10f49fdcbf9a09a8e3115.tar.bz2 |
make DokuWiki xml conform
XML has problems with usual PHP shortcuts like '<?' or '<?
darcs-hash:20050617130335-7ef76-8e98db5cdae5f8b81993a380cb3d3acc9ac33dbd.gz
Diffstat (limited to 'lib')
-rw-r--r-- | lib/tpl/default/main.php | 82 | ||||
-rw-r--r-- | lib/tpl/default/media.php | 28 |
2 files changed, 55 insertions, 55 deletions
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 28ad48f6f..e7dd3a7d1 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<? +<?php /** * DokuWiki Default Template * @@ -14,116 +14,116 @@ * @author Andreas Gohr <andi@splitbrain.org> */ ?> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$conf['lang']?>" - lang="<?=$conf['lang']?>" dir="<?=$lang['direction']?>"> +<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> - <title><?=$ID?> [<?=hsc($conf['title'])?>]</title> + <title><?php echo $ID?> [<php echo hsc($conf['title'])?>]</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <?tpl_metaheaders()?> + <?php tpl_metaheaders()?> - <link rel="shortcut icon" href="<?=DOKU_BASE?>lib/images/favicon.ico" /> - <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>layout.css" /> - <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>design.css" /> + <link rel="shortcut icon" href="<?php echo DOKU_BASE?>lib/images/favicon.ico" /> + <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>layout.css" /> + <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>design.css" /> - <? if($lang['direction'] == 'rtl') {?> - <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>rtl.css" /> - <? } ?> + <?php if($lang['direction'] == 'rtl') {?> + <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>rtl.css" /> + <?php } ?> - <link rel="stylesheet" media="print" type="text/css" href="<?=DOKU_TPL?>print.css" /> + <link rel="stylesheet" media="print" type="text/css" href="<?php echo DOKU_TPL?>print.css" /> <!--[if gte IE 5]> <style type="text/css"> /* that IE 5+ conditional comment makes this only visible in IE 5+ */ /* IE bugfix for transparent PNGs */ - //DISABLED img { behavior: url("<?=DOKU_BASE?>lib/scripts/pngbehavior.htc"); } + //DISABLED img { behavior: url("<?php echo DOKU_BASE?>lib/scripts/pngbehavior.htc"); } </style> <![endif]--> - <?/*old includehook*/ @include(dirname(__FILE__).'/meta.html')?> + <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?> </head> <body> -<?/*old includehook*/ @include(dirname(__FILE__).'/topheader.html')?> +<?php /*old includehook*/ @include(dirname(__FILE__).'/topheader.html')?> <div class="dokuwiki"> - <?html_msgarea()?> + <?php html_msgarea()?> <div class="stylehead"> <div class="header"> <div class="pagename"> - [[<?tpl_link(wl($ID,'do=backlink'),$ID)?>]] + [[<?php tpl_link(wl($ID,'do=backlink'),$ID)?>]] </div> <div class="logo"> - <?tpl_link(wl(),$conf['title'],'name="top" accesskey="h" title="[ALT+H]"')?> + <?php tpl_link(wl(),$conf['title'],'name="top" accesskey="h" title="[ALT+H]"')?> </div> </div> - <?/*old includehook*/ @include(dirname(__FILE__).'/header.html')?> + <?php /*old includehook*/ @include(dirname(__FILE__).'/header.html')?> <div class="bar" id="bar_top"> <div class="bar-left" id="bar_topleft"> - <?tpl_button('edit')?> - <?tpl_button('history')?> + <?php tpl_button('edit')?> + <?php tpl_button('history')?> </div> <div class="bar-right" id="bar_topright"> - <?tpl_button('recent')?> - <?tpl_searchform()?> + <?php tpl_button('recent')?> + <?php tpl_searchform()?> </div> </div> - <?if($conf['breadcrumbs']){?> + <?php if($conf['breadcrumbs']){?> <div class="breadcrumbs"> - <?tpl_breadcrumbs()?> - <?//tpl_youarehere() //(some people prefer this)?> + <?php tpl_breadcrumbs()?> + <?php //tpl_youarehere() //(some people prefer this)?> </div> - <?}?> + <?php }?> </div> - <?flush()?> + <?php flush()?> - <?/*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?> + <?php /*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?> <div class="page"> <!-- wikipage start --> - <?tpl_content()?> + <?php tpl_content()?> <!-- wikipage stop --> </div> <div class="clearer"> </div> - <?flush()?> + <?php flush()?> <div class="stylefoot"> <div class="meta"> <div class="user"> - <?tpl_userinfo()?> + <?php tpl_userinfo()?> </div> <div class="doc"> - <?tpl_pageinfo()?> + <?php tpl_pageinfo()?> </div> </div> - <?/*old includehook*/ @include(dirname(__FILE__).'/pagefooter.html')?> + <?php /*old includehook*/ @include(dirname(__FILE__).'/pagefooter.html')?> <div class="bar" id="bar_bottom"> <div class="bar-left" id="bar_bottomleft"> - <?tpl_button('edit')?> - <?tpl_button('history')?> + <?php tpl_button('edit')?> + <?php tpl_button('history')?> </div> <div class="bar-right" id="bar_bottomright"> - <?tpl_button('admin')?> - <?tpl_button('login')?> - <?tpl_button('index')?> - <?tpl_button('top')?> + <?php tpl_button('admin')?> + <?php tpl_button('login')?> + <?php tpl_button('index')?> + <?php tpl_button('top')?> </div> </div> </div> </div> -<?/*old includehook*/ @include(dirname(__FILE__).'/footer.html')?> +<?php /*old includehook*/ @include(dirname(__FILE__).'/footer.html')?> </body> </html> diff --git a/lib/tpl/default/media.php b/lib/tpl/default/media.php index 507717463..d4417d5f6 100644 --- a/lib/tpl/default/media.php +++ b/lib/tpl/default/media.php @@ -1,6 +1,6 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<? +<?php /** * DokuWiki Default Template * @@ -13,45 +13,45 @@ * @author Andreas Gohr <andi@splitbrain.org> */ ?> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$conf['lang']?>" lang="<?=$conf['lang']?>" dir="ltr"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr"> <head> - <title><?=hsc($lang['mediaselect'])?> [<?=hsc($conf['title'])?>]</title> + <title><?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>]</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> - <?tpl_metaheaders()?> + <?php tpl_metaheaders()?> - <link rel="shortcut icon" href="<?=DOKU_BASE?>lib/images/favicon.ico" /> - <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>layout.css" /> - <link rel="stylesheet" media="screen" type="text/css" href="<?=DOKU_TPL?>design.css" /> + <link rel="shortcut icon" href="<?php echo DOKU_BASE?>lib/images/favicon.ico" /> + <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>layout.css" /> + <link rel="stylesheet" media="screen" type="text/css" href="<?php echo DOKU_TPL?>design.css" /> <!--[if gte IE 5]> <style type="text/css"> /* that IE 5+ conditional comment makes this only visible in IE 5+ */ /* IE bugfix for transparent PNGs */ - //DISABLED img { behavior: url("<?=DOKU_BASE?>lib/scripts/pngbehavior.htc"); } + //DISABLED img { behavior: url("<?php echo DOKU_BASE?>lib/scripts/pngbehavior.htc"); } </style> <![endif]--> </head> <body> <div class="dokuwiki"> - <?html_msgarea()?> + <?php html_msgarea()?> - <h1><?=hsc($lang['mediaselect'])?> <code><?=hsc($NS)?></code></h1> + <h1><?php echo hsc($lang['mediaselect'])?> <code><?php echo hsc($NS)?></code></h1> <div class="mediaselect"> <div class="mediaselect-left"> - <b><a href="<?=DOKU_BASE?>/lib/exe/media.php?ns="><?=hsc($lang['namespaces'])?></a></b> + <b><a href="<?php echo DOKU_BASE?>/lib/exe/media.php?ns="><?php echo hsc($lang['namespaces'])?></a></b> - <?tpl_medianamespaces()?> + <?php tpl_medianamespaces()?> </div> <div class="mediaselect-right"> - <?tpl_mediafilelist()?> + <?php tpl_mediafilelist()?> <div class="uploadform"> - <?tpl_mediauploadform()?> + <?php tpl_mediauploadform()?> </div> </div> |