Changeset 557:e4ca21f50855 for plugins/importExport

Timestamp:

07/10/11 11:48:44 (14 years ago)

Author:

kozlika

Branch:

default

Message:

Ergo: harmonisation de la terminologie des boutons, termes plus précis quand possible. Accessibilité: fieldsets, labels…

La passe suivante pour essayer d'alléger le boulot des traducteurs…

Location:

plugins/importExport/inc

Files:

• class.dc.export.flat.php (modified) (2 diffs)
• class.dc.import.feed.php (modified) (1 diff)
• class.dc.import.flat.php (modified) (3 diffs)

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

@@ -157 +157 @@
           '<p>'.sprintf(__('This will create an export of your current blog: %s'),
           '<strong>'.html::escapeHTML($this->core->blog->name).'</strong>').'</p>'.
-          '<p><label for="file_name" class="classic">'.__('File name:').' '.
+          '<p><label for="file_name" class="classic">'.__('File name:').'</label>'.
           form::field(array('file_name','file_name'),25,255,date('Y-m-d-').html::escapeHTML($this->core->blog->id.'-backup.txt')).
-          '</label> '.
           '<input type="submit" value="'.__('Export').'" />'.
           form::hidden(array('do'),'export_blog').
@@ -172 +171 @@
                '<form action="'.$this->getURL(true).'" method="post">'.
                '<fieldset><legend>'.__('Export all content').'</legend>'.
-               '<p><label for="file_name2" class="classic">'.__('File name:').' '.
+               '<p><label for="file_name2" class="classic">'.__('File name:').'</label>'.
                form::field(array('file_name','file_name2'),25,255,date('Y-m-d-').'dotclear-backup.txt').
-               '</label> '.
                '<input type="submit" value="'.__('Export all content').'" />'.
                form::hidden(array('do'),'export_all').

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

@@ -86 +86 @@
           '<form action="'.$this->getURL(true).'" method="post">'.
           
-          '<fieldset>'.
+          '<div class="fieldset">'.
           $this->core->formNonce().
           form::hidden(array('do'),1).
-          '<p><label for="feed_url">'.__('Feed URL:').' '.
-          form::field('feed_url',40,300,html::escapeHTML($this->feed_url)).'</label></p>'.
-          '<p><input type="submit" value="'.__('Send').'" /></p>'.
-          '</fieldset>'.
+          '<p><label for="feed_url">'.__('Feed URL:').'</label>'.
+          form::field('feed_url',40,300,html::escapeHTML($this->feed_url)).'</p>'.
+          '<p><input type="submit" value="'.__('Import').'" /></p>'.
+          '</div>'.
           '</form>';
      }

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

@@ -160 +160 @@
           '<form action="'.$this->getURL(true).'" method="post" enctype="multipart/form-data">'.
           
-          '<fieldset>'.
+          '<div class="fieldset">'.
           $this->core->formNonce().
           form::hidden(array('do'),1).
           form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
-          '<p><label for="up_single_file">'.__('Upload a backup file').' '.
+          '<p><label for="up_single_file">'.__('Upload a backup file').'</label>'.
           '<input type="file" id="up_single_file" name="up_single_file" size="20" />'.
-          '</label></p>';
+          '</p>';
           
           $public_files = $this->getPublicFiles();
@@ -178 +178 @@
           
           echo
-          '<p><input type="submit" value="'.__('Send').'" /></p>'.
-          '</fieldset>'.
+          '<p><input type="submit" value="'.__('Import').'" /></p>'.
+          '</div>'.
           '</form>';
           
@@ -189 +189 @@
                '<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).'</div>'.
                
-               '<fieldset>'.
+               '<div class="fieldset">'.
                $this->core->formNonce().
                form::hidden(array('do'),1).
                form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
-               '<p><label for="up_full_file">'.__('Upload a backup file').' '.
+               '<p><label for="up_full_file">'.__('Upload a backup file').'</label>'.
                '<input type="file" id="up_full_file" name="up_full_file" size="20" />'.
-               '</label></p>';
+               '</p>';
                
                echo
-               '<p><label for="public_full_file">'.__('or pick up a local file in your public directory').' '.
+               '<p><label for="public_full_file">'.__('or pick up a local file in your public directory').'</label>'.
                form::combo('public_full_file',$public_files, '', '', '', $empty).
-               '</label></p>';
+               '</p>';
                
                echo
-               '<p><strong>'.__('Warning: This will reset all the content of your database, except users.').'</strong></p>'.
-               
-               '<p><label for="your_pwd">'.__('Your password:').
-               form::password('your_pwd',20,255).'</label></p>'.
-               
-               '<p><input type="submit" value="'.__('Send').'" /></p>'.
-               '</fieldset>'.
+               '<p class="form-note warning"><strong>'.__('Warning: This will reset all the content of your database, except users.').'</strong></p>'.
+               
+               '<p><label for="your_pwd" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Your password:').'</label>'.
+               form::password('your_pwd',20,255).'</p>'.
+               
+               '<p><input type="submit" value="'.__('Import').'" /></p>'.
+               '</div>'.
                '</form>';
           }