Changeset 1622:8acfe7bdb542

Timestamp:

08/30/13 11:38:25 (10 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

HTML validation

Files:

• admin/plugins.php (modified) (1 diff)
• inc/admin/lib.pager.php (modified) (1 diff)
• locales/en/main.po (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)
• plugins/antispam/filters/class.dc.filter.iplookup.php (modified) (1 diff)
• plugins/importExport/inc/class.dc.import.dc1.php (modified) (3 diffs)
• plugins/importExport/inc/class.dc.import.wp.php (modified) (4 diffs)
• themes/ductile/_config.php (modified) (4 diffs)

admin/plugins.php

@@ -374 +374 @@
      form::password(array('your_pwd','your_pwd2'),20,255).'</p>'.
      '<p><input type="submit" name="fetch_pkg" value="'.__('Download plugin').'" />'.
-     $core->formNonce().
-     '</fieldset>'.
+     $core->formNonce().'</p>'.
      '</form>';
 }

inc/admin/lib.pager.php

@@ -333 +333 @@
           '<td class="nowrap">'.
           form::checkbox(array('comments[]'),$this->rs->comment_id,'','','',0).'</td>'.
-          '<td class="status class="txt-center">'.
+          '<td class="status txt-center">'.
                '<a href="'.$comment_url.'">'.
                '<img src="images/edit-mini.png" alt="" title="'.__('Edit').'" /> '.

locales/en/main.po

@@ -547 +547 @@
 
 msgid "Entries (all types)"
-msgstr "Entries & pages"
+msgstr "Entries & pages"
 
 msgid "Status"

locales/fr/main.po

@@ -578 +578 @@
 
 msgid "Entries (all types)"
-msgstr "Billets & pages"
+msgstr "Billets & pages"
 
 msgid "Status"

plugins/antispam/filters/class.dc.filter.iplookup.php

@@ -81 +81 @@
           form::textarea('bls',40,3,html::escapeHTML($bls),'maximal').
           '</p>'.
-          '<p><input type="submit" value="'.__('Save').'" /></p>'.
+          '<p><input type="submit" value="'.__('Save').'" />'.
           $this->core->formNonce().'</p>'.
           '</form>';

plugins/importExport/inc/class.dc.import.dc1.php

@@ -160 +160 @@
                     '<p><label for="db_prefix">'.__('Database Tables Prefix:').'</label> '.
                     form::field('db_prefix',30,255,html::escapeHTML($this->vars['db_prefix'])).'</p>'.
-                    '<h3>'.__('Entries import options').'</h3>'.
+                    '<h3 class="vertical-separator">'.__('Entries import options').'</h3>'.
                     '<p><label for="post_limit">'.__('Number of entries to import at once:').'</label> '.
                     form::field('post_limit',3,3,html::escapeHTML($this->vars['post_limit'])).'</p>'
@@ -190 +190 @@
                case 6:
                     echo 
-                    '<h3>'.__('Please read carefully').'</h3>'.
+                    '<h3 class="vertical-separator">'.__('Please read carefully').'</h3>'.
                     '<ul>'.
                     '<li>'.__('Every newly imported user has received a random password '.
@@ -216 +216 @@
           return
           '<form action="'.$this->getURL(true).'" method="post">'.
-          '<h3>'.$legend.'</h3>'.
-          $this->core->formNonce().
+          '<h3 class="vertical-separator">'.$legend.'</h3>'.
+          '<div>'.$this->core->formNonce().
           form::hidden(array('do'),'step'.$step).
-          '%s'.
-          '<p><input type="submit" value="'.$submit_value.'" /></p>'.
+          '%s'.'</div>'.
+          '<p class="vertical-separator"><input type="submit" value="'.$submit_value.'" /></p>'.
           '<p class="form-note info">'.__('Depending on the size of your blog, it could take a few minutes.').'</p>'.
           '</form>';

plugins/importExport/inc/class.dc.import.wp.php

@@ -192 +192 @@
                     form::field('db_prefix',30,255,html::escapeHTML($this->vars['db_prefix'])).'</p>'.
 
-                    '<h3>'.__('Entries import options').'</h3>'.
+                    '<h3 class="vertical-separator">'.__('Entries import options').'</h3>'.
+                    '<div class="two-cols">'.
+
+                    '<div class="col">'.
                     '<p>'.__('WordPress and Dotclear\'s handling of categories are quite different. '.
                     'You can assign several categories to a single post in WordPress. In the Dotclear world, '.
@@ -203 +206 @@
                     'importing your blog, as Dotclear allows you to actually keep your posts '.
                     'uncategorized.').'</p>'.
+                    '</div>'.
 
+                    '<div class="col">'.
                     '<p><label for="ignore_first_cat" class="classic">'.form::checkbox('ignore_first_cat',1,$this->vars['ignore_first_cat']).' '.
                     __('Ignore the first category:').'</label></p>'.
@@ -214 +219 @@
                     '<p><label for="post_limit">'.__('Number of entries to import at once:').'</label> '.
                     form::field('post_limit',3,3,html::escapeHTML($this->vars['post_limit'])).'</p>'.
+                    '</div>'.
                     
-                    '<h3>'.__('Content filters').'</h3>'.
+                    '</div>'.
+
+                    '<h3 class="clear vertical-separator">'.__('Content filters').'</h3>'.
                     '<p>'.__('You may want to process your post and/or comment content with the following filters.').'</p>'.
                     '<p><label for="post_formater">'.__('Post content formatter:').'</label> '.
                     form::combo('post_formater',$this->formaters,$this->vars['post_formater']).'</p>'.
                     '<p><label for="comment_formater">'.__('Comment content formatter:').'</label> '
-                    .form::combo('comment_formater',$this->formaters,$this->vars['comment_formater']).'</label></p>'
+                    .form::combo('comment_formater',$this->formaters,$this->vars['comment_formater']).'</p>'
                     );
                     break;
@@ -265 +273 @@
           return
           '<form action="'.$this->getURL(true).'" method="post">'.
-          '<h3>'.$legend.'</h3>'.
-          $this->core->formNonce().
+          '<h3 class="vertical-separator">'.$legend.'</h3>'.
+          '<div>'.$this->core->formNonce().
           form::hidden(array('do'),'step'.$step).
-          '%s'.
+          '%s'.'</div>'.
           '<p><input type="submit" value="'.$submit_value.'" /></p>'.
           '<p class="form-note info">'.__('Depending on the size of your blog, it could take a few minutes.').'</p>'.

themes/ductile/_config.php

@@ -471 +471 @@
      '<td class="handle minimal">'.form::field(array('order['.$i.']'),2,3,$count,'position','',false).
           form::hidden(array('dynorder[]','dynorder-'.$i),$i).'</td>'.
-     '<td>'.form::hidden(array('sticker_image[]'),$v['image']).'<img src="'.$img_url.$v['image'].'" /> '.'</td>'.
-     '<td scope="raw">'.form::field(array('sticker_label[]','dsl-'.$i),20,255,$v['label']).'</td>'.
+     '<td>'.form::hidden(array('sticker_image[]'),$v['image']).'<img src="'.$img_url.$v['image'].'" alt="'.$v['image'].'" /> '.'</td>'.
+     '<td scope="row">'.form::field(array('sticker_label[]','dsl-'.$i),20,255,$v['label']).'</td>'.
      '<td>'.form::field(array('sticker_url[]','dsu-'.$i),40,255,$v['url']).'</td>'.
      '</tr>';
@@ -496 +496 @@
      echo 
           '<tr>'.
-          '<td scope="raw">'.$contexts[$k].'</td>'.
+          '<td scope="row">'.$contexts[$k].'</td>'.
           '<td>'.form::hidden(array('list_ctx[]'),$k).form::combo(array('list_type[]'),$list_types,$v).'</td>';
      if (array_key_exists($k,$ductile_counts)) {
@@ -517 +517 @@
 echo '</fieldset>';
 
-echo '<input type="hidden" name="conf_tab" value="html">';
+echo '<p><input type="hidden" name="conf_tab" value="html" /></p>';
 echo '<p class="clear">'.form::hidden('ds_order','').'<input type="submit" value="'.__('Save').'" />'.$core->formNonce().'</p>';
 echo '</form>';
@@ -674 +674 @@
 echo '</div>';
 
-echo '<input type="hidden" name="conf_tab" value="css">';
+echo '<p><input type="hidden" name="conf_tab" value="css" /></p>';
 echo '<p class="clear"><input type="submit" value="'.__('Save').'" />'.$core->formNonce().'</p>';
 echo '</form>';