Changeset 1852:c0c05a0c54a3

Timestamp:

09/14/13 13:31:08 (12 years ago)

Author:

Anne Kozlika <kozlika@…>

Branch:

default

Message:

Media.php. Amélioration de l'upload multiple, ajout d'une image pour remonter dans l'arbo, présentation un peu différente pour les répertoires vs. fichiers.

Location:

admin

Files:

• images/media/folder-up.png (added)
• js/_media.js (modified) (1 diff)
• media.php (modified) (1 diff)
• style/default.css (modified) (10 diffs)

admin/js/_media.js

@@ -25 +25 @@
                }
                
-               $('.button.add').click(function(e) {
+               $('.button.choose_files').click(function(e) {
                     // Use the native click() of the file input.
                     $('#upfile').click();

admin/media.php

@@ -372 +372 @@
      echo
      '<p><label for="upfile">'.'<span class="add-label one-file">'.__('Choose file').'</span>'.'</label>'.
-     '<button class="button add">'.__('Choose files').'</button>'.
+     '<button class="button choose_files">'.__('Choose files').'</button>'.
      '<input type="file" id="upfile" name="upfile[]"'.($user_ui_enhanceduploader?' multiple="mutiple"':'').' data-url="'.html::escapeURL($page_url).'" /></p>';
 

admin/style/default.css

@@ -563 +563 @@
      border-radius: 3px;
      cursor: pointer;
+     font: 100% "DejaVu Sans","Lucida Grande","Lucida Sans Unicode",Arial,sans-serif;
      }
 button,
@@ -571 +572 @@
      }
  /* validation */
-input[type=submit], a.button.submit {
+input[type=submit], a.button.submit, input.button.start {
      color: #fff;
      border: 1px solid #2C8FD1;
@@ -581 +582 @@
      }
      input[type=submit]:hover, input[type=submit]:focus,
+     input.button.start:hover, input.button.start:focus,
      a.button.submit:hover, a.button.submit:focus {
           background-image:-moz-linear-gradient(top,#188BC0 0%,#25A6E1 100%);
@@ -1620 +1622 @@
      min-height: 120px
      }
+     .media-folder {
+          background: transparent url(bg_menu.png) repeat-y;
+          border-left-color: #f90;
+          }
+     .media-folder-up {
+          border: none;
+          }
      .media-item ul {
           display: block;
@@ -1626 +1635 @@
           padding: 0;
           }
+     .media-folder ul, .media-folder img {
+          padding-left: 2em;
+          }
      a.media-icon {
           display: block;
@@ -1643 +1655 @@
      display: block;
      position: absolute;
-     top: 5px;
-     right: 5px;
+     bottom: 4px;
+     right: 8px;
      height: 16px;
      }
@@ -1660 +1672 @@
      padding: 5px 0 5px 20px;
      }
-
+/* upload multiple */
 .enhanced_uploader .add, .enhanced_uploader .cancel, 
 .enhanced_uploader .clean, .enhanced_uploader .start {
      margin-right: .4em;
-}
+     }
 .enhanced_uploader #upfile {
      visibility: hidden;
@@ -1673 +1685 @@
      filter: alpha(opacity=0);
      cursor: pointer;
-}
+     }
 .button.clean, .button.cancel, .button.add {
      display: none;
-}
+     }
 .enhanced_uploader .button.add {
      display: inline-block;
-}
+     }
 .enhanced_uploader .max-size {
      display: block;
-}
+     }
 .enhanced_uploader .one-file {
      display: none;
-}
+     }
 label span.one-file {
      display: inline;
-}
+     }
 .enhanced_uploader p.clear {
      padding-top: 1em;
      margin-bottom: 1em;
-}
+     }
 #add-file-f p.clear {
      margin-top: 1em;
      margin-bottom: 0;
      clear: both;
-}
-/* files */
+     }
 .files {
      list-style-type: none;
      margin-left: 0;
      padding-left: 0;
-}
+     border-bottom: 1px solid #ddd;
+     }
 .files li {
      margin-left: 0;
      padding-left: 0;
-}
+     }
 .upload-msg {
      font-weight: bold;
-}
+     }
 .upload-msg.upload-error {
      color: #c00;
-}
+     }
 .upload-files {
      padding: 0 0.5em;
-     margin: 10px 0;
-}
+     margin: 1em 0;
+     }
 .upload-file {
-     margin: 0 0 8px 0;
+     margin: 0;
+     padding: .3em 0;
+     border-top: 1px solid #ddd;
      position: relative;
-}
+     }
 .upload-fileinfo {
-     margin-left: 8px;
-     margin-bottom: .4em;
-}
+     margin-left: 0;
+/*   margin-bottom: .4em;*/
+     }
+.upload-fileinfo input {
+     position: absolute;
+     top: .5em;
+     right: .5em;
+     }
 .upload-fileinfo span {
      padding-right: 8px;
-}
+     }
 .upload-fileinfo .upload-filecancel {
      display: block;
@@ -1739 +1758 @@
      cursor: pointer;
      float: left;
-}
+     }
 .upload-filemsg {
      font-weight: bold;
      color: green;
-}
+     }
 .upload-filemsg.upload-error {
      color: #c00;
-}
+     }
 .upload-progress {
-     padding: 0 8px;
-}
+     padding: .3em 0; 
+     }
 .upload-progress div {
      width: 0;
@@ -1761 +1780 @@
      color: white;
      border-radius: 2px;
-}
+     }
 div.template-upload {
      clear: both;
-}
+     }
 .queue-message {
      font-weight: bold;
-     margin: 0 0 1em 0;
-}
+     }
 
 /* --------------------------------------------------------------- media-item.php */