Changeset 1450:ce68ee4d8668

Timestamp:

08/18/13 14:36:23 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix issue #1555 : improve html in a more semantic way for media.php page

Files:

• admin/media.php (modified) (3 diffs)
• inc/admin/lib.dc.page.php (modified) (5 diffs)

admin/media.php

@@ -354 +354 @@
 
      echo
-     '<fieldset id="add-file-f"><legend>'.__('Add files').'</legend>'.
+     '<div class="fieldset">'.
+     '<h3>'.__('Add files').'</h3>'.
      '<p>'.__('Please take care to publish media that you own and that are not protected by copyright.').'</p>'.
-     ' <form id="fileupload" action="'.html::escapeURL($page_url).'" method="POST" enctype="multipart/form-data">'.
-     '<div>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
-     $core->formNonce().'</div>'.
-     '<div class="fileupload-ctrl"><div class="queue-message"></div><div class="files"></div></div>';
+     ' <form id="fileupload" action="'.html::escapeURL($page_url).'" method="POST" enctype="multipart/form-data" aria-disabled="false">'.
+     '<p>'.form::hidden(array('MAX_FILE_SIZE'),DC_MAX_UPLOAD_SIZE).
+     $core->formNonce().'</p>'.
+     '<div class="fileupload-ctrl"><p class="queue-message"></p><ul class="files"></ul></div>';
 
      echo
@@ -366 +367 @@
      echo
      '<p class="max-sier form-note info">&nbsp;'.__('Maximum file size allowed:').' '.files::size(DC_MAX_UPLOAD_SIZE).'</p>'.
-     '<label for="upfile">'.'<span class="add-label one-file">'.__('Choose file').'</span>'.'</label>'.
+     '<p><label for="upfile">'.'<span class="add-label one-file">'.__('Choose file').'</span>'.'</label>'.
      '<button class="button add">'.__('Choose files').'</button>'.
-     '<input type="file" id="upfile" name="upfile[]"'.($user_ui_enhanceduploader?' multiple="mutiple"':'').' data-url="'.html::escapeURL($page_url).'" />';
-
-     echo
-     '<p class="one-file"><label for="upfiletitle">'.__('Title:').form::field(array('upfiletitle','upfiletitle'),35,255).'</label></p>'.
-     '<p class="one-file"><label for="upfilepriv" class="classic">'.form::checkbox(array('upfilepriv','upfilepriv'),1).' '.
-     __('Private').'</label></p>';
+     '<input type="file" id="upfile" name="upfile[]"'.($user_ui_enhanceduploader?' multiple="mutiple"':'').' data-url="'.html::escapeURL($page_url).'" /></p>';
+
+     echo
+     '<p class="one-file"><label for="upfiletitle">'.__('Title:').'</label>'.form::field(array('upfiletitle','upfiletitle'),35,255).'</p>'.
+     '<p class="one-file"><label for="upfilepriv" class="classic">'.__('Private').'</label>'.
+     form::checkbox(array('upfilepriv','upfilepriv'),1).'</p>';
 
      if (!$user_ui_enhanceduploader) {
@@ -382 +383 @@
 
      echo
-     '<button class="button clean">'.__('Refresh').'</button>'.
+     '<p><button class="button clean">'.__('Refresh').'</button>'.
      '<input class="button cancel one-file" type="reset" value="'.__('Clear all').'"/>'.
-     '<input class="button start" type="submit" value="'.__('Upload').'"/>'.
+     '<input class="button start" type="submit" value="'.__('Upload').'"/></p>'.
      '</div>';
 
      echo
-     '<div>'.form::hidden(array('d'),$d).'</div>'.
-     '</fieldset>'.
+     '<p>'.form::hidden(array('d'),$d).'</p>'.
      '</form>'.
      '</div>';
-     
+
      echo
      '<div class="col">'.

inc/admin/lib.dc.page.php

@@ -471 +471 @@
                __("Are you sure you want to delete this entry?")).
           self::jsVar('dotclear.msg.click_to_unlock',
-               __("Click here to unlock the field")).            
+               __("Click here to unlock the field")).
           self::jsVar('dotclear.msg.confirm_spam_delete',
                __('Are you sure you want to delete all spams?')).
@@ -726 +726 @@
      '<script id="template-upload" type="text/x-tmpl">
      {% for (var i=0, file; file=o.files[i]; i++) { %}
-     <div class="template-upload fade">
+     <li class="template-upload fade">
      <div class="upload-file">
      <div class="upload-fileinfo">
@@ -740 +740 @@
      <div class="upload-progress progress progress-success progress-striped active"><div class="bar" style="width:0%;"></div></div>
      {% } %}
-     </div>
+     </li>
      {% } %}
      </script>
@@ -746 +746 @@
      <script id="template-download" type="text/x-tmpl">
      {% for (var i=0, file; file=o.files[i]; i++) { %}
-     <div class="template-download fade">
+     <li class="template-download fade">
      <div class="upload-file">
      <div class="upload-fileinfo">
@@ -764 +764 @@
           {% } %}
      </div>
-     </div>
+     </li>
      {% } %}
      </script>'.