summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--inc/html.php46
-rw-r--r--inc/parser/xhtml.php4
-rw-r--r--inc/template.php4
-rw-r--r--lib/exe/ajax.php2
-rw-r--r--lib/plugins/info/syntax.php2
-rw-r--r--lib/tpl/default/design.css5
-rw-r--r--lib/tpl/default/footer.html2
-rw-r--r--lib/tpl/default/media.php2
8 files changed, 37 insertions, 30 deletions
diff --git a/inc/html.php b/inc/html.php
index b46176897..4ab687b5c 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -50,7 +50,7 @@ function html_login(){
print p_locale_xhtml('login');
?>
- <div align="center">
+ <div class="centeralign">
<form action="<?php echo script()?>" accept-charset="<?php echo $lang['encoding']?>" method="post">
<fieldset>
<legend><?php echo $lang['btn_login']?></legend>
@@ -339,7 +339,7 @@ function html_search(){
if(count($data)){
sort($data);
print '<div class="search_quickresult">';
- print '<b>'.$lang[quickhits].':</b><br />';
+ print '<strong>'.$lang[quickhits].':</strong><br />';
foreach($data as $id){
print '<div class="search_quickhits">';
print html_wikilink(':'.$id,$conf['useheading']?NULL:$id);
@@ -393,8 +393,8 @@ function html_locked(){
print p_locale_xhtml('locked');
print '<ul>';
- print '<li><b>'.$lang['lockedby'].':</b> '.$INFO['locked'].'</li>';
- print '<li><b>'.$lang['lockexpire'].':</b> '.$expire.' ('.$min.' min)</li>';
+ print '<li><strong>'.$lang['lockedby'].':</strong> '.$INFO['locked'].'</li>';
+ print '<li><strong>'.$lang['lockexpire'].':</strong> '.$expire.' ('.$min.' min)</li>';
print '</ul>';
}
@@ -768,11 +768,11 @@ function html_conflict($text,$summary){
print p_locale_xhtml('conflict');
?>
<form name="editform" method="post" action="<?php echo script()?>" accept-charset="<?php echo $lang['encoding']?>">
- <input type="hidden" name="id" value="<?php echo $ID?>" />
- <input type="hidden" name="wikitext" value="<?php echo formText($text)?>" />
- <input type="hidden" name="summary" value="<?php echo formText($summary)?>" />
-
- <div align="center">
+ <div class="centeralign">
+ <input type="hidden" name="id" value="<?php echo $ID?>" />
+ <input type="hidden" name="wikitext" value="<?php echo formText($text)?>" />
+ <input type="hidden" name="summary" value="<?php echo formText($summary)?>" />
+
<input class="button" type="submit" name="do" value="<?php echo $lang['btn_save']?>" accesskey="s" title="[ALT+S]" />
<input class="button" type="submit" name="do" value="<?php echo $lang['btn_cancel']?>" />
</div>
@@ -810,11 +810,12 @@ function html_register(){
print p_locale_xhtml('register');
?>
- <div align="center">
+ <div class="centeralign">
<form name="register" method="post" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>">
- <input type="hidden" name="do" value="register" />
- <input type="hidden" name="save" value="1" />
<fieldset>
+ <input type="hidden" name="do" value="register" />
+ <input type="hidden" name="save" value="1" />
+
<legend><?php echo $lang['register']?></legend>
<label class="block">
<?php echo $lang['user']?>
@@ -868,11 +869,12 @@ function html_updateprofile(){
if (empty($_POST['fullname'])) $_POST['fullname'] = $INFO['userinfo']['name'];
if (empty($_POST['email'])) $_POST['email'] = $INFO['userinfo']['mail'];
?>
- <div align="center">
+ <div class="centeralign">
<form name="register" method="post" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>">
- <input type="hidden" name="do" value="profile" />
- <input type="hidden" name="save" value="1" />
<fieldset style="width: 80%;">
+ <input type="hidden" name="do" value="profile" />
+ <input type="hidden" name="save" value="1" />
+
<legend><?php echo $lang['profile']?></legend>
<label class="block">
<?php echo $lang['user']?>
@@ -968,15 +970,15 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
?>
<form name="editform" method="post" action="<?php echo script()?>" accept-charset="<?php echo $lang['encoding']?>">
- <input type="hidden" name="id" value="<?php echo $ID?>" />
- <input type="hidden" name="rev" value="<?php echo $REV?>" />
- <input type="hidden" name="date" value="<?php echo $DATE?>" />
- <input type="hidden" name="prefix" value="<?php echo formText($PRE)?>" />
- <input type="hidden" name="suffix" value="<?php echo formText($SUF)?>" />
<table style="width:99%">
<tr>
<td class="toolbar" colspan="2">
<div id="toolbar"></div>
+ <input type="hidden" name="id" value="<?php echo $ID?>" />
+ <input type="hidden" name="rev" value="<?php echo $REV?>" />
+ <input type="hidden" name="date" value="<?php echo $DATE?>" />
+ <input type="hidden" name="prefix" value="<?php echo formText($PRE)?>" />
+ <input type="hidden" name="suffix" value="<?php echo formText($SUF)?>" />
<?php if($wr){?>
<script type="text/javascript" charset="utf-8">
@@ -1011,7 +1013,7 @@ function html_edit($text=null,$include='edit'){ //FIXME: include needed?
<?php html_minoredit()?>
<?php }?>
</td>
- <td align="right">
+ <td class="rightalign">
<div id="sizectl"></div>
</td>
</tr>
@@ -1160,7 +1162,7 @@ function html_resendpwd() {
print p_locale_xhtml('resendpwd');
?>
- <div align="center">
+ <div class="centeralign">
<form name="resendpwd" action="<?php echo wl($ID)?>" accept-charset="<?php echo $lang['encoding']?>" method="post">
<fieldset>
<br />
diff --git a/inc/parser/xhtml.php b/inc/parser/xhtml.php
index dc8922ee7..d03939542 100644
--- a/inc/parser/xhtml.php
+++ b/inc/parser/xhtml.php
@@ -346,11 +346,11 @@ class Doku_Renderer_xhtml extends Doku_Renderer {
}
function quote_open() {
- $this->doc .= '<blockquote>'.DOKU_LF;
+ $this->doc .= '<blockquote><div class="no">'.DOKU_LF;
}
function quote_close() {
- $this->doc .= '</blockquote>'.DOKU_LF;
+ $this->doc .= '</div></blockquote>'.DOKU_LF;
}
/**
diff --git a/inc/template.php b/inc/template.php
index f2f214bd9..636fcfca3 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -727,7 +727,7 @@ function tpl_mediafilelist(){
//read EXIF/IPTC data
$t = $item['meta']->getField('IPTC.Headline');
- if($t) print '<b>'.$t.'</b><br />';
+ if($t) print '<strong>'.$t.'</strong><br />';
$t = $item['meta']->getField(array('IPTC.Caption','EXIF.UserComment',
'EXIF.TIFFImageDescription',
@@ -735,7 +735,7 @@ function tpl_mediafilelist(){
if($t) print $t.'<br />';
$t = $item['meta']->getField(array('IPTC.Keywords','IPTC.Category'));
- if($t) print '<i>'.$t.'</i><br />';
+ if($t) print '<em>'.$t.'</em><br />';
//add edit button
if($AUTH >= AUTH_UPLOAD && $item['meta']->getField('File.Mime') == 'image/jpeg'){
diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index d8cf8bc75..8c93bcdab 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -50,7 +50,7 @@ function ajax_qsearch(){
if(!count($data)) return;
- print '<b>'.$lang['quickhits'].'</b>';
+ print '<strong>'.$lang['quickhits'].'</strong>';
print '<ul>';
foreach($data as $id){
print '<li>';
diff --git a/lib/plugins/info/syntax.php b/lib/plugins/info/syntax.php
index ea46da7bb..25b2fff45 100644
--- a/lib/plugins/info/syntax.php
+++ b/lib/plugins/info/syntax.php
@@ -113,7 +113,7 @@ class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
$renderer->doc .= '<li>';
$renderer->externallink($info['url'],$info['name']);
$renderer->doc .= ' ';
- $renderer->doc .= '<i>'.$info['date'].'</i>';
+ $renderer->doc .= '<em>'.$info['date'].'</em>';
$renderer->doc .= ' ';
$renderer->doc .= $lang['by'];
$renderer->doc .= ' ';
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 7e9bd2db6..d9f0a2307 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -82,6 +82,7 @@ fieldset {
text-align: center;
border: 1px solid __dark__;
padding: 0.5em;
+ margin: auto;
}
textarea.edit {
@@ -644,6 +645,10 @@ div.search_quickhits {
}
/* ------------------ Additional ---------------------- */
+
+div.footerinc {
+ text-align: center;
+}
.footerinc a img {
opacity: 0.5;
}
diff --git a/lib/tpl/default/footer.html b/lib/tpl/default/footer.html
index fb1d38fd2..e75d029d3 100644
--- a/lib/tpl/default/footer.html
+++ b/lib/tpl/default/footer.html
@@ -7,7 +7,7 @@
*/
?>
-<div align="center" class="footerinc">
+<div class="footerinc">
<a target="_blank" href="<?php echo DOKU_BASE; ?>feed.php" title="Recent changes RSS feed"><img src="<?php echo DOKU_TPL; ?>images/button-rss.png" width="80" height="15" alt="Recent changes RSS feed" border="0" /></a>
<a target="_blank" href="http://creativecommons.org/licenses/by-nc-sa/2.0/" rel="license" title="Creative Commons License"><img src="<?php echo DOKU_TPL; ?>images/button-cc.gif" width="80" height="15" alt="Creative Commons License" border="0" /></a>
diff --git a/lib/tpl/default/media.php b/lib/tpl/default/media.php
index e4b792ff3..c464597bb 100644
--- a/lib/tpl/default/media.php
+++ b/lib/tpl/default/media.php
@@ -33,7 +33,7 @@
<div class="mediaselect">
<div class="mediaselect-left">
- <b><a href="<?php echo DOKU_BASE?>lib/exe/media.php?ns="><?php echo hsc($lang['namespaces'])?></a></b>
+ <strong><a href="<?php echo DOKU_BASE?>lib/exe/media.php?ns="><?php echo hsc($lang['namespaces'])?></a></strong>
<?php tpl_medianamespaces()?>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 21:28:03 +0000