more strict validity

darcs-hash:20090119194529-f7d6d-170bca22f3579528f1a6405cbec334209b40a106.gz

2 files changed, 19 insertions, 10 deletions

diff --git a/inc/form.php b/inc/form.php
index 261f40142..e1760442e 100644
--- a/inc/form.php
+++ b/inc/form.php
@@ -668,7 +668,8 @@ function form_button($attrs) {
  * @author  Tom N Harris <tnharris@whoopdedo.org>
  */
 function form_field($attrs) {
-  $s = '<label class="'.$attrs['_class'].'"';
+  $s = '<label';
+  if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
   if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
   $s .= '><span>'.$attrs['_text'].'</span>';
   $s .= ' <input '.buildAttributes($attrs,true).'/></label>';
@@ -688,7 +689,8 @@ function form_field($attrs) {
  * @author  Tom N Harris <tnharris@whoopdedo.org>
  */
 function form_fieldright($attrs) {
-  $s = '<label class="'.$attrs['_class'].'"';
+  $s = '<label';
+  if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
   if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
   $s .= '><input '.buildAttributes($attrs,true).'/>';
   $s .= ' <span>'.$attrs['_text'].'</span></label>';
@@ -710,7 +712,8 @@ function form_fieldright($attrs) {
 function form_textfield($attrs) {
   // mandatory attributes
   unset($attrs['type']);
-  $s = '<label class="'.$attrs['_class'].'"';
+  $s = '<label';
+  if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
   if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
   $s .= '><span>'.$attrs['_text'].'</span> ';
   $s .= '<input type="text" '.buildAttributes($attrs,true).'/></label>';
@@ -732,7 +735,8 @@ function form_textfield($attrs) {
 function form_passwordfield($attrs) {
   // mandatory attributes
   unset($attrs['type']);
-  $s = '<label class="'.$attrs['_class'].'"';
+  $s = '<label';
+  if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
   if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
   $s .= '><span>'.$attrs['_text'].'</span> ';
   $s .= '<input type="password" '.buildAttributes($attrs,true).'/></label>';
@@ -754,7 +758,8 @@ function form_passwordfield($attrs) {
  * @author  Michael Klier <chi@chimeric.de>
  */
 function form_filefield($attrs) {
-  $s = '<label class="'.$attrs['_class'].'"';
+  $s = '<label';
+  if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
   if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
   $s .= '><span>'.$attrs['_text'].'</span> ';
   $s .= '<input type="file" '.buildAttributes($attrs,true);
@@ -779,7 +784,8 @@ function form_filefield($attrs) {
 function form_checkboxfield($attrs) {
   // mandatory attributes
   unset($attrs['type']);
-  $s = '<label class="'.$attrs['_class'].'"';
+  $s = '<label';
+  if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
   if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
   $s .= '><input type="checkbox" '.buildAttributes($attrs,true).'/>';
   $s .= ' <span>'.$attrs['_text'].'</span></label>';
@@ -801,7 +807,8 @@ function form_checkboxfield($attrs) {
 function form_radiofield($attrs) {
   // mandatory attributes
   unset($attrs['type']);
-  $s = '<label class="'.$attrs['_class'].'"';
+  $s = '<label';
+  if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
   if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
   $s .= '><input type="radio" '.buildAttributes($attrs,true).'/>';
   $s .= ' <span>'.$attrs['_text'].'</span></label>';
@@ -825,7 +832,8 @@ function form_radiofield($attrs) {
  */
 function form_menufield($attrs) {
   $attrs['size'] = '1';
-  $s = '<label class="'.$attrs['_class'].'"';
+  $s = '<label';
+  if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
   if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
   $s .= '><span>'.$attrs['_text'].'</span>';
   $s .= ' <select '.buildAttributes($attrs,true).'>'.NL;
@@ -866,7 +874,8 @@ function form_menufield($attrs) {
  * @author  Tom N Harris <tnharris@whoopdedo.org>
  */
 function form_listboxfield($attrs) {
-  $s = '<label class="'.$attrs['_class'].'"';
+  $s = '<label';
+  if ($attrs['_class']) $s .= ' class="'.$attrs['_class'].'"';
   if (!empty($attrs['id'])) $s .= ' for="'.$attrs['id'].'"';
   $s .= '><span>'.$attrs['_text'].'</span> ';
   $s .= '<select '.buildAttributes($attrs,true).'>'.NL;
diff --git a/inc/template.php b/inc/template.php
index 9d29ad291..909de999c 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1318,7 +1318,7 @@ function tpl_license($img='badge',$return=false){
         if($src){
             $out .= '<a href="'.$lic['url'].'" rel="license"';
             if($conf['target']['external']) $out .= ' target="'.$conf['target']['external'].'"';
-            $out .= '><img src="'.DOKU_BASE.$src.'" class="lic'.$img.'" alt="'.$lic['name'].'" align="left" /></a> ';
+            $out .= '><img src="'.DOKU_BASE.$src.'" class="medialeft lic'.$img.'" alt="'.$lic['name'].'" /></a> ';
         }
     }
     $out .= $lang['license'];