Changeset 1454:e64273de06ad for plugins/importExport

Timestamp:

08/18/13 16:27:51 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Let labels be labels, the end (I hope so).

Location:

plugins/importExport/inc

Files:

• class.dc.import.dc1.php (modified) (1 diff)
• class.dc.import.flat.php (modified) (1 diff)
• class.dc.import.wp.php (modified) (3 diffs)

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

@@ -150 +150 @@
                     
                     printf($this->imForm(1,__('General information'),__('Import my blog now')),
-                    '<h3>'.__('We first need some information about your old Dotclear 1.2 installation.').'</h3>'.
-                    '<p><label for="db_host">'.__('Database Host Name:').' '.
-                    form::field('db_host',30,255,html::escapeHTML($this->vars['db_host'])).'</label></p>'.
-                    '<p><label for="db_name">'.__('Database Name:',html::escapeHTML($this->vars['db_name'])).' '.
-                    form::field('db_name',30,255,html::escapeHTML($this->vars['db_name'])).'</label></p>'.
-                    '<p><label for="db_user">'.__('Database User Name:').' '.
-                    form::field('db_user',30,255,html::escapeHTML($this->vars['db_user'])).'</label></p>'.
-                    '<p><label for="db_pwd">'.__('Database Password:').' '.
-                    form::password('db_pwd',30,255).'</label></p>'.
-                    '<p><label for="db_prefix">'.__('Database Tables Prefix:').' '.
-                    form::field('db_prefix',30,255,html::escapeHTML($this->vars['db_prefix'])).'</label></p>'.
+                    '<p class="form-note info">'.__('We first need some information about your old Dotclear 1.2 installation.').'</p>'.
+                    '<p><label for="db_host">'.__('Database Host Name:').'</label> '.
+                    form::field('db_host',30,255,html::escapeHTML($this->vars['db_host'])).'</p>'.
+                    '<p><label for="db_name">'.__('Database Name:',html::escapeHTML($this->vars['db_name'])).'</label> '.
+                    form::field('db_name',30,255,html::escapeHTML($this->vars['db_name'])).'</p>'.
+                    '<p><label for="db_user">'.__('Database User Name:').'</label> '.
+                    form::field('db_user',30,255,html::escapeHTML($this->vars['db_user'])).'</p>'.
+                    '<p><label for="db_pwd">'.__('Database Password:').'</label> '.
+                    form::password('db_pwd',30,255).'</p>'.
+                    '<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>'.
-                    '<p><label for="post_limit">'.__('Number of entries to import at once:').' '.
-                    form::field('post_limit',3,3,html::escapeHTML($this->vars['post_limit'])).'</label></p>'
+                    '<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>'
                     );
                     break;

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

@@ -191 +191 @@
           if ($has_files) {
                echo 
-               '<p><label for="public_single_file" class="classic">'.__('or pick up a local file in your public directory').' '.
+               '<p><label for="public_single_file" class="classic">'.__('or pick up a local file in your public directory').'</label> '.
                form::combo('public_single_file',$public_files).
-               '</label></p>';
+               '</p>';
           }
           

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

@@ -182 +182 @@
                     printf($this->imForm(1,__('General information'),__('Import my blog now')),
                     '<h3>'.__('We first need some information about your old WordPress installation.').'</h3>'.
-                    '<p><label for="db_host">'.__('Database Host Name:').' '.
-                    form::field('db_host',30,255,html::escapeHTML($this->vars['db_host'])).'</label></p>'.
-                    '<p><label for="db_name">'.__('Database Name:',html::escapeHTML($this->vars['db_name'])).' '.
-                    form::field('db_name',30,255,html::escapeHTML($this->vars['db_name'])).'</label></p>'.
-                    '<p><label for="db_user">'.__('Database User Name:').' '.
-                    form::field('db_user',30,255,html::escapeHTML($this->vars['db_user'])).'</label></p>'.
-                    '<p><label for="db_pwd">'.__('Database Password:').' '.
-                    form::password('db_pwd',30,255).'</label></p>'.
-                    '<p><label for="db_prefix">'.__('Database Tables Prefix:').' '.
-                    form::field('db_prefix',30,255,html::escapeHTML($this->vars['db_prefix'])).'</label></p>'.
+                    '<p><label for="db_host">'.__('Database Host Name:').'</label> '.
+                    form::field('db_host',30,255,html::escapeHTML($this->vars['db_host'])).'</p>'.
+                    '<p><label for="db_name">'.__('Database Name:',html::escapeHTML($this->vars['db_name'])).'</label> '.
+                    form::field('db_name',30,255,html::escapeHTML($this->vars['db_name'])).'</p>'.
+                    '<p><label for="db_user">'.__('Database User Name:').'</label> '.
+                    form::field('db_user',30,255,html::escapeHTML($this->vars['db_user'])).'</p>'.
+                    '<p><label for="db_pwd">'.__('Database Password:').'</label> '.
+                    form::password('db_pwd',30,255).'</p>'.
+                    '<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>'.
                     '<p>'.__('WordPress and Dotclear\'s handling of categories are quite different. '.
@@ -202 +203 @@
                     'category, you can just ignore it while importing your blog, as Dotclear allows you to '.
                     'actually keep your posts uncategorized.').'</p>'.
+
                     '<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>'.
@@ -208 +210 @@
                     '<p><label for="cat_as_tags" class="classic">'.form::checkbox('cat_as_tags',1,$this->vars['cat_as_tags']).' '.
                     __('Import all categories as tags:').'</label></p>'.
-                    '<p><label for="cat_tags_prefix">'.__('Prefix such tags with:').' '.
-                    form::field('cat_tags_prefix',10,20,html::escapeHTML($this->vars['cat_tags_prefix'])).'</label></p>'.
-                    '<p><label for="post_limit">'.__('Number of entries to import at once:').' '.
-                    form::field('post_limit',3,3,html::escapeHTML($this->vars['post_limit'])).'</label></p>'.
+                    '<p><label for="cat_tags_prefix">'.__('Prefix such tags with:').'</label> '.
+                    form::field('cat_tags_prefix',10,20,html::escapeHTML($this->vars['cat_tags_prefix'])).'</p>'.
+                    '<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>'.
                     
                     '<h3>'.__('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:').' '.form::combo('post_formater',$this->formaters,$this->vars['post_formater']).'</label></p>'.
-                    '<p><label for="comment_formater">'.__('Comment content formatter:').' '.form::combo('comment_formater',$this->formaters,$this->vars['comment_formater']).'</label></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>'
                     );
                     break;