Changeset 4466

Timestamp:

11/14/06 23:18:20 (2 years ago)

Author:

ryan

Message:

Inline uploader tweaks from mdawaffe. fixes #3360

Files:

• trunk/wp-admin/upload-functions.php (modified) (1 diff)
• trunk/wp-admin/upload-js.php (modified) (4 diffs)
• trunk/wp-admin/upload-rtl.css (modified) (2 diffs)
• trunk/wp-admin/upload.css (modified) (2 diffs)
• trunk/wp-admin/upload.php (modified) (4 diffs)
• trunk/wp-admin/wp-admin.css (modified) (1 diff)
• trunk/wp-includes/script-loader.php (modified) (1 diff)

trunk/wp-admin/upload-functions.php

@@ -359 +359 @@
-function wp_upload_admin_head() {
-    global $wp_locale;
-
+a
-    if ( 'rtl' == $wp_locale->text_direction )
-
+a
-    if ( 'inline' == @$_GET['style'] ) {
-
-
-
-
+
+
+
+
+
-        echo "</style>";
-    }

trunk/wp-admin/upload-js.php

@@ -75 +75 @@
-                h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "' title='Browse your files' class='back'>&laquo; Back</a>";
-            } else {
-theFileList.cancelView()
+return theFileList.cancelView();
-            }
-            h += "<div id='file-title'>"
@@ -83 +83 @@
-                h += "<h2>" + this.currentImage.title + "</h2>";
-            h += " &#8212; <span>";
-theFileList.editView(" + id + ")
+return theFileList.editView(" + id + ");
-            h += "</span>";
-            h += '</div>'
@@ -137 +137 @@
-                h += "<a href='" + this.urlData[0] + '?' + params.toQueryString() + "'  title='Browse your files' class='back'>&laquo; Back</a>";
-            } else {
-theFileList.cancelView()
+return theFileList.cancelView();
-            }
-            h += "<div id='file-title'>"
@@ -145 +145 @@
-                h += "<h2>" + this.currentImage.title + "</h2>";
-            h += " &#8212; <span>";
-theFileList.imageView(" + id + ")
+return theFileList.imageView(" + id + ");
-            h += "</span>";
-            h += '</div>'

trunk/wp-admin/upload-rtl.css

@@ +1 @@
+#upload-menu li a.upload-tab-link {
+    float: right;
+    margin: 0 .75em 0 0;
+}
+
-table { float: right; }
+
+#upload-menu li #current-tab-nav {
+    float: right;
+    padding: 5px 0 0 5px;
+    margin-right: -5px;
+}
-
-#upload-file th, #the-attachment-links textarea { text-align: left; }
@@ -10 +21 @@
-
-#upload-menu li {
-    margin: 0 .75em 0 0;
-    display: block;
-    float: right;
-}
-
-.current div
+li.current
-    border-right: 0;
-    border-left: 2px solid #448abd;

trunk/wp-admin/upload.css

@@ -4 +4 @@
-
-#upload-menu {
-ackground:
-px
+order-top: 2em solid
+
-    padding: 0;
+    height: 0;
-    list-style: none;
-    height: 2em;
-    border-bottom: 1px solid #448abd;
-    width: 100%;
-}
-
-#upload-menu li { margin: 0 0 0 .75em
+body > #upload-menu { border-bottom: 7px solid #fff
-
-
-
+
+
+
+
+
+
-    border-top: 3px solid #247fab;
-}
-
-
+
+
+
+
+
+
-    text-decoration: none;
-    border-bottom: none;
@@ -26 +34 @@
-}
-
-
-
-
-
+
-    border-right: 2px solid #448abd;
-    color: #000;
-}
-
-
+
+
-    color: #000;
-}
-
-
-
-
+
+
+
+
-}
+
+#upload-menu li span .page-numbers {
+    padding: 0;
+    border: none;
+}
+
+#upload-menu li span a.page-numbers { color: #00019b; }
+#upload-menu li span a.page-numbers:hover { text-decoration: underline; }
-
-#upload-content {

trunk/wp-admin/upload.php

@@ -36 +36 @@
-    $wp_upload_tabs = array_merge($wp_upload_tabs, apply_filters( 'wp_upload_tabs', array() ));
-
-function_exists
+is_callable
-    $to_tab = isset($wp_upload_tabs['upload']) ? 'upload' : 'browse-all';
-    wp_redirect( add_query_arg( 'tab', $to_tab ) );
@@ -77 +77 @@
-echo "<ul id='upload-menu'>\n";
-foreach ( $wp_upload_tabs as $t => $tab_array ) { // We've already done the current_user_can check
-    $class = 'upload-tab';
-    $href = add_query_arg( array('tab' => $t, 'ID' => '', 'action' => '', 'paged' => '') );
-    if ( isset($tab_array[4]) && is_array($tab_array[4]) )
@@ -83 +82 @@
-    $_href = wp_specialchars( $href, 1 );
-    $page_links = '';
+    $class = 'upload-tab alignleft';
-    if ( $tab == $t ) {
-        $class .= ' current';
@@ -106 +106 @@
-    }
-
- alignleft'><div><a href='$_href' title='{$tab_array[0]}'>{$tab_array[0]}</a>$page_links</div>
+'><a href='$_href' class='upload-tab-link' title='{$tab_array[0]}'>{$tab_array[0]}</a>$page_links
-}
-unset($t, $tab_array, $href, $_href, $page_links, $total, $per, $class);

trunk/wp-admin/wp-admin.css

@@ -207 +207 @@
-    padding: 0px;
-    margin-bottom: 16px;
-7
+8
-    width: 100%;
-/*  overflow-y: hidden;*/
-}
-

trunk/wp-includes/script-loader.php

@@ -30 +30 @@
-            $this->add( 'admin-users', '/wp-admin/users.js', array('listman'), '3684' );
-            $this->add( 'xfn', '/wp-admin/xfn.js', false, '3517' );
-1
+6
-        }
-    }