diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2006-03-04 17:41:19 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2006-03-04 17:41:19 +0100 |
| commit | 2c5c33084b359f89e534423a600774972e9d84d3 (patch) | |
| tree | 61463f8074bc5e6a76810c9c9f219d3fcbe64bb1 /lib/tpl | |
| parent | 1ca31cfe69e2d10cce65c4323eb652b355f4c904 (diff) | |
| download | rpg-2c5c33084b359f89e534423a600774972e9d84d3.tar.gz rpg-2c5c33084b359f89e534423a600774972e9d84d3.tar.bz2 | |
move content-type meta header above title tag
This is recommended here: http://www.joelonsoftware.com/articles/Unicode.html
darcs-hash:20060304164119-7ad00-f7da3e6edeefb8dcfc907bf28b51379d7b31689e.gz
Diffstat (limited to 'lib/tpl')
| -rw-r--r-- | lib/tpl/default/detail.php | 24 | ||||
| -rw-r--r-- | lib/tpl/default/main.php | 2 | ||||
| -rw-r--r-- | lib/tpl/default/media.php | 14 | ||||
| -rw-r--r-- | lib/tpl/default/mediaedit.php | 3 | ||||
| -rw-r--r-- | lib/tpl/default/mediaref.php | 10 |
5 files changed, 26 insertions, 27 deletions
diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php index b40698a84..98e6ab713 100644 --- a/lib/tpl/default/detail.php +++ b/lib/tpl/default/detail.php @@ -15,11 +15,11 @@ ?> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr"> <head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title> <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?> [<?php echo hsc($conf['title'])?>] </title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <?php tpl_metaheaders()?> @@ -31,27 +31,27 @@ <?php html_msgarea()?> <div class="page"> - <?php if($ERROR){ print $ERROR; }else{ ?> + <?php if($ERROR){ print $ERROR; }else{ ?> - <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1> + <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1> - <div class="img_big"> - <?php tpl_img(900,700) ?> - </div> + <div class="img_big"> + <?php tpl_img(900,700) ?> + </div> - <div class="img_detail"> - <p class="img_caption"> - <?php print nl2br(hsc(tpl_img_getTag(array('IPTC.Caption', + <div class="img_detail"> + <p class="img_caption"> + <?php print nl2br(hsc(tpl_img_getTag(array('IPTC.Caption', 'EXIF.UserComment', 'EXIF.TIFFImageDescription', 'EXIF.TIFFUserComment')))); ?> - </p> + </p> <p>← <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p> <dl class="img_tags"> <?php - $t = tpl_img_getTag('Date.EarliestTime'); + $t = tpl_img_getTag('Date.EarliestTime'); if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.date($conf['dformat'],$t).'</dd>'; $t = tpl_img_getTag('File.Name'); @@ -78,7 +78,7 @@ ?> </dl> <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?> - </div> + </div> <?php } ?> </div> diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php index 9e1a4681d..4ddcf7dab 100644 --- a/lib/tpl/default/main.php +++ b/lib/tpl/default/main.php @@ -17,8 +17,8 @@ <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><?php tpl_pagetitle()?> [<?php echo hsc($conf['title'])?>]</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title><?php tpl_pagetitle()?> [<?php echo hsc($conf['title'])?>]</title> <?php tpl_metaheaders()?> diff --git a/lib/tpl/default/media.php b/lib/tpl/default/media.php index c464597bb..c2c632e46 100644 --- a/lib/tpl/default/media.php +++ b/lib/tpl/default/media.php @@ -15,8 +15,8 @@ ?> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr"> <head> - <title><?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>]</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title><?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>]</title> <?php tpl_metaheaders()?> @@ -35,16 +35,16 @@ <div class="mediaselect-left"> <strong><a href="<?php echo DOKU_BASE?>lib/exe/media.php?ns="><?php echo hsc($lang['namespaces'])?></a></strong> - <?php tpl_medianamespaces()?> - </div> + <?php tpl_medianamespaces()?> + </div> <div class="mediaselect-right"> <?php tpl_mediafilelist()?> - <div class="uploadform"> - <?php tpl_mediauploadform()?> - </div> - </div> + <div class="uploadform"> + <?php tpl_mediauploadform()?> + </div> + </div> </div> diff --git a/lib/tpl/default/mediaedit.php b/lib/tpl/default/mediaedit.php index 66d40ad5e..a533a5f1e 100644 --- a/lib/tpl/default/mediaedit.php +++ b/lib/tpl/default/mediaedit.php @@ -16,8 +16,8 @@ ?> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr"> <head> - <title><?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>]</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title><?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>]</title> <?php tpl_metaheaders()?> @@ -85,4 +85,3 @@ </div> </body> </html> - diff --git a/lib/tpl/default/mediaref.php b/lib/tpl/default/mediaref.php index 4651b5667..a2d12eb95 100644 --- a/lib/tpl/default/mediaref.php +++ b/lib/tpl/default/mediaref.php @@ -16,8 +16,8 @@ ?> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr"> <head> - <title><?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>]</title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> + <title><?php echo hsc($lang['mediaselect'])?> [<?php echo hsc($conf['title'])?>]</title> <?php tpl_metaheaders()?> @@ -35,11 +35,11 @@ <div class="mediaref_head"> <p><?php echo hsc($lang['ref_inuse'])?></p> </div> - + <?php tpl_showreferences($mediareferences)?> - - <div class="mediaref_footer"> - <hr> + + <div class="mediaref_footer"> + <hr> <?php tpl_button('backtomedia')?> </div> </div> |